diff options
| author | msmith <msmith@FreeBSD.org> | 2001-11-28 04:36:29 +0000 |
|---|---|---|
| committer | msmith <msmith@FreeBSD.org> | 2001-11-28 04:36:29 +0000 |
| commit | adb7d36871c47f61c135d75eb203d85686d8bb13 (patch) | |
| tree | c757fe8dd108c3e249b3148f1771a3a8ae68595d /sys/dev/acpica/acpi_ec.c | |
| parent | 02c92eb332c4d56cd990b07b9cecc1ada735ed68 (diff) | |
| download | FreeBSD-src-adb7d36871c47f61c135d75eb203d85686d8bb13.zip FreeBSD-src-adb7d36871c47f61c135d75eb203d85686d8bb13.tar.gz | |
Synch with minor changes in the ACPI CA 20011120 snapshot.
Diffstat (limited to 'sys/dev/acpica/acpi_ec.c')
| -rw-r--r-- | sys/dev/acpica/acpi_ec.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/dev/acpica/acpi_ec.c b/sys/dev/acpica/acpi_ec.c index c681368..adc09a6 100644 --- a/sys/dev/acpica/acpi_ec.c +++ b/sys/dev/acpica/acpi_ec.c @@ -278,7 +278,7 @@ typedef struct static void EcGpeHandler(void *Context); static ACPI_STATUS EcSpaceSetup(ACPI_HANDLE Region, UINT32 Function, void *Context, void **return_Context); -static ACPI_STATUS EcSpaceHandler(UINT32 Function, ACPI_PHYSICAL_ADDRESS Address, UINT32 width, UINT32 *Value, +static ACPI_STATUS EcSpaceHandler(UINT32 Function, ACPI_PHYSICAL_ADDRESS Address, UINT32 width, ACPI_INTEGER *Value, void *Context, void *RegionContext); static ACPI_STATUS EcWaitEvent(struct acpi_ec_softc *sc, EC_EVENT Event); @@ -538,7 +538,7 @@ EcSpaceSetup(ACPI_HANDLE Region, UINT32 Function, void *Context, void **RegionCo } static ACPI_STATUS -EcSpaceHandler(UINT32 Function, ACPI_PHYSICAL_ADDRESS Address, UINT32 width, UINT32 *Value, +EcSpaceHandler(UINT32 Function, ACPI_PHYSICAL_ADDRESS Address, UINT32 width, ACPI_INTEGER *Value, void *Context, void *RegionContext) { struct acpi_ec_softc *sc = (struct acpi_ec_softc *)Context; @@ -552,13 +552,13 @@ EcSpaceHandler(UINT32 Function, ACPI_PHYSICAL_ADDRESS Address, UINT32 width, UIN return_ACPI_STATUS(AE_BAD_PARAMETER); switch (Function) { - case ACPI_READ_ADR_SPACE: + case ACPI_READ: EcRequest.Command = EC_COMMAND_READ; EcRequest.Address = Address; (*Value) = 0; break; - case ACPI_WRITE_ADR_SPACE: + case ACPI_WRITE: EcRequest.Command = EC_COMMAND_WRITE; EcRequest.Address = Address; break; @@ -572,13 +572,13 @@ EcSpaceHandler(UINT32 Function, ACPI_PHYSICAL_ADDRESS Address, UINT32 width, UIN * Perform the transaction. */ for (i = 0; i < width; i += 8) { - if (Function == ACPI_READ_ADR_SPACE) + if (Function == ACPI_READ) EcRequest.Data = 0; else EcRequest.Data = (UINT8)((*Value) >> i); if ((Status = EcTransaction(sc, &EcRequest)) != AE_OK) break; - (*Value) |= (UINT32)EcRequest.Data << i; + (*Value) |= (ACPI_INTEGER)EcRequest.Data << i; if (++EcRequest.Address == 0) return_ACPI_STATUS(AE_BAD_PARAMETER); } |
