diff options
author | jkim <jkim@FreeBSD.org> | 2015-04-18 08:01:12 +0000 |
---|---|---|
committer | jkim <jkim@FreeBSD.org> | 2015-04-18 08:01:12 +0000 |
commit | c90c234f291222de71399eb6bf3cf20dd5146286 (patch) | |
tree | aa7f3f24f120870935af1a85c50092755374cc6e /sys/dev/acpica/acpi_pcib_acpi.c | |
parent | 07d63652f3a52adc1f72560c92bb639de8bffbe1 (diff) | |
download | FreeBSD-src-c90c234f291222de71399eb6bf3cf20dd5146286.zip FreeBSD-src-c90c234f291222de71399eb6bf3cf20dd5146286.tar.gz |
MFC: r281396, r281475
Merge ACPICA 20150410.
Relnotes: yes
Diffstat (limited to 'sys/dev/acpica/acpi_pcib_acpi.c')
-rw-r--r-- | sys/dev/acpica/acpi_pcib_acpi.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/sys/dev/acpica/acpi_pcib_acpi.c b/sys/dev/acpica/acpi_pcib_acpi.c index 545f641..490f277 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) |