* RE: [patch 1/6] asus_acpi: W3000 support
@ 2006-06-30 18:10 Brown, Len
2006-06-30 19:31 ` Karol Kozimor
0 siblings, 1 reply; 11+ messages in thread
From: Brown, Len @ 2006-06-30 18:10 UTC (permalink / raw)
To: akpm, sziwan; +Cc: linux-acpi, marekw1977, acpi4asus-user
I've applied this to acpi-test, but really the asus_acpi.c
maintainer or at least the list of asus_acpi users should ack it.
thanks,
-Len
>-----Original Message-----
>From: akpm@osdl.org [mailto:akpm@osdl.org]
>Sent: Friday, June 30, 2006 5:15 AM
>To: Brown, Len
>Cc: linux-acpi@vger.kernel.org; akpm@osdl.org; marekw1977@yahoo.com.au
>Subject: [patch 1/6] asus_acpi: W3000 support
>
>From: Marek W <marekw1977@yahoo.com.au>
>
>Add support for W3000 (W3V) and indirectly fixes an issue with
>kmilo under
>KDE (it was triggering excessive LCD read error messages by querying
>asus_acpi module) allowing people (I am probably the only one
>who tested
>this) with W3000 to run kmilo.
>
>
>Signed-off-by: Andrew Morton <akpm@osdl.org>
>---
>
> drivers/acpi/asus_acpi.c | 19 +++++++++++++++++--
> 1 file changed, 17 insertions(+), 2 deletions(-)
>
>diff -puN drivers/acpi/asus_acpi.c~asus_acpi-w3000-support
>drivers/acpi/asus_acpi.c
>--- a/drivers/acpi/asus_acpi.c~asus_acpi-w3000-support
>+++ a/drivers/acpi/asus_acpi.c
>@@ -131,6 +131,7 @@ struct asus_hotk {
> P30, //Samsung P30
> S1x, //S1300A, but also L1400B and
>M2400A (L84F)
> S2x, //S200 (J1 reported), Victor MP-XP7210
>+ W3V, //W3030V
> xxN, //M2400N, M3700N, M5200N,
>S1300N, S5200N, W1OOON
> //(Centrino)
> END_MODEL
>@@ -345,6 +346,17 @@ static struct model_data model_conf[END_
> .brightness_down = S2x_PREFIX "_Q0A"},
>
> {
>+ .name = "W3V",
>+ .mt_mled = "MLED",
>+ .mt_wled = "WLED",
>+ .mt_lcd_switch = xxN_PREFIX "_Q10",
>+ .lcd_status = "\\BKLT",
>+ .brightness_set = "SPLV",
>+ .brightness_get = "GPLV",
>+ .display_set = "SDSP",
>+ .display_get = "\\INFB"},
>+
>+ {
> .name = "xxN",
> .mt_mled = "MLED",
> /* WLED present, but not controlled by ACPI */
>@@ -1066,6 +1078,8 @@ static int asus_hotk_get_info(void)
> hotk->model = S2x;
> else if (strncmp(model->string.pointer, "L5", 2) == 0)
> hotk->model = L5x;
>+ else if (strncmp(model->string.pointer, "W3V", 3) == 0)
>+ hotk->model = W3V;
>
> if (hotk->model == END_MODEL) {
> printk("unsupported, trying default values, supply the "
>@@ -1087,9 +1101,10 @@ static int asus_hotk_get_info(void)
> hotk->methods->mt_mled = NULL;
> /* S5N and M5N have no MLED */
> else if (strncmp(model->string.pointer, "M2N", 3) == 0 ||
>- strncmp(model->string.pointer, "W1N", 3) == 0)
>+ strncmp(model->string.pointer, "W1N", 3) == 0 ||
>+ strncmp(model->string.pointer, "W3V", 3) == 0)
> hotk->methods->mt_wled = "WLED";
>- /* M2N and W1N have a usable WLED */
>+ /* M2N, W1N and W3V have a usable WLED */
> else if (asus_info) {
> if (strncmp(asus_info->oem_table_id, "L1", 2) == 0)
> hotk->methods->mled_status = NULL;
>_
>
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [patch 1/6] asus_acpi: W3000 support
2006-06-30 18:10 [patch 1/6] asus_acpi: W3000 support Brown, Len
@ 2006-06-30 19:31 ` Karol Kozimor
2006-07-01 14:50 ` [Acpi4asus-user] " Timo Hoenig
0 siblings, 1 reply; 11+ messages in thread
From: Karol Kozimor @ 2006-06-30 19:31 UTC (permalink / raw)
To: Brown, Len; +Cc: akpm, linux-acpi, marekw1977, acpi4asus-user
Thus wrote Brown, Len:
> I've applied this to acpi-test, but really the asus_acpi.c
> maintainer or at least the list of asus_acpi users should ack it.
Len,
I would really prefer this to be respun and applied *over* the batch
of patches I sent you *in mid-January*, as they rework some significant
portions of the code this patch touches and it would be a real PITA to
respin that batch instead of this little piece here.
I'll see if those patches still apply and will resend them if you wish so.
Best regards,
--
Karol 'sziwan' Kozimor
sziwan@hell.org.pl
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [Acpi4asus-user] [patch 1/6] asus_acpi: W3000 support
2006-06-30 19:31 ` Karol Kozimor
@ 2006-07-01 14:50 ` Timo Hoenig
2006-07-01 22:46 ` R Cerqueira
0 siblings, 1 reply; 11+ messages in thread
From: Timo Hoenig @ 2006-07-01 14:50 UTC (permalink / raw)
To: Karol Kozimor; +Cc: Brown, Len, akpm, linux-acpi, acpi4asus-user, marekw1977
Hi,
On Fri, 2006-06-30 at 21:31 +0200, Karol Kozimor wrote:
> I would really prefer this to be respun and applied *over* the batch
> of patches I sent you *in mid-January*, as they rework some significant
> portions of the code this patch touches and it would be a real PITA to
> respin that batch instead of this little piece here.
Updating ASUS ACPI to 0.30 would be absolutely be adorable.
We have applied the patches for SL 10.1 as well as for SLES 10 and SLED
10. My bug count for the driver is zero with regard to those patches.
Timo
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [Acpi4asus-user] [patch 1/6] asus_acpi: W3000 support
2006-07-01 14:50 ` [Acpi4asus-user] " Timo Hoenig
@ 2006-07-01 22:46 ` R Cerqueira
2006-07-01 23:05 ` Timo Hoenig
2006-07-01 23:06 ` Karol Kozimor
0 siblings, 2 replies; 11+ messages in thread
From: R Cerqueira @ 2006-07-01 22:46 UTC (permalink / raw)
To: Timo Hoenig
Cc: Karol Kozimor, akpm, Brown, Len, acpi4asus-user, marekw1977,
linux-acpi
On Sat, 2006-07-01 at 16:50 +0200, Timo Hoenig wrote:
> Hi,
>
> On Fri, 2006-06-30 at 21:31 +0200, Karol Kozimor wrote:
>
> > I would really prefer this to be respun and applied *over* the batch
> > of patches I sent you *in mid-January*, as they rework some significant
> > portions of the code this patch touches and it would be a real PITA to
> > respin that batch instead of this little piece here.
>
> Updating ASUS ACPI to 0.30 would be absolutely be adorable.
>
> We have applied the patches for SL 10.1 as well as for SLES 10 and SLED
> 10. My bug count for the driver is zero with regard to those patches.
Since we're talking about applying patches, it would be nice if the W5F
patch I sent to the list back on April 26th could go in as well.
Anything wrong with it?
--
Ricardo Cerqueira
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [Acpi4asus-user] [patch 1/6] asus_acpi: W3000 support
2006-07-01 22:46 ` R Cerqueira
@ 2006-07-01 23:05 ` Timo Hoenig
2006-07-01 23:35 ` Andrew Morton
2006-07-01 23:06 ` Karol Kozimor
1 sibling, 1 reply; 11+ messages in thread
From: Timo Hoenig @ 2006-07-01 23:05 UTC (permalink / raw)
To: R Cerqueira
Cc: akpm, Brown, Len, acpi4asus-user, linux-acpi, Karol Kozimor,
marekw1977
Hi Ricardo,
On Sat, 2006-07-01 at 23:46 +0100, R Cerqueira wrote:
> Since we're talking about applying patches, it would be nice if the W5F
> patch I sent to the list back on April 26th could go in as well.
Patches sent to the acpi4asus list should be reviewed there and
afterwards sent to linux-acpi. As there was no reply to your mail on
acpi4asus it got lost.
> Anything wrong with it?
Just had a short look at it and it looks fine to me. You may probably
want to re-diff against Len's tree as I haven't checked if it still
applies cleanly.
Timo
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [Acpi4asus-user] [patch 1/6] asus_acpi: W3000 support
2006-07-01 23:05 ` Timo Hoenig
@ 2006-07-01 23:35 ` Andrew Morton
2006-07-02 9:46 ` Johannes Engel
2006-07-02 10:33 ` Timo Hoenig
0 siblings, 2 replies; 11+ messages in thread
From: Andrew Morton @ 2006-07-01 23:35 UTC (permalink / raw)
To: Timo Hoenig
Cc: acpi4asus-list, len.brown, acpi4asus-user, linux-acpi, sziwan,
marekw1977
On Sun, 02 Jul 2006 01:05:55 +0200
Timo Hoenig <thoenig@suse.de> wrote:
> Hi Ricardo,
>
> On Sat, 2006-07-01 at 23:46 +0100, R Cerqueira wrote:
>
> > Since we're talking about applying patches, it would be nice if the W5F
> > patch I sent to the list back on April 26th could go in as well.
>
> Patches sent to the acpi4asus list should be reviewed there and
> afterwards sent to linux-acpi. As there was no reply to your mail on
> acpi4asus it got lost.
>
> > Anything wrong with it?
>
> Just had a short look at it and it looks fine to me. You may probably
> want to re-diff against Len's tree as I haven't checked if it still
> applies cleanly.
>
I'm carrying this version, whcih applies and builds OK.
From: Marek W <marekw1977@yahoo.com.au>
Add support for W3000 (W3V) and indirectly fixes an issue with kmilo under KDE
(it was triggering excessive LCD read error messages by querying asus_acpi
module) allowing people (I am probably the only one who tested this) with
W3000 to run kmilo.
Cc: Karol Kozimor <sziwan@hell.org.pl>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---
drivers/acpi/asus_acpi.c | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-)
diff -puN drivers/acpi/asus_acpi.c~asus_acpi-w3000-support drivers/acpi/asus_acpi.c
--- a/drivers/acpi/asus_acpi.c~asus_acpi-w3000-support
+++ a/drivers/acpi/asus_acpi.c
@@ -138,6 +138,7 @@ struct asus_hotk {
S2x, //S200 (J1 reported), Victor MP-XP7210
W1N, //W1000N
W5A, //W5A
+ W3V, //W3030V
xxN, //M2400N, M3700N, M5200N, M6800N, S1300N, S5200N
//(Centrino)
END_MODEL
@@ -376,6 +377,17 @@ static struct model_data model_conf[END_
.display_get = "\\ADVG"},
{
+ .name = "W3V",
+ .mt_mled = "MLED",
+ .mt_wled = "WLED",
+ .mt_lcd_switch = xxN_PREFIX "_Q10",
+ .lcd_status = "\\BKLT",
+ .brightness_set = "SPLV",
+ .brightness_get = "GPLV",
+ .display_set = "SDSP",
+ .display_get = "\\INFB"},
+
+ {
.name = "xxN",
.mt_mled = "MLED",
/* WLED present, but not controlled by ACPI */
@@ -1097,6 +1109,8 @@ static int asus_model_match(char *model)
return A4G;
else if (strncmp(model, "W1N", 3) == 0)
return W1N;
+ else if (strncmp(model, "W3V", 3) == 0)
+ return W3V;
else if (strncmp(model, "W5A", 3) == 0)
return W5A;
else
@@ -1200,9 +1214,10 @@ static int asus_hotk_get_info(void)
hotk->methods->mt_wled = NULL;
/* L5D's WLED is not controlled by ACPI */
else if (strncmp(string, "M2N", 3) == 0 ||
+ strncmp(string, "W3V", 3) == 0 ||
strncmp(string, "S1N", 3) == 0)
hotk->methods->mt_wled = "WLED";
- /* M2N and S1N have a usable WLED */
+ /* M2N, S1N and W3V have a usable WLED */
else if (asus_info) {
if (strncmp(asus_info->oem_table_id, "L1", 2) == 0)
hotk->methods->mled_status = NULL;
_
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [Acpi4asus-user] [patch 1/6] asus_acpi: W3000 support
2006-07-01 23:35 ` Andrew Morton
@ 2006-07-02 9:46 ` Johannes Engel
2006-07-02 10:35 ` Timo Hoenig
2006-07-02 10:33 ` Timo Hoenig
1 sibling, 1 reply; 11+ messages in thread
From: Johannes Engel @ 2006-07-02 9:46 UTC (permalink / raw)
Cc: Timo Hoenig, len.brown, acpi4asus-user, linux-acpi, sziwan
OK, then, may I ask for my V6V patch again, too? It already ships with
SuSE Linux 10.1 and as far as I know there is no known bug until now,
isn't it, Timo?
Greetings, Johannes
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [Acpi4asus-user] [patch 1/6] asus_acpi: W3000 support
2006-07-02 9:46 ` Johannes Engel
@ 2006-07-02 10:35 ` Timo Hoenig
0 siblings, 0 replies; 11+ messages in thread
From: Timo Hoenig @ 2006-07-02 10:35 UTC (permalink / raw)
To: Johannes Engel; +Cc: sziwan, len.brown, acpi4asus-user, linux-acpi
Hi Johannes,
On Sun, 2006-07-02 at 11:46 +0200, Johannes Engel wrote:
> OK, then, may I ask for my V6V patch again, too? It already ships with
> SuSE Linux 10.1 and as far as I know there is no known bug until now,
> isn't it, Timo?
No, your patch for the V6V is absolutely fine, no worries. I'll re-diff
your patch to apply on top of Len's tree and the other model updates and
send it to Karol.
> Greetings, Johannes
Timo
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [Acpi4asus-user] [patch 1/6] asus_acpi: W3000 support
2006-07-01 23:35 ` Andrew Morton
2006-07-02 9:46 ` Johannes Engel
@ 2006-07-02 10:33 ` Timo Hoenig
1 sibling, 0 replies; 11+ messages in thread
From: Timo Hoenig @ 2006-07-02 10:33 UTC (permalink / raw)
To: Andrew Morton
Cc: len.brown, acpi4asus-user, acpi4asus-list, linux-acpi, sziwan,
marekw1977
Hi Andrew,
On Sat, 2006-07-01 at 16:35 -0700, Andrew Morton wrote:
> On Sun, 02 Jul 2006 01:05:55 +0200
> Timo Hoenig <thoenig@suse.de> wrote:
>
> > Hi Ricardo,
> >
> > On Sat, 2006-07-01 at 23:46 +0100, R Cerqueira wrote:
> >
> > > Since we're talking about applying patches, it would be nice if the W5F
> > > patch I sent to the list back on April 26th could go in as well.
> >
> > Patches sent to the acpi4asus list should be reviewed there and
> > afterwards sent to linux-acpi. As there was no reply to your mail on
> > acpi4asus it got lost.
> >
> > > Anything wrong with it?
> >
> > Just had a short look at it and it looks fine to me. You may probably
> > want to re-diff against Len's tree as I haven't checked if it still
> > applies cleanly.
> >
>
> I'm carrying this version, whcih applies and builds OK.
>
> From: Marek W <marekw1977@yahoo.com.au>
>
> Add support for W3000 (W3V) and indirectly fixes an issue with kmilo under KDE
> (it was triggering excessive LCD read error messages by querying asus_acpi
> module) allowing people (I am probably the only one who tested this) with
> W3000 to run kmilo.
>
> Cc: Karol Kozimor <sziwan@hell.org.pl>
> Signed-off-by: Andrew Morton <akpm@osdl.org>
That is not the patch Ricardo was referring to. There is yet another
patch pending to support his ASUS W5F (not W3V).
To avoid further confusion I'll send more model updates for the driver
to Karol and ask him to submit a cumulative patch.
Timo
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [Acpi4asus-user] [patch 1/6] asus_acpi: W3000 support
2006-07-01 22:46 ` R Cerqueira
2006-07-01 23:05 ` Timo Hoenig
@ 2006-07-01 23:06 ` Karol Kozimor
1 sibling, 0 replies; 11+ messages in thread
From: Karol Kozimor @ 2006-07-01 23:06 UTC (permalink / raw)
To: R Cerqueira
Cc: Timo Hoenig, akpm, Brown, Len, acpi4asus-user, marekw1977,
linux-acpi
Thus wrote R Cerqueira:
> Since we're talking about applying patches, it would be nice if the W5F
> patch I sent to the list back on April 26th could go in as well.
> Anything wrong with it?
No, not at all, I'll queue that in.
Best regards,
--
Karol 'sziwan' Kozimor
sziwan@hell.org.pl
^ permalink raw reply [flat|nested] 11+ messages in thread
* [patch 1/6] asus_acpi: W3000 support
@ 2006-06-30 9:15 akpm
0 siblings, 0 replies; 11+ messages in thread
From: akpm @ 2006-06-30 9:15 UTC (permalink / raw)
To: len.brown; +Cc: linux-acpi, akpm, marekw1977
From: Marek W <marekw1977@yahoo.com.au>
Add support for W3000 (W3V) and indirectly fixes an issue with kmilo under
KDE (it was triggering excessive LCD read error messages by querying
asus_acpi module) allowing people (I am probably the only one who tested
this) with W3000 to run kmilo.
Signed-off-by: Andrew Morton <akpm@osdl.org>
---
drivers/acpi/asus_acpi.c | 19 +++++++++++++++++--
1 file changed, 17 insertions(+), 2 deletions(-)
diff -puN drivers/acpi/asus_acpi.c~asus_acpi-w3000-support drivers/acpi/asus_acpi.c
--- a/drivers/acpi/asus_acpi.c~asus_acpi-w3000-support
+++ a/drivers/acpi/asus_acpi.c
@@ -131,6 +131,7 @@ struct asus_hotk {
P30, //Samsung P30
S1x, //S1300A, but also L1400B and M2400A (L84F)
S2x, //S200 (J1 reported), Victor MP-XP7210
+ W3V, //W3030V
xxN, //M2400N, M3700N, M5200N, S1300N, S5200N, W1OOON
//(Centrino)
END_MODEL
@@ -345,6 +346,17 @@ static struct model_data model_conf[END_
.brightness_down = S2x_PREFIX "_Q0A"},
{
+ .name = "W3V",
+ .mt_mled = "MLED",
+ .mt_wled = "WLED",
+ .mt_lcd_switch = xxN_PREFIX "_Q10",
+ .lcd_status = "\\BKLT",
+ .brightness_set = "SPLV",
+ .brightness_get = "GPLV",
+ .display_set = "SDSP",
+ .display_get = "\\INFB"},
+
+ {
.name = "xxN",
.mt_mled = "MLED",
/* WLED present, but not controlled by ACPI */
@@ -1066,6 +1078,8 @@ static int asus_hotk_get_info(void)
hotk->model = S2x;
else if (strncmp(model->string.pointer, "L5", 2) == 0)
hotk->model = L5x;
+ else if (strncmp(model->string.pointer, "W3V", 3) == 0)
+ hotk->model = W3V;
if (hotk->model == END_MODEL) {
printk("unsupported, trying default values, supply the "
@@ -1087,9 +1101,10 @@ static int asus_hotk_get_info(void)
hotk->methods->mt_mled = NULL;
/* S5N and M5N have no MLED */
else if (strncmp(model->string.pointer, "M2N", 3) == 0 ||
- strncmp(model->string.pointer, "W1N", 3) == 0)
+ strncmp(model->string.pointer, "W1N", 3) == 0 ||
+ strncmp(model->string.pointer, "W3V", 3) == 0)
hotk->methods->mt_wled = "WLED";
- /* M2N and W1N have a usable WLED */
+ /* M2N, W1N and W3V have a usable WLED */
else if (asus_info) {
if (strncmp(asus_info->oem_table_id, "L1", 2) == 0)
hotk->methods->mled_status = NULL;
_
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2006-07-02 10:35 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-06-30 18:10 [patch 1/6] asus_acpi: W3000 support Brown, Len
2006-06-30 19:31 ` Karol Kozimor
2006-07-01 14:50 ` [Acpi4asus-user] " Timo Hoenig
2006-07-01 22:46 ` R Cerqueira
2006-07-01 23:05 ` Timo Hoenig
2006-07-01 23:35 ` Andrew Morton
2006-07-02 9:46 ` Johannes Engel
2006-07-02 10:35 ` Timo Hoenig
2006-07-02 10:33 ` Timo Hoenig
2006-07-01 23:06 ` Karol Kozimor
-- strict thread matches above, loose matches on Subject: below --
2006-06-30 9:15 akpm
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox