diff -ur acpi_ppc/acpi_ppc.c 7.0B1/acpi_ppc.c --- acpi_ppc/acpi_ppc.c Tue Jul 25 18:58:26 2006 +++ 7.0B1/acpi_ppc.c Wed Nov 7 21:45:00 2007 @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2004-2006 FUKUDA Nobuhiko + * Copyright (c) 2004-2007 FUKUDA Nobuhiko * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * [acpi_ppc/20060725] + * [acpi_ppc/20071107-7.0B1-test] */ /* @@ -215,12 +215,12 @@ goto done; memcpy(&gas, obj->Buffer.Pointer + 3, sizeof(gas)); - switch (gas.AddressSpaceId) { + switch (gas.SpaceId) { case ACPI_ADR_SPACE_SYSTEM_IO: - if (!ACPI_VALID_ADDRESS(gas.Address)) + if (!gas.Address) goto done; sc->cpu_px_control.address = gas.Address; - sc->cpu_px_control.bitwidth = gas.RegisterBitWidth; + sc->cpu_px_control.bitwidth = gas.BitWidth; break; case ACPI_ADR_SPACE_FIXED_HARDWARE: sc->cpu_px_control.bitwidth = 0; @@ -235,12 +235,12 @@ goto done; memcpy(&gas, obj->Buffer.Pointer + 3, sizeof(gas)); - switch (gas.AddressSpaceId) { + switch (gas.SpaceId) { case ACPI_ADR_SPACE_SYSTEM_IO: - if (!ACPI_VALID_ADDRESS(gas.Address)) - goto done; + if (!gas.Address) + goto done; sc->cpu_px_status.address = gas.Address; - sc->cpu_px_status.bitwidth = gas.RegisterBitWidth; + sc->cpu_px_status.bitwidth = gas.BitWidth; break; case ACPI_ADR_SPACE_FIXED_HARDWARE: sc->cpu_px_status.bitwidth = 0;