diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2015-04-11 03:23:41 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2015-04-11 03:23:41 +0000 |
| commit | 7cf3e94a41ba78bb319589610ad72bf914dc75c1 (patch) | |
| tree | 4624054659df9227c59dda7a6d689446bc231b4b /sys/dev/acpica | |
| parent | bcd1483d9da9d13f4b880c60572c71e5d88f2d12 (diff) | |
| parent | 2a91972d59fb9df39eae760a853d6f5bc4065cf0 (diff) | |
| download | src-7cf3e94a41ba78bb319589610ad72bf914dc75c1.tar.gz src-7cf3e94a41ba78bb319589610ad72bf914dc75c1.zip | |
Merge ACPICA 20150410.
Notes
Notes:
svn path=/head/; revision=281396
Diffstat (limited to 'sys/dev/acpica')
| -rw-r--r-- | sys/dev/acpica/acpi_pcib_acpi.c | 24 | ||||
| -rw-r--r-- | sys/dev/acpica/acpi_resource.c | 32 |
2 files changed, 28 insertions, 28 deletions
diff --git a/sys/dev/acpica/acpi_pcib_acpi.c b/sys/dev/acpica/acpi_pcib_acpi.c index 545f6411ecb4..490f2779512f 100644 --- a/sys/dev/acpica/acpi_pcib_acpi.c +++ b/sys/dev/acpica/acpi_pcib_acpi.c @@ -194,27 +194,27 @@ acpi_pcib_producer_handler(ACPI_RESOURCE *res, void *context) break; switch (res->Type) { case ACPI_RESOURCE_TYPE_ADDRESS16: - min = res->Data.Address16.Minimum; - max = res->Data.Address16.Maximum; - length = res->Data.Address16.AddressLength; + min = res->Data.Address16.Address.Minimum; + max = res->Data.Address16.Address.Maximum; + length = res->Data.Address16.Address.AddressLength; break; case ACPI_RESOURCE_TYPE_ADDRESS32: - min = res->Data.Address32.Minimum; - max = res->Data.Address32.Maximum; - length = res->Data.Address32.AddressLength; + min = res->Data.Address32.Address.Minimum; + max = res->Data.Address32.Address.Maximum; + length = res->Data.Address32.Address.AddressLength; break; case ACPI_RESOURCE_TYPE_ADDRESS64: - min = res->Data.Address64.Minimum; - max = res->Data.Address64.Maximum; - length = res->Data.Address64.AddressLength; + min = res->Data.Address64.Address.Minimum; + max = res->Data.Address64.Address.Maximum; + length = res->Data.Address64.Address.AddressLength; break; default: KASSERT(res->Type == ACPI_RESOURCE_TYPE_EXTENDED_ADDRESS64, ("should never happen")); - min = res->Data.ExtAddress64.Minimum; - max = res->Data.ExtAddress64.Maximum; - length = res->Data.ExtAddress64.AddressLength; + min = res->Data.ExtAddress64.Address.Minimum; + max = res->Data.ExtAddress64.Address.Maximum; + length = res->Data.ExtAddress64.Address.AddressLength; break; } if (length == 0) diff --git a/sys/dev/acpica/acpi_resource.c b/sys/dev/acpica/acpi_resource.c index 07ebace2d636..f8936a53c572 100644 --- a/sys/dev/acpica/acpi_resource.c +++ b/sys/dev/acpica/acpi_resource.c @@ -298,28 +298,28 @@ acpi_parse_resource(ACPI_RESOURCE *res, void *context) case ACPI_RESOURCE_TYPE_EXTENDED_ADDRESS64: switch (res->Type) { case ACPI_RESOURCE_TYPE_ADDRESS16: - gran = res->Data.Address16.Granularity; - min = res->Data.Address16.Minimum; - max = res->Data.Address16.Maximum; - length = res->Data.Address16.AddressLength; + gran = res->Data.Address16.Address.Granularity; + min = res->Data.Address16.Address.Minimum; + max = res->Data.Address16.Address.Maximum; + length = res->Data.Address16.Address.AddressLength; #ifdef ACPI_DEBUG name = "Address16"; #endif break; case ACPI_RESOURCE_TYPE_ADDRESS32: - gran = res->Data.Address32.Granularity; - min = res->Data.Address32.Minimum; - max = res->Data.Address32.Maximum; - length = res->Data.Address32.AddressLength; + gran = res->Data.Address32.Address.Granularity; + min = res->Data.Address32.Address.Minimum; + max = res->Data.Address32.Address.Maximum; + length = res->Data.Address32.Address.AddressLength; #ifdef ACPI_DEBUG name = "Address32"; #endif break; case ACPI_RESOURCE_TYPE_ADDRESS64: - gran = res->Data.Address64.Granularity; - min = res->Data.Address64.Minimum; - max = res->Data.Address64.Maximum; - length = res->Data.Address64.AddressLength; + gran = res->Data.Address64.Address.Granularity; + min = res->Data.Address64.Address.Minimum; + max = res->Data.Address64.Address.Maximum; + length = res->Data.Address64.Address.AddressLength; #ifdef ACPI_DEBUG name = "Address64"; #endif @@ -327,10 +327,10 @@ acpi_parse_resource(ACPI_RESOURCE *res, void *context) default: KASSERT(res->Type == ACPI_RESOURCE_TYPE_EXTENDED_ADDRESS64, ("should never happen")); - gran = res->Data.ExtAddress64.Granularity; - min = res->Data.ExtAddress64.Minimum; - max = res->Data.ExtAddress64.Maximum; - length = res->Data.ExtAddress64.AddressLength; + gran = res->Data.ExtAddress64.Address.Granularity; + min = res->Data.ExtAddress64.Address.Minimum; + max = res->Data.ExtAddress64.Address.Maximum; + length = res->Data.ExtAddress64.Address.AddressLength; #ifdef ACPI_DEBUG name = "ExtAddress64"; #endif |