system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-10-18 22:33:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use the new API for acpi_MatchHid(). The difference between ACPI_HANDLE

Browse source 
and device_t isn't caught by the compiler.
This commit is contained in:
Nate Lawson 2004-06-14 03:40:56 +00:00
parent b46dfa92b4
commit 7a15653c9c
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=130447
4 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sys/dev/acpi_support/acpi_asus.c
View file

@ -213,7 +213,7 @@ acpi_asus_probe(device_t dev)
if (!acpi_disabled("asus") &&
acpi_get_type(dev) == ACPI_TYPE_DEVICE &&
acpi_MatchHid(dev, "ATK0100")) {
acpi_MatchHid(acpi_get_handle(dev), "ATK0100")) {
sc = device_get_softc(dev);
sc->dev = dev;
sc->handle = acpi_get_handle(dev);

6
sys/dev/acpi_support/acpi_toshiba.c
View file

@ -212,13 +212,15 @@ TUNABLE_INT("hw.acpi.toshiba.enable_fn_keys", &enable_fn_keys);
static int
acpi_toshiba_probe(device_t dev)
{
ACPI_HANDLE h;
int ret = ENXIO;
h = acpi_get_handle(dev);
if (!acpi_disabled("toshiba") &&
acpi_get_type(dev) == ACPI_TYPE_DEVICE &&
device_get_unit(dev) == 0 &&
(acpi_MatchHid(dev, "TOS6200") ||
acpi_MatchHid(dev, "TOS6207"))) {
(acpi_MatchHid(h, "TOS6200") ||
acpi_MatchHid(h, "TOS6207"))) {
device_set_desc(dev, "Toshiba HCI Extras");
ret = 0;
}

2
sys/i386/acpica/acpi_asus.c
View file

@ -213,7 +213,7 @@ acpi_asus_probe(device_t dev)
if (!acpi_disabled("asus") &&
acpi_get_type(dev) == ACPI_TYPE_DEVICE &&
acpi_MatchHid(dev, "ATK0100")) {
acpi_MatchHid(acpi_get_handle(dev), "ATK0100")) {
sc = device_get_softc(dev);
sc->dev = dev;
sc->handle = acpi_get_handle(dev);

6
sys/i386/acpica/acpi_toshiba.c
View file

@ -212,13 +212,15 @@ TUNABLE_INT("hw.acpi.toshiba.enable_fn_keys", &enable_fn_keys);
static int
acpi_toshiba_probe(device_t dev)
{
ACPI_HANDLE h;
int ret = ENXIO;
h = acpi_get_handle(dev);
if (!acpi_disabled("toshiba") &&
acpi_get_type(dev) == ACPI_TYPE_DEVICE &&
device_get_unit(dev) == 0 &&
(acpi_MatchHid(dev, "TOS6200") ||
acpi_MatchHid(dev, "TOS6207"))) {
(acpi_MatchHid(h, "TOS6200") ||
acpi_MatchHid(h, "TOS6207"))) {
device_set_desc(dev, "Toshiba HCI Extras");
ret = 0;
}