diff options
author | jkim <jkim@FreeBSD.org> | 2016-04-20 21:21:47 +0000 |
---|---|---|
committer | jkim <jkim@FreeBSD.org> | 2016-04-20 21:21:47 +0000 |
commit | c6fadd21159e75b733e0d9255c93d1d052bee153 (patch) | |
tree | ea2a96c448c4fc1d8a0e720656dde93b2928bb00 | |
parent | b389a6beb1565ba2536fc0d1ff653bdd61a18b00 (diff) | |
download | FreeBSD-src-c6fadd21159e75b733e0d9255c93d1d052bee153.zip FreeBSD-src-c6fadd21159e75b733e0d9255c93d1d052bee153.tar.gz |
Remove query flag from acpi_EvaluateOSC(). This function does not support
return buffer (yet).
-rw-r--r-- | sys/dev/acpica/acpi.c | 3 | ||||
-rw-r--r-- | sys/dev/acpica/acpi_cpu.c | 4 | ||||
-rw-r--r-- | sys/dev/acpica/acpi_pcib_acpi.c | 5 | ||||
-rw-r--r-- | sys/dev/acpica/acpivar.h | 2 |
4 files changed, 8 insertions, 6 deletions
diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c index 8539f2f..c6ea082 100644 --- a/sys/dev/acpica/acpi.c +++ b/sys/dev/acpica/acpi.c @@ -2482,7 +2482,7 @@ acpi_AppendBufferResource(ACPI_BUFFER *buf, ACPI_RESOURCE *res) ACPI_STATUS acpi_EvaluateOSC(ACPI_HANDLE handle, uint8_t *uuid, int revision, int count, - uint32_t *caps, bool query) + uint32_t *caps) { ACPI_OBJECT arg[4]; ACPI_OBJECT_LIST arglist; @@ -2499,7 +2499,6 @@ acpi_EvaluateOSC(ACPI_HANDLE handle, uint8_t *uuid, int revision, int count, arg[3].Type = ACPI_TYPE_BUFFER; arg[3].Buffer.Length = count * sizeof(uint32_t); arg[3].Buffer.Pointer = (uint8_t *)caps; - caps[0] = query ? 1 : 0; return (AcpiEvaluateObject(handle, "_OSC", &arglist, NULL)); } diff --git a/sys/dev/acpica/acpi_cpu.c b/sys/dev/acpica/acpi_cpu.c index fda40e2..f770d26 100644 --- a/sys/dev/acpica/acpi_cpu.c +++ b/sys/dev/acpica/acpi_cpu.c @@ -391,9 +391,9 @@ acpi_cpu_attach(device_t dev) * Intel Processor Vendor-Specific ACPI Interface Specification. */ if (sc->cpu_features) { + cap_set[0] = 0; cap_set[1] = sc->cpu_features; - status = acpi_EvaluateOSC(sc->cpu_handle, cpu_oscuuid, 1, 2, cap_set, - false); + status = acpi_EvaluateOSC(sc->cpu_handle, cpu_oscuuid, 1, 2, cap_set); if (ACPI_SUCCESS(status)) { if (cap_set[0] != 0) device_printf(dev, "_OSC returned status %#x\n", cap_set[0]); diff --git a/sys/dev/acpica/acpi_pcib_acpi.c b/sys/dev/acpica/acpi_pcib_acpi.c index a4fe5a8..cd51e79 100644 --- a/sys/dev/acpica/acpi_pcib_acpi.c +++ b/sys/dev/acpica/acpi_pcib_acpi.c @@ -306,6 +306,9 @@ acpi_pcib_osc(struct acpi_hpcib_softc *sc) 0x96, 0x57, 0x74, 0x41, 0xc0, 0x3d, 0xd7, 0x66 }; + /* Query Support Flag */ + cap_set[0] = 0; + /* Support Field: Extended PCI Config Space, MSI */ cap_set[1] = 0x11; @@ -313,7 +316,7 @@ acpi_pcib_osc(struct acpi_hpcib_softc *sc) cap_set[2] = 0; status = acpi_EvaluateOSC(sc->ap_handle, pci_host_bridge_uuid, 1, - nitems(cap_set), cap_set, false); + nitems(cap_set), cap_set); if (ACPI_FAILURE(status)) { if (status == AE_NOT_FOUND) return; diff --git a/sys/dev/acpica/acpivar.h b/sys/dev/acpica/acpivar.h index 034f6df..6a31aea 100644 --- a/sys/dev/acpica/acpivar.h +++ b/sys/dev/acpica/acpivar.h @@ -336,7 +336,7 @@ ACPI_STATUS acpi_FindIndexedResource(ACPI_BUFFER *buf, int index, ACPI_STATUS acpi_AppendBufferResource(ACPI_BUFFER *buf, ACPI_RESOURCE *res); ACPI_STATUS acpi_EvaluateOSC(ACPI_HANDLE handle, uint8_t *uuid, - int revision, int count, uint32_t *caps, bool query); + int revision, int count, uint32_t *caps); ACPI_STATUS acpi_OverrideInterruptLevel(UINT32 InterruptNumber); ACPI_STATUS acpi_SetIntrModel(int model); int acpi_ReqSleepState(struct acpi_softc *sc, int state); |