diff options
| author | jkim <jkim@FreeBSD.org> | 2010-01-21 21:14:28 +0000 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2010-01-21 21:14:28 +0000 |
| commit | fa5d03cca6e75599903d9e88eb88558b07b57224 (patch) | |
| tree | 88dae9a5d7e108bfbd0e233fac4e5d043718b0b2 /sys/dev/acpica/acpi_ec.c | |
| parent | 83fed061c4fe4086f0414be4bd83235282f469cb (diff) | |
| download | FreeBSD-src-fa5d03cca6e75599903d9e88eb88558b07b57224.zip FreeBSD-src-fa5d03cca6e75599903d9e88eb88558b07b57224.tar.gz | |
Merge ACPICA 20100121.
Diffstat (limited to 'sys/dev/acpica/acpi_ec.c')
| -rw-r--r-- | sys/dev/acpica/acpi_ec.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sys/dev/acpica/acpi_ec.c b/sys/dev/acpica/acpi_ec.c index 9348a2a..d4ef019 100644 --- a/sys/dev/acpica/acpi_ec.c +++ b/sys/dev/acpica/acpi_ec.c @@ -223,7 +223,7 @@ 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, ACPI_INTEGER *Value, + UINT32 width, UINT64 *Value, void *Context, void *RegionContext); static ACPI_STATUS EcWaitEvent(struct acpi_ec_softc *sc, EC_EVENT Event, u_int gen_count); @@ -238,9 +238,9 @@ static int acpi_ec_suspend(device_t dev); static int acpi_ec_resume(device_t dev); static int acpi_ec_shutdown(device_t dev); static int acpi_ec_read_method(device_t dev, u_int addr, - ACPI_INTEGER *val, int width); + UINT64 *val, int width); static int acpi_ec_write_method(device_t dev, u_int addr, - ACPI_INTEGER val, int width); + UINT64 val, int width); static device_method_t acpi_ec_methods[] = { /* Device interface */ @@ -581,7 +581,7 @@ acpi_ec_shutdown(device_t dev) /* Methods to allow other devices (e.g., smbat) to read/write EC space. */ static int -acpi_ec_read_method(device_t dev, u_int addr, ACPI_INTEGER *val, int width) +acpi_ec_read_method(device_t dev, u_int addr, UINT64 *val, int width) { struct acpi_ec_softc *sc; ACPI_STATUS status; @@ -594,7 +594,7 @@ acpi_ec_read_method(device_t dev, u_int addr, ACPI_INTEGER *val, int width) } static int -acpi_ec_write_method(device_t dev, u_int addr, ACPI_INTEGER val, int width) +acpi_ec_write_method(device_t dev, u_int addr, UINT64 val, int width) { struct acpi_ec_softc *sc; ACPI_STATUS status; @@ -724,7 +724,7 @@ EcSpaceSetup(ACPI_HANDLE Region, UINT32 Function, void *Context, static ACPI_STATUS EcSpaceHandler(UINT32 Function, ACPI_PHYSICAL_ADDRESS Address, UINT32 width, - ACPI_INTEGER *Value, void *Context, void *RegionContext) + UINT64 *Value, void *Context, void *RegionContext) { struct acpi_ec_softc *sc = (struct acpi_ec_softc *)Context; ACPI_STATUS Status; @@ -765,7 +765,7 @@ EcSpaceHandler(UINT32 Function, ACPI_PHYSICAL_ADDRESS Address, UINT32 width, case ACPI_READ: Status = EcRead(sc, EcAddr, &EcData); if (ACPI_SUCCESS(Status)) - *Value |= ((ACPI_INTEGER)EcData) << i; + *Value |= ((UINT64)EcData) << i; break; case ACPI_WRITE: EcData = (UINT8)((*Value) >> i); |
