config: import latest kconfig

[carl9170fw.git] / config / lkc_proto.h

diff --git a/config/lkc_proto.h b/config/lkc_proto.h
index aa326cd403a8a04486f6454b84bd3f5f655cef0f..47fe9c340f9a20b9b6bd9871d18d79ea9ddc7d1d 100644 (file)
--- a/config/lkc_proto.h
+++ b/config/lkc_proto.h
@@ -1,47 +1,54 @@
+#include <stdarg.h>
 
 /* confdata.c */
-P(conf_parse, void, (const char *name));
-P(conf_read, int, (const char *name));
-P(conf_read_simple, int, (const char *name, int));
-P(conf_write, int, (const char *name));
-P(conf_write_autoconf, int, (void));
-P(conf_get_changed, bool, (void));
-P(conf_set_changed_callback, void, (void (*fn)(void)));
+P(conf_parse,void,(const char *name));
+P(conf_read,int,(const char *name));
+P(conf_read_simple,int,(const char *name, int));
+P(conf_write_defconfig,int,(const char *name));
+P(conf_write,int,(const char *name));
+P(conf_write_autoconf,int,(void));
+P(conf_get_changed,bool,(void));
+P(conf_set_changed_callback, void,(void (*fn)(void)));
+P(conf_set_message_callback, void,(void (*fn)(const char *fmt, va_list ap)));
 
 /* menu.c */
-P(rootmenu, struct menu,);
+P(rootmenu,struct menu,);
 
 P(menu_is_visible, bool, (struct menu *menu));
-P(menu_get_prompt, const char *, (struct menu *menu));
-P(menu_get_root_menu, struct menu *, (struct menu *menu));
-P(menu_get_parent_menu, struct menu *, (struct menu *menu));
-P(menu_has_help, bool, (struct menu *menu));
-P(menu_get_help, const char *, (struct menu *menu));
+P(menu_has_prompt, bool, (struct menu *menu));
+P(menu_get_prompt,const char *,(struct menu *menu));
+P(menu_get_root_menu,struct menu *,(struct menu *menu));
+P(menu_get_parent_menu,struct menu *,(struct menu *menu));
+P(menu_has_help,bool,(struct menu *menu));
+P(menu_get_help,const char *,(struct menu *menu));
 P(get_symbol_str, void, (struct gstr *r, struct symbol *sym));
-P(menu_get_ext_help, void, (struct menu *menu, struct gstr *help));
+P(get_relations_str, struct gstr, (struct symbol **sym_arr));
+P(menu_get_ext_help,void,(struct menu *menu, struct gstr *help));
 
 /* symbol.c */
-P(symbol_hash, struct symbol *, [SYMBOL_HASHSIZE]);
+P(symbol_hash,struct symbol *,[SYMBOL_HASHSIZE]);
 
-P(sym_lookup, struct symbol *, (const char *name, int flags));
-P(sym_find, struct symbol *, (const char *name));
-P(sym_re_search, struct symbol **, (const char *pattern));
-P(sym_type_name, const char *, (enum symbol_type type));
-P(sym_calc_value, void, (struct symbol *sym));
-P(sym_get_type, enum symbol_type, (struct symbol *sym));
-P(sym_tristate_within_range, bool, (struct symbol *sym, tristate tri));
-P(sym_set_tristate_value, bool, (struct symbol *sym, tristate tri));
-P(sym_toggle_tristate_value, tristate, (struct symbol *sym));
-P(sym_string_valid, bool, (struct symbol *sym, const char *newval));
-P(sym_string_within_range, bool, (struct symbol *sym, const char *str));
-P(sym_set_string_value, bool, (struct symbol *sym, const char *newval));
-P(sym_is_changable, bool, (struct symbol *sym));
-P(sym_get_choice_prop, struct property *, (struct symbol *sym));
-P(sym_get_default_prop, struct property *, (struct symbol *sym));
-P(sym_get_string_value, const char *, (struct symbol *sym));
+P(sym_lookup,struct symbol *,(const char *name, int flags));
+P(sym_find,struct symbol *,(const char *name));
+P(sym_expand_string_value,const char *,(const char *in));
+P(sym_escape_string_value, const char *,(const char *in));
+P(sym_re_search,struct symbol **,(const char *pattern));
+P(sym_type_name,const char *,(enum symbol_type type));
+P(sym_calc_value,void,(struct symbol *sym));
+P(sym_get_type,enum symbol_type,(struct symbol *sym));
+P(sym_tristate_within_range,bool,(struct symbol *sym,tristate tri));
+P(sym_set_tristate_value,bool,(struct symbol *sym,tristate tri));
+P(sym_toggle_tristate_value,tristate,(struct symbol *sym));
+P(sym_string_valid,bool,(struct symbol *sym, const char *newval));
+P(sym_string_within_range,bool,(struct symbol *sym, const char *str));
+P(sym_set_string_value,bool,(struct symbol *sym, const char *newval));
+P(sym_is_changable,bool,(struct symbol *sym));
+P(sym_get_choice_prop,struct property *,(struct symbol *sym));
+P(sym_get_default_prop,struct property *,(struct symbol *sym));
+P(sym_get_string_value,const char *,(struct symbol *sym));
 
-P(prop_get_type_name, const char *, (enum prop_type type));
+P(prop_get_type_name,const char *,(enum prop_type type));
 
 /* expr.c */
-P(expr_compare_type, int, (enum expr_type t1, enum expr_type t2));
-P(expr_print, void, (struct expr *e, void (*fn)(void *, struct symbol *, const char *), void *data, int prevtoken));
+P(expr_compare_type,int,(enum expr_type t1, enum expr_type t2));
+P(expr_print,void,(struct expr *e, void (*fn)(void *, struct symbol *, const char *), void *data, int prevtoken));