* [PATCH] tristate choices with mixed tristate and boolean values
@ 2007-09-10 12:58 Jan Beulich
2007-09-16 11:07 ` Sam Ravnborg
2007-09-16 17:29 ` Roman Zippel
0 siblings, 2 replies; 4+ messages in thread
From: Jan Beulich @ 2007-09-10 12:58 UTC (permalink / raw)
To: Roman Zippel; +Cc: linux-kernel
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 <jbeulich@novell.com>
scripts/kconfig/menu.c | 35 ++++++++++++++++++++++++++---------
1 file changed, 26 insertions(+), 9 deletions(-)
--- linux-2.6.23-rc5/scripts/kconfig/menu.c 2007-09-07 16:48:23.000000000 +0200
+++ 2.6.23-rc5-tristate-choices/scripts/kconfig/menu.c 2007-09-03 10:29:41.000000000 +0200
@@ -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)
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] tristate choices with mixed tristate and boolean values
2007-09-10 12:58 [PATCH] tristate choices with mixed tristate and boolean values Jan Beulich
@ 2007-09-16 11:07 ` Sam Ravnborg
2007-09-16 17:29 ` Roman Zippel
1 sibling, 0 replies; 4+ messages in thread
From: Sam Ravnborg @ 2007-09-16 11:07 UTC (permalink / raw)
To: Jan Beulich; +Cc: Roman Zippel, linux-kernel
On Mon, Sep 10, 2007 at 01:58:02PM +0100, 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 <jbeulich@novell.com>
Applied after fixing whitespace issue (spaces -> tabs)
Sam
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] tristate choices with mixed tristate and boolean values
2007-09-10 12:58 [PATCH] tristate choices with mixed tristate and boolean values Jan Beulich
2007-09-16 11:07 ` Sam Ravnborg
@ 2007-09-16 17:29 ` Roman Zippel
2007-09-17 8:49 ` Jan Beulich
1 sibling, 1 reply; 4+ messages in thread
From: Roman Zippel @ 2007-09-16 17:29 UTC (permalink / raw)
To: Jan Beulich; +Cc: linux-kernel
Hi,
On Mon, 10 Sep 2007, Jan Beulich wrote:
> --- linux-2.6.23-rc5/scripts/kconfig/menu.c 2007-09-07 16:48:23.000000000 +0200
> +++ 2.6.23-rc5-tristate-choices/scripts/kconfig/menu.c 2007-09-03 10:29:41.000000000 +0200
> @@ -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;
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.
> @@ -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)
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
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] tristate choices with mixed tristate and boolean values
2007-09-16 17:29 ` Roman Zippel
@ 2007-09-17 8:49 ` Jan Beulich
0 siblings, 0 replies; 4+ messages in thread
From: Jan Beulich @ 2007-09-17 8:49 UTC (permalink / raw)
To: Roman Zippel; +Cc: sam, linux-kernel
>>> Roman Zippel <zippel@linux-m68k.org> 16.09.07 19:29 >>>
>On Mon, 10 Sep 2007, Jan Beulich wrote:
>
>> --- linux-2.6.23-rc5/scripts/kconfig/menu.c 2007-09-07 16:48:23.000000000 +0200
>> +++ 2.6.23-rc5-tristate-choices/scripts/kconfig/menu.c 2007-09-03 10:29:41.000000000 +0200
>> @@ -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;
>
>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.
>> @@ -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)
>
>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;
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).
>Otherwise it looks ok.
Jan
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2007-09-17 9:10 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-09-10 12:58 [PATCH] tristate choices with mixed tristate and boolean values Jan Beulich
2007-09-16 11:07 ` Sam Ravnborg
2007-09-16 17:29 ` Roman Zippel
2007-09-17 8:49 ` Jan Beulich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox