diff options
| author | njl <njl@FreeBSD.org> | 2003-07-13 22:57:16 +0000 |
|---|---|---|
| committer | njl <njl@FreeBSD.org> | 2003-07-13 22:57:16 +0000 |
| commit | bce9717b4643784c8c7781798956e458c2a831ea (patch) | |
| tree | a1485388131287815461bcf2de309d011715dbd0 /sys/dev/acpica/acpi_pcib.c | |
| parent | 17dd0864eb9c81bb222c6fa5670d3666dbbe2068 (diff) | |
| download | FreeBSD-src-bce9717b4643784c8c7781798956e458c2a831ea.zip FreeBSD-src-bce9717b4643784c8c7781798956e458c2a831ea.tar.gz | |
Update code to work with 0619 dist
* Use ACPI_BUFFER as the type for AcpiGetObjectInfo
* Remove AcpiEnableEvent/AcpiClearEvent for ACPI_EVENT_FIXED (power/sleep
buttons) as they are no longer needed
* Change calls to use the new GPE functions
* Add AcpiOs*Lock functions
Diffstat (limited to 'sys/dev/acpica/acpi_pcib.c')
| -rw-r--r-- | sys/dev/acpica/acpi_pcib.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sys/dev/acpica/acpi_pcib.c b/sys/dev/acpica/acpi_pcib.c index 3677966..ac274a4cd 100644 --- a/sys/dev/acpica/acpi_pcib.c +++ b/sys/dev/acpica/acpi_pcib.c @@ -114,6 +114,7 @@ acpi_pcib_route_interrupt(device_t pcib, device_t dev, int pin, ACPI_BUFFER crsbuf, prsbuf; ACPI_RESOURCE *crsres, *prsres, resbuf; ACPI_DEVICE_INFO devinfo; + ACPI_BUFFER buf = {sizeof(devinfo), &devinfo}; ACPI_STATUS status; u_int8_t *prtp; int interrupt; @@ -182,14 +183,14 @@ acpi_pcib_route_interrupt(device_t pcib, device_t dev, int pin, /* * Verify that this is a PCI link device, and that it's present. */ - if (ACPI_FAILURE(AcpiGetObjectInfo(lnkdev, &devinfo))) { + if (ACPI_FAILURE(AcpiGetObjectInfo(lnkdev, &buf))) { device_printf(pcib, "couldn't validate PCI interrupt link device %s\n", prt->Source); goto out; } - if (!(devinfo.Valid & ACPI_VALID_HID) || strcmp("PNP0C0F", devinfo.HardwareId)) { + if (!(devinfo.Valid & ACPI_VALID_HID) || strcmp("PNP0C0F", devinfo.HardwareId.Value)) { device_printf(pcib, "PCI interrupt link device %s has wrong _HID (%s)\n", - prt->Source, devinfo.HardwareId); + prt->Source, devinfo.HardwareId.Value); goto out; } if (devinfo.Valid & ACPI_VALID_STA && (devinfo.CurrentStatus & 0x9) != 0x9) { |
