diff options
author | philip <philip@FreeBSD.org> | 2004-11-12 23:21:19 +0000 |
---|---|---|
committer | philip <philip@FreeBSD.org> | 2004-11-12 23:21:19 +0000 |
commit | faa1fd5f159d5e13dc43242eb956ba3a10e01936 (patch) | |
tree | 703b2781dc1ea5ce57e2c1ca93fd5cf2306b5b6a /sys/i386/acpica | |
parent | da2085deb355918e9092b2c3669b863b70ebc0f1 (diff) | |
download | FreeBSD-src-faa1fd5f159d5e13dc43242eb956ba3a10e01936.zip FreeBSD-src-faa1fd5f159d5e13dc43242eb956ba3a10e01936.tar.gz |
o Change the strcmp() to a strncmp() to allow us to attach to 'E'
models of laptops, which are essentially the same as the normal
ones, as far as acpi_asus is concerned[1]
o Use the above as an excuse to reshuffle the mess I made of the
probe function when I originally wrote it.
Reported by: Soeren Larsen <soeren@whiteswan.dk>
Diffstat (limited to 'sys/i386/acpica')
-rw-r--r-- | sys/i386/acpica/acpi_asus.c | 136 |
1 files changed, 67 insertions, 69 deletions
diff --git a/sys/i386/acpica/acpi_asus.c b/sys/i386/acpica/acpi_asus.c index 38eaee0..d65e187 100644 --- a/sys/i386/acpica/acpi_asus.c +++ b/sys/i386/acpica/acpi_asus.c @@ -265,79 +265,77 @@ acpi_asus_probe(device_t dev) ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); - if (!acpi_disabled("asus") && - ACPI_ID_PROBE(device_get_parent(dev), dev, asus_ids)) { - sc = device_get_softc(dev); - sc->dev = dev; - sc->handle = acpi_get_handle(dev); - - Arg.Type = ACPI_TYPE_INTEGER; - Arg.Integer.Value = 0; - - Args.Count = 1; - Args.Pointer = &Arg; - - Buf.Pointer = NULL; - Buf.Length = ACPI_ALLOCATE_BUFFER; - - AcpiEvaluateObject(sc->handle, "INIT", &Args, &Buf); - Obj = Buf.Pointer; - - /* - * The Samsung P30 returns a null-pointer from INIT, we - * can identify it from the 'ODEM' string in the DSDT. - */ - if (Obj->String.Pointer == NULL) { - ACPI_STATUS status; - ACPI_TABLE_HEADER th; - - status = AcpiGetTableHeader(ACPI_TABLE_DSDT, 1, &th); - if (ACPI_FAILURE(status)) { - device_printf(dev, "Unsupported laptop\n"); - AcpiOsFree(Buf.Pointer); - return (ENXIO); - } - - if (strncmp("ODEM", th.OemTableId, 4) == 0) { - sc->model = &acpi_samsung_models[0]; - device_set_desc(dev, - "Samsung P30 Laptop Extras"); - AcpiOsFree(Buf.Pointer); - return (0); - } + if (acpi_disabled("asus") || + ACPI_ID_PROBE(device_get_parent(dev), dev, asus_ids) == NULL) + return (ENXIO); + + sc = device_get_softc(dev); + sc->dev = dev; + sc->handle = acpi_get_handle(dev); + + Arg.Type = ACPI_TYPE_INTEGER; + Arg.Integer.Value = 0; + + Args.Count = 1; + Args.Pointer = &Arg; + + Buf.Pointer = NULL; + Buf.Length = ACPI_ALLOCATE_BUFFER; + + AcpiEvaluateObject(sc->handle, "INIT", &Args, &Buf); + Obj = Buf.Pointer; + + /* + * The Samsung P30 returns a null-pointer from INIT, we + * can identify it from the 'ODEM' string in the DSDT. + */ + if (Obj->String.Pointer == NULL) { + ACPI_STATUS status; + ACPI_TABLE_HEADER th; + + status = AcpiGetTableHeader(ACPI_TABLE_DSDT, 1, &th); + if (ACPI_FAILURE(status)) { + device_printf(dev, "Unsupported (Samsung?) laptop\n"); + AcpiOsFree(Buf.Pointer); + return (ENXIO); } - sb = sbuf_new(NULL, NULL, 0, SBUF_AUTOEXTEND); - if (sb == NULL) - return (ENOMEM); - - /* - * Asus laptops are simply identified by name, easy! - */ - for (model = acpi_asus_models; model->name != NULL; model++) - if (strcmp(Obj->String.Pointer, model->name) == 0) { - sbuf_printf(sb, "Asus %s Laptop Extras", - Obj->String.Pointer); - sbuf_finish(sb); - - sc->model = model; - device_set_desc(dev, sbuf_data(sb)); - - sbuf_delete(sb); - AcpiOsFree(Buf.Pointer); - return (0); - } - - sbuf_printf(sb, "Unsupported Asus laptop detected: %s\n", - Obj->String.Pointer); - sbuf_finish(sb); - - device_printf(dev, sbuf_data(sb)); - - sbuf_delete(sb); - AcpiOsFree(Buf.Pointer); + if (strncmp("ODEM", th.OemTableId, 4) == 0) { + sc->model = &acpi_samsung_models[0]; + device_set_desc(dev, "Samsung P30 Laptop Extras"); + AcpiOsFree(Buf.Pointer); + return (0); + } } + sb = sbuf_new(NULL, NULL, 0, SBUF_AUTOEXTEND); + if (sb == NULL) + return (ENOMEM); + + /* + * Asus laptops are simply identified by name, easy! + */ + for (model = acpi_asus_models; model->name != NULL; model++) + if (strncmp(Obj->String.Pointer, model->name, 3) == 0) { + sbuf_printf(sb, "Asus %s Laptop Extras", model->name); + sbuf_finish(sb); + + sc->model = model; + device_set_desc(dev, sbuf_data(sb)); + + sbuf_delete(sb); + AcpiOsFree(Buf.Pointer); + return (0); + } + + sbuf_printf(sb, "Unsupported Asus laptop: %s\n", Obj->String.Pointer); + sbuf_finish(sb); + + device_printf(dev, sbuf_data(sb)); + + sbuf_delete(sb); + AcpiOsFree(Buf.Pointer); + return (ENXIO); } |