turn the wrtsl54gs workaround into a more generic fix and reduce the chance of it...

[openwrt.git] / scripts / config / symbol.c

diff --git a/scripts/config/symbol.c b/scripts/config/symbol.c
index b79d81a..2c1392a 100644 (file)
--- a/scripts/config/symbol.c
+++ b/scripts/config/symbol.c
@@ -197,6 +197,7 @@ static void sym_calc_visibility(struct symbol *sym)
 {
        struct property *prop;
        tristate tri;
+       int deselected = 0;
 
        /* any prompt visible? */
        tri = no;
@@ -204,18 +205,17 @@ static void sym_calc_visibility(struct symbol *sym)
                prop->visible.tri = expr_calc_value(prop->visible.expr);
                tri = E_OR(tri, prop->visible.tri);
        }
-/* tristate always enabled */
-#if 0
-       if (tri == mod && (sym->type != S_TRISTATE || modules_val == no))
-#else
        if (tri == mod && (sym->type != S_TRISTATE))
-#endif
                tri = yes;
+       if (sym->rev_dep_inv.expr && (expr_calc_value(sym->rev_dep_inv.expr) == yes)) {
+               tri = no;
+               deselected = 1;
+       }
        if (sym->visible != tri) {
                sym->visible = tri;
                sym_set_changed(sym);
        }
-       if (sym_is_choice_value(sym))
+       if (sym_is_choice_value(sym) || deselected)
                return;
        tri = no;
        if (sym->rev_dep.expr)
@@ -311,6 +311,8 @@ void sym_calc_value(struct symbol *sym)
                if (sym_is_choice_value(sym) && sym->visible == yes) {
                        prop = sym_get_choice_prop(sym);
                        newval.tri = (prop_get_symbol(prop)->curr.val == sym) ? yes : no;
+               } else if (sym->rev_dep_inv.expr && (expr_calc_value(sym->rev_dep_inv.expr) == yes)) {
+                       newval.tri = no;
                } else if (E_OR(sym->visible, sym->rev_dep.tri) != no) {
                        sym->flags |= SYMBOL_WRITE;
                        if (sym_has_value(sym))
@@ -814,7 +816,7 @@ struct symbol *sym_check_deps(struct symbol *sym)
                goto out;
 
        for (prop = sym->prop; prop; prop = prop->next) {
-               if (prop->type == P_CHOICE || prop->type == P_SELECT)
+               if (prop->type == P_CHOICE || prop->type == P_SELECT || prop->type == P_DESELECT)
                        continue;
                sym2 = sym_check_expr_deps(prop->visible.expr);
                if (sym2)
@@ -882,6 +884,8 @@ const char *prop_get_type_name(enum prop_type type)
                return "choice";
        case P_SELECT:
                return "select";
+       case P_DESELECT:
+               return "deselect";
        case P_RANGE:
                return "range";
        case P_UNKNOWN: