tristate choices with mixed tristate and boolean values
PATCH 1/1 tristate choices with mixed tristate and boolean values
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.
scripts/kconfig/menu.c | 35 ++++++++++++++++++++++++++--------- 1 file changed, 26 insertions(+), 9 deletions(-)
scripts/kconfig/menu.c +26 -9
@@ -235,16 +235,23 @@ void menu_finalize(struct menu *parent) sym = parent->sym;if (parent->list) {if (sym &&sym_is_choice (sym)) { -/* find the first choice value and find out choice type */ +/* find out choice type */ +enum symbol_type type =S_UNKNOWN ; +for (menu = parent->list; menu; menu = menu->next) { -if (menu->sym) { - current_entry = parent; -menu_set_type (menu->sym->type); - current_entry = menu; -menu_set_type (sym->type); -break ; +if (menu->sym && menu->sym->type !=S_UNKNOWN ) { +if (type ==S_UNKNOWN ) + type = menu->sym->type; +if (type !=S_BOOLEAN ) +break ; +if (menu->sym->type ==S_TRISTATE ) { + type =S_TRISTATE ; +break ; + } } } + current_entry = parent; +menu_set_type (type); parentdep =expr_alloc_symbol (sym); }else if (parent->prompt) parentdep = parent->prompt->visible.expr;
@@ -253,7 +260,16 @@ void menu_finalize(struct menu *parent)for (menu = parent->list; menu; menu = menu->next) { basedep =expr_transform (menu->dep); - basedep =expr_alloc_and (expr_copy (parentdep), basedep); + dep = parentdep; +if (sym &&sym_is_choice (sym) && menu->sym) { +enum symbol_type type = menu->sym->type; + +if (type ==S_UNKNOWN ) + type = sym->type; +if (type !=S_TRISTATE ) + dep =expr_alloc_comp (E_EQUAL , sym, &symbol_yes); + } + basedep =expr_alloc_and (expr_copy (dep), basedep); basedep =expr_eliminate_dups (basedep); menu->dep = basedep;if (menu->sym)
@@ -326,7 +342,8 @@ 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);menu_add_symbol (P_CHOICE , sym,NULL ); prop =sym_get_choice_prop (sym);for (ep = &prop->expr; *ep; ep = &(*ep)->left.expr)
Quoted 6 lines · Jan Beulich
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]>
Applied after fixing whitespace issue (spaces -> tabs)
Sam
Hi,
Quoted 23 lines · Jan Beulich
scripts/kconfig/menu.c +9
-7@@ -235,16 +235,23 @@ void menu_finalize(struct menu *parent) sym = parent->sym;if (parent->list) {if (sym &&sym_is_choice (sym)) { -/* find the first choice value and find out choice type */ +/* find out choice type */ +enum symbol_type type =S_UNKNOWN ; +for (menu = parent->list; menu; menu = menu->next) { -if (menu->sym) { - current_entry = parent; -menu_set_type (menu->sym->type); - current_entry = menu; -menu_set_type (sym->type); -break ; +if (menu->sym && menu->sym->type !=S_UNKNOWN ) { +if (type ==S_UNKNOWN ) + type = menu->sym->type; +if (type !=S_BOOLEAN ) +break ; +if (menu->sym->type ==S_TRISTATE ) {
scripts/kconfig/menu.c void menu_finalize(struct menu *parent) · line 257
Quoted 10 lines
scripts/kconfig/menu.c +5
-0+ type =S_TRISTATE ; +break ; + } } } + current_entry = parent; +menu_set_type (type); parentdep =expr_alloc_symbol (sym); }else if (parent->prompt) parentdep = parent->prompt->visible.expr;
If I understand it correctly this makes possible to override the type of choice symbol, so this loop should only be done if the type is not S_UNKNOWN.
Quoted 8 lines
scripts/kconfig/menu.c +3
-1@@ -253,7 +260,16 @@ void menu_finalize(struct menu *parent)for (menu = parent->list; menu; menu = menu->next) { basedep =expr_transform (menu->dep); - basedep =expr_alloc_and (expr_copy (parentdep), basedep); + dep = parentdep; +if (sym &&sym_is_choice (sym) && menu->sym) { +enum symbol_type type = menu->sym->type;
scripts/kconfig/menu.c void menu_finalize(struct menu *parent) · line 275
Quoted 10 lines
scripts/kconfig/menu.c +7
-0+ +if (type ==S_UNKNOWN ) + type = sym->type; +if (type !=S_TRISTATE ) + dep =expr_alloc_comp (E_EQUAL , sym, &symbol_yes); + } + basedep =expr_alloc_and (expr_copy (dep), basedep); basedep =expr_eliminate_dups (basedep); menu->dep = basedep;if (menu->sym)
Hmm, if you want to do it this way, I'd prefer you add a parentdep_bool and simply do:
dep = (menu->sym && menu->sym->type != S_TRISTATE) ? parentdep_bool : parentdep;
Otherwise it looks ok.
bye, Roman
Quoted 32 lines
Quoted 1 line
Quoted 1 line
Roman Zippel <[email protected]> 16.09.07 19:29 >>>
Quoted 29 lines · Jan Beulich
scripts/kconfig/menu.c +13
-7@@ -235,16 +235,23 @@ void menu_finalize(struct menu *parent) sym = parent->sym;if (parent->list) {if (sym &&sym_is_choice (sym)) { -/* find the first choice value and find out choice type */ +/* find out choice type */ +enum symbol_type type =S_UNKNOWN ; +for (menu = parent->list; menu; menu = menu->next) { -if (menu->sym) { - current_entry = parent; -menu_set_type (menu->sym->type); - current_entry = menu; -menu_set_type (sym->type); -break ; +if (menu->sym && menu->sym->type !=S_UNKNOWN ) { +if (type ==S_UNKNOWN ) + type = menu->sym->type; +if (type !=S_BOOLEAN ) +break ; +if (menu->sym->type ==S_TRISTATE ) { + type =S_TRISTATE ; +break ; + } } } + current_entry = parent;
Quoted 8 lines
scripts/kconfig/menu.c void menu_finalize(struct menu *parent) · line 257
Quoted 4 lines
scripts/kconfig/menu.c +1
-0+menu_set_type (type); parentdep =expr_alloc_symbol (sym); }else if (parent->prompt) parentdep = parent->prompt->visible.expr;If I understand it correctly this makes possible to override the type of choice symbol, so this loop should only be done if the type is not
S_UNKNOWN.
I think it is better to do it this way, as it results in a (correct) warning from menu_set_type() if the choice type is inconsistently being overridden.
Quoted 22 lines
Quoted 8 lines
scripts/kconfig/menu.c +3
-1@@ -253,7 +260,16 @@ void menu_finalize(struct menu *parent)for (menu = parent->list; menu; menu = menu->next) { basedep =expr_transform (menu->dep); - basedep =expr_alloc_and (expr_copy (parentdep), basedep); + dep = parentdep; +if (sym &&sym_is_choice (sym) && menu->sym) { +enum symbol_type type = menu->sym->type;scripts/kconfig/menu.c void menu_finalize(struct menu *parent) · line 275
Quoted 10 lines
scripts/kconfig/menu.c +7
-0+ +if (type ==S_UNKNOWN ) + type = sym->type; +if (type !=S_TRISTATE ) + dep =expr_alloc_comp (E_EQUAL , sym, &symbol_yes); + } + basedep =expr_alloc_and (expr_copy (dep), basedep); basedep =expr_eliminate_dups (basedep); menu->dep = basedep;if (menu->sym)Hmm, if you want to do it this way, I'd prefer you add a
parentdep_booland simply do:
Quoted 2 lines
dep = (menu->sym && menu->sym->type != S_TRISTATE) ? parentdep_bool : parentdep;
That would lose the S_UNKNOWN compare (menu->sym->type may not be set at this point, yet, and would later get defaulted to tristate if the choice is such).
Quoted 1 line
Otherwise it looks ok.
Jan