Attachment 91325 Details for Bug 128639 – acpi_asus.c.diff

[patch] acpi_asus.c.diff

acpi_asus.c.diff (text/plain), 2.92 KB, created by Akira Funahashi on 2008-11-06 10:20:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Akira Funahashi

Created: 2008-11-06 10:20:01 UTC

Size: 2.92 KB

patch

obsolete

>--- acpi_asus.c.dist	2007-06-03 06:10:00.000000000 +0900
>+++ acpi_asus.c	2008-04-15 22:47:29.000000000 +0900
>@@ -146,16 +146,39 @@
> 		.disp_set	= "SDSP"
> 	},
> 	{
>+		.name           = "A3E",
>+		.mled_set       = "MLED",
>+		.wled_set       = "WLED",
>+		.lcd_get        = "\\_SB.PCI0.SBRG.EC0.RPIN(0x67)",
>+		.lcd_set        = "\\_SB.PCI0.SBRG.EC0._Q10",
>+		.brn_get        = "GPLV",
>+		.brn_set        = "SPLV",
>+		.disp_get       = "\\_SB.PCI0.P0P2.VGA.GETD",
>+		.disp_set       = "SDSP"
>+	},
>+	{
>+		.name           = "A3F",
>+		.mled_set       = "MLED",
>+		.wled_set       = "WLED",
>+		.bled_set       = "BLED",
>+		.lcd_get        = "\\_SB.PCI0.SBRG.EC0.RPIN(0x11)",
>+		.lcd_set        = "\\_SB.PCI0.SBRG.EC0._Q10",
>+		.brn_get        = "GPLV",
>+		.brn_set        = "SPLV",
>+		.disp_get       = "\\SSTE",
>+		.disp_set       = "SDSP"
>+	},
>+	{
> 		.name           = "A3N",
> 		.mled_set       = "MLED",
> 		.bled_set       = "BLED",
> 		.wled_set       = "WLED",
>-		.lcd_get        = NULL,
>+		.lcd_get        = "\\BKLT",
> 		.lcd_set        = "\\_SB.PCI0.SBRG.EC0._Q10",
>+		.brn_get        = "GPLV",
> 		.brn_set        = "SPLV",
>-		.brn_get        = "SDSP",
>-		.disp_set       = "SDSP",
>-		.disp_get       = "\\_SB.PCI0.P0P3.VGA.GETD"
>+		.disp_get       = "\\_SB.PCI0.P0P3.VGA.GETD",
>+		.disp_set       = "SDSP"
> 	},
> 	{
> 		.name		= "A4D",
>@@ -354,6 +377,20 @@
> 	{ .name = NULL }
> };
> 
>+/*
>+ * EeePC have an Asus ASUS010 gadget interface,
>+ * but they can't be probed quite the same way as Asus laptops.
>+ */
>+static struct acpi_asus_model acpi_eeepc_models[] = {
>+	{
>+		.name		= "EEE",
>+		.brn_get	= "\\_SB.ATKD.PBLG",
>+		.brn_set	= "\\_SB.ATKD.PBLS"
>+	},
>+
>+	{ .name = NULL }
>+};
>+
> static struct {
> 	char	*name;
> 	char	*description;
>@@ -423,13 +460,17 @@
> 	ACPI_BUFFER		Buf;
> 	ACPI_OBJECT		Arg, *Obj;
> 	ACPI_OBJECT_LIST	Args;
>-	static char		*asus_ids[] = { "ATK0100", NULL };
>+	static char		*asus_ids[] = { "ATK0100", "ASUS010", NULL };
>+	char *rstr;
> 
> 	ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__);
> 
>-	if (acpi_disabled("asus") ||
>-	    ACPI_ID_PROBE(device_get_parent(dev), dev, asus_ids) == NULL)
>+	if (acpi_disabled("asus"))
> 		return (ENXIO);
>+	rstr = ACPI_ID_PROBE(device_get_parent(dev), dev, asus_ids);
>+	if (rstr == NULL) {
>+		return (ENXIO);
>+	}
> 
> 	sc = device_get_softc(dev);
> 	sc->dev = dev;
>@@ -468,6 +509,14 @@
> 			AcpiOsFree(Buf.Pointer);
> 			return (0);
> 		}
>+
>+		/* if EeePC */
>+		if(strncmp("ASUS010", rstr, 7) == 0) {
>+			sc->model = &acpi_eeepc_models[0];
>+			device_set_desc(dev, "ASUS EeePC");
>+			AcpiOsFree(Buf.Pointer);
>+			return (0);
>+		}
> 	}
> 
> 	sb = sbuf_new(NULL, NULL, 0, SBUF_AUTOEXTEND);
>@@ -511,6 +560,9 @@
> 		else if (strncmp(model->name, "A2x", 3) == 0 &&
> 		    strncmp(Obj->String.Pointer, "A2", 2) == 0)
> 			goto good;
>+		else if (strncmp(model->name, "A3F", 3) == 0 &&
>+		    strncmp(Obj->String.Pointer, "A6F", 3) == 0)
>+			goto good;
> 		else if (strncmp(model->name, "D1x", 3) == 0 &&
> 		    strncmp(Obj->String.Pointer, "D1", 2) == 0)
> 			goto good;

Actions: View | Diff

Attachments on bug 128639: 91325