summaryrefslogtreecommitdiffstats
path: root/usr.sbin
diff options
context:
space:
mode:
authortakawata <takawata@FreeBSD.org>2007-03-27 17:03:52 +0000
committertakawata <takawata@FreeBSD.org>2007-03-27 17:03:52 +0000
commit116255f144cc1ddfa0c53bcab91464dc347c343b (patch)
tree42d0a37c711b6acb59d7670f32514086dace1679 /usr.sbin
parent38635fcc558fe931a5a864b1a29dadf5d0fc233f (diff)
downloadFreeBSD-src-116255f144cc1ddfa0c53bcab91464dc347c343b.zip
FreeBSD-src-116255f144cc1ddfa0c53bcab91464dc347c343b.tar.gz
Correct HPET header handling.
MFC after: 7 days
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/acpi/acpidump/acpi.c3
-rw-r--r--usr.sbin/acpi/acpidump/acpidump.h3
2 files changed, 3 insertions, 3 deletions
diff --git a/usr.sbin/acpi/acpidump/acpi.c b/usr.sbin/acpi/acpidump/acpi.c
index 6241dfd..7be007e 100644
--- a/usr.sbin/acpi/acpidump/acpi.c
+++ b/usr.sbin/acpi/acpidump/acpi.c
@@ -344,7 +344,8 @@ acpi_handle_hpet(struct ACPIsdt *sdp)
acpi_print_sdt(sdp);
hpetp = (struct HPETbody *) sdp->body;
printf("\tHPET Number=%d\n", hpetp->hpet_number);
- printf("\tADDR=0x%08x\n", hpetp->base_addr);
+ printf("\tADDR=");
+ acpi_print_gas(&hpetp->genaddr);
printf("\tHW Rev=0x%x\n", hpetp->block_hwrev);
printf("\tComparitors=%d\n", hpetp->block_comparitors);
printf("\tCounter Size=%d\n", hpetp->block_counter_size);
diff --git a/usr.sbin/acpi/acpidump/acpidump.h b/usr.sbin/acpi/acpidump/acpidump.h
index 231f493..8d79168 100644
--- a/usr.sbin/acpi/acpidump/acpidump.h
+++ b/usr.sbin/acpi/acpidump/acpidump.h
@@ -278,8 +278,7 @@ struct HPETbody {
:1,
block_legacy_capable:1,
block_pcivendor:16;
- u_int32_t base_addr;
- u_int64_t reserved1;
+ struct ACPIgas genaddr;
u_int8_t hpet_number;
u_int16_t clock_tick __packed;
} __packed;
OpenPOWER on IntegriCloud