Date: Thu, 29 Oct 2009 14:40:21 +0000 (UTC) From: John Baldwin <jhb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r198591 - in stable/8/usr.sbin/acpi: . acpidump Message-ID: <200910291440.n9TEeLL2099559@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jhb Date: Thu Oct 29 14:40:21 2009 New Revision: 198591 URL: http://svn.freebsd.org/changeset/base/198591 Log: MFC 196555: - Use the headers from ACPI-CA to define various constants and structures for table layouts, etc. rather than homerolling our own structures and constants in acpidump.h. - Verify the extended checksum on the RSDP. - Handle new ACPI 3.0 fields in MADT including X2APIC entries and UIDs for local SAPICs. - Add handling for new ACPI 3.0 flags in the FADT. Modified: stable/8/usr.sbin/acpi/ (props changed) stable/8/usr.sbin/acpi/acpidump/acpi.c stable/8/usr.sbin/acpi/acpidump/acpi_user.c stable/8/usr.sbin/acpi/acpidump/acpidump.c stable/8/usr.sbin/acpi/acpidump/acpidump.h Modified: stable/8/usr.sbin/acpi/acpidump/acpi.c ============================================================================== --- stable/8/usr.sbin/acpi/acpidump/acpi.c Thu Oct 29 14:34:24 2009 (r198590) +++ stable/8/usr.sbin/acpi/acpidump/acpi.c Thu Oct 29 14:40:21 2009 (r198591) @@ -47,31 +47,36 @@ #define END_COMMENT " */\n" static void acpi_print_string(char *s, size_t length); -static void acpi_print_gas(struct ACPIgas *gas); -static int acpi_get_fadt_revision(struct FADTbody *fadt); -static void acpi_handle_fadt(struct ACPIsdt *fadt); +static void acpi_print_gas(ACPI_GENERIC_ADDRESS *gas); +static int acpi_get_fadt_revision(ACPI_TABLE_FADT *fadt); +static void acpi_handle_fadt(ACPI_TABLE_HEADER *fadt); static void acpi_print_cpu(u_char cpu_id); -static void acpi_print_local_apic(u_char cpu_id, u_char apic_id, - u_int32_t flags); -static void acpi_print_io_apic(u_char apic_id, u_int32_t int_base, - u_int64_t apic_addr); -static void acpi_print_mps_flags(u_int16_t flags); -static void acpi_print_intr(u_int32_t intr, u_int16_t mps_flags); -static void acpi_print_apic(struct MADT_APIC *mp); -static void acpi_handle_apic(struct ACPIsdt *sdp); -static void acpi_handle_hpet(struct ACPIsdt *sdp); +static void acpi_print_cpu_uid(uint32_t uid, char *uid_string); +static void acpi_print_local_apic(uint32_t apic_id, uint32_t flags); +static void acpi_print_io_apic(uint32_t apic_id, uint32_t int_base, + uint64_t apic_addr); +static void acpi_print_mps_flags(uint16_t flags); +static void acpi_print_intr(uint32_t intr, uint16_t mps_flags); +static void acpi_print_local_nmi(u_int lint, uint16_t mps_flags); +static void acpi_print_madt(ACPI_SUBTABLE_HEADER *mp); +static void acpi_handle_madt(ACPI_TABLE_HEADER *sdp); +static void acpi_handle_ecdt(ACPI_TABLE_HEADER *sdp); +static void acpi_handle_hpet(ACPI_TABLE_HEADER *sdp); +static void acpi_handle_mcfg(ACPI_TABLE_HEADER *sdp); static void acpi_print_srat_cpu(uint32_t apic_id, uint32_t proximity_domain, uint32_t flags); -static void acpi_print_srat_memory(struct SRAT_memory *mp); -static void acpi_print_srat(struct SRATentry *srat); -static void acpi_handle_srat(struct ACPIsdt *sdp); -static void acpi_print_sdt(struct ACPIsdt *sdp); -static void acpi_print_fadt(struct ACPIsdt *sdp); -static void acpi_print_facs(struct FACSbody *facs); -static void acpi_print_dsdt(struct ACPIsdt *dsdp); -static struct ACPIsdt *acpi_map_sdt(vm_offset_t pa); -static void acpi_print_rsd_ptr(struct ACPIrsdp *rp); -static void acpi_handle_rsdt(struct ACPIsdt *rsdp); +static void acpi_print_srat_memory(ACPI_SRAT_MEM_AFFINITY *mp); +static void acpi_print_srat(ACPI_SUBTABLE_HEADER *srat); +static void acpi_handle_srat(ACPI_TABLE_HEADER *sdp); +static void acpi_print_sdt(ACPI_TABLE_HEADER *sdp); +static void acpi_print_fadt(ACPI_TABLE_HEADER *sdp); +static void acpi_print_facs(ACPI_TABLE_FACS *facs); +static void acpi_print_dsdt(ACPI_TABLE_HEADER *dsdp); +static ACPI_TABLE_HEADER *acpi_map_sdt(vm_offset_t pa); +static void acpi_print_rsd_ptr(ACPI_TABLE_RSDP *rp); +static void acpi_handle_rsdt(ACPI_TABLE_HEADER *rsdp); +static void acpi_walk_subtables(ACPI_TABLE_HEADER *table, void *first, + void (*action)(ACPI_SUBTABLE_HEADER *)); /* Size of an address. 32-bit for ACPI 1.0, 64-bit for ACPI 2.0 and up. */ static int addr_size; @@ -92,41 +97,44 @@ acpi_print_string(char *s, size_t length } static void -acpi_print_gas(struct ACPIgas *gas) +acpi_print_gas(ACPI_GENERIC_ADDRESS *gas) { - switch(gas->address_space_id) { + switch(gas->SpaceId) { case ACPI_GAS_MEMORY: - printf("0x%08lx:%u[%u] (Memory)", (u_long)gas->address, - gas->bit_offset, gas->bit_width); + printf("0x%08lx:%u[%u] (Memory)", (u_long)gas->Address, + gas->BitOffset, gas->BitWidth); break; case ACPI_GAS_IO: - printf("0x%02lx:%u[%u] (IO)", (u_long)gas->address, - gas->bit_offset, gas->bit_width); + printf("0x%02lx:%u[%u] (IO)", (u_long)gas->Address, + gas->BitOffset, gas->BitWidth); break; case ACPI_GAS_PCI: - printf("%x:%x+0x%x (PCI)", (uint16_t)(gas->address >> 32), - (uint16_t)((gas->address >> 16) & 0xffff), - (uint16_t)gas->address); + printf("%x:%x+0x%x (PCI)", (uint16_t)(gas->Address >> 32), + (uint16_t)((gas->Address >> 16) & 0xffff), + (uint16_t)gas->Address); break; /* XXX How to handle these below? */ case ACPI_GAS_EMBEDDED: - printf("0x%x:%u[%u] (EC)", (uint16_t)gas->address, - gas->bit_offset, gas->bit_width); + printf("0x%x:%u[%u] (EC)", (uint16_t)gas->Address, + gas->BitOffset, gas->BitWidth); break; case ACPI_GAS_SMBUS: - printf("0x%x:%u[%u] (SMBus)", (uint16_t)gas->address, - gas->bit_offset, gas->bit_width); + printf("0x%x:%u[%u] (SMBus)", (uint16_t)gas->Address, + gas->BitOffset, gas->BitWidth); break; + case ACPI_GAS_CMOS: + case ACPI_GAS_PCIBAR: + case ACPI_GAS_DATATABLE: case ACPI_GAS_FIXED: default: - printf("0x%08lx (?)", (u_long)gas->address); + printf("0x%08lx (?)", (u_long)gas->Address); break; } } /* The FADT revision indicates whether we use the DSDT or X_DSDT addresses. */ static int -acpi_get_fadt_revision(struct FADTbody *fadt) +acpi_get_fadt_revision(ACPI_TABLE_FADT *fadt) { int fadt_revision; @@ -141,8 +149,8 @@ acpi_get_fadt_revision(struct FADTbody * * 32 and 64 bit versions don't match, prefer the 32 bit * version for all subsequent tables. */ - if (fadt->facs_ptr != 0 && - (fadt->x_facs_ptr & 0xffffffff) != fadt->facs_ptr) + if (fadt->Facs != 0 && + (fadt->XFacs & 0xffffffff) != fadt->Facs) fadt_revision = 1; } else fadt_revision = 1; @@ -150,35 +158,52 @@ acpi_get_fadt_revision(struct FADTbody * } static void -acpi_handle_fadt(struct ACPIsdt *sdp) +acpi_handle_fadt(ACPI_TABLE_HEADER *sdp) { - struct ACPIsdt *dsdp; - struct FACSbody *facs; - struct FADTbody *fadt; + ACPI_TABLE_HEADER *dsdp; + ACPI_TABLE_FACS *facs; + ACPI_TABLE_FADT *fadt; int fadt_revision; - fadt = (struct FADTbody *)sdp->body; + fadt = (ACPI_TABLE_FADT *)sdp; acpi_print_fadt(sdp); fadt_revision = acpi_get_fadt_revision(fadt); if (fadt_revision == 1) - facs = (struct FACSbody *)acpi_map_sdt(fadt->facs_ptr); + facs = (ACPI_TABLE_FACS *)acpi_map_sdt(fadt->Facs); else - facs = (struct FACSbody *)acpi_map_sdt(fadt->x_facs_ptr); - if (memcmp(facs->signature, "FACS", 4) != 0 || facs->len < 64) + facs = (ACPI_TABLE_FACS *)acpi_map_sdt(fadt->XFacs); + if (memcmp(facs->Signature, ACPI_SIG_FACS, 4) != 0 || facs->Length < 64) errx(1, "FACS is corrupt"); acpi_print_facs(facs); if (fadt_revision == 1) - dsdp = (struct ACPIsdt *)acpi_map_sdt(fadt->dsdt_ptr); + dsdp = (ACPI_TABLE_HEADER *)acpi_map_sdt(fadt->Dsdt); else - dsdp = (struct ACPIsdt *)acpi_map_sdt(fadt->x_dsdt_ptr); - if (acpi_checksum(dsdp, dsdp->len)) + dsdp = (ACPI_TABLE_HEADER *)acpi_map_sdt(fadt->XDsdt); + if (acpi_checksum(dsdp, dsdp->Length)) errx(1, "DSDT is corrupt"); acpi_print_dsdt(dsdp); } static void +acpi_walk_subtables(ACPI_TABLE_HEADER *table, void *first, + void (*action)(ACPI_SUBTABLE_HEADER *)) +{ + ACPI_SUBTABLE_HEADER *subtable; + char *end; + + subtable = first; + end = (char *)table + table->Length; + while ((char *)subtable < end) { + printf("\n"); + action(subtable); + subtable = (ACPI_SUBTABLE_HEADER *)((char *)subtable + + subtable->Length); + } +} + +static void acpi_print_cpu(u_char cpu_id) { @@ -190,219 +215,264 @@ acpi_print_cpu(u_char cpu_id) } static void -acpi_print_local_apic(u_char cpu_id, u_char apic_id, u_int32_t flags) +acpi_print_cpu_uid(uint32_t uid, char *uid_string) { - acpi_print_cpu(cpu_id); + + printf("\tUID=%d", uid); + if (uid_string != NULL) + printf(" (%s)", uid_string); + printf("\n"); +} + +static void +acpi_print_local_apic(uint32_t apic_id, uint32_t flags) +{ + printf("\tFlags={"); - if (flags & ACPI_MADT_APIC_LOCAL_FLAG_ENABLED) + if (flags & ACPI_MADT_ENABLED) printf("ENABLED"); else printf("DISABLED"); printf("}\n"); - printf("\tAPIC ID=%d\n", (u_int)apic_id); + printf("\tAPIC ID=%d\n", apic_id); } static void -acpi_print_io_apic(u_char apic_id, u_int32_t int_base, u_int64_t apic_addr) +acpi_print_io_apic(uint32_t apic_id, uint32_t int_base, uint64_t apic_addr) { - printf("\tAPIC ID=%d\n", (u_int)apic_id); + + printf("\tAPIC ID=%d\n", apic_id); printf("\tINT BASE=%d\n", int_base); - printf("\tADDR=0x%016jx\n", apic_addr); + printf("\tADDR=0x%016jx\n", (uintmax_t)apic_addr); } static void -acpi_print_mps_flags(u_int16_t flags) +acpi_print_mps_flags(uint16_t flags) { printf("\tFlags={Polarity="); - switch (flags & MPS_INT_FLAG_POLARITY_MASK) { - case MPS_INT_FLAG_POLARITY_CONFORM: + switch (flags & ACPI_MADT_POLARITY_MASK) { + case ACPI_MADT_POLARITY_CONFORMS: printf("conforming"); break; - case MPS_INT_FLAG_POLARITY_HIGH: + case ACPI_MADT_POLARITY_ACTIVE_HIGH: printf("active-hi"); break; - case MPS_INT_FLAG_POLARITY_LOW: + case ACPI_MADT_POLARITY_ACTIVE_LOW: printf("active-lo"); break; default: - printf("0x%x", flags & MPS_INT_FLAG_POLARITY_MASK); + printf("0x%x", flags & ACPI_MADT_POLARITY_MASK); break; } printf(", Trigger="); - switch (flags & MPS_INT_FLAG_TRIGGER_MASK) { - case MPS_INT_FLAG_TRIGGER_CONFORM: + switch (flags & ACPI_MADT_TRIGGER_MASK) { + case ACPI_MADT_TRIGGER_CONFORMS: printf("conforming"); break; - case MPS_INT_FLAG_TRIGGER_EDGE: + case ACPI_MADT_TRIGGER_EDGE: printf("edge"); break; - case MPS_INT_FLAG_TRIGGER_LEVEL: + case ACPI_MADT_TRIGGER_LEVEL: printf("level"); break; default: - printf("0x%x", (flags & MPS_INT_FLAG_TRIGGER_MASK) >> 2); + printf("0x%x", (flags & ACPI_MADT_TRIGGER_MASK) >> 2); } printf("}\n"); } static void -acpi_print_intr(u_int32_t intr, u_int16_t mps_flags) +acpi_print_intr(uint32_t intr, uint16_t mps_flags) { - printf("\tINTR=%d\n", (u_int)intr); + printf("\tINTR=%d\n", intr); + acpi_print_mps_flags(mps_flags); +} + +static void +acpi_print_local_nmi(u_int lint, uint16_t mps_flags) +{ + + printf("\tLINT Pin=%d\n", lint); acpi_print_mps_flags(mps_flags); } const char *apic_types[] = { "Local APIC", "IO APIC", "INT Override", "NMI", - "Local NMI", "Local APIC Override", "IO SAPIC", - "Local SAPIC", "Platform Interrupt" }; -const char *platform_int_types[] = { "PMI", "INIT", + "Local APIC NMI", "Local APIC Override", + "IO SAPIC", "Local SAPIC", "Platform Interrupt", + "Local X2APIC", "Local X2APIC NMI" }; +const char *platform_int_types[] = { "0 (unknown)", "PMI", "INIT", "Corrected Platform Error" }; static void -acpi_print_apic(struct MADT_APIC *mp) +acpi_print_madt(ACPI_SUBTABLE_HEADER *mp) { + ACPI_MADT_LOCAL_APIC *lapic; + ACPI_MADT_IO_APIC *ioapic; + ACPI_MADT_INTERRUPT_OVERRIDE *over; + ACPI_MADT_NMI_SOURCE *nmi; + ACPI_MADT_LOCAL_APIC_NMI *lapic_nmi; + ACPI_MADT_LOCAL_APIC_OVERRIDE *lapic_over; + ACPI_MADT_IO_SAPIC *iosapic; + ACPI_MADT_LOCAL_SAPIC *lsapic; + ACPI_MADT_INTERRUPT_SOURCE *isrc; + ACPI_MADT_LOCAL_X2APIC *x2apic; + ACPI_MADT_LOCAL_X2APIC_NMI *x2apic_nmi; - if (mp->type < sizeof(apic_types) / sizeof(apic_types[0])) - printf("\tType=%s\n", apic_types[mp->type]); + if (mp->Type < sizeof(apic_types) / sizeof(apic_types[0])) + printf("\tType=%s\n", apic_types[mp->Type]); else - printf("\tType=%d (unknown)\n", mp->type); - switch (mp->type) { - case ACPI_MADT_APIC_TYPE_LOCAL_APIC: - acpi_print_local_apic(mp->body.local_apic.cpu_id, - mp->body.local_apic.apic_id, mp->body.local_apic.flags); - break; - case ACPI_MADT_APIC_TYPE_IO_APIC: - acpi_print_io_apic(mp->body.io_apic.apic_id, - mp->body.io_apic.int_base, - mp->body.io_apic.apic_addr); - break; - case ACPI_MADT_APIC_TYPE_INT_OVERRIDE: - printf("\tBUS=%d\n", (u_int)mp->body.int_override.bus); - printf("\tIRQ=%d\n", (u_int)mp->body.int_override.source); - acpi_print_intr(mp->body.int_override.intr, - mp->body.int_override.mps_flags); - break; - case ACPI_MADT_APIC_TYPE_NMI: - acpi_print_intr(mp->body.nmi.intr, mp->body.nmi.mps_flags); - break; - case ACPI_MADT_APIC_TYPE_LOCAL_NMI: - acpi_print_cpu(mp->body.local_nmi.cpu_id); - printf("\tLINT Pin=%d\n", mp->body.local_nmi.lintpin); - acpi_print_mps_flags(mp->body.local_nmi.mps_flags); + printf("\tType=%d (unknown)\n", mp->Type); + switch (mp->Type) { + case ACPI_MADT_TYPE_LOCAL_APIC: + lapic = (ACPI_MADT_LOCAL_APIC *)mp; + acpi_print_cpu(lapic->ProcessorId); + acpi_print_local_apic(lapic->Id, lapic->LapicFlags); + break; + case ACPI_MADT_TYPE_IO_APIC: + ioapic = (ACPI_MADT_IO_APIC *)mp; + acpi_print_io_apic(ioapic->Id, ioapic->GlobalIrqBase, + ioapic->Address); + break; + case ACPI_MADT_TYPE_INTERRUPT_OVERRIDE: + over = (ACPI_MADT_INTERRUPT_OVERRIDE *)mp; + printf("\tBUS=%d\n", (u_int)over->Bus); + printf("\tIRQ=%d\n", (u_int)over->SourceIrq); + acpi_print_intr(over->GlobalIrq, over->IntiFlags); + break; + case ACPI_MADT_TYPE_NMI_SOURCE: + nmi = (ACPI_MADT_NMI_SOURCE *)mp; + acpi_print_intr(nmi->GlobalIrq, nmi->IntiFlags); + break; + case ACPI_MADT_TYPE_LOCAL_APIC_NMI: + lapic_nmi = (ACPI_MADT_LOCAL_APIC_NMI *)mp; + acpi_print_cpu(lapic_nmi->ProcessorId); + acpi_print_local_nmi(lapic_nmi->Lint, lapic_nmi->IntiFlags); break; - case ACPI_MADT_APIC_TYPE_LOCAL_OVERRIDE: + case ACPI_MADT_TYPE_LOCAL_APIC_OVERRIDE: + lapic_over = (ACPI_MADT_LOCAL_APIC_OVERRIDE *)mp; printf("\tLocal APIC ADDR=0x%016jx\n", - mp->body.local_apic_override.apic_addr); - break; - case ACPI_MADT_APIC_TYPE_IO_SAPIC: - acpi_print_io_apic(mp->body.io_sapic.apic_id, - mp->body.io_sapic.int_base, - mp->body.io_sapic.apic_addr); - break; - case ACPI_MADT_APIC_TYPE_LOCAL_SAPIC: - acpi_print_local_apic(mp->body.local_sapic.cpu_id, - mp->body.local_sapic.apic_id, mp->body.local_sapic.flags); - printf("\tAPIC EID=%d\n", (u_int)mp->body.local_sapic.apic_eid); + (uintmax_t)lapic_over->Address); break; - case ACPI_MADT_APIC_TYPE_INT_SRC: - printf("\tType=%s\n", - platform_int_types[mp->body.int_src.type]); - printf("\tCPU ID=%d\n", (u_int)mp->body.int_src.cpu_id); - printf("\tCPU EID=%d\n", (u_int)mp->body.int_src.cpu_id); - printf("\tSAPIC Vector=%d\n", - (u_int)mp->body.int_src.sapic_vector); - acpi_print_intr(mp->body.int_src.intr, - mp->body.int_src.mps_flags); + case ACPI_MADT_TYPE_IO_SAPIC: + iosapic = (ACPI_MADT_IO_SAPIC *)mp; + acpi_print_io_apic(iosapic->Id, iosapic->GlobalIrqBase, + iosapic->Address); + break; + case ACPI_MADT_TYPE_LOCAL_SAPIC: + lsapic = (ACPI_MADT_LOCAL_SAPIC *)mp; + acpi_print_cpu(lsapic->ProcessorId); + acpi_print_local_apic(lsapic->Id, lsapic->LapicFlags); + printf("\tAPIC EID=%d\n", (u_int)lsapic->Eid); + if (mp->Length > __offsetof(ACPI_MADT_LOCAL_SAPIC, Uid)) + acpi_print_cpu_uid(lsapic->Uid, lsapic->UidString); + break; + case ACPI_MADT_TYPE_INTERRUPT_SOURCE: + isrc = (ACPI_MADT_INTERRUPT_SOURCE *)mp; + if (isrc->Type < sizeof(platform_int_types) / + sizeof(platform_int_types[0])) + printf("\tType=%s\n", platform_int_types[isrc->Type]); + else + printf("\tType=%d (unknown)\n", isrc->Type); + printf("\tAPIC ID=%d\n", (u_int)isrc->Id); + printf("\tAPIC EID=%d\n", (u_int)isrc->Eid); + printf("\tSAPIC Vector=%d\n", (u_int)isrc->IoSapicVector); + acpi_print_intr(isrc->GlobalIrq, isrc->IntiFlags); + break; + case ACPI_MADT_TYPE_LOCAL_X2APIC: + x2apic = (ACPI_MADT_LOCAL_X2APIC *)mp; + acpi_print_cpu_uid(x2apic->Uid, NULL); + acpi_print_local_apic(x2apic->LocalApicId, x2apic->LapicFlags); + break; + case ACPI_MADT_TYPE_LOCAL_X2APIC_NMI: + x2apic_nmi = (ACPI_MADT_LOCAL_X2APIC_NMI *)mp; + acpi_print_cpu_uid(x2apic_nmi->Uid, NULL); + acpi_print_local_nmi(x2apic_nmi->Lint, x2apic_nmi->IntiFlags); break; } } static void -acpi_handle_apic(struct ACPIsdt *sdp) +acpi_handle_madt(ACPI_TABLE_HEADER *sdp) { - struct MADTbody *madtp; - struct MADT_APIC *madt_apicp; + ACPI_TABLE_MADT *madt; printf(BEGIN_COMMENT); acpi_print_sdt(sdp); - madtp = (struct MADTbody *) sdp->body; - printf("\tLocal APIC ADDR=0x%08x\n", madtp->lapic_addr); + madt = (ACPI_TABLE_MADT *)sdp; + printf("\tLocal APIC ADDR=0x%08x\n", madt->Address); printf("\tFlags={"); - if (madtp->flags & ACPI_APIC_FLAG_PCAT_COMPAT) + if (madt->Flags & ACPI_MADT_PCAT_COMPAT) printf("PC-AT"); printf("}\n"); - madt_apicp = (struct MADT_APIC *)madtp->body; - while (((uintptr_t)madt_apicp) - ((uintptr_t)sdp) < sdp->len) { - printf("\n"); - acpi_print_apic(madt_apicp); - madt_apicp = (struct MADT_APIC *) ((char *)madt_apicp + - madt_apicp->len); - } + acpi_walk_subtables(sdp, (madt + 1), acpi_print_madt); printf(END_COMMENT); } static void -acpi_handle_hpet(struct ACPIsdt *sdp) +acpi_handle_hpet(ACPI_TABLE_HEADER *sdp) { - struct HPETbody *hpetp; + ACPI_TABLE_HPET *hpet; printf(BEGIN_COMMENT); acpi_print_sdt(sdp); - hpetp = (struct HPETbody *) sdp->body; - printf("\tHPET Number=%d\n", hpetp->hpet_number); + hpet = (ACPI_TABLE_HPET *)sdp; + printf("\tHPET Number=%d\n", hpet->Sequence); 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); + acpi_print_gas(&hpet->Address); + printf("\tHW Rev=0x%x\n", hpet->Id & ACPI_HPET_ID_HARDWARE_REV_ID); + printf("\tComparators=%d\n", (hpet->Id & ACPI_HPET_ID_COMPARATORS) >> + 8); + printf("\tCounter Size=%d\n", hpet->Id & ACPI_HPET_ID_COUNT_SIZE_CAP ? + 1 : 0); printf("\tLegacy IRQ routing capable={"); - if (hpetp->block_legacy_capable) + if (hpet->Id & ACPI_HPET_ID_LEGACY_CAPABLE) printf("TRUE}\n"); else printf("FALSE}\n"); - printf("\tPCI Vendor ID=0x%04x\n", hpetp->block_pcivendor); - printf("\tMinimal Tick=%d\n", hpetp->clock_tick); + printf("\tPCI Vendor ID=0x%04x\n", hpet->Id >> 16); + printf("\tMinimal Tick=%d\n", hpet->MinimumTick); printf(END_COMMENT); } static void -acpi_handle_ecdt(struct ACPIsdt *sdp) +acpi_handle_ecdt(ACPI_TABLE_HEADER *sdp) { - struct ECDTbody *ecdt; + ACPI_TABLE_ECDT *ecdt; printf(BEGIN_COMMENT); acpi_print_sdt(sdp); - ecdt = (struct ECDTbody *) sdp->body; + ecdt = (ACPI_TABLE_ECDT *)sdp; printf("\tEC_CONTROL="); - acpi_print_gas(&ecdt->ec_control); + acpi_print_gas(&ecdt->Control); printf("\n\tEC_DATA="); - acpi_print_gas(&ecdt->ec_data); - printf("\n\tUID=%#x, ", ecdt->uid); - printf("GPE_BIT=%#x\n", ecdt->gpe_bit); - printf("\tEC_ID=%s\n", ecdt->ec_id); + acpi_print_gas(&ecdt->Data); + printf("\n\tUID=%#x, ", ecdt->Uid); + printf("GPE_BIT=%#x\n", ecdt->Gpe); + printf("\tEC_ID=%s\n", ecdt->Id); printf(END_COMMENT); } static void -acpi_handle_mcfg(struct ACPIsdt *sdp) +acpi_handle_mcfg(ACPI_TABLE_HEADER *sdp) { - struct MCFGbody *mcfg; - u_int i, e; + ACPI_TABLE_MCFG *mcfg; + ACPI_MCFG_ALLOCATION *alloc; + u_int i, entries; printf(BEGIN_COMMENT); acpi_print_sdt(sdp); - mcfg = (struct MCFGbody *) sdp->body; - - e = (sdp->len - ((caddr_t)&mcfg->s[0] - (caddr_t)sdp)) / - sizeof(*mcfg->s); - for (i = 0; i < e; i++, mcfg++) { + mcfg = (ACPI_TABLE_MCFG *)sdp; + entries = (sdp->Length - sizeof(ACPI_TABLE_MCFG)) / + sizeof(ACPI_MCFG_ALLOCATION); + alloc = (ACPI_MCFG_ALLOCATION *)(mcfg + 1); + for (i = 0; i < entries; i++, alloc++) { printf("\n"); - printf("\tBase Address=0x%016jx\n", mcfg->s[i].baseaddr); - printf("\tSegment Group=0x%04x\n", mcfg->s[i].seg_grp); - printf("\tStart Bus=%d\n", mcfg->s[i].start); - printf("\tEnd Bus=%d\n", mcfg->s[i].end); + printf("\tBase Address=0x%016jx\n", alloc->Address); + printf("\tSegment Group=0x%04x\n", alloc->PciSegment); + printf("\tStart Bus=%d\n", alloc->StartBusNumber); + printf("\tEnd Bus=%d\n", alloc->EndBusNumber); } printf(END_COMMENT); } @@ -423,108 +493,109 @@ acpi_print_srat_cpu(uint32_t apic_id, ui } static void -acpi_print_srat_memory(struct SRAT_memory *mp) +acpi_print_srat_memory(ACPI_SRAT_MEM_AFFINITY *mp) { printf("\tFlags={"); - if (mp->flags & ACPI_SRAT_MEM_ENABLED) + if (mp->Flags & ACPI_SRAT_MEM_ENABLED) printf("ENABLED"); else printf("DISABLED"); - if (mp->flags & ACPI_SRAT_MEM_HOT_PLUGGABLE) + if (mp->Flags & ACPI_SRAT_MEM_HOT_PLUGGABLE) printf(",HOT_PLUGGABLE"); - if (mp->flags & ACPI_SRAT_MEM_NON_VOLATILE) + if (mp->Flags & ACPI_SRAT_MEM_NON_VOLATILE) printf(",NON_VOLATILE"); printf("}\n"); - printf("\tBase Address=0x%016jx\n", (uintmax_t)mp->base_address); - printf("\tLength=0x%016jx\n", (uintmax_t)mp->length); - printf("\tProximity Domain=%d\n", mp->proximity_domain); + printf("\tBase Address=0x%016jx\n", (uintmax_t)mp->BaseAddress); + printf("\tLength=0x%016jx\n", (uintmax_t)mp->Length); + printf("\tProximity Domain=%d\n", mp->ProximityDomain); } const char *srat_types[] = { "CPU", "Memory", "X2APIC" }; static void -acpi_print_srat(struct SRATentry *srat) +acpi_print_srat(ACPI_SUBTABLE_HEADER *srat) { + ACPI_SRAT_CPU_AFFINITY *cpu; + ACPI_SRAT_X2APIC_CPU_AFFINITY *x2apic; - if (srat->type < sizeof(srat_types) / sizeof(srat_types[0])) - printf("\tType=%s\n", srat_types[srat->type]); + if (srat->Type < sizeof(srat_types) / sizeof(srat_types[0])) + printf("\tType=%s\n", srat_types[srat->Type]); else - printf("\tType=%d (unknown)\n", srat->type); - switch (srat->type) { + printf("\tType=%d (unknown)\n", srat->Type); + switch (srat->Type) { case ACPI_SRAT_TYPE_CPU_AFFINITY: - acpi_print_srat_cpu(srat->body.cpu.apic_id, - srat->body.cpu.proximity_domain_hi[2] << 24 | - srat->body.cpu.proximity_domain_hi[1] << 16 | - srat->body.cpu.proximity_domain_hi[0] << 0 | - srat->body.cpu.proximity_domain_lo, srat->body.cpu.flags); + cpu = (ACPI_SRAT_CPU_AFFINITY *)srat; + acpi_print_srat_cpu(cpu->ApicId, + cpu->ProximityDomainHi[2] << 24 | + cpu->ProximityDomainHi[1] << 16 | + cpu->ProximityDomainHi[0] << 0 | + cpu->ProximityDomainLo, cpu->Flags); break; case ACPI_SRAT_TYPE_MEMORY_AFFINITY: - acpi_print_srat_memory(&srat->body.mem); + acpi_print_srat_memory((ACPI_SRAT_MEM_AFFINITY *)srat); break; case ACPI_SRAT_TYPE_X2APIC_CPU_AFFINITY: - acpi_print_srat_cpu(srat->body.x2apic.apic_id, - srat->body.x2apic.proximity_domain, - srat->body.x2apic.flags); + x2apic = (ACPI_SRAT_X2APIC_CPU_AFFINITY *)srat; + acpi_print_srat_cpu(x2apic->ApicId, x2apic->ProximityDomain, + x2apic->Flags); break; } } static void -acpi_handle_srat(struct ACPIsdt *sdp) +acpi_handle_srat(ACPI_TABLE_HEADER *sdp) { - struct SRATbody *sratp; - struct SRATentry *entry; + ACPI_TABLE_SRAT *srat; printf(BEGIN_COMMENT); acpi_print_sdt(sdp); - sratp = (struct SRATbody *)sdp->body; - printf("\tTable Revision=%d\n", sratp->table_revision); - entry = sratp->body; - while (((uintptr_t)entry) - ((uintptr_t)sdp) < sdp->len) { - printf("\n"); - acpi_print_srat(entry); - entry = (struct SRATentry *)((char *)entry + entry->len); - } + srat = (ACPI_TABLE_SRAT *)sdp; + printf("\tTable Revision=%d\n", srat->TableRevision); + acpi_walk_subtables(sdp, (srat + 1), acpi_print_srat); printf(END_COMMENT); } static void -acpi_print_sdt(struct ACPIsdt *sdp) +acpi_print_sdt(ACPI_TABLE_HEADER *sdp) { printf(" "); - acpi_print_string(sdp->signature, 4); + acpi_print_string(sdp->Signature, ACPI_NAME_SIZE); printf(": Length=%d, Revision=%d, Checksum=%d,\n", - sdp->len, sdp->rev, sdp->check); + sdp->Length, sdp->Revision, sdp->Checksum); printf("\tOEMID="); - acpi_print_string(sdp->oemid, 6); + acpi_print_string(sdp->OemId, ACPI_OEM_ID_SIZE); printf(", OEM Table ID="); - acpi_print_string(sdp->oemtblid, 8); - printf(", OEM Revision=0x%x,\n", sdp->oemrev); + acpi_print_string(sdp->OemTableId, ACPI_OEM_TABLE_ID_SIZE); + printf(", OEM Revision=0x%x,\n", sdp->OemRevision); printf("\tCreator ID="); - acpi_print_string(sdp->creator, 4); - printf(", Creator Revision=0x%x\n", sdp->crerev); + acpi_print_string(sdp->AslCompilerId, ACPI_NAME_SIZE); + printf(", Creator Revision=0x%x\n", sdp->AslCompilerRevision); } static void -acpi_print_rsdt(struct ACPIsdt *rsdp) +acpi_print_rsdt(ACPI_TABLE_HEADER *rsdp) { + ACPI_TABLE_RSDT *rsdt; + ACPI_TABLE_XSDT *xsdt; int i, entries; u_long addr; + rsdt = (ACPI_TABLE_RSDT *)rsdp; + xsdt = (ACPI_TABLE_XSDT *)rsdp; printf(BEGIN_COMMENT); acpi_print_sdt(rsdp); - entries = (rsdp->len - SIZEOF_SDT_HDR) / addr_size; + entries = (rsdp->Length - sizeof(ACPI_TABLE_HEADER)) / addr_size; printf("\tEntries={ "); for (i = 0; i < entries; i++) { if (i > 0) printf(", "); switch (addr_size) { case 4: - addr = le32dec((char*)rsdp->body + i * addr_size); + addr = le32toh(rsdt->TableOffsetEntry[i]); break; case 8: - addr = le64dec((char*)rsdp->body + i * addr_size); + addr = le64toh(xsdt->TableOffsetEntry[i]); break; default: addr = 0; @@ -542,138 +613,147 @@ static const char *acpi_pm_profiles[] = }; static void -acpi_print_fadt(struct ACPIsdt *sdp) +acpi_print_fadt(ACPI_TABLE_HEADER *sdp) { - struct FADTbody *fadt; + ACPI_TABLE_FADT *fadt; const char *pm; char sep; - fadt = (struct FADTbody *)sdp->body; + fadt = (ACPI_TABLE_FADT *)sdp; printf(BEGIN_COMMENT); acpi_print_sdt(sdp); - printf(" \tFACS=0x%x, DSDT=0x%x\n", fadt->facs_ptr, - fadt->dsdt_ptr); - printf("\tINT_MODEL=%s\n", fadt->int_model ? "APIC" : "PIC"); - if (fadt->pm_profile >= sizeof(acpi_pm_profiles) / sizeof(char *)) + printf(" \tFACS=0x%x, DSDT=0x%x\n", fadt->Facs, + fadt->Dsdt); + printf("\tINT_MODEL=%s\n", fadt->Model ? "APIC" : "PIC"); + if (fadt->PreferredProfile >= sizeof(acpi_pm_profiles) / sizeof(char *)) pm = "Reserved"; else - pm = acpi_pm_profiles[fadt->pm_profile]; - printf("\tPreferred_PM_Profile=%s (%d)\n", pm, fadt->pm_profile); - printf("\tSCI_INT=%d\n", fadt->sci_int); - printf("\tSMI_CMD=0x%x, ", fadt->smi_cmd); - printf("ACPI_ENABLE=0x%x, ", fadt->acpi_enable); - printf("ACPI_DISABLE=0x%x, ", fadt->acpi_disable); - printf("S4BIOS_REQ=0x%x\n", fadt->s4biosreq); - printf("\tPSTATE_CNT=0x%x\n", fadt->pstate_cnt); + pm = acpi_pm_profiles[fadt->PreferredProfile]; + printf("\tPreferred_PM_Profile=%s (%d)\n", pm, fadt->PreferredProfile); + printf("\tSCI_INT=%d\n", fadt->SciInterrupt); + printf("\tSMI_CMD=0x%x, ", fadt->SmiCommand); + printf("ACPI_ENABLE=0x%x, ", fadt->AcpiEnable); + printf("ACPI_DISABLE=0x%x, ", fadt->AcpiDisable); + printf("S4BIOS_REQ=0x%x\n", fadt->S4BiosRequest); + printf("\tPSTATE_CNT=0x%x\n", fadt->PstateControl); printf("\tPM1a_EVT_BLK=0x%x-0x%x\n", - fadt->pm1a_evt_blk, - fadt->pm1a_evt_blk + fadt->pm1_evt_len - 1); - if (fadt->pm1b_evt_blk != 0) + fadt->Pm1aEventBlock, + fadt->Pm1aEventBlock + fadt->Pm1EventLength - 1); + if (fadt->Pm1bEventBlock != 0) printf("\tPM1b_EVT_BLK=0x%x-0x%x\n", - fadt->pm1b_evt_blk, - fadt->pm1b_evt_blk + fadt->pm1_evt_len - 1); + fadt->Pm1bEventBlock, + fadt->Pm1bEventBlock + fadt->Pm1EventLength - 1); printf("\tPM1a_CNT_BLK=0x%x-0x%x\n", - fadt->pm1a_cnt_blk, - fadt->pm1a_cnt_blk + fadt->pm1_cnt_len - 1); - if (fadt->pm1b_cnt_blk != 0) + fadt->Pm1aControlBlock, + fadt->Pm1aControlBlock + fadt->Pm1ControlLength - 1); + if (fadt->Pm1bControlBlock != 0) printf("\tPM1b_CNT_BLK=0x%x-0x%x\n", - fadt->pm1b_cnt_blk, - fadt->pm1b_cnt_blk + fadt->pm1_cnt_len - 1); - if (fadt->pm2_cnt_blk != 0) + fadt->Pm1bControlBlock, + fadt->Pm1bControlBlock + fadt->Pm1ControlLength - 1); + if (fadt->Pm2ControlBlock != 0) printf("\tPM2_CNT_BLK=0x%x-0x%x\n", - fadt->pm2_cnt_blk, - fadt->pm2_cnt_blk + fadt->pm2_cnt_len - 1); + fadt->Pm2ControlBlock, + fadt->Pm2ControlBlock + fadt->Pm2ControlLength - 1); printf("\tPM_TMR_BLK=0x%x-0x%x\n", - fadt->pm_tmr_blk, - fadt->pm_tmr_blk + fadt->pm_tmr_len - 1); - if (fadt->gpe0_blk != 0) + fadt->PmTimerBlock, + fadt->PmTimerBlock + fadt->PmTimerLength - 1); + if (fadt->Gpe0Block != 0) printf("\tGPE0_BLK=0x%x-0x%x\n", - fadt->gpe0_blk, - fadt->gpe0_blk + fadt->gpe0_len - 1); - if (fadt->gpe1_blk != 0) + fadt->Gpe0Block, + fadt->Gpe0Block + fadt->Gpe0BlockLength - 1); + if (fadt->Gpe1Block != 0) printf("\tGPE1_BLK=0x%x-0x%x, GPE1_BASE=%d\n", - fadt->gpe1_blk, - fadt->gpe1_blk + fadt->gpe1_len - 1, - fadt->gpe1_base); - if (fadt->cst_cnt != 0) - printf("\tCST_CNT=0x%x\n", fadt->cst_cnt); + fadt->Gpe1Block, + fadt->Gpe1Block + fadt->Gpe1BlockLength - 1, + fadt->Gpe1Base); + if (fadt->CstControl != 0) + printf("\tCST_CNT=0x%x\n", fadt->CstControl); printf("\tP_LVL2_LAT=%d us, P_LVL3_LAT=%d us\n", - fadt->p_lvl2_lat, fadt->p_lvl3_lat); + fadt->C2Latency, fadt->C3Latency); printf("\tFLUSH_SIZE=%d, FLUSH_STRIDE=%d\n", - fadt->flush_size, fadt->flush_stride); + fadt->FlushSize, fadt->FlushStride); printf("\tDUTY_OFFSET=%d, DUTY_WIDTH=%d\n", - fadt->duty_off, fadt->duty_width); + fadt->DutyOffset, fadt->DutyWidth); printf("\tDAY_ALRM=%d, MON_ALRM=%d, CENTURY=%d\n", - fadt->day_alrm, fadt->mon_alrm, fadt->century); + fadt->DayAlarm, fadt->MonthAlarm, fadt->Century); #define PRINTFLAG(var, flag) do { \ - if ((var) & FADT_FLAG_## flag) { \ + if ((var) & ACPI_FADT_## flag) { \ printf("%c%s", sep, #flag); sep = ','; \ } \ } while (0) printf("\tIAPC_BOOT_ARCH="); sep = '{'; - PRINTFLAG(fadt->iapc_boot_arch, LEGACY_DEV); - PRINTFLAG(fadt->iapc_boot_arch, 8042); - if (fadt->iapc_boot_arch != 0) + PRINTFLAG(fadt->BootFlags, LEGACY_DEVICES); + PRINTFLAG(fadt->BootFlags, 8042); + PRINTFLAG(fadt->BootFlags, NO_VGA); + PRINTFLAG(fadt->BootFlags, NO_MSI); + PRINTFLAG(fadt->BootFlags, NO_ASPM); + if (fadt->BootFlags != 0) printf("}"); printf("\n"); printf("\tFlags="); sep = '{'; - PRINTFLAG(fadt->flags, WBINVD); - PRINTFLAG(fadt->flags, WBINVD_FLUSH); - PRINTFLAG(fadt->flags, PROC_C1); - PRINTFLAG(fadt->flags, P_LVL2_UP); - PRINTFLAG(fadt->flags, PWR_BUTTON); - PRINTFLAG(fadt->flags, SLP_BUTTON); - PRINTFLAG(fadt->flags, FIX_RTC); - PRINTFLAG(fadt->flags, RTC_S4); - PRINTFLAG(fadt->flags, TMR_VAL_EXT); - PRINTFLAG(fadt->flags, DCK_CAP); - PRINTFLAG(fadt->flags, RESET_REG); - PRINTFLAG(fadt->flags, SEALED_CASE); - PRINTFLAG(fadt->flags, HEADLESS); - PRINTFLAG(fadt->flags, CPU_SW_SLP); - if (fadt->flags != 0) + PRINTFLAG(fadt->Flags, WBINVD); + PRINTFLAG(fadt->Flags, WBINVD_FLUSH); + PRINTFLAG(fadt->Flags, C1_SUPPORTED); + PRINTFLAG(fadt->Flags, C2_MP_SUPPORTED); + PRINTFLAG(fadt->Flags, POWER_BUTTON); + PRINTFLAG(fadt->Flags, SLEEP_BUTTON); + PRINTFLAG(fadt->Flags, FIXED_RTC); + PRINTFLAG(fadt->Flags, S4_RTC_WAKE); + PRINTFLAG(fadt->Flags, 32BIT_TIMER); + PRINTFLAG(fadt->Flags, DOCKING_SUPPORTED); + PRINTFLAG(fadt->Flags, RESET_REGISTER); + PRINTFLAG(fadt->Flags, SEALED_CASE); + PRINTFLAG(fadt->Flags, HEADLESS); + PRINTFLAG(fadt->Flags, SLEEP_TYPE); + PRINTFLAG(fadt->Flags, PCI_EXPRESS_WAKE); + PRINTFLAG(fadt->Flags, PLATFORM_CLOCK); + PRINTFLAG(fadt->Flags, S4_RTC_VALID); + PRINTFLAG(fadt->Flags, REMOTE_POWER_ON); + PRINTFLAG(fadt->Flags, APIC_CLUSTER); + PRINTFLAG(fadt->Flags, APIC_PHYSICAL); + if (fadt->Flags != 0) printf("}\n"); #undef PRINTFLAG - if (fadt->flags & FADT_FLAG_RESET_REG) { + if (fadt->Flags & ACPI_FADT_RESET_REGISTER) { printf("\tRESET_REG="); - acpi_print_gas(&fadt->reset_reg); - printf(", RESET_VALUE=%#x\n", fadt->reset_value); + acpi_print_gas(&fadt->ResetRegister); + printf(", RESET_VALUE=%#x\n", fadt->ResetValue); } if (acpi_get_fadt_revision(fadt) > 1) { - printf("\tX_FACS=0x%08lx, ", (u_long)fadt->x_facs_ptr); - printf("X_DSDT=0x%08lx\n", (u_long)fadt->x_dsdt_ptr); + printf("\tX_FACS=0x%08lx, ", (u_long)fadt->XFacs); + printf("X_DSDT=0x%08lx\n", (u_long)fadt->XDsdt); printf("\tX_PM1a_EVT_BLK="); - acpi_print_gas(&fadt->x_pm1a_evt_blk); - if (fadt->x_pm1b_evt_blk.address != 0) { + acpi_print_gas(&fadt->XPm1aEventBlock); + if (fadt->XPm1bEventBlock.Address != 0) { printf("\n\tX_PM1b_EVT_BLK="); - acpi_print_gas(&fadt->x_pm1b_evt_blk); + acpi_print_gas(&fadt->XPm1bEventBlock); } printf("\n\tX_PM1a_CNT_BLK="); - acpi_print_gas(&fadt->x_pm1a_cnt_blk); - if (fadt->x_pm1b_cnt_blk.address != 0) { + acpi_print_gas(&fadt->XPm1aControlBlock); + if (fadt->XPm1bControlBlock.Address != 0) { printf("\n\tX_PM1b_CNT_BLK="); - acpi_print_gas(&fadt->x_pm1b_cnt_blk); + acpi_print_gas(&fadt->XPm1bControlBlock); } - if (fadt->x_pm1b_cnt_blk.address != 0) { + if (fadt->XPm2ControlBlock.Address != 0) { printf("\n\tX_PM2_CNT_BLK="); - acpi_print_gas(&fadt->x_pm2_cnt_blk); + acpi_print_gas(&fadt->XPm2ControlBlock); } printf("\n\tX_PM_TMR_BLK="); - acpi_print_gas(&fadt->x_pm_tmr_blk); - if (fadt->x_gpe0_blk.address != 0) { + acpi_print_gas(&fadt->XPmTimerBlock); + if (fadt->XGpe0Block.Address != 0) { printf("\n\tX_GPE0_BLK="); - acpi_print_gas(&fadt->x_gpe0_blk); + acpi_print_gas(&fadt->XGpe0Block); } - if (fadt->x_gpe1_blk.address != 0) { + if (fadt->XGpe1Block.Address != 0) { printf("\n\tX_GPE1_BLK="); - acpi_print_gas(&fadt->x_gpe1_blk); + acpi_print_gas(&fadt->XGpe1Block); } printf("\n"); } @@ -682,38 +762,38 @@ acpi_print_fadt(struct ACPIsdt *sdp) } static void -acpi_print_facs(struct FACSbody *facs) +acpi_print_facs(ACPI_TABLE_FACS *facs) { printf(BEGIN_COMMENT); - printf(" FACS:\tLength=%u, ", facs->len); - printf("HwSig=0x%08x, ", facs->hw_sig); - printf("Firm_Wake_Vec=0x%08x\n", facs->firm_wake_vec); + printf(" FACS:\tLength=%u, ", facs->Length); + printf("HwSig=0x%08x, ", facs->HardwareSignature); + printf("Firm_Wake_Vec=0x%08x\n", facs->FirmwareWakingVector); printf("\tGlobal_Lock="); - if (facs->global_lock != 0) { - if (facs->global_lock & FACS_FLAG_LOCK_PENDING) + if (facs->GlobalLock != 0) { + if (facs->GlobalLock & ACPI_GLOCK_PENDING) printf("PENDING,"); - if (facs->global_lock & FACS_FLAG_LOCK_OWNED) + if (facs->GlobalLock & ACPI_GLOCK_OWNED) printf("OWNED"); } printf("\n"); printf("\tFlags="); - if (facs->flags & FACS_FLAG_S4BIOS_F) + if (facs->Flags & ACPI_FACS_S4_BIOS_PRESENT) printf("S4BIOS"); printf("\n"); - if (facs->x_firm_wake_vec != 0) { + if (facs->XFirmwareWakingVector != 0) { printf("\tX_Firm_Wake_Vec=%08lx\n", - (u_long)facs->x_firm_wake_vec); + (u_long)facs->XFirmwareWakingVector); } - printf("\tVersion=%u\n", facs->version); + printf("\tVersion=%u\n", facs->Version); *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200910291440.n9TEeLL2099559>