Merge/rework config system per the latest from linux-2.6.0-test2.

Fix the config bugs revealed by the updated config system.
 -Erik

1 files changed, 17 insertions, 65 deletions

diff --git a/scripts/config/expr.h b/scripts/config/expr.h
index e96d03b5a..cc616f1f8 100644
--- a/scripts/config/expr.h
+++ b/scripts/config/expr.h
@@ -18,10 +18,6 @@ extern "C" {
 struct file {
         struct file *next;
         struct file *parent;
-#ifdef CML1
-        struct statement *stmt;
-        struct statement *last_stmt;
-#endif
         char *name;
         int lineno;
         int flags;
@@ -36,7 +32,7 @@ typedef enum tristate {
 } tristate;
 
 enum expr_type {
-        E_NONE, E_OR, E_AND, E_NOT, E_EQUAL, E_UNEQUAL, E_CHOICE, E_SYMBOL
+        E_NONE, E_OR, E_AND, E_NOT, E_EQUAL, E_UNEQUAL, E_CHOICE, E_SYMBOL, E_RANGE
 };
 
 union expr_data {
@@ -45,18 +41,10 @@ union expr_data {
 };
 
 struct expr {
-#ifdef CML1
-        int token;
-#else
         enum expr_type type;
-#endif
         union expr_data left, right;
 };
 
-#define E_TRI(ev)       ((ev).tri)
-#define E_EXPR(ev)      ((ev).expr)
-#define E_CALC(ev)      (E_TRI(ev) = expr_calc_value(E_EXPR(ev)))
-
 #define E_OR(dep1, dep2)        (((dep1)>(dep2))?(dep1):(dep2))
 #define E_AND(dep1, dep2)       (((dep1)<(dep2))?(dep1):(dep2))
 #define E_NOT(dep)              (2-(dep))
@@ -66,12 +54,8 @@ struct expr_value {
         tristate tri;
 };
 
-#define S_VAL(sv)       ((sv).value)
-#define S_TRI(sv)       ((sv).tri)
-#define S_EQ(sv1, sv2)  (S_VAL(sv1) == S_VAL(sv2) || !strcmp(S_VAL(sv1), S_VAL(sv2)))
-
 struct symbol_value {
-        void *value;
+        void *val;
         tristate tri;
 };
 
@@ -83,31 +67,17 @@ struct symbol {
         struct symbol *next;
         char *name;
         char *help;
-#ifdef CML1
-        int type;
-#else
         enum symbol_type type;
-#endif
-        struct symbol_value curr, def;
+        struct symbol_value curr, user;
         tristate visible;
         int flags;
         struct property *prop;
         struct expr *dep, *dep2;
-        struct menu *menu;
+        struct expr_value rev_dep;
 };
 
 #define for_all_symbols(i, sym) for (i = 0; i < 257; i++) for (sym = symbol_hash[i]; sym; sym = sym->next) if (sym->type != S_OTHER)
 
-#ifdef CML1
-#define SYMBOL_UNKNOWN          S_UNKNOWN
-#define SYMBOL_BOOLEAN          S_BOOLEAN
-#define SYMBOL_TRISTATE         S_TRISTATE
-#define SYMBOL_INT              S_INT
-#define SYMBOL_HEX              S_HEX
-#define SYMBOL_STRING           S_STRING
-#define SYMBOL_OTHER            S_OTHER
-#endif
-
 #define SYMBOL_YES              0x0001
 #define SYMBOL_MOD              0x0002
 #define SYMBOL_NO               0x0004
@@ -122,42 +92,38 @@ struct symbol {
 #define SYMBOL_CHANGED          0x0400
 #define SYMBOL_NEW              0x0800
 #define SYMBOL_AUTO             0x1000
+#define SYMBOL_CHECKED          0x2000
+#define SYMBOL_CHECK_DONE       0x4000
+#define SYMBOL_WARNED           0x8000
 
 #define SYMBOL_MAXLENGTH        256
 #define SYMBOL_HASHSIZE         257
 #define SYMBOL_HASHMASK         0xff
 
 enum prop_type {
-        P_UNKNOWN, P_PROMPT, P_COMMENT, P_MENU, P_ROOTMENU, P_DEFAULT, P_CHOICE
+        P_UNKNOWN, P_PROMPT, P_COMMENT, P_MENU, P_DEFAULT, P_CHOICE, P_SELECT, P_RANGE
 };
 
 struct property {
         struct property *next;
         struct symbol *sym;
-#ifdef CML1
-        int token;
-#else
         enum prop_type type;
-#endif
         const char *text;
-        struct symbol *def;
         struct expr_value visible;
-        struct expr *dep;
-        struct expr *dep2;
+        struct expr *expr;
         struct menu *menu;
         struct file *file;
         int lineno;
-#ifdef CML1
-        struct property *next_pos;
-#endif
 };
 
 #define for_all_properties(sym, st, tok) \
         for (st = sym->prop; st; st = st->next) \
                 if (st->type == (tok))
-#define for_all_prompts(sym, st) for_all_properties(sym, st, P_PROMPT)
 #define for_all_defaults(sym, st) for_all_properties(sym, st, P_DEFAULT)
 #define for_all_choices(sym, st) for_all_properties(sym, st, P_CHOICE)
+#define for_all_prompts(sym, st) \
+        for (st = sym->prop; st; st = st->next) \
+                if (st->text)
 
 struct menu {
         struct menu *next;
@@ -166,12 +132,16 @@ struct menu {
         struct symbol *sym;
         struct property *prompt;
         struct expr *dep;
+        unsigned int flags;
         //char *help;
         struct file *file;
         int lineno;
         void *data;
 };
 
+#define MENU_CHANGED            0x0001
+#define MENU_ROOT               0x0002
+
 #ifndef SWIG
 
 extern struct file *file_list;
@@ -181,18 +151,12 @@ struct file *lookup_file(const char *name);
 extern struct symbol symbol_yes, symbol_no, symbol_mod;
 extern struct symbol *modules_sym;
 extern int cdebug;
-extern int print_type;
 struct expr *expr_alloc_symbol(struct symbol *sym);
-#ifdef CML1
-struct expr *expr_alloc_one(int token, struct expr *ce);
-struct expr *expr_alloc_two(int token, struct expr *e1, struct expr *e2);
-struct expr *expr_alloc_comp(int token, struct symbol *s1, struct symbol *s2);
-#else
 struct expr *expr_alloc_one(enum expr_type type, struct expr *ce);
 struct expr *expr_alloc_two(enum expr_type type, struct expr *e1, struct expr *e2);
 struct expr *expr_alloc_comp(enum expr_type type, struct symbol *s1, struct symbol *s2);
-#endif
 struct expr *expr_alloc_and(struct expr *e1, struct expr *e2);
+struct expr *expr_alloc_or(struct expr *e1, struct expr *e2);
 struct expr *expr_copy(struct expr *org);
 void expr_free(struct expr *e);
 int expr_eq(struct expr *e1, struct expr *e2);
@@ -212,17 +176,6 @@ struct expr *expr_trans_compare(struct expr *e, enum expr_type type, struct symb
 void expr_fprint(struct expr *e, FILE *out);
 void print_expr(int mask, struct expr *e, int prevtoken);
 
-#ifdef CML1
-static inline int expr_is_yes(struct expr *e)
-{
-        return !e || (e->token == WORD && e->left.sym == &symbol_yes);
-}
-
-static inline int expr_is_no(struct expr *e)
-{
-        return e && (e->token == WORD && e->left.sym == &symbol_no);
-}
-#else
 static inline int expr_is_yes(struct expr *e)
 {
         return !e || (e->type == E_SYMBOL && e->left.sym == &symbol_yes);
@@ -233,7 +186,6 @@ static inline int expr_is_no(struct expr *e)
         return e && (e->type == E_SYMBOL && e->left.sym == &symbol_no);
 }
 #endif
-#endif
 
 #ifdef __cplusplus
 }