From owner-svn-src-head@FreeBSD.ORG Mon May 20 22:10:01 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id A09EA3B0; Mon, 20 May 2013 22:10:01 +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 79CE3627; Mon, 20 May 2013 22:10:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4KMA1cN072380; Mon, 20 May 2013 22:10:01 GMT (envelope-from jkim@svn.freebsd.org) Received: (from jkim@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4KMA1Pa072379; Mon, 20 May 2013 22:10:01 GMT (envelope-from jkim@svn.freebsd.org) Message-Id: <201305202210.r4KMA1Pa072379@svn.freebsd.org> From: Jung-uk Kim Date: Mon, 20 May 2013 22:10:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r250833 - head/sys/dev/acpica/Osd 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: Mon, 20 May 2013 22:10:01 -0000 Author: jkim Date: Mon May 20 22:10:01 2013 New Revision: 250833 URL: http://svnweb.freebsd.org/changeset/base/250833 Log: Fix white spaces. Modified: head/sys/dev/acpica/Osd/OsdTable.c Modified: head/sys/dev/acpica/Osd/OsdTable.c ============================================================================== --- head/sys/dev/acpica/Osd/OsdTable.c Mon May 20 21:16:38 2013 (r250832) +++ head/sys/dev/acpica/Osd/OsdTable.c Mon May 20 22:10:01 2013 (r250833) @@ -50,51 +50,49 @@ AcpiOsPredefinedOverride(const ACPI_PRED ACPI_STRING *NewVal) { - if (InitVal == NULL || NewVal == NULL) - return (AE_BAD_PARAMETER); + if (InitVal == NULL || NewVal == NULL) + return (AE_BAD_PARAMETER); - *NewVal = NULL; - if (strncmp(InitVal->Name, "_OS_", ACPI_NAME_SIZE) == 0 && - strlen(acpi_osname) > 0) { - printf("ACPI: Overriding _OS definition with \"%s\"\n", acpi_osname); - *NewVal = acpi_osname; - } - - return (AE_OK); + *NewVal = NULL; + if (strncmp(InitVal->Name, "_OS_", ACPI_NAME_SIZE) == 0 && + strlen(acpi_osname) > 0) { + printf("ACPI: Overriding _OS definition with \"%s\"\n", + acpi_osname); + *NewVal = acpi_osname; + } + return (AE_OK); } ACPI_STATUS AcpiOsTableOverride(ACPI_TABLE_HEADER *ExistingTable, ACPI_TABLE_HEADER **NewTable) { - char modname[] = "acpi_dsdt"; - caddr_t acpi_table; - ACPI_TABLE_HEADER *hdr; - size_t sz; + char modname[] = "acpi_dsdt"; + caddr_t acpi_table; + ACPI_TABLE_HEADER *hdr; + size_t sz; - if (ExistingTable == NULL || NewTable == NULL) - return (AE_BAD_PARAMETER); + if (ExistingTable == NULL || NewTable == NULL) + return (AE_BAD_PARAMETER); - *NewTable = NULL; + *NewTable = NULL; #ifdef notyet - for (int i = 0; i < ACPI_NAME_SIZE; i++) - modname[i + 5] = tolower(ExistingTable->Signature[i]); + for (int i = 0; i < ACPI_NAME_SIZE; i++) + modname[i + 5] = tolower(ExistingTable->Signature[i]); #else - /* If we're not overriding the DSDT, just return. */ - if (strncmp(ExistingTable->Signature, ACPI_SIG_DSDT, ACPI_NAME_SIZE) != 0) - return (AE_OK); + /* If we're not overriding the DSDT, just return. */ + if (strncmp(ExistingTable->Signature, ACPI_SIG_DSDT, + ACPI_NAME_SIZE) != 0) + return (AE_OK); #endif - - acpi_table = preload_search_by_type(modname); - if (acpi_table == NULL) + acpi_table = preload_search_by_type(modname); + if (acpi_table == NULL) + return (AE_OK); + hdr = preload_fetch_addr(acpi_table); + sz = preload_fetch_size(acpi_table); + if (hdr != NULL && sz != 0) + *NewTable = hdr; return (AE_OK); - - hdr = preload_fetch_addr(acpi_table); - sz = preload_fetch_size(acpi_table); - if (hdr != NULL && sz != 0) - *NewTable = hdr; - - return (AE_OK); } ACPI_STATUS