Index: head/sys/dev/acpi_support/acpi_asus.c =================================================================== --- head/sys/dev/acpi_support/acpi_asus.c (revision 131283) +++ head/sys/dev/acpi_support/acpi_asus.c (revision 131284) @@ -1,618 +1,618 @@ /*- * Copyright (c) 2004 Philip Paeps * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * */ #include __FBSDID("$FreeBSD$"); /* * Driver for extra ACPI-controlled gadgets (hotkeys, leds, etc) found on * recent Asus (and Medion) laptops. Inspired by the Acpi4Asus project which * implements these features in the Linux kernel. * * * * Currently should support most features, but could use some more testing. * Particularly the display-switching stuff is a bit hairy. If you have an * Asus laptop which doesn't appear to be supported, or strange things happen * when using this driver, please report to . * */ #include "opt_acpi.h" #include #include #include #include #include #include "acpi.h" #include #include #define _COMPONENT ACPI_ASUS ACPI_MODULE_NAME("ASUS") struct acpi_asus_model { char *name; char *mled_set; char *tled_set; char *wled_set; char *brn_get; char *brn_set; char *brn_up; char *brn_dn; char *lcd_get; char *lcd_set; char *disp_get; char *disp_set; }; struct acpi_asus_softc { device_t dev; ACPI_HANDLE handle; struct acpi_asus_model *model; struct sysctl_ctx_list sysctl_ctx; struct sysctl_oid *sysctl_tree; struct cdev *s_mled; struct cdev *s_tled; struct cdev *s_wled; int s_brn; int s_disp; int s_lcd; }; /* Models we know about */ static struct acpi_asus_model acpi_asus_models[] = { { .name = "L2D", .mled_set = "MLED", .wled_set = "WLED", .brn_up = "\\Q0E", .brn_dn = "\\Q0F", .lcd_get = "\\SGP0", .lcd_set = "\\Q10" }, { .name = "L3C", .mled_set = "MLED", .wled_set = "WLED", .brn_get = "GPLV", .brn_set = "SPLV", .lcd_get = "\\GL32", .lcd_set = "\\_SB.PCI0.PX40.ECD0._Q10" }, { .name = "L3D", .mled_set = "MLED", .wled_set = "WLED", .brn_get = "GPLV", .brn_set = "SPLV", .lcd_get = "\\BKLG", .lcd_set = "\\Q10" }, { .name = "L3H", .mled_set = "MLED", .wled_set = "WLED", .brn_get = "GPLV", .brn_set = "SPLV", .lcd_get = "\\_SB.PCI0.PM.PBC", .lcd_set = "EHK", .disp_get = "\\_SB.INFB", .disp_set = "SDSP" }, { .name = "L8L" /* Only has hotkeys, apparantly */ }, { .name = "M1A", .mled_set = "MLED", .brn_up = "\\_SB.PCI0.PX40.EC0.Q0E", .brn_dn = "\\_SB.PCI0.PX40.EC0.Q0F", .lcd_get = "\\PNOF", .lcd_set = "\\_SB.PCI0.PX40.EC0.Q10" }, { .name = "M2E", .mled_set = "MLED", .wled_set = "WLED", .brn_get = "GPLV", .brn_set = "SPLV", .lcd_get = "\\GP06", .lcd_set = "\\Q10" }, { .name = "P30", .wled_set = "WLED", .brn_up = "\\_SB.PCI0.LPCB.EC0._Q68", .brn_dn = "\\_SB.PCI0.LPCB.EC0._Q69", .lcd_get = "\\BKLT", .lcd_set = "\\_SB.PCI0.LPCB.EC0._Q0E" }, { .name = NULL } }; /* Function prototypes */ static int acpi_asus_probe(device_t dev); static int acpi_asus_attach(device_t dev); static int acpi_asus_detach(device_t dev); static void acpi_asus_mled(device_t dev, int state); static void acpi_asus_tled(device_t dev, int state); static void acpi_asus_wled(device_t dev, int state); static int acpi_asus_sysctl_brn(SYSCTL_HANDLER_ARGS); static int acpi_asus_sysctl_lcd(SYSCTL_HANDLER_ARGS); static int acpi_asus_sysctl_disp(SYSCTL_HANDLER_ARGS); static void acpi_asus_notify(ACPI_HANDLE h, UINT32 notify, void *context); static device_method_t acpi_asus_methods[] = { DEVMETHOD(device_probe, acpi_asus_probe), DEVMETHOD(device_attach, acpi_asus_attach), DEVMETHOD(device_detach, acpi_asus_detach), { 0, 0 } }; static driver_t acpi_asus_driver = { "acpi_asus", acpi_asus_methods, sizeof(struct acpi_asus_softc) }; static devclass_t acpi_asus_devclass; DRIVER_MODULE(acpi_asus, acpi, acpi_asus_driver, acpi_asus_devclass, 0, 0); MODULE_DEPEND(acpi_asus, acpi, 1, 1, 1); static int acpi_asus_probe(device_t dev) { struct acpi_asus_model *model; struct acpi_asus_softc *sc; struct sbuf *sb; ACPI_BUFFER Buf; ACPI_OBJECT Arg, *Obj; ACPI_OBJECT_LIST Args; + static char *asus_ids[] = { "ATK0100", NULL }; ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); if (!acpi_disabled("asus") && - acpi_get_type(dev) == ACPI_TYPE_DEVICE && - acpi_MatchHid(acpi_get_handle(dev), "ATK0100")) { + ACPI_ID_PROBE(device_get_parent(dev), dev, asus_ids)) { sc = device_get_softc(dev); sc->dev = dev; sc->handle = acpi_get_handle(dev); sb = sbuf_new(NULL, NULL, 0, SBUF_AUTOEXTEND); if (sb == NULL) return (ENOMEM); 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; 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); } return (ENXIO); } static int acpi_asus_attach(device_t dev) { struct acpi_asus_softc *sc; struct acpi_softc *acpi_sc; ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); sc = device_get_softc(dev); acpi_sc = acpi_device_get_parent_softc(dev); /* Build sysctl tree */ sysctl_ctx_init(&sc->sysctl_ctx); sc->sysctl_tree = SYSCTL_ADD_NODE(&sc->sysctl_ctx, SYSCTL_CHILDREN(acpi_sc->acpi_sysctl_tree), OID_AUTO, "asus", CTLFLAG_RD, 0, ""); /* Attach leds */ if (sc->model->mled_set) sc->s_mled = led_create((led_t *)acpi_asus_mled, dev, "mled"); if (sc->model->tled_set) sc->s_tled = led_create((led_t *)acpi_asus_tled, dev, "tled"); if (sc->model->wled_set) sc->s_wled = led_create((led_t *)acpi_asus_wled, dev, "wled"); /* Attach brightness for GPLV/SPLV models */ if (sc->model->brn_get && ACPI_SUCCESS(acpi_GetInteger(sc->handle, sc->model->brn_get, &sc->s_brn))) SYSCTL_ADD_PROC(&sc->sysctl_ctx, SYSCTL_CHILDREN(sc->sysctl_tree), OID_AUTO, "lcd_brightness", CTLTYPE_INT | CTLFLAG_RW, sc, 0, acpi_asus_sysctl_brn, "I", "brightness of the lcd panel"); /* Attach brightness for other models */ if (sc->model->brn_up && ACPI_SUCCESS(AcpiEvaluateObject(sc->handle, sc->model->brn_up, NULL, NULL)) && ACPI_SUCCESS(AcpiEvaluateObject(sc->handle, sc->model->brn_dn, NULL, NULL))) SYSCTL_ADD_PROC(&sc->sysctl_ctx, SYSCTL_CHILDREN(sc->sysctl_tree), OID_AUTO, "lcd_brightness", CTLTYPE_INT | CTLFLAG_RW, sc, 0, acpi_asus_sysctl_brn, "I", "brightness of the lcd panel"); /* Attach display switching */ if (sc->model->disp_get && ACPI_SUCCESS(acpi_GetInteger(sc->handle, sc->model->disp_get, &sc->s_disp))) SYSCTL_ADD_PROC(&sc->sysctl_ctx, SYSCTL_CHILDREN(sc->sysctl_tree), OID_AUTO, "video_output", CTLTYPE_INT | CTLFLAG_RW, sc, 0, acpi_asus_sysctl_disp, "I", "display output state"); /* Attach LCD state, easy for most models... */ if (sc->model->lcd_get && strncmp(sc->model->name, "L3H", 3) != 0 && ACPI_SUCCESS(acpi_GetInteger(sc->handle, sc->model->lcd_get, &sc->s_lcd))) SYSCTL_ADD_PROC(&sc->sysctl_ctx, SYSCTL_CHILDREN(sc->sysctl_tree), OID_AUTO, "lcd_backlight", CTLTYPE_INT | CTLFLAG_RW, sc, 0, acpi_asus_sysctl_lcd, "I", "state of the lcd backlight"); /* ...a nightmare for the L3H */ else if (sc->model->lcd_get) { ACPI_BUFFER Buf; ACPI_OBJECT Arg[2], Obj; ACPI_OBJECT_LIST Args; Arg[0].Type = ACPI_TYPE_INTEGER; Arg[0].Integer.Value = 0x02; Arg[1].Type = ACPI_TYPE_INTEGER; Arg[1].Integer.Value = 0x03; Args.Count = 2; Args.Pointer = Arg; Buf.Length = sizeof(Obj); Buf.Pointer = &Obj; if (ACPI_SUCCESS(AcpiEvaluateObject(sc->handle, sc->model->lcd_get, &Args, &Buf)) && Obj.Type == ACPI_TYPE_INTEGER) { sc->s_lcd = Obj.Integer.Value >> 8; SYSCTL_ADD_PROC(&sc->sysctl_ctx, SYSCTL_CHILDREN(sc->sysctl_tree), OID_AUTO, "lcd_backlight", CTLTYPE_INT | CTLFLAG_RW, sc, 0, acpi_asus_sysctl_lcd, "I", "state of the lcd backlight"); } } /* Activate hotkeys */ AcpiEvaluateObject(sc->handle, "BSTS", NULL, NULL); /* Handle notifies */ AcpiInstallNotifyHandler(sc->handle, ACPI_SYSTEM_NOTIFY, acpi_asus_notify, dev); return (0); } static int acpi_asus_detach(device_t dev) { struct acpi_asus_softc *sc; ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); sc = device_get_softc(dev); /* Turn the lights off */ if (sc->model->mled_set) led_destroy(sc->s_mled); if (sc->model->tled_set) led_destroy(sc->s_tled); if (sc->model->wled_set) led_destroy(sc->s_wled); /* Remove notify handler */ AcpiRemoveNotifyHandler(sc->handle, ACPI_SYSTEM_NOTIFY, acpi_asus_notify); /* Free sysctl tree */ sysctl_ctx_free(&sc->sysctl_ctx); return (0); } static void acpi_asus_mled(device_t dev, int state) { struct acpi_asus_softc *sc; ACPI_OBJECT Arg; ACPI_OBJECT_LIST Args; ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); sc = device_get_softc(dev); Arg.Type = ACPI_TYPE_INTEGER; Arg.Integer.Value = !state; /* Inverted, yes! */ Args.Count = 1; Args.Pointer = &Arg; AcpiEvaluateObject(sc->handle, sc->model->mled_set, &Args, NULL); } static void acpi_asus_tled(device_t dev, int state) { struct acpi_asus_softc *sc; ACPI_OBJECT Arg; ACPI_OBJECT_LIST Args; ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); sc = device_get_softc(dev); Arg.Type = ACPI_TYPE_INTEGER; Arg.Integer.Value = state; Args.Count = 1; Args.Pointer = &Arg; AcpiEvaluateObject(sc->handle, sc->model->tled_set, &Args, NULL); } static void acpi_asus_wled(device_t dev, int state) { struct acpi_asus_softc *sc; ACPI_OBJECT Arg; ACPI_OBJECT_LIST Args; ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); sc = device_get_softc(dev); Arg.Type = ACPI_TYPE_INTEGER; Arg.Integer.Value = state; Args.Count = 1; Args.Pointer = &Arg; AcpiEvaluateObject(sc->handle, sc->model->wled_set, &Args, NULL); } static int acpi_asus_sysctl_brn(SYSCTL_HANDLER_ARGS) { struct acpi_asus_softc *sc; ACPI_OBJECT Arg; ACPI_OBJECT_LIST Args; int brn, err; ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); sc = (struct acpi_asus_softc *)oidp->oid_arg1; /* Sanity check */ brn = sc->s_brn; err = sysctl_handle_int(oidp, &brn, 0, req); if ((err != 0) || (req->newptr == NULL)) return (err); if ((brn < 0) || (brn > 15)) return (EINVAL); /* Keep track and update */ sc->s_brn = brn; Arg.Type = ACPI_TYPE_INTEGER; Arg.Integer.Value = brn; Args.Count = 1; Args.Pointer = &Arg; if (sc->model->brn_set) AcpiEvaluateObject(sc->handle, sc->model->brn_set, &Args, NULL); else { brn -= sc->s_brn; while (brn != 0) { AcpiEvaluateObject(sc->handle,(brn > 0) ? sc->model->brn_up : sc->model->brn_dn, NULL, NULL); (brn > 0) ? brn-- : brn++; } } return (0); } static int acpi_asus_sysctl_lcd(SYSCTL_HANDLER_ARGS) { struct acpi_asus_softc *sc; int lcd, err; ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); sc = (struct acpi_asus_softc *)oidp->oid_arg1; /* Sanity check */ lcd = sc->s_lcd; err = sysctl_handle_int(oidp, &lcd, 0, req); if ((err != 0) || (req->newptr == NULL)) return (err); if ((lcd < 0) || (lcd > 1)) return (EINVAL); /* Keep track and update */ sc->s_lcd = lcd; /* Most models just need a lcd_set evaluated, the L3H is trickier */ if (strncmp(sc->model->name, "L3H", 3) != 0) AcpiEvaluateObject(sc->handle, sc->model->lcd_set, NULL, NULL); else { ACPI_OBJECT Arg; ACPI_OBJECT_LIST Args; Arg.Type = ACPI_TYPE_INTEGER; Arg.Integer.Value = 0x07; Args.Count = 1; Args.Pointer = &Arg; AcpiEvaluateObject(sc->handle, sc->model->lcd_set, &Args, NULL); } return (0); } static int acpi_asus_sysctl_disp(SYSCTL_HANDLER_ARGS) { struct acpi_asus_softc *sc; ACPI_OBJECT Arg; ACPI_OBJECT_LIST Args; int disp, err; ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); sc = (struct acpi_asus_softc *)oidp->oid_arg1; /* Sanity check */ disp = sc->s_disp; err = sysctl_handle_int(oidp, &disp, 0, req); if ((err != 0) || (req->newptr == NULL)) return (err); if ((disp < 0) || (disp > 7)) return (EINVAL); /* Keep track and update */ sc->s_disp = disp; Arg.Type = ACPI_TYPE_INTEGER; Arg.Integer.Value = disp; Args.Count = 1; Args.Pointer = &Arg; AcpiEvaluateObject(sc->handle, sc->model->disp_set, &Args, NULL); return (0); } static void acpi_asus_notify(ACPI_HANDLE h, UINT32 notify, void *context) { struct acpi_asus_softc *sc; struct acpi_softc *acpi_sc; ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); sc = device_get_softc((device_t)context); acpi_sc = acpi_device_get_parent_softc(sc->dev); if ((notify & ~0x10) <= 15) { sc->s_brn = (notify & ~0x10); ACPI_VPRINT(sc->dev, acpi_sc, "Brightness increased\n"); } else if ((notify & ~0x20) <= 15) { sc->s_brn = (notify & ~0x20); ACPI_VPRINT(sc->dev, acpi_sc, "Brightness decreased\n"); } else if (notify == 0x33) { sc->s_lcd = 1; ACPI_VPRINT(sc->dev, acpi_sc, "LCD turned on\n"); } else if (notify == 0x34) { sc->s_lcd = 0; ACPI_VPRINT(sc->dev, acpi_sc, "LCD turned off\n"); } else { /* Notify devd(8) */ acpi_UserNotify("ASUS", h, notify); } } Index: head/sys/dev/acpi_support/acpi_toshiba.c =================================================================== --- head/sys/dev/acpi_support/acpi_toshiba.c (revision 131283) +++ head/sys/dev/acpi_support/acpi_toshiba.c (revision 131284) @@ -1,551 +1,544 @@ /*- * Copyright (c) 2003 Hiroyuki Aizu * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * */ #include __FBSDID("$FreeBSD$"); #include "opt_acpi.h" #include #include #include #include #include "acpi.h" #include /* * Toshiba HCI interface definitions * * HCI is Toshiba's "Hardware Control Interface" which is supposed to * be uniform across all their models. Ideally we would just call * dedicated ACPI methods instead of using this primitive interface. * However, the ACPI methods seem to be incomplete in some areas (for * example they allow setting, but not reading, the LCD brightness * value), so this is still useful. */ #define METHOD_HCI "GHCI" #define METHOD_HCI_ENABLE "ENAB" #define METHOD_VIDEO "DSSX" /* Operations */ #define HCI_SET 0xFF00 #define HCI_GET 0xFE00 /* Return codes */ #define HCI_SUCCESS 0x0000 #define HCI_FAILURE 0x1000 #define HCI_NOT_SUPPORTED 0x8000 #define HCI_EMPTY 0x8C00 /* Functions */ #define HCI_REG_LCD_BACKLIGHT 0x0002 #define HCI_REG_FAN 0x0004 #define HCI_REG_SYSTEM_EVENT 0x0016 #define HCI_REG_VIDEO_OUTPUT 0x001C #define HCI_REG_HOTKEY_EVENT 0x001E #define HCI_REG_LCD_BRIGHTNESS 0x002A #define HCI_REG_CPU_SPEED 0x0032 /* Field definitions */ #define HCI_FAN_SHIFT 7 #define HCI_LCD_BRIGHTNESS_BITS 3 #define HCI_LCD_BRIGHTNESS_SHIFT (16 - HCI_LCD_BRIGHTNESS_BITS) #define HCI_LCD_BRIGHTNESS_MAX ((1 << HCI_LCD_BRIGHTNESS_BITS) - 1) #define HCI_VIDEO_OUTPUT_FLAG 0x0100 #define HCI_VIDEO_OUTPUT_LCD 0x1 #define HCI_VIDEO_OUTPUT_CRT 0x2 #define HCI_VIDEO_OUTPUT_TV 0x4 #define HCI_CPU_SPEED_BITS 3 #define HCI_CPU_SPEED_SHIFT (16 - HCI_CPU_SPEED_BITS) #define HCI_CPU_SPEED_MAX ((1 << HCI_CPU_SPEED_BITS) - 1) /* Key press/release events. */ #define FN_F1_PRESS 0x013B #define FN_F1_RELEASE 0x01BB #define FN_F2_PRESS 0x013C #define FN_F2_RELEASE 0x01BC #define FN_F3_PRESS 0x013D #define FN_F3_RELEASE 0x01BD #define FN_F4_PRESS 0x013E #define FN_F4_RELEASE 0x01BE #define FN_F5_PRESS 0x013F #define FN_F5_RELEASE 0x01BF #define FN_F6_PRESS 0x0140 #define FN_F6_RELEASE 0x01C0 #define FN_F7_PRESS 0x0141 #define FN_F7_RELEASE 0x01C1 #define FN_F8_PRESS 0x0142 #define FN_F8_RELEASE 0x01C2 #define FN_F9_PRESS 0x0143 #define FN_F9_RELEASE 0x01C3 #define FN_BS_PRESS 0x010E #define FN_BS_RELEASE 0x018E #define FN_ESC_PRESS 0x0101 #define FN_ESC_RELEASE 0x0181 #define FN_KNJ_PRESS 0x0129 #define FN_KNJ_RELEASE 0x01A9 /* HCI register definitions. */ #define HCI_WORDS 6 /* Number of registers */ #define HCI_REG_AX 0 /* Operation, then return value */ #define HCI_REG_BX 1 /* Function */ #define HCI_REG_CX 2 /* Argument (in or out) */ #define HCI_REG_DX 3 /* Unused? */ #define HCI_REG_SI 4 /* Unused? */ #define HCI_REG_DI 5 /* Unused? */ struct acpi_toshiba_softc { device_t dev; ACPI_HANDLE handle; ACPI_HANDLE video_handle; struct sysctl_ctx_list sysctl_ctx; struct sysctl_oid *sysctl_tree; }; /* Prototype for HCI functions for getting/setting a value. */ typedef int hci_fn_t(ACPI_HANDLE, int, UINT32 *); static int acpi_toshiba_probe(device_t dev); static int acpi_toshiba_attach(device_t dev); static int acpi_toshiba_detach(device_t dev); static int acpi_toshiba_sysctl(SYSCTL_HANDLER_ARGS); static hci_fn_t hci_force_fan; static hci_fn_t hci_video_output; static hci_fn_t hci_lcd_brightness; static hci_fn_t hci_lcd_backlight; static hci_fn_t hci_cpu_speed; static int hci_call(ACPI_HANDLE h, int op, int function, UINT32 *arg); static void hci_key_action(struct acpi_toshiba_softc *sc, ACPI_HANDLE h, UINT32 key); static void acpi_toshiba_notify(ACPI_HANDLE h, UINT32 notify, void *context); static int acpi_toshiba_video_probe(device_t dev); static int acpi_toshiba_video_attach(device_t dev); /* Table of sysctl names and HCI functions to call. */ static struct { char *name; hci_fn_t *handler; } sysctl_table[] = { /* name, handler */ {"force_fan", hci_force_fan}, {"video_output", hci_video_output}, {"lcd_brightness", hci_lcd_brightness}, {"lcd_backlight", hci_lcd_backlight}, {"cpu_speed", hci_cpu_speed}, {NULL, NULL} }; static device_method_t acpi_toshiba_methods[] = { DEVMETHOD(device_probe, acpi_toshiba_probe), DEVMETHOD(device_attach, acpi_toshiba_attach), DEVMETHOD(device_detach, acpi_toshiba_detach), {0, 0} }; static driver_t acpi_toshiba_driver = { "acpi_toshiba", acpi_toshiba_methods, sizeof(struct acpi_toshiba_softc), }; static devclass_t acpi_toshiba_devclass; DRIVER_MODULE(acpi_toshiba, acpi, acpi_toshiba_driver, acpi_toshiba_devclass, 0, 0); MODULE_DEPEND(acpi_toshiba, acpi, 1, 1, 1); static device_method_t acpi_toshiba_video_methods[] = { DEVMETHOD(device_probe, acpi_toshiba_video_probe), DEVMETHOD(device_attach, acpi_toshiba_video_attach), {0, 0} }; static driver_t acpi_toshiba_video_driver = { "acpi_toshiba_video", acpi_toshiba_video_methods, 0, }; static devclass_t acpi_toshiba_video_devclass; DRIVER_MODULE(acpi_toshiba_video, acpi, acpi_toshiba_video_driver, acpi_toshiba_video_devclass, 0, 0); MODULE_DEPEND(acpi_toshiba_video, acpi, 1, 1, 1); static int enable_fn_keys = 1; TUNABLE_INT("hw.acpi.toshiba.enable_fn_keys", &enable_fn_keys); /* * HID Model * ------------------------------------- * TOS6200 Libretto L Series * Dynabook Satellite 2455 * Dynabook SS 3500 * TOS6207 Dynabook SS2110 Series */ static int acpi_toshiba_probe(device_t dev) { - ACPI_HANDLE h; - int ret = ENXIO; + static char *tosh_ids[] = { "TOS6200", "TOS6207", NULL }; - h = acpi_get_handle(dev); - if (!acpi_disabled("toshiba") && - acpi_get_type(dev) == ACPI_TYPE_DEVICE && - device_get_unit(dev) == 0 && - (acpi_MatchHid(h, "TOS6200") || - acpi_MatchHid(h, "TOS6207"))) { - device_set_desc(dev, "Toshiba HCI Extras"); - ret = 0; - } + if (acpi_disabled("toshiba") || + ACPI_ID_PROBE(device_get_parent(dev), dev, tosh_ids) == NULL || + device_get_unit(dev) != 0) + return (ENXIO); - return (ret); + device_set_desc(dev, "Toshiba HCI Extras"); + return (0); } static int acpi_toshiba_attach(device_t dev) { struct acpi_toshiba_softc *sc; struct acpi_softc *acpi_sc; ACPI_STATUS status; int i; sc = device_get_softc(dev); sc->dev = dev; sc->handle = acpi_get_handle(dev); acpi_sc = acpi_device_get_parent_softc(dev); sysctl_ctx_init(&sc->sysctl_ctx); sc->sysctl_tree = SYSCTL_ADD_NODE(&sc->sysctl_ctx, SYSCTL_CHILDREN(acpi_sc->acpi_sysctl_tree), OID_AUTO, "toshiba", CTLFLAG_RD, 0, ""); for (i = 0; sysctl_table[i].name != NULL; i++) { SYSCTL_ADD_PROC(&sc->sysctl_ctx, SYSCTL_CHILDREN(sc->sysctl_tree), OID_AUTO, sysctl_table[i].name, CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_ANYBODY, sc, i, acpi_toshiba_sysctl, "I", ""); } if (enable_fn_keys != 0) { status = AcpiEvaluateObject(sc->handle, METHOD_HCI_ENABLE, NULL, NULL); if (ACPI_FAILURE(status)) { device_printf(dev, "enable FN keys failed\n"); sysctl_ctx_free(&sc->sysctl_ctx); return (ENXIO); } AcpiInstallNotifyHandler(sc->handle, ACPI_DEVICE_NOTIFY, acpi_toshiba_notify, sc); } return (0); } static int acpi_toshiba_detach(device_t dev) { struct acpi_toshiba_softc *sc; sc = device_get_softc(dev); if (enable_fn_keys != 0) { AcpiRemoveNotifyHandler(sc->handle, ACPI_DEVICE_NOTIFY, acpi_toshiba_notify); } sysctl_ctx_free(&sc->sysctl_ctx); return (0); } static int acpi_toshiba_sysctl(SYSCTL_HANDLER_ARGS) { struct acpi_toshiba_softc *sc; UINT32 arg; int function, error = 0; hci_fn_t *handler; sc = (struct acpi_toshiba_softc *)oidp->oid_arg1; function = oidp->oid_arg2; handler = sysctl_table[function].handler; /* Get the current value from the appropriate function. */ error = handler(sc->handle, HCI_GET, &arg); if (error != 0) return (error); /* Send the current value to the user and return if no new value. */ error = sysctl_handle_int(oidp, &arg, 0, req); if (error != 0 || req->newptr == NULL) return (error); /* Set the new value via the appropriate function. */ error = handler(sc->handle, HCI_SET, &arg); return (error); } static int hci_force_fan(ACPI_HANDLE h, int op, UINT32 *state) { int ret; if (op == HCI_SET) { if (*state < 0 || *state > 1) return (EINVAL); *state <<= HCI_FAN_SHIFT; } ret = hci_call(h, op, HCI_REG_FAN, state); if (ret == 0 && op == HCI_GET) *state >>= HCI_FAN_SHIFT; return (ret); } static int hci_video_output(ACPI_HANDLE h, int op, UINT32 *video_output) { int ret; ACPI_STATUS status; if (op == HCI_SET) { if (*video_output < 1 || *video_output > 7) return (EINVAL); if (h == NULL) return (ENXIO); *video_output |= HCI_VIDEO_OUTPUT_FLAG; status = acpi_SetInteger(h, METHOD_VIDEO, *video_output); if (ACPI_SUCCESS(status)) ret = 0; else ret = ENXIO; } else { ret = hci_call(h, op, HCI_REG_VIDEO_OUTPUT, video_output); if (ret == 0) *video_output &= 0xff; } return (ret); } static int hci_lcd_brightness(ACPI_HANDLE h, int op, UINT32 *brightness) { int ret; if (op == HCI_SET) { if (*brightness < 0 || *brightness > HCI_LCD_BRIGHTNESS_MAX) return (EINVAL); *brightness <<= HCI_LCD_BRIGHTNESS_SHIFT; } ret = hci_call(h, op, HCI_REG_LCD_BRIGHTNESS, brightness); if (ret == 0 && op == HCI_GET) *brightness >>= HCI_LCD_BRIGHTNESS_SHIFT; return (ret); } static int hci_lcd_backlight(ACPI_HANDLE h, int op, UINT32 *backlight) { if (op == HCI_SET) { if (*backlight < 0 || *backlight > 1) return (EINVAL); } return (hci_call(h, op, HCI_REG_LCD_BACKLIGHT, backlight)); } static int hci_cpu_speed(ACPI_HANDLE h, int op, UINT32 *speed) { int ret; if (op == HCI_SET) { if (*speed < 0 || *speed > HCI_CPU_SPEED_MAX) return (EINVAL); *speed <<= HCI_CPU_SPEED_SHIFT; } ret = hci_call(h, op, HCI_REG_CPU_SPEED, speed); if (ret == 0 && op == HCI_GET) *speed >>= HCI_CPU_SPEED_SHIFT; return (ret); } static int hci_call(ACPI_HANDLE h, int op, int function, UINT32 *arg) { ACPI_OBJECT_LIST args; ACPI_BUFFER results; ACPI_OBJECT obj[HCI_WORDS]; ACPI_OBJECT *res; int status, i, ret; status = ENXIO; for (i = 0; i < HCI_WORDS; i++) { obj[i].Type = ACPI_TYPE_INTEGER; obj[i].Integer.Value = 0; } obj[HCI_REG_AX].Integer.Value = op; obj[HCI_REG_BX].Integer.Value = function; if (op == HCI_SET) obj[HCI_REG_CX].Integer.Value = *arg; args.Count = HCI_WORDS; args.Pointer = obj; results.Pointer = NULL; results.Length = ACPI_ALLOCATE_BUFFER; if (ACPI_FAILURE(AcpiEvaluateObject(h, METHOD_HCI, &args, &results))) goto end; res = (ACPI_OBJECT *)results.Pointer; if (!ACPI_PKG_VALID(res, HCI_WORDS)) { printf("toshiba: invalid package!\n"); return (ENXIO); } acpi_PkgInt32(res, HCI_REG_AX, &ret); if (ret == HCI_SUCCESS) { if (op == HCI_GET) acpi_PkgInt32(res, HCI_REG_CX, arg); status = 0; } else if (function == HCI_REG_SYSTEM_EVENT && op == HCI_GET && ret == HCI_NOT_SUPPORTED) { /* * Sometimes system events are disabled without us requesting * it. This workaround attempts to re-enable them. */ i = 1; hci_call(h, HCI_SET, HCI_REG_SYSTEM_EVENT, &i); } end: if (results.Pointer != NULL) AcpiOsFree(results.Pointer); return (status); } /* * Perform a few actions based on the keypress. Users can extend this * functionality by reading the keystrokes we send to devd(8). */ static void hci_key_action(struct acpi_toshiba_softc *sc, ACPI_HANDLE h, UINT32 key) { UINT32 arg; switch (key) { case FN_F6_RELEASE: /* Decrease LCD brightness. */ hci_lcd_brightness(h, HCI_GET, &arg); if (arg-- == 0) arg = 0; else hci_lcd_brightness(h, HCI_SET, &arg); break; case FN_F7_RELEASE: /* Increase LCD brightness. */ hci_lcd_brightness(h, HCI_GET, &arg); if (arg++ == 7) arg = 7; else hci_lcd_brightness(h, HCI_SET, &arg); break; case FN_F5_RELEASE: /* Cycle through video outputs. */ hci_video_output(h, HCI_GET, &arg); arg = (arg + 1) % 7; hci_video_output(sc->video_handle, HCI_SET, &arg); break; case FN_F8_RELEASE: /* Toggle LCD backlight. */ hci_lcd_backlight(h, HCI_GET, &arg); arg = (arg != 0) ? 0 : 1; hci_lcd_backlight(h, HCI_SET, &arg); break; case FN_ESC_RELEASE: /* Toggle forcing fan on. */ hci_force_fan(h, HCI_GET, &arg); arg = (arg != 0) ? 0 : 1; hci_force_fan(h, HCI_SET, &arg); break; } } static void acpi_toshiba_notify(ACPI_HANDLE h, UINT32 notify, void *context) { struct acpi_toshiba_softc *sc; UINT32 key; sc = (struct acpi_toshiba_softc *)context; if (notify == 0x80) { while (hci_call(h, HCI_GET, HCI_REG_SYSTEM_EVENT, &key) == 0) { hci_key_action(sc, h, key); acpi_UserNotify("TOSHIBA", h, (uint8_t)key); } } else device_printf(sc->dev, "unknown notify: 0x%x\n", notify); } /* * Toshiba video pseudo-device to provide the DSSX method. * * HID Model * ------------------------------------- * TOS6201 Libretto L Series */ static int acpi_toshiba_video_probe(device_t dev) { - int ret = ENXIO; + static char *vid_ids[] = { "TOS6201", NULL }; - if (!acpi_disabled("toshiba") && - acpi_get_type(dev) == ACPI_TYPE_DEVICE && - device_get_unit(dev) == 0 && - acpi_MatchHid(acpi_get_handle(dev), "TOS6201")) { - device_quiet(dev); - device_set_desc(dev, "Toshiba Video"); - ret = 0; - } + if (acpi_disabled("toshiba") || + ACPI_ID_PROBE(device_get_parent(dev), dev, vid_ids) == NULL || + device_get_unit(dev) != 0) + return (ENXIO); - return (ret); + device_quiet(dev); + device_set_desc(dev, "Toshiba Video"); + return (0); } static int acpi_toshiba_video_attach(device_t dev) { struct acpi_toshiba_softc *sc; sc = devclass_get_softc(acpi_toshiba_devclass, 0); if (sc == NULL) return (ENXIO); sc->video_handle = acpi_get_handle(dev); return (0); } Index: head/sys/i386/acpica/acpi_asus.c =================================================================== --- head/sys/i386/acpica/acpi_asus.c (revision 131283) +++ head/sys/i386/acpica/acpi_asus.c (revision 131284) @@ -1,618 +1,618 @@ /*- * Copyright (c) 2004 Philip Paeps * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * */ #include __FBSDID("$FreeBSD$"); /* * Driver for extra ACPI-controlled gadgets (hotkeys, leds, etc) found on * recent Asus (and Medion) laptops. Inspired by the Acpi4Asus project which * implements these features in the Linux kernel. * * * * Currently should support most features, but could use some more testing. * Particularly the display-switching stuff is a bit hairy. If you have an * Asus laptop which doesn't appear to be supported, or strange things happen * when using this driver, please report to . * */ #include "opt_acpi.h" #include #include #include #include #include #include "acpi.h" #include #include #define _COMPONENT ACPI_ASUS ACPI_MODULE_NAME("ASUS") struct acpi_asus_model { char *name; char *mled_set; char *tled_set; char *wled_set; char *brn_get; char *brn_set; char *brn_up; char *brn_dn; char *lcd_get; char *lcd_set; char *disp_get; char *disp_set; }; struct acpi_asus_softc { device_t dev; ACPI_HANDLE handle; struct acpi_asus_model *model; struct sysctl_ctx_list sysctl_ctx; struct sysctl_oid *sysctl_tree; struct cdev *s_mled; struct cdev *s_tled; struct cdev *s_wled; int s_brn; int s_disp; int s_lcd; }; /* Models we know about */ static struct acpi_asus_model acpi_asus_models[] = { { .name = "L2D", .mled_set = "MLED", .wled_set = "WLED", .brn_up = "\\Q0E", .brn_dn = "\\Q0F", .lcd_get = "\\SGP0", .lcd_set = "\\Q10" }, { .name = "L3C", .mled_set = "MLED", .wled_set = "WLED", .brn_get = "GPLV", .brn_set = "SPLV", .lcd_get = "\\GL32", .lcd_set = "\\_SB.PCI0.PX40.ECD0._Q10" }, { .name = "L3D", .mled_set = "MLED", .wled_set = "WLED", .brn_get = "GPLV", .brn_set = "SPLV", .lcd_get = "\\BKLG", .lcd_set = "\\Q10" }, { .name = "L3H", .mled_set = "MLED", .wled_set = "WLED", .brn_get = "GPLV", .brn_set = "SPLV", .lcd_get = "\\_SB.PCI0.PM.PBC", .lcd_set = "EHK", .disp_get = "\\_SB.INFB", .disp_set = "SDSP" }, { .name = "L8L" /* Only has hotkeys, apparantly */ }, { .name = "M1A", .mled_set = "MLED", .brn_up = "\\_SB.PCI0.PX40.EC0.Q0E", .brn_dn = "\\_SB.PCI0.PX40.EC0.Q0F", .lcd_get = "\\PNOF", .lcd_set = "\\_SB.PCI0.PX40.EC0.Q10" }, { .name = "M2E", .mled_set = "MLED", .wled_set = "WLED", .brn_get = "GPLV", .brn_set = "SPLV", .lcd_get = "\\GP06", .lcd_set = "\\Q10" }, { .name = "P30", .wled_set = "WLED", .brn_up = "\\_SB.PCI0.LPCB.EC0._Q68", .brn_dn = "\\_SB.PCI0.LPCB.EC0._Q69", .lcd_get = "\\BKLT", .lcd_set = "\\_SB.PCI0.LPCB.EC0._Q0E" }, { .name = NULL } }; /* Function prototypes */ static int acpi_asus_probe(device_t dev); static int acpi_asus_attach(device_t dev); static int acpi_asus_detach(device_t dev); static void acpi_asus_mled(device_t dev, int state); static void acpi_asus_tled(device_t dev, int state); static void acpi_asus_wled(device_t dev, int state); static int acpi_asus_sysctl_brn(SYSCTL_HANDLER_ARGS); static int acpi_asus_sysctl_lcd(SYSCTL_HANDLER_ARGS); static int acpi_asus_sysctl_disp(SYSCTL_HANDLER_ARGS); static void acpi_asus_notify(ACPI_HANDLE h, UINT32 notify, void *context); static device_method_t acpi_asus_methods[] = { DEVMETHOD(device_probe, acpi_asus_probe), DEVMETHOD(device_attach, acpi_asus_attach), DEVMETHOD(device_detach, acpi_asus_detach), { 0, 0 } }; static driver_t acpi_asus_driver = { "acpi_asus", acpi_asus_methods, sizeof(struct acpi_asus_softc) }; static devclass_t acpi_asus_devclass; DRIVER_MODULE(acpi_asus, acpi, acpi_asus_driver, acpi_asus_devclass, 0, 0); MODULE_DEPEND(acpi_asus, acpi, 1, 1, 1); static int acpi_asus_probe(device_t dev) { struct acpi_asus_model *model; struct acpi_asus_softc *sc; struct sbuf *sb; ACPI_BUFFER Buf; ACPI_OBJECT Arg, *Obj; ACPI_OBJECT_LIST Args; + static char *asus_ids[] = { "ATK0100", NULL }; ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); if (!acpi_disabled("asus") && - acpi_get_type(dev) == ACPI_TYPE_DEVICE && - acpi_MatchHid(acpi_get_handle(dev), "ATK0100")) { + ACPI_ID_PROBE(device_get_parent(dev), dev, asus_ids)) { sc = device_get_softc(dev); sc->dev = dev; sc->handle = acpi_get_handle(dev); sb = sbuf_new(NULL, NULL, 0, SBUF_AUTOEXTEND); if (sb == NULL) return (ENOMEM); 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; 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); } return (ENXIO); } static int acpi_asus_attach(device_t dev) { struct acpi_asus_softc *sc; struct acpi_softc *acpi_sc; ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); sc = device_get_softc(dev); acpi_sc = acpi_device_get_parent_softc(dev); /* Build sysctl tree */ sysctl_ctx_init(&sc->sysctl_ctx); sc->sysctl_tree = SYSCTL_ADD_NODE(&sc->sysctl_ctx, SYSCTL_CHILDREN(acpi_sc->acpi_sysctl_tree), OID_AUTO, "asus", CTLFLAG_RD, 0, ""); /* Attach leds */ if (sc->model->mled_set) sc->s_mled = led_create((led_t *)acpi_asus_mled, dev, "mled"); if (sc->model->tled_set) sc->s_tled = led_create((led_t *)acpi_asus_tled, dev, "tled"); if (sc->model->wled_set) sc->s_wled = led_create((led_t *)acpi_asus_wled, dev, "wled"); /* Attach brightness for GPLV/SPLV models */ if (sc->model->brn_get && ACPI_SUCCESS(acpi_GetInteger(sc->handle, sc->model->brn_get, &sc->s_brn))) SYSCTL_ADD_PROC(&sc->sysctl_ctx, SYSCTL_CHILDREN(sc->sysctl_tree), OID_AUTO, "lcd_brightness", CTLTYPE_INT | CTLFLAG_RW, sc, 0, acpi_asus_sysctl_brn, "I", "brightness of the lcd panel"); /* Attach brightness for other models */ if (sc->model->brn_up && ACPI_SUCCESS(AcpiEvaluateObject(sc->handle, sc->model->brn_up, NULL, NULL)) && ACPI_SUCCESS(AcpiEvaluateObject(sc->handle, sc->model->brn_dn, NULL, NULL))) SYSCTL_ADD_PROC(&sc->sysctl_ctx, SYSCTL_CHILDREN(sc->sysctl_tree), OID_AUTO, "lcd_brightness", CTLTYPE_INT | CTLFLAG_RW, sc, 0, acpi_asus_sysctl_brn, "I", "brightness of the lcd panel"); /* Attach display switching */ if (sc->model->disp_get && ACPI_SUCCESS(acpi_GetInteger(sc->handle, sc->model->disp_get, &sc->s_disp))) SYSCTL_ADD_PROC(&sc->sysctl_ctx, SYSCTL_CHILDREN(sc->sysctl_tree), OID_AUTO, "video_output", CTLTYPE_INT | CTLFLAG_RW, sc, 0, acpi_asus_sysctl_disp, "I", "display output state"); /* Attach LCD state, easy for most models... */ if (sc->model->lcd_get && strncmp(sc->model->name, "L3H", 3) != 0 && ACPI_SUCCESS(acpi_GetInteger(sc->handle, sc->model->lcd_get, &sc->s_lcd))) SYSCTL_ADD_PROC(&sc->sysctl_ctx, SYSCTL_CHILDREN(sc->sysctl_tree), OID_AUTO, "lcd_backlight", CTLTYPE_INT | CTLFLAG_RW, sc, 0, acpi_asus_sysctl_lcd, "I", "state of the lcd backlight"); /* ...a nightmare for the L3H */ else if (sc->model->lcd_get) { ACPI_BUFFER Buf; ACPI_OBJECT Arg[2], Obj; ACPI_OBJECT_LIST Args; Arg[0].Type = ACPI_TYPE_INTEGER; Arg[0].Integer.Value = 0x02; Arg[1].Type = ACPI_TYPE_INTEGER; Arg[1].Integer.Value = 0x03; Args.Count = 2; Args.Pointer = Arg; Buf.Length = sizeof(Obj); Buf.Pointer = &Obj; if (ACPI_SUCCESS(AcpiEvaluateObject(sc->handle, sc->model->lcd_get, &Args, &Buf)) && Obj.Type == ACPI_TYPE_INTEGER) { sc->s_lcd = Obj.Integer.Value >> 8; SYSCTL_ADD_PROC(&sc->sysctl_ctx, SYSCTL_CHILDREN(sc->sysctl_tree), OID_AUTO, "lcd_backlight", CTLTYPE_INT | CTLFLAG_RW, sc, 0, acpi_asus_sysctl_lcd, "I", "state of the lcd backlight"); } } /* Activate hotkeys */ AcpiEvaluateObject(sc->handle, "BSTS", NULL, NULL); /* Handle notifies */ AcpiInstallNotifyHandler(sc->handle, ACPI_SYSTEM_NOTIFY, acpi_asus_notify, dev); return (0); } static int acpi_asus_detach(device_t dev) { struct acpi_asus_softc *sc; ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); sc = device_get_softc(dev); /* Turn the lights off */ if (sc->model->mled_set) led_destroy(sc->s_mled); if (sc->model->tled_set) led_destroy(sc->s_tled); if (sc->model->wled_set) led_destroy(sc->s_wled); /* Remove notify handler */ AcpiRemoveNotifyHandler(sc->handle, ACPI_SYSTEM_NOTIFY, acpi_asus_notify); /* Free sysctl tree */ sysctl_ctx_free(&sc->sysctl_ctx); return (0); } static void acpi_asus_mled(device_t dev, int state) { struct acpi_asus_softc *sc; ACPI_OBJECT Arg; ACPI_OBJECT_LIST Args; ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); sc = device_get_softc(dev); Arg.Type = ACPI_TYPE_INTEGER; Arg.Integer.Value = !state; /* Inverted, yes! */ Args.Count = 1; Args.Pointer = &Arg; AcpiEvaluateObject(sc->handle, sc->model->mled_set, &Args, NULL); } static void acpi_asus_tled(device_t dev, int state) { struct acpi_asus_softc *sc; ACPI_OBJECT Arg; ACPI_OBJECT_LIST Args; ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); sc = device_get_softc(dev); Arg.Type = ACPI_TYPE_INTEGER; Arg.Integer.Value = state; Args.Count = 1; Args.Pointer = &Arg; AcpiEvaluateObject(sc->handle, sc->model->tled_set, &Args, NULL); } static void acpi_asus_wled(device_t dev, int state) { struct acpi_asus_softc *sc; ACPI_OBJECT Arg; ACPI_OBJECT_LIST Args; ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); sc = device_get_softc(dev); Arg.Type = ACPI_TYPE_INTEGER; Arg.Integer.Value = state; Args.Count = 1; Args.Pointer = &Arg; AcpiEvaluateObject(sc->handle, sc->model->wled_set, &Args, NULL); } static int acpi_asus_sysctl_brn(SYSCTL_HANDLER_ARGS) { struct acpi_asus_softc *sc; ACPI_OBJECT Arg; ACPI_OBJECT_LIST Args; int brn, err; ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); sc = (struct acpi_asus_softc *)oidp->oid_arg1; /* Sanity check */ brn = sc->s_brn; err = sysctl_handle_int(oidp, &brn, 0, req); if ((err != 0) || (req->newptr == NULL)) return (err); if ((brn < 0) || (brn > 15)) return (EINVAL); /* Keep track and update */ sc->s_brn = brn; Arg.Type = ACPI_TYPE_INTEGER; Arg.Integer.Value = brn; Args.Count = 1; Args.Pointer = &Arg; if (sc->model->brn_set) AcpiEvaluateObject(sc->handle, sc->model->brn_set, &Args, NULL); else { brn -= sc->s_brn; while (brn != 0) { AcpiEvaluateObject(sc->handle,(brn > 0) ? sc->model->brn_up : sc->model->brn_dn, NULL, NULL); (brn > 0) ? brn-- : brn++; } } return (0); } static int acpi_asus_sysctl_lcd(SYSCTL_HANDLER_ARGS) { struct acpi_asus_softc *sc; int lcd, err; ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); sc = (struct acpi_asus_softc *)oidp->oid_arg1; /* Sanity check */ lcd = sc->s_lcd; err = sysctl_handle_int(oidp, &lcd, 0, req); if ((err != 0) || (req->newptr == NULL)) return (err); if ((lcd < 0) || (lcd > 1)) return (EINVAL); /* Keep track and update */ sc->s_lcd = lcd; /* Most models just need a lcd_set evaluated, the L3H is trickier */ if (strncmp(sc->model->name, "L3H", 3) != 0) AcpiEvaluateObject(sc->handle, sc->model->lcd_set, NULL, NULL); else { ACPI_OBJECT Arg; ACPI_OBJECT_LIST Args; Arg.Type = ACPI_TYPE_INTEGER; Arg.Integer.Value = 0x07; Args.Count = 1; Args.Pointer = &Arg; AcpiEvaluateObject(sc->handle, sc->model->lcd_set, &Args, NULL); } return (0); } static int acpi_asus_sysctl_disp(SYSCTL_HANDLER_ARGS) { struct acpi_asus_softc *sc; ACPI_OBJECT Arg; ACPI_OBJECT_LIST Args; int disp, err; ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); sc = (struct acpi_asus_softc *)oidp->oid_arg1; /* Sanity check */ disp = sc->s_disp; err = sysctl_handle_int(oidp, &disp, 0, req); if ((err != 0) || (req->newptr == NULL)) return (err); if ((disp < 0) || (disp > 7)) return (EINVAL); /* Keep track and update */ sc->s_disp = disp; Arg.Type = ACPI_TYPE_INTEGER; Arg.Integer.Value = disp; Args.Count = 1; Args.Pointer = &Arg; AcpiEvaluateObject(sc->handle, sc->model->disp_set, &Args, NULL); return (0); } static void acpi_asus_notify(ACPI_HANDLE h, UINT32 notify, void *context) { struct acpi_asus_softc *sc; struct acpi_softc *acpi_sc; ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); sc = device_get_softc((device_t)context); acpi_sc = acpi_device_get_parent_softc(sc->dev); if ((notify & ~0x10) <= 15) { sc->s_brn = (notify & ~0x10); ACPI_VPRINT(sc->dev, acpi_sc, "Brightness increased\n"); } else if ((notify & ~0x20) <= 15) { sc->s_brn = (notify & ~0x20); ACPI_VPRINT(sc->dev, acpi_sc, "Brightness decreased\n"); } else if (notify == 0x33) { sc->s_lcd = 1; ACPI_VPRINT(sc->dev, acpi_sc, "LCD turned on\n"); } else if (notify == 0x34) { sc->s_lcd = 0; ACPI_VPRINT(sc->dev, acpi_sc, "LCD turned off\n"); } else { /* Notify devd(8) */ acpi_UserNotify("ASUS", h, notify); } } Index: head/sys/i386/acpica/acpi_toshiba.c =================================================================== --- head/sys/i386/acpica/acpi_toshiba.c (revision 131283) +++ head/sys/i386/acpica/acpi_toshiba.c (revision 131284) @@ -1,551 +1,544 @@ /*- * Copyright (c) 2003 Hiroyuki Aizu * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * */ #include __FBSDID("$FreeBSD$"); #include "opt_acpi.h" #include #include #include #include #include "acpi.h" #include /* * Toshiba HCI interface definitions * * HCI is Toshiba's "Hardware Control Interface" which is supposed to * be uniform across all their models. Ideally we would just call * dedicated ACPI methods instead of using this primitive interface. * However, the ACPI methods seem to be incomplete in some areas (for * example they allow setting, but not reading, the LCD brightness * value), so this is still useful. */ #define METHOD_HCI "GHCI" #define METHOD_HCI_ENABLE "ENAB" #define METHOD_VIDEO "DSSX" /* Operations */ #define HCI_SET 0xFF00 #define HCI_GET 0xFE00 /* Return codes */ #define HCI_SUCCESS 0x0000 #define HCI_FAILURE 0x1000 #define HCI_NOT_SUPPORTED 0x8000 #define HCI_EMPTY 0x8C00 /* Functions */ #define HCI_REG_LCD_BACKLIGHT 0x0002 #define HCI_REG_FAN 0x0004 #define HCI_REG_SYSTEM_EVENT 0x0016 #define HCI_REG_VIDEO_OUTPUT 0x001C #define HCI_REG_HOTKEY_EVENT 0x001E #define HCI_REG_LCD_BRIGHTNESS 0x002A #define HCI_REG_CPU_SPEED 0x0032 /* Field definitions */ #define HCI_FAN_SHIFT 7 #define HCI_LCD_BRIGHTNESS_BITS 3 #define HCI_LCD_BRIGHTNESS_SHIFT (16 - HCI_LCD_BRIGHTNESS_BITS) #define HCI_LCD_BRIGHTNESS_MAX ((1 << HCI_LCD_BRIGHTNESS_BITS) - 1) #define HCI_VIDEO_OUTPUT_FLAG 0x0100 #define HCI_VIDEO_OUTPUT_LCD 0x1 #define HCI_VIDEO_OUTPUT_CRT 0x2 #define HCI_VIDEO_OUTPUT_TV 0x4 #define HCI_CPU_SPEED_BITS 3 #define HCI_CPU_SPEED_SHIFT (16 - HCI_CPU_SPEED_BITS) #define HCI_CPU_SPEED_MAX ((1 << HCI_CPU_SPEED_BITS) - 1) /* Key press/release events. */ #define FN_F1_PRESS 0x013B #define FN_F1_RELEASE 0x01BB #define FN_F2_PRESS 0x013C #define FN_F2_RELEASE 0x01BC #define FN_F3_PRESS 0x013D #define FN_F3_RELEASE 0x01BD #define FN_F4_PRESS 0x013E #define FN_F4_RELEASE 0x01BE #define FN_F5_PRESS 0x013F #define FN_F5_RELEASE 0x01BF #define FN_F6_PRESS 0x0140 #define FN_F6_RELEASE 0x01C0 #define FN_F7_PRESS 0x0141 #define FN_F7_RELEASE 0x01C1 #define FN_F8_PRESS 0x0142 #define FN_F8_RELEASE 0x01C2 #define FN_F9_PRESS 0x0143 #define FN_F9_RELEASE 0x01C3 #define FN_BS_PRESS 0x010E #define FN_BS_RELEASE 0x018E #define FN_ESC_PRESS 0x0101 #define FN_ESC_RELEASE 0x0181 #define FN_KNJ_PRESS 0x0129 #define FN_KNJ_RELEASE 0x01A9 /* HCI register definitions. */ #define HCI_WORDS 6 /* Number of registers */ #define HCI_REG_AX 0 /* Operation, then return value */ #define HCI_REG_BX 1 /* Function */ #define HCI_REG_CX 2 /* Argument (in or out) */ #define HCI_REG_DX 3 /* Unused? */ #define HCI_REG_SI 4 /* Unused? */ #define HCI_REG_DI 5 /* Unused? */ struct acpi_toshiba_softc { device_t dev; ACPI_HANDLE handle; ACPI_HANDLE video_handle; struct sysctl_ctx_list sysctl_ctx; struct sysctl_oid *sysctl_tree; }; /* Prototype for HCI functions for getting/setting a value. */ typedef int hci_fn_t(ACPI_HANDLE, int, UINT32 *); static int acpi_toshiba_probe(device_t dev); static int acpi_toshiba_attach(device_t dev); static int acpi_toshiba_detach(device_t dev); static int acpi_toshiba_sysctl(SYSCTL_HANDLER_ARGS); static hci_fn_t hci_force_fan; static hci_fn_t hci_video_output; static hci_fn_t hci_lcd_brightness; static hci_fn_t hci_lcd_backlight; static hci_fn_t hci_cpu_speed; static int hci_call(ACPI_HANDLE h, int op, int function, UINT32 *arg); static void hci_key_action(struct acpi_toshiba_softc *sc, ACPI_HANDLE h, UINT32 key); static void acpi_toshiba_notify(ACPI_HANDLE h, UINT32 notify, void *context); static int acpi_toshiba_video_probe(device_t dev); static int acpi_toshiba_video_attach(device_t dev); /* Table of sysctl names and HCI functions to call. */ static struct { char *name; hci_fn_t *handler; } sysctl_table[] = { /* name, handler */ {"force_fan", hci_force_fan}, {"video_output", hci_video_output}, {"lcd_brightness", hci_lcd_brightness}, {"lcd_backlight", hci_lcd_backlight}, {"cpu_speed", hci_cpu_speed}, {NULL, NULL} }; static device_method_t acpi_toshiba_methods[] = { DEVMETHOD(device_probe, acpi_toshiba_probe), DEVMETHOD(device_attach, acpi_toshiba_attach), DEVMETHOD(device_detach, acpi_toshiba_detach), {0, 0} }; static driver_t acpi_toshiba_driver = { "acpi_toshiba", acpi_toshiba_methods, sizeof(struct acpi_toshiba_softc), }; static devclass_t acpi_toshiba_devclass; DRIVER_MODULE(acpi_toshiba, acpi, acpi_toshiba_driver, acpi_toshiba_devclass, 0, 0); MODULE_DEPEND(acpi_toshiba, acpi, 1, 1, 1); static device_method_t acpi_toshiba_video_methods[] = { DEVMETHOD(device_probe, acpi_toshiba_video_probe), DEVMETHOD(device_attach, acpi_toshiba_video_attach), {0, 0} }; static driver_t acpi_toshiba_video_driver = { "acpi_toshiba_video", acpi_toshiba_video_methods, 0, }; static devclass_t acpi_toshiba_video_devclass; DRIVER_MODULE(acpi_toshiba_video, acpi, acpi_toshiba_video_driver, acpi_toshiba_video_devclass, 0, 0); MODULE_DEPEND(acpi_toshiba_video, acpi, 1, 1, 1); static int enable_fn_keys = 1; TUNABLE_INT("hw.acpi.toshiba.enable_fn_keys", &enable_fn_keys); /* * HID Model * ------------------------------------- * TOS6200 Libretto L Series * Dynabook Satellite 2455 * Dynabook SS 3500 * TOS6207 Dynabook SS2110 Series */ static int acpi_toshiba_probe(device_t dev) { - ACPI_HANDLE h; - int ret = ENXIO; + static char *tosh_ids[] = { "TOS6200", "TOS6207", NULL }; - h = acpi_get_handle(dev); - if (!acpi_disabled("toshiba") && - acpi_get_type(dev) == ACPI_TYPE_DEVICE && - device_get_unit(dev) == 0 && - (acpi_MatchHid(h, "TOS6200") || - acpi_MatchHid(h, "TOS6207"))) { - device_set_desc(dev, "Toshiba HCI Extras"); - ret = 0; - } + if (acpi_disabled("toshiba") || + ACPI_ID_PROBE(device_get_parent(dev), dev, tosh_ids) == NULL || + device_get_unit(dev) != 0) + return (ENXIO); - return (ret); + device_set_desc(dev, "Toshiba HCI Extras"); + return (0); } static int acpi_toshiba_attach(device_t dev) { struct acpi_toshiba_softc *sc; struct acpi_softc *acpi_sc; ACPI_STATUS status; int i; sc = device_get_softc(dev); sc->dev = dev; sc->handle = acpi_get_handle(dev); acpi_sc = acpi_device_get_parent_softc(dev); sysctl_ctx_init(&sc->sysctl_ctx); sc->sysctl_tree = SYSCTL_ADD_NODE(&sc->sysctl_ctx, SYSCTL_CHILDREN(acpi_sc->acpi_sysctl_tree), OID_AUTO, "toshiba", CTLFLAG_RD, 0, ""); for (i = 0; sysctl_table[i].name != NULL; i++) { SYSCTL_ADD_PROC(&sc->sysctl_ctx, SYSCTL_CHILDREN(sc->sysctl_tree), OID_AUTO, sysctl_table[i].name, CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_ANYBODY, sc, i, acpi_toshiba_sysctl, "I", ""); } if (enable_fn_keys != 0) { status = AcpiEvaluateObject(sc->handle, METHOD_HCI_ENABLE, NULL, NULL); if (ACPI_FAILURE(status)) { device_printf(dev, "enable FN keys failed\n"); sysctl_ctx_free(&sc->sysctl_ctx); return (ENXIO); } AcpiInstallNotifyHandler(sc->handle, ACPI_DEVICE_NOTIFY, acpi_toshiba_notify, sc); } return (0); } static int acpi_toshiba_detach(device_t dev) { struct acpi_toshiba_softc *sc; sc = device_get_softc(dev); if (enable_fn_keys != 0) { AcpiRemoveNotifyHandler(sc->handle, ACPI_DEVICE_NOTIFY, acpi_toshiba_notify); } sysctl_ctx_free(&sc->sysctl_ctx); return (0); } static int acpi_toshiba_sysctl(SYSCTL_HANDLER_ARGS) { struct acpi_toshiba_softc *sc; UINT32 arg; int function, error = 0; hci_fn_t *handler; sc = (struct acpi_toshiba_softc *)oidp->oid_arg1; function = oidp->oid_arg2; handler = sysctl_table[function].handler; /* Get the current value from the appropriate function. */ error = handler(sc->handle, HCI_GET, &arg); if (error != 0) return (error); /* Send the current value to the user and return if no new value. */ error = sysctl_handle_int(oidp, &arg, 0, req); if (error != 0 || req->newptr == NULL) return (error); /* Set the new value via the appropriate function. */ error = handler(sc->handle, HCI_SET, &arg); return (error); } static int hci_force_fan(ACPI_HANDLE h, int op, UINT32 *state) { int ret; if (op == HCI_SET) { if (*state < 0 || *state > 1) return (EINVAL); *state <<= HCI_FAN_SHIFT; } ret = hci_call(h, op, HCI_REG_FAN, state); if (ret == 0 && op == HCI_GET) *state >>= HCI_FAN_SHIFT; return (ret); } static int hci_video_output(ACPI_HANDLE h, int op, UINT32 *video_output) { int ret; ACPI_STATUS status; if (op == HCI_SET) { if (*video_output < 1 || *video_output > 7) return (EINVAL); if (h == NULL) return (ENXIO); *video_output |= HCI_VIDEO_OUTPUT_FLAG; status = acpi_SetInteger(h, METHOD_VIDEO, *video_output); if (ACPI_SUCCESS(status)) ret = 0; else ret = ENXIO; } else { ret = hci_call(h, op, HCI_REG_VIDEO_OUTPUT, video_output); if (ret == 0) *video_output &= 0xff; } return (ret); } static int hci_lcd_brightness(ACPI_HANDLE h, int op, UINT32 *brightness) { int ret; if (op == HCI_SET) { if (*brightness < 0 || *brightness > HCI_LCD_BRIGHTNESS_MAX) return (EINVAL); *brightness <<= HCI_LCD_BRIGHTNESS_SHIFT; } ret = hci_call(h, op, HCI_REG_LCD_BRIGHTNESS, brightness); if (ret == 0 && op == HCI_GET) *brightness >>= HCI_LCD_BRIGHTNESS_SHIFT; return (ret); } static int hci_lcd_backlight(ACPI_HANDLE h, int op, UINT32 *backlight) { if (op == HCI_SET) { if (*backlight < 0 || *backlight > 1) return (EINVAL); } return (hci_call(h, op, HCI_REG_LCD_BACKLIGHT, backlight)); } static int hci_cpu_speed(ACPI_HANDLE h, int op, UINT32 *speed) { int ret; if (op == HCI_SET) { if (*speed < 0 || *speed > HCI_CPU_SPEED_MAX) return (EINVAL); *speed <<= HCI_CPU_SPEED_SHIFT; } ret = hci_call(h, op, HCI_REG_CPU_SPEED, speed); if (ret == 0 && op == HCI_GET) *speed >>= HCI_CPU_SPEED_SHIFT; return (ret); } static int hci_call(ACPI_HANDLE h, int op, int function, UINT32 *arg) { ACPI_OBJECT_LIST args; ACPI_BUFFER results; ACPI_OBJECT obj[HCI_WORDS]; ACPI_OBJECT *res; int status, i, ret; status = ENXIO; for (i = 0; i < HCI_WORDS; i++) { obj[i].Type = ACPI_TYPE_INTEGER; obj[i].Integer.Value = 0; } obj[HCI_REG_AX].Integer.Value = op; obj[HCI_REG_BX].Integer.Value = function; if (op == HCI_SET) obj[HCI_REG_CX].Integer.Value = *arg; args.Count = HCI_WORDS; args.Pointer = obj; results.Pointer = NULL; results.Length = ACPI_ALLOCATE_BUFFER; if (ACPI_FAILURE(AcpiEvaluateObject(h, METHOD_HCI, &args, &results))) goto end; res = (ACPI_OBJECT *)results.Pointer; if (!ACPI_PKG_VALID(res, HCI_WORDS)) { printf("toshiba: invalid package!\n"); return (ENXIO); } acpi_PkgInt32(res, HCI_REG_AX, &ret); if (ret == HCI_SUCCESS) { if (op == HCI_GET) acpi_PkgInt32(res, HCI_REG_CX, arg); status = 0; } else if (function == HCI_REG_SYSTEM_EVENT && op == HCI_GET && ret == HCI_NOT_SUPPORTED) { /* * Sometimes system events are disabled without us requesting * it. This workaround attempts to re-enable them. */ i = 1; hci_call(h, HCI_SET, HCI_REG_SYSTEM_EVENT, &i); } end: if (results.Pointer != NULL) AcpiOsFree(results.Pointer); return (status); } /* * Perform a few actions based on the keypress. Users can extend this * functionality by reading the keystrokes we send to devd(8). */ static void hci_key_action(struct acpi_toshiba_softc *sc, ACPI_HANDLE h, UINT32 key) { UINT32 arg; switch (key) { case FN_F6_RELEASE: /* Decrease LCD brightness. */ hci_lcd_brightness(h, HCI_GET, &arg); if (arg-- == 0) arg = 0; else hci_lcd_brightness(h, HCI_SET, &arg); break; case FN_F7_RELEASE: /* Increase LCD brightness. */ hci_lcd_brightness(h, HCI_GET, &arg); if (arg++ == 7) arg = 7; else hci_lcd_brightness(h, HCI_SET, &arg); break; case FN_F5_RELEASE: /* Cycle through video outputs. */ hci_video_output(h, HCI_GET, &arg); arg = (arg + 1) % 7; hci_video_output(sc->video_handle, HCI_SET, &arg); break; case FN_F8_RELEASE: /* Toggle LCD backlight. */ hci_lcd_backlight(h, HCI_GET, &arg); arg = (arg != 0) ? 0 : 1; hci_lcd_backlight(h, HCI_SET, &arg); break; case FN_ESC_RELEASE: /* Toggle forcing fan on. */ hci_force_fan(h, HCI_GET, &arg); arg = (arg != 0) ? 0 : 1; hci_force_fan(h, HCI_SET, &arg); break; } } static void acpi_toshiba_notify(ACPI_HANDLE h, UINT32 notify, void *context) { struct acpi_toshiba_softc *sc; UINT32 key; sc = (struct acpi_toshiba_softc *)context; if (notify == 0x80) { while (hci_call(h, HCI_GET, HCI_REG_SYSTEM_EVENT, &key) == 0) { hci_key_action(sc, h, key); acpi_UserNotify("TOSHIBA", h, (uint8_t)key); } } else device_printf(sc->dev, "unknown notify: 0x%x\n", notify); } /* * Toshiba video pseudo-device to provide the DSSX method. * * HID Model * ------------------------------------- * TOS6201 Libretto L Series */ static int acpi_toshiba_video_probe(device_t dev) { - int ret = ENXIO; + static char *vid_ids[] = { "TOS6201", NULL }; - if (!acpi_disabled("toshiba") && - acpi_get_type(dev) == ACPI_TYPE_DEVICE && - device_get_unit(dev) == 0 && - acpi_MatchHid(acpi_get_handle(dev), "TOS6201")) { - device_quiet(dev); - device_set_desc(dev, "Toshiba Video"); - ret = 0; - } + if (acpi_disabled("toshiba") || + ACPI_ID_PROBE(device_get_parent(dev), dev, vid_ids) == NULL || + device_get_unit(dev) != 0) + return (ENXIO); - return (ret); + device_quiet(dev); + device_set_desc(dev, "Toshiba Video"); + return (0); } static int acpi_toshiba_video_attach(device_t dev) { struct acpi_toshiba_softc *sc; sc = devclass_get_softc(acpi_toshiba_devclass, 0); if (sc == NULL) return (ENXIO); sc->video_handle = acpi_get_handle(dev); return (0); }