-rw-r--r-- | scripts/kconfig/lkc.h | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/scripts/kconfig/lkc.h b/scripts/kconfig/lkc.h index cdd04a9..dd040f7 100644 --- a/scripts/kconfig/lkc.h +++ b/scripts/kconfig/lkc.h | |||
@@ -44,41 +44,46 @@ char *conf_get_default_confname(void); | |||
44 | void kconfig_load(void); | 44 | void kconfig_load(void); |
45 | 45 | ||
46 | /* menu.c */ | 46 | /* menu.c */ |
47 | void menu_init(void); | 47 | void menu_init(void); |
48 | void menu_add_menu(void); | 48 | void menu_add_menu(void); |
49 | void menu_end_menu(void); | 49 | void menu_end_menu(void); |
50 | void menu_add_entry(struct symbol *sym); | 50 | void menu_add_entry(struct symbol *sym); |
51 | void menu_end_entry(void); | 51 | void menu_end_entry(void); |
52 | struct property *create_prop(enum prop_type type); | ||
53 | void menu_add_dep(struct expr *dep); | 52 | void menu_add_dep(struct expr *dep); |
54 | struct property *menu_add_prop(int token, char *prompt, struct symbol *def, struct expr *dep); | 53 | struct property *menu_add_prop(enum prop_type type, char *prompt, struct expr *expr, struct expr *dep); |
54 | void menu_add_prompt(enum prop_type type, char *prompt, struct expr *dep); | ||
55 | void menu_add_expr(enum prop_type type, struct expr *expr, struct expr *dep); | ||
56 | void menu_add_symbol(enum prop_type type, struct symbol *sym, struct expr *dep); | ||
55 | void menu_finalize(struct menu *parent); | 57 | void menu_finalize(struct menu *parent); |
56 | void menu_set_type(int type); | 58 | void menu_set_type(int type); |
57 | struct file *file_lookup(const char *name); | 59 | struct file *file_lookup(const char *name); |
58 | int file_write_dep(const char *name); | 60 | int file_write_dep(const char *name); |
59 | 61 | ||
60 | extern struct menu *current_entry; | 62 | extern struct menu *current_entry; |
61 | extern struct menu *current_menu; | 63 | extern struct menu *current_menu; |
62 | 64 | ||
63 | /* symbol.c */ | 65 | /* symbol.c */ |
64 | void sym_init(void); | 66 | void sym_init(void); |
65 | void sym_clear_all_valid(void); | 67 | void sym_clear_all_valid(void); |
66 | void sym_set_changed(struct symbol *sym); | 68 | void sym_set_changed(struct symbol *sym); |
69 | struct symbol *sym_check_deps(struct symbol *sym); | ||
70 | struct property *prop_alloc(enum prop_type type, struct symbol *sym); | ||
71 | struct symbol *prop_get_symbol(struct property *prop); | ||
67 | 72 | ||
68 | static inline tristate sym_get_tristate_value(struct symbol *sym) | 73 | static inline tristate sym_get_tristate_value(struct symbol *sym) |
69 | { | 74 | { |
70 | return S_TRI(sym->curr); | 75 | return sym->curr.tri; |
71 | } | 76 | } |
72 | 77 | ||
73 | 78 | ||
74 | static inline struct symbol *sym_get_choice_value(struct symbol *sym) | 79 | static inline struct symbol *sym_get_choice_value(struct symbol *sym) |
75 | { | 80 | { |
76 | return (struct symbol *)S_VAL(sym->curr); | 81 | return (struct symbol *)sym->curr.val; |
77 | } | 82 | } |
78 | 83 | ||
79 | static inline bool sym_set_choice_value(struct symbol *ch, struct symbol *chval) | 84 | static inline bool sym_set_choice_value(struct symbol *ch, struct symbol *chval) |
80 | { | 85 | { |
81 | return sym_set_tristate_value(chval, yes); | 86 | return sym_set_tristate_value(chval, yes); |
82 | } | 87 | } |
83 | 88 | ||
84 | static inline bool sym_is_choice(struct symbol *sym) | 89 | static inline bool sym_is_choice(struct symbol *sym) |
@@ -93,17 +98,16 @@ static inline bool sym_is_choice_value(struct symbol *sym) | |||
93 | 98 | ||
94 | static inline bool sym_is_optional(struct symbol *sym) | 99 | static inline bool sym_is_optional(struct symbol *sym) |
95 | { | 100 | { |
96 | return sym->flags & SYMBOL_OPTIONAL ? true : false; | 101 | return sym->flags & SYMBOL_OPTIONAL ? true : false; |
97 | } | 102 | } |
98 | 103 | ||
99 | static inline bool sym_has_value(struct symbol *sym) | 104 | static inline bool sym_has_value(struct symbol *sym) |
100 | { | 105 | { |
101 | //return S_VAL(sym->def) != NULL; | ||
102 | return sym->flags & SYMBOL_NEW ? false : true; | 106 | return sym->flags & SYMBOL_NEW ? false : true; |
103 | } | 107 | } |
104 | 108 | ||
105 | #ifdef __cplusplus | 109 | #ifdef __cplusplus |
106 | } | 110 | } |
107 | #endif | 111 | #endif |
108 | 112 | ||
109 | #endif /* LKC_H */ | 113 | #endif /* LKC_H */ |