From owner-svn-src-head@FreeBSD.ORG Tue Nov 9 00:14:39 2010 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AFFA3106566C; Tue, 9 Nov 2010 00:14:39 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 92B9E8FC14; Tue, 9 Nov 2010 00:14:39 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oA90Edrr064841; Tue, 9 Nov 2010 00:14:39 GMT (envelope-from jkim@svn.freebsd.org) Received: (from jkim@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id oA90EdKh064837; Tue, 9 Nov 2010 00:14:39 GMT (envelope-from jkim@svn.freebsd.org) Message-Id: <201011090014.oA90EdKh064837@svn.freebsd.org> From: Jung-uk Kim Date: Tue, 9 Nov 2010 00:14:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r215023 - in head/sys: amd64/acpica i386/acpica ia64/acpica X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 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, 09 Nov 2010 00:14:39 -0000 Author: jkim Date: Tue Nov 9 00:14:39 2010 New Revision: 215023 URL: http://svn.freebsd.org/changeset/base/215023 Log: Reduce diff between platforms and fix style(9) bugs. Modified: head/sys/amd64/acpica/OsdEnvironment.c head/sys/i386/acpica/OsdEnvironment.c head/sys/ia64/acpica/OsdEnvironment.c Modified: head/sys/amd64/acpica/OsdEnvironment.c ============================================================================== --- head/sys/amd64/acpica/OsdEnvironment.c Mon Nov 8 23:15:10 2010 (r215022) +++ head/sys/amd64/acpica/OsdEnvironment.c Tue Nov 9 00:14:39 2010 (r215023) @@ -28,9 +28,6 @@ #include __FBSDID("$FreeBSD$"); -/* - * 6.1 : Environmental support - */ #include #include #include @@ -39,33 +36,56 @@ __FBSDID("$FreeBSD$"); #include #include -static u_long amd64_acpi_root; +static u_long acpi_root_phys; -SYSCTL_ULONG(_machdep, OID_AUTO, acpi_root, CTLFLAG_RD, &amd64_acpi_root, 0, - "The physical address of the RSDP"); +SYSCTL_ULONG(_machdep, OID_AUTO, acpi_root, CTLFLAG_RD, &acpi_root_phys, 0, + "The physical address of the RSDP"); ACPI_STATUS AcpiOsInitialize(void) { - return(0); + + return (AE_OK); } ACPI_STATUS AcpiOsTerminate(void) { - return(0); + + return (AE_OK); +} + +static u_long +acpi_get_root_from_loader(void) +{ + long acpi_root; + + if (resource_long_value("acpi", 0, "rsdp", &acpi_root) == 0) + return (acpi_root); + + return (0); +} + +static u_long +acpi_get_root_from_memory(void) +{ + ACPI_SIZE acpi_root; + + if (ACPI_SUCCESS(AcpiFindRootPointer(&acpi_root))) + return (acpi_root); + + return (0); } ACPI_PHYSICAL_ADDRESS AcpiOsGetRootPointer(void) { - u_long ptr; - if (amd64_acpi_root == 0 && - (resource_long_value("acpi", 0, "rsdp", (long *)&ptr) == 0 || - AcpiFindRootPointer((ACPI_SIZE *)&ptr) == AE_OK) && - ptr != 0) - amd64_acpi_root = ptr; + if (acpi_root_phys == 0) { + acpi_root_phys = acpi_get_root_from_loader(); + if (acpi_root_phys == 0) + acpi_root_phys = acpi_get_root_from_memory(); + } - return (amd64_acpi_root); + return (acpi_root_phys); } Modified: head/sys/i386/acpica/OsdEnvironment.c ============================================================================== --- head/sys/i386/acpica/OsdEnvironment.c Mon Nov 8 23:15:10 2010 (r215022) +++ head/sys/i386/acpica/OsdEnvironment.c Tue Nov 9 00:14:39 2010 (r215023) @@ -28,9 +28,6 @@ #include __FBSDID("$FreeBSD$"); -/* - * 6.1 : Environmental support - */ #include #include #include @@ -39,33 +36,56 @@ __FBSDID("$FreeBSD$"); #include #include -static u_long i386_acpi_root; +static u_long acpi_root_phys; -SYSCTL_ULONG(_machdep, OID_AUTO, acpi_root, CTLFLAG_RD, &i386_acpi_root, 0, - "The physical address of the RSDP"); +SYSCTL_ULONG(_machdep, OID_AUTO, acpi_root, CTLFLAG_RD, &acpi_root_phys, 0, + "The physical address of the RSDP"); ACPI_STATUS AcpiOsInitialize(void) { - return(0); + + return (AE_OK); } ACPI_STATUS AcpiOsTerminate(void) { - return(0); + + return (AE_OK); +} + +static u_long +acpi_get_root_from_loader(void) +{ + long acpi_root; + + if (resource_long_value("acpi", 0, "rsdp", &acpi_root) == 0) + return (acpi_root); + + return (0); +} + +static u_long +acpi_get_root_from_memory(void) +{ + ACPI_SIZE acpi_root; + + if (ACPI_SUCCESS(AcpiFindRootPointer(&acpi_root))) + return (acpi_root); + + return (0); } ACPI_PHYSICAL_ADDRESS AcpiOsGetRootPointer(void) { - u_long ptr; - if (i386_acpi_root == 0 && - (resource_long_value("acpi", 0, "rsdp", (long *)&ptr) == 0 || - AcpiFindRootPointer((ACPI_SIZE *)&ptr) == AE_OK) && - ptr != 0) - i386_acpi_root = ptr; + if (acpi_root_phys == 0) { + acpi_root_phys = acpi_get_root_from_loader(); + if (acpi_root_phys == 0) + acpi_root_phys = acpi_get_root_from_memory(); + } - return (i386_acpi_root); + return (acpi_root_phys); } Modified: head/sys/ia64/acpica/OsdEnvironment.c ============================================================================== --- head/sys/ia64/acpica/OsdEnvironment.c Mon Nov 8 23:15:10 2010 (r215022) +++ head/sys/ia64/acpica/OsdEnvironment.c Tue Nov 9 00:14:39 2010 (r215023) @@ -35,8 +35,6 @@ __FBSDID("$FreeBSD$"); #include -static struct uuid acpi_root_uuid = EFI_TABLE_ACPI20; - static u_long acpi_root_phys; SYSCTL_ULONG(_machdep, OID_AUTO, acpi_root, CTLFLAG_RD, &acpi_root_phys, 0, @@ -46,27 +44,35 @@ ACPI_STATUS AcpiOsInitialize(void) { - return(AE_OK); + return (AE_OK); } ACPI_STATUS AcpiOsTerminate(void) { - return(AE_OK); + return (AE_OK); +} + +static u_long +acpi_get_root_from_efi(void) +{ + static struct uuid acpi_root_uuid = EFI_TABLE_ACPI20; + void *acpi_root; + + acpi_root = efi_get_table(&acpi_root_uuid); + if (acpi_root != NULL) + return (IA64_RR_MASK((uintptr_t)acpi_root)); + + return (0); } ACPI_PHYSICAL_ADDRESS AcpiOsGetRootPointer(void) { - void *acpi_root; - if (acpi_root_phys == 0) { - acpi_root = efi_get_table(&acpi_root_uuid); - if (acpi_root == NULL) - return (0); - acpi_root_phys = IA64_RR_MASK((u_long)acpi_root); - } + if (acpi_root_phys == 0) + acpi_root_phys = acpi_get_root_from_efi(); return (acpi_root_phys); }