From 0cf697a724b72d38005ba8166618ac363e99b384 Mon Sep 17 00:00:00 2001 From: jkim Date: Tue, 23 Apr 2013 19:29:49 +0000 Subject: Clean up generated files added in r233250. --- usr.sbin/acpi/iasl/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'usr.sbin/acpi') diff --git a/usr.sbin/acpi/iasl/Makefile b/usr.sbin/acpi/iasl/Makefile index 973b63d..fb144e3 100644 --- a/usr.sbin/acpi/iasl/Makefile +++ b/usr.sbin/acpi/iasl/Makefile @@ -74,7 +74,8 @@ YFLAGS= -d CLEANFILES= aslcompiler.y.h aslcompilerlex.c aslcompilerparse.c \ aslcompilerparse.h dtparser.y.h dtparserlex.c \ - dtparserparse.c dtparserparse.h + dtparserparse.c dtparserparse.h prparser.y.h \ + prparserlex.c prparserparse.c prparserparse.h aslcompilerlex.c: aslcompiler.l aslsupport.l ${LEX} ${LFLAGS} -PAslCompiler -o${.TARGET} \ -- cgit v1.1 From 821a71eede1b0c3a1ae516d59e5ba3c14c6b69de Mon Sep 17 00:00:00 2001 From: jkim Date: Tue, 23 Apr 2013 19:42:45 +0000 Subject: Fix declarations to slightly increase WARNS level. --- usr.sbin/acpi/acpidb/Makefile | 2 +- usr.sbin/acpi/acpidb/acpidb.c | 13 ++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) (limited to 'usr.sbin/acpi') diff --git a/usr.sbin/acpi/acpidb/Makefile b/usr.sbin/acpi/acpidb/Makefile index 5e56bf3..d61e61f 100644 --- a/usr.sbin/acpi/acpidb/Makefile +++ b/usr.sbin/acpi/acpidb/Makefile @@ -67,7 +67,7 @@ SRCS+= utaddress.c utalloc.c utcache.c utcopy.c utdebug.c \ utxfinit.c MAN= acpidb.8 -WARNS?= 2 +WARNS?= 3 CFLAGS+= -DACPI_EXEC_APP -fno-strict-aliasing DPADD= ${LIBPTHREAD} diff --git a/usr.sbin/acpi/acpidb/acpidb.c b/usr.sbin/acpi/acpidb/acpidb.c index 4095252..40522ca 100644 --- a/usr.sbin/acpi/acpidb/acpidb.c +++ b/usr.sbin/acpi/acpidb/acpidb.c @@ -50,7 +50,7 @@ * Dummy DSDT Table Header */ -ACPI_TABLE_HEADER dummy_dsdt_table = { +static ACPI_TABLE_HEADER dummy_dsdt_table = { "DSDT", 123, 1, 123, "OEMID", "OEMTBLID", 1, "CRID", 1 }; @@ -58,7 +58,7 @@ ACPI_TABLE_HEADER dummy_dsdt_table = { * Region space I/O routines on virtual machine */ -int aml_debug_prompt = 1; +static int aml_debug_prompt = 1; struct ACPIRegionContent { TAILQ_ENTRY(ACPIRegionContent) links; @@ -68,10 +68,13 @@ struct ACPIRegionContent { }; TAILQ_HEAD(ACPIRegionContentList, ACPIRegionContent); -struct ACPIRegionContentList RegionContentList; +static struct ACPIRegionContentList RegionContentList; static int aml_simulation_initialized = 0; +ACPI_PHYSICAL_ADDRESS AeLocalGetRootPointer(void); +void AeTableOverride(ACPI_TABLE_HEADER *, ACPI_TABLE_HEADER **); + static void aml_simulation_init(void); static int aml_simulate_regcontent_add(int regtype, ACPI_PHYSICAL_ADDRESS addr, @@ -87,11 +90,11 @@ static void aml_simulation_regload(const char *dumpfile); static void aml_simulation_regdump(const char *dumpfile); /* Stubs to simplify linkage to the ACPI CA core subsystem. */ -ACPI_STATUS +ACPI_PHYSICAL_ADDRESS AeLocalGetRootPointer(void) { - return (AE_ERROR); + return (0); } void -- cgit v1.1 From db7e9a0a660f6bce11b7e91b8412eb4f1d0dff93 Mon Sep 17 00:00:00 2001 From: jkim Date: Fri, 31 May 2013 17:23:38 +0000 Subject: Fix a long standing logic bug introduced in r167814. The code was added to get RSDP from loader(8) hint via kenv(2) but the bug nullified the new code and we always fell back to the previous method, i. e., sysctlbyname(3). MFC after: 3 days --- usr.sbin/acpi/acpidump/acpi_user.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'usr.sbin/acpi') diff --git a/usr.sbin/acpi/acpidump/acpi_user.c b/usr.sbin/acpi/acpidump/acpi_user.c index 0b2beb2..d759ea7 100644 --- a/usr.sbin/acpi/acpidump/acpi_user.c +++ b/usr.sbin/acpi/acpidump/acpi_user.c @@ -172,7 +172,7 @@ acpi_find_rsd_ptr(void) addr = 0; /* Attempt to use kenv or sysctl to find RSD PTR record. */ - if (kenv(KENV_GET, hint_acpi_0_rsdp, buf, 20) == 0) + if (kenv(KENV_GET, hint_acpi_0_rsdp, buf, 20) > 0) addr = strtoul(buf, NULL, 0); if (addr == 0) { len = sizeof(addr); -- cgit v1.1 From d6fbe88f0679a615b69608ec3ecb115885430183 Mon Sep 17 00:00:00 2001 From: jkim Date: Wed, 26 Jun 2013 23:52:10 +0000 Subject: Consistently cast ACPICA 64-bit integer types when we print them. --- usr.sbin/acpi/acpidb/acpidb.c | 4 ++-- usr.sbin/acpi/acpidump/acpi.c | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'usr.sbin/acpi') diff --git a/usr.sbin/acpi/acpidb/acpidb.c b/usr.sbin/acpi/acpidb/acpidb.c index 40522ca..3cd8d3f 100644 --- a/usr.sbin/acpi/acpidb/acpidb.c +++ b/usr.sbin/acpi/acpidb/acpidb.c @@ -176,8 +176,8 @@ aml_simulate_prompt(char *msg, UINT64 def_val) if (msg != NULL) { printf("%s", msg); } - printf("(default: 0x%jx ", val); - printf(" / %ju) >>", val); + printf("(default: 0x%jx ", (uintmax_t)val); + printf(" / %ju) >>", (uintmax_t)val); fflush(stdout); bzero(buf, sizeof buf); diff --git a/usr.sbin/acpi/acpidump/acpi.c b/usr.sbin/acpi/acpidump/acpi.c index c7f5bd8..d3f9685 100644 --- a/usr.sbin/acpi/acpidump/acpi.c +++ b/usr.sbin/acpi/acpidump/acpi.c @@ -537,7 +537,7 @@ acpi_handle_mcfg(ACPI_TABLE_HEADER *sdp) alloc = (ACPI_MCFG_ALLOCATION *)(mcfg + 1); for (i = 0; i < entries; i++, alloc++) { printf("\n"); - printf("\tBase Address=0x%016jx\n", alloc->Address); + printf("\tBase Address=0x%016jx\n", (uintmax_t)alloc->Address); printf("\tSegment Group=0x%04x\n", alloc->PciSegment); printf("\tStart Bus=%d\n", alloc->StartBusNumber); printf("\tEnd Bus=%d\n", alloc->EndBusNumber); @@ -554,16 +554,16 @@ acpi_handle_slit(ACPI_TABLE_HEADER *sdp) printf(BEGIN_COMMENT); acpi_print_sdt(sdp); slit = (ACPI_TABLE_SLIT *)sdp; - printf("\tLocality Count=%jd\n", slit->LocalityCount); + printf("\tLocality Count=%ju\n", (uintmax_t)slit->LocalityCount); printf("\n\t "); for (i = 0; i < slit->LocalityCount; i++) - printf(" %3jd", i); + printf(" %3ju", (uintmax_t)i); printf("\n\t +"); for (i = 0; i < slit->LocalityCount; i++) printf("----"); printf("\n"); for (i = 0; i < slit->LocalityCount; i++) { - printf("\t %3jd |", i); + printf("\t %3ju |", (uintmax_t)i); for (j = 0; j < slit->LocalityCount; j++) printf(" %3d", slit->Entry[i * slit->LocalityCount + j]); @@ -830,7 +830,7 @@ acpi_handle_dmar_drhd(ACPI_DMAR_HARDWARE_UNIT *drhd) #undef PRINTFLAG printf("\tSegment=%d\n", drhd->Segment); - printf("\tAddress=0x%0jx\n", drhd->Address); + printf("\tAddress=0x%0jx\n", (uintmax_t)drhd->Address); remaining = drhd->Header.Length - sizeof(ACPI_DMAR_HARDWARE_UNIT); if (remaining > 0) @@ -855,8 +855,8 @@ acpi_handle_dmar_rmrr(ACPI_DMAR_RESERVED_MEMORY *rmrr) printf("\tType=RMRR\n"); printf("\tLength=%d\n", rmrr->Header.Length); printf("\tSegment=%d\n", rmrr->Segment); - printf("\tBaseAddress=0x%0jx\n", rmrr->BaseAddress); - printf("\tLimitAddress=0x%0jx\n", rmrr->EndAddress); + printf("\tBaseAddress=0x%0jx\n", (uintmax_t)rmrr->BaseAddress); + printf("\tLimitAddress=0x%0jx\n", (uintmax_t)rmrr->EndAddress); remaining = rmrr->Header.Length - sizeof(ACPI_DMAR_RESERVED_MEMORY); if (remaining > 0) @@ -911,7 +911,7 @@ acpi_handle_dmar_rhsa(ACPI_DMAR_RHSA *rhsa) printf("\n"); printf("\tType=RHSA\n"); printf("\tLength=%d\n", rhsa->Header.Length); - printf("\tBaseAddress=0x%0jx\n", rhsa->BaseAddress); + printf("\tBaseAddress=0x%0jx\n", (uintmax_t)rhsa->BaseAddress); printf("\tProximityDomain=0x%08x\n", rhsa->ProximityDomain); } -- cgit v1.1