Re: [PATCH] tristate choices with mixed tristate and boolean values (v2)
On Thu, Jan 24, 2008 at 11:57:03AM +, Jan Beulich wrote: > >menu_finalize as it stand today is already too complicated. > > > >Could we have this additional functionlity factored out or at least commented > >so mare humans have a small chance to understand what is going on. > > I'd prefer leaving the factoring-out to Roman, in fear of breaking > something if I do it myself. I sent out an updated patch just a second > ago, which adds a comment as you requested and also fixes another > problem (not one the patch introduced) that utilizing the new > functionality elsewhere uncovered. Thanks - I will give Roman a few days and if I see no complains then I will add it to kbuild.git. Sam -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] tristate choices with mixed tristate and boolean values (v2)
>menu_finalize as it stand today is already too complicated. > >Could we have this additional functionlity factored out or at least commented >so mare humans have a small chance to understand what is going on. I'd prefer leaving the factoring-out to Roman, in fear of breaking something if I do it myself. I sent out an updated patch just a second ago, which adds a comment as you requested and also fixes another problem (not one the patch introduced) that utilizing the new functionality elsewhere uncovered. Jan -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] tristate choices with mixed tristate and boolean values (v2)
menu_finalize as it stand today is already too complicated. Could we have this additional functionlity factored out or at least commented so mare humans have a small chance to understand what is going on. I'd prefer leaving the factoring-out to Roman, in fear of breaking something if I do it myself. I sent out an updated patch just a second ago, which adds a comment as you requested and also fixes another problem (not one the patch introduced) that utilizing the new functionality elsewhere uncovered. Jan -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] tristate choices with mixed tristate and boolean values (v2)
On Thu, Jan 24, 2008 at 11:57:03AM +, Jan Beulich wrote: menu_finalize as it stand today is already too complicated. Could we have this additional functionlity factored out or at least commented so mare humans have a small chance to understand what is going on. I'd prefer leaving the factoring-out to Roman, in fear of breaking something if I do it myself. I sent out an updated patch just a second ago, which adds a comment as you requested and also fixes another problem (not one the patch introduced) that utilizing the new functionality elsewhere uncovered. Thanks - I will give Roman a few days and if I see no complains then I will add it to kbuild.git. Sam -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] tristate choices with mixed tristate and boolean values (v2)
On Wed, Jan 23, 2008 at 04:44:40PM +, Jan Beulich wrote:
> Change kconfig behavior so that mixing bool and tristate config
> settings in a choice is possible and has the desired effect of offering
> just the tristate options individually if the choice gets set to M, and
> a normal boolean selection if the choice gets set to Y.
>
> Signed-off-by: Jan Beulich <[EMAIL PROTECTED]>
>
> ---
> scripts/kconfig/expr.c | 10 --
> scripts/kconfig/menu.c | 33 ++---
> 2 files changed, 38 insertions(+), 5 deletions(-)
>
> --- linux-2.6.24-rc8/scripts/kconfig/expr.c 2006-09-20 05:42:06.0
> +0200
> +++ 2.6.24-rc8-tristate-choices/scripts/kconfig/expr.c2008-01-21
> 13:32:44.0 +0100
> @@ -1034,12 +1034,18 @@ void expr_print(struct expr *e, void (*f
> expr_print(e->left.expr, fn, data, E_NOT);
> break;
> case E_EQUAL:
> - fn(data, e->left.sym, e->left.sym->name);
> + if (e->left.sym->name)
> + fn(data, e->left.sym, e->left.sym->name);
> + else
> + fn(data, NULL, "");
> fn(data, NULL, "=");
> fn(data, e->right.sym, e->right.sym->name);
> break;
> case E_UNEQUAL:
> - fn(data, e->left.sym, e->left.sym->name);
> + if (e->left.sym->name)
> + fn(data, e->left.sym, e->left.sym->name);
> + else
> + fn(data, NULL, "");
> fn(data, NULL, "!=");
> fn(data, e->right.sym, e->right.sym->name);
> break;
> --- linux-2.6.24-rc8/scripts/kconfig/menu.c 2007-10-09 22:31:38.0
> +0200
> +++ 2.6.24-rc8-tristate-choices/scripts/kconfig/menu.c2008-01-22
> 09:36:59.0 +0100
> @@ -239,9 +239,11 @@ void menu_finalize(struct menu *parent)
> for (menu = parent->list; menu; menu = menu->next) {
> if (menu->sym) {
> current_entry = parent;
> - menu_set_type(menu->sym->type);
> + if (sym->type == S_UNKNOWN)
> + menu_set_type(menu->sym->type);
> current_entry = menu;
> - menu_set_type(sym->type);
> + if (menu->sym->type == S_UNKNOWN)
> + menu_set_type(sym->type);
> break;
> }
> }
> @@ -326,7 +328,32 @@ void menu_finalize(struct menu *parent)
> "values not supported");
> }
> current_entry = menu;
> - menu_set_type(sym->type);
> + if (menu->sym->type == S_UNKNOWN)
> + menu_set_type(sym->type);
> + if (sym->type == S_TRISTATE && menu->sym->type !=
> S_TRISTATE) {
> + basedep = expr_alloc_comp(E_EQUAL, sym,
> _yes);
> + basedep = expr_alloc_and(basedep, menu->dep);
> + basedep = expr_eliminate_dups(basedep);
> + menu->dep = basedep;
> + for (prop = menu->sym->prop; prop; prop =
> prop->next) {
> + if (prop->menu != menu)
> + continue;
> + dep = expr_alloc_and(expr_copy(basedep),
> +
> prop->visible.expr);
> + dep = expr_eliminate_dups(dep);
> + dep = expr_trans_bool(dep);
> + prop->visible.expr = dep;
> + if (prop->type == P_SELECT) {
> + struct symbol *es =
> prop_get_symbol(prop);
> + dep2 =
> expr_alloc_symbol(menu->sym);
> + dep = expr_alloc_and(dep2,
> +
> expr_copy(dep));
> + dep =
> expr_alloc_or(es->rev_dep.expr, dep);
> + dep = expr_eliminate_dups(dep);
> + es->rev_dep.expr = dep;
> + }
> + }
> + }
> menu_add_symbol(P_CHOICE, sym, NULL);
> prop = sym_get_choice_prop(sym);
> for (ep = >expr; *ep; ep = &(*ep)->left.expr)
menu_finalize as it
[PATCH] tristate choices with mixed tristate and boolean values (v2)
Change kconfig behavior so that mixing bool and tristate config
settings in a choice is possible and has the desired effect of offering
just the tristate options individually if the choice gets set to M, and
a normal boolean selection if the choice gets set to Y.
Signed-off-by: Jan Beulich <[EMAIL PROTECTED]>
---
scripts/kconfig/expr.c | 10 --
scripts/kconfig/menu.c | 33 ++---
2 files changed, 38 insertions(+), 5 deletions(-)
--- linux-2.6.24-rc8/scripts/kconfig/expr.c 2006-09-20 05:42:06.0
+0200
+++ 2.6.24-rc8-tristate-choices/scripts/kconfig/expr.c 2008-01-21
13:32:44.0 +0100
@@ -1034,12 +1034,18 @@ void expr_print(struct expr *e, void (*f
expr_print(e->left.expr, fn, data, E_NOT);
break;
case E_EQUAL:
- fn(data, e->left.sym, e->left.sym->name);
+ if (e->left.sym->name)
+ fn(data, e->left.sym, e->left.sym->name);
+ else
+ fn(data, NULL, "");
fn(data, NULL, "=");
fn(data, e->right.sym, e->right.sym->name);
break;
case E_UNEQUAL:
- fn(data, e->left.sym, e->left.sym->name);
+ if (e->left.sym->name)
+ fn(data, e->left.sym, e->left.sym->name);
+ else
+ fn(data, NULL, "");
fn(data, NULL, "!=");
fn(data, e->right.sym, e->right.sym->name);
break;
--- linux-2.6.24-rc8/scripts/kconfig/menu.c 2007-10-09 22:31:38.0
+0200
+++ 2.6.24-rc8-tristate-choices/scripts/kconfig/menu.c 2008-01-22
09:36:59.0 +0100
@@ -239,9 +239,11 @@ void menu_finalize(struct menu *parent)
for (menu = parent->list; menu; menu = menu->next) {
if (menu->sym) {
current_entry = parent;
- menu_set_type(menu->sym->type);
+ if (sym->type == S_UNKNOWN)
+ menu_set_type(menu->sym->type);
current_entry = menu;
- menu_set_type(sym->type);
+ if (menu->sym->type == S_UNKNOWN)
+ menu_set_type(sym->type);
break;
}
}
@@ -326,7 +328,32 @@ void menu_finalize(struct menu *parent)
"values not supported");
}
current_entry = menu;
- menu_set_type(sym->type);
+ if (menu->sym->type == S_UNKNOWN)
+ menu_set_type(sym->type);
+ if (sym->type == S_TRISTATE && menu->sym->type !=
S_TRISTATE) {
+ basedep = expr_alloc_comp(E_EQUAL, sym,
_yes);
+ basedep = expr_alloc_and(basedep, menu->dep);
+ basedep = expr_eliminate_dups(basedep);
+ menu->dep = basedep;
+ for (prop = menu->sym->prop; prop; prop =
prop->next) {
+ if (prop->menu != menu)
+ continue;
+ dep = expr_alloc_and(expr_copy(basedep),
+
prop->visible.expr);
+ dep = expr_eliminate_dups(dep);
+ dep = expr_trans_bool(dep);
+ prop->visible.expr = dep;
+ if (prop->type == P_SELECT) {
+ struct symbol *es =
prop_get_symbol(prop);
+ dep2 =
expr_alloc_symbol(menu->sym);
+ dep = expr_alloc_and(dep2,
+
expr_copy(dep));
+ dep =
expr_alloc_or(es->rev_dep.expr, dep);
+ dep = expr_eliminate_dups(dep);
+ es->rev_dep.expr = dep;
+ }
+ }
+ }
menu_add_symbol(P_CHOICE, sym, NULL);
prop = sym_get_choice_prop(sym);
for (ep = >expr; *ep; ep = &(*ep)->left.expr)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at
[PATCH] tristate choices with mixed tristate and boolean values (v2)
Change kconfig behavior so that mixing bool and tristate config
settings in a choice is possible and has the desired effect of offering
just the tristate options individually if the choice gets set to M, and
a normal boolean selection if the choice gets set to Y.
Signed-off-by: Jan Beulich [EMAIL PROTECTED]
---
scripts/kconfig/expr.c | 10 --
scripts/kconfig/menu.c | 33 ++---
2 files changed, 38 insertions(+), 5 deletions(-)
--- linux-2.6.24-rc8/scripts/kconfig/expr.c 2006-09-20 05:42:06.0
+0200
+++ 2.6.24-rc8-tristate-choices/scripts/kconfig/expr.c 2008-01-21
13:32:44.0 +0100
@@ -1034,12 +1034,18 @@ void expr_print(struct expr *e, void (*f
expr_print(e-left.expr, fn, data, E_NOT);
break;
case E_EQUAL:
- fn(data, e-left.sym, e-left.sym-name);
+ if (e-left.sym-name)
+ fn(data, e-left.sym, e-left.sym-name);
+ else
+ fn(data, NULL, choice);
fn(data, NULL, =);
fn(data, e-right.sym, e-right.sym-name);
break;
case E_UNEQUAL:
- fn(data, e-left.sym, e-left.sym-name);
+ if (e-left.sym-name)
+ fn(data, e-left.sym, e-left.sym-name);
+ else
+ fn(data, NULL, choice);
fn(data, NULL, !=);
fn(data, e-right.sym, e-right.sym-name);
break;
--- linux-2.6.24-rc8/scripts/kconfig/menu.c 2007-10-09 22:31:38.0
+0200
+++ 2.6.24-rc8-tristate-choices/scripts/kconfig/menu.c 2008-01-22
09:36:59.0 +0100
@@ -239,9 +239,11 @@ void menu_finalize(struct menu *parent)
for (menu = parent-list; menu; menu = menu-next) {
if (menu-sym) {
current_entry = parent;
- menu_set_type(menu-sym-type);
+ if (sym-type == S_UNKNOWN)
+ menu_set_type(menu-sym-type);
current_entry = menu;
- menu_set_type(sym-type);
+ if (menu-sym-type == S_UNKNOWN)
+ menu_set_type(sym-type);
break;
}
}
@@ -326,7 +328,32 @@ void menu_finalize(struct menu *parent)
values not supported);
}
current_entry = menu;
- menu_set_type(sym-type);
+ if (menu-sym-type == S_UNKNOWN)
+ menu_set_type(sym-type);
+ if (sym-type == S_TRISTATE menu-sym-type !=
S_TRISTATE) {
+ basedep = expr_alloc_comp(E_EQUAL, sym,
symbol_yes);
+ basedep = expr_alloc_and(basedep, menu-dep);
+ basedep = expr_eliminate_dups(basedep);
+ menu-dep = basedep;
+ for (prop = menu-sym-prop; prop; prop =
prop-next) {
+ if (prop-menu != menu)
+ continue;
+ dep = expr_alloc_and(expr_copy(basedep),
+
prop-visible.expr);
+ dep = expr_eliminate_dups(dep);
+ dep = expr_trans_bool(dep);
+ prop-visible.expr = dep;
+ if (prop-type == P_SELECT) {
+ struct symbol *es =
prop_get_symbol(prop);
+ dep2 =
expr_alloc_symbol(menu-sym);
+ dep = expr_alloc_and(dep2,
+
expr_copy(dep));
+ dep =
expr_alloc_or(es-rev_dep.expr, dep);
+ dep = expr_eliminate_dups(dep);
+ es-rev_dep.expr = dep;
+ }
+ }
+ }
menu_add_symbol(P_CHOICE, sym, NULL);
prop = sym_get_choice_prop(sym);
for (ep = prop-expr; *ep; ep = (*ep)-left.expr)
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read
Re: [PATCH] tristate choices with mixed tristate and boolean values (v2)
On Wed, Jan 23, 2008 at 04:44:40PM +, Jan Beulich wrote:
Change kconfig behavior so that mixing bool and tristate config
settings in a choice is possible and has the desired effect of offering
just the tristate options individually if the choice gets set to M, and
a normal boolean selection if the choice gets set to Y.
Signed-off-by: Jan Beulich [EMAIL PROTECTED]
---
scripts/kconfig/expr.c | 10 --
scripts/kconfig/menu.c | 33 ++---
2 files changed, 38 insertions(+), 5 deletions(-)
--- linux-2.6.24-rc8/scripts/kconfig/expr.c 2006-09-20 05:42:06.0
+0200
+++ 2.6.24-rc8-tristate-choices/scripts/kconfig/expr.c2008-01-21
13:32:44.0 +0100
@@ -1034,12 +1034,18 @@ void expr_print(struct expr *e, void (*f
expr_print(e-left.expr, fn, data, E_NOT);
break;
case E_EQUAL:
- fn(data, e-left.sym, e-left.sym-name);
+ if (e-left.sym-name)
+ fn(data, e-left.sym, e-left.sym-name);
+ else
+ fn(data, NULL, choice);
fn(data, NULL, =);
fn(data, e-right.sym, e-right.sym-name);
break;
case E_UNEQUAL:
- fn(data, e-left.sym, e-left.sym-name);
+ if (e-left.sym-name)
+ fn(data, e-left.sym, e-left.sym-name);
+ else
+ fn(data, NULL, choice);
fn(data, NULL, !=);
fn(data, e-right.sym, e-right.sym-name);
break;
--- linux-2.6.24-rc8/scripts/kconfig/menu.c 2007-10-09 22:31:38.0
+0200
+++ 2.6.24-rc8-tristate-choices/scripts/kconfig/menu.c2008-01-22
09:36:59.0 +0100
@@ -239,9 +239,11 @@ void menu_finalize(struct menu *parent)
for (menu = parent-list; menu; menu = menu-next) {
if (menu-sym) {
current_entry = parent;
- menu_set_type(menu-sym-type);
+ if (sym-type == S_UNKNOWN)
+ menu_set_type(menu-sym-type);
current_entry = menu;
- menu_set_type(sym-type);
+ if (menu-sym-type == S_UNKNOWN)
+ menu_set_type(sym-type);
break;
}
}
@@ -326,7 +328,32 @@ void menu_finalize(struct menu *parent)
values not supported);
}
current_entry = menu;
- menu_set_type(sym-type);
+ if (menu-sym-type == S_UNKNOWN)
+ menu_set_type(sym-type);
+ if (sym-type == S_TRISTATE menu-sym-type !=
S_TRISTATE) {
+ basedep = expr_alloc_comp(E_EQUAL, sym,
symbol_yes);
+ basedep = expr_alloc_and(basedep, menu-dep);
+ basedep = expr_eliminate_dups(basedep);
+ menu-dep = basedep;
+ for (prop = menu-sym-prop; prop; prop =
prop-next) {
+ if (prop-menu != menu)
+ continue;
+ dep = expr_alloc_and(expr_copy(basedep),
+
prop-visible.expr);
+ dep = expr_eliminate_dups(dep);
+ dep = expr_trans_bool(dep);
+ prop-visible.expr = dep;
+ if (prop-type == P_SELECT) {
+ struct symbol *es =
prop_get_symbol(prop);
+ dep2 =
expr_alloc_symbol(menu-sym);
+ dep = expr_alloc_and(dep2,
+
expr_copy(dep));
+ dep =
expr_alloc_or(es-rev_dep.expr, dep);
+ dep = expr_eliminate_dups(dep);
+ es-rev_dep.expr = dep;
+ }
+ }
+ }
menu_add_symbol(P_CHOICE, sym, NULL);
prop = sym_get_choice_prop(sym);
for (ep = prop-expr; *ep; ep = (*ep)-left.expr)
menu_finalize as it stand today is already too complicated.
Could we have this additional functionlity factored out or at least commented
so mare humans have a small
