From owner-svn-src-head@FreeBSD.ORG Tue Apr 23 19:42:46 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 1BA74F7B; Tue, 23 Apr 2013 19:42:46 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id E86591AEE; Tue, 23 Apr 2013 19:42:45 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3NJgj1p067744; Tue, 23 Apr 2013 19:42:45 GMT (envelope-from jkim@svn.freebsd.org) Received: (from jkim@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3NJgjad067742; Tue, 23 Apr 2013 19:42:45 GMT (envelope-from jkim@svn.freebsd.org) Message-Id: <201304231942.r3NJgjad067742@svn.freebsd.org> From: Jung-uk Kim Date: Tue, 23 Apr 2013 19:42:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r249821 - head/usr.sbin/acpi/acpidb X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Apr 2013 19:42:46 -0000 Author: jkim Date: Tue Apr 23 19:42:45 2013 New Revision: 249821 URL: http://svnweb.freebsd.org/changeset/base/249821 Log: Fix declarations to slightly increase WARNS level. Modified: head/usr.sbin/acpi/acpidb/Makefile head/usr.sbin/acpi/acpidb/acpidb.c Modified: head/usr.sbin/acpi/acpidb/Makefile ============================================================================== --- head/usr.sbin/acpi/acpidb/Makefile Tue Apr 23 19:40:20 2013 (r249820) +++ head/usr.sbin/acpi/acpidb/Makefile Tue Apr 23 19:42:45 2013 (r249821) @@ -67,7 +67,7 @@ SRCS+= utaddress.c utalloc.c utcache.c u utxfinit.c MAN= acpidb.8 -WARNS?= 2 +WARNS?= 3 CFLAGS+= -DACPI_EXEC_APP -fno-strict-aliasing DPADD= ${LIBPTHREAD} Modified: head/usr.sbin/acpi/acpidb/acpidb.c ============================================================================== --- head/usr.sbin/acpi/acpidb/acpidb.c Tue Apr 23 19:40:20 2013 (r249820) +++ head/usr.sbin/acpi/acpidb/acpidb.c Tue Apr 23 19:42:45 2013 (r249821) @@ -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(con 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