From owner-svn-src-all@FreeBSD.ORG Mon Mar 31 19:37:39 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CF44AA1C; Mon, 31 Mar 2014 19:37:39 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BC6D6BBE; Mon, 31 Mar 2014 19:37:39 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2VJbdun049121; Mon, 31 Mar 2014 19:37:39 GMT (envelope-from imp@svn.freebsd.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2VJbdBZ049120; Mon, 31 Mar 2014 19:37:39 GMT (envelope-from imp@svn.freebsd.org) Message-Id: <201403311937.s2VJbdBZ049120@svn.freebsd.org> From: Warner Losh Date: Mon, 31 Mar 2014 19:37:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r263975 - head/sys/dev/acpica X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Mar 2014 19:37:39 -0000 Author: imp Date: Mon Mar 31 19:37:39 2014 New Revision: 263975 URL: http://svnweb.freebsd.org/changeset/base/263975 Log: Turns out name was used here when ACPI_DEBUG was defined, so refine my previous patch. Modified: head/sys/dev/acpica/acpi_resource.c Modified: head/sys/dev/acpica/acpi_resource.c ============================================================================== --- head/sys/dev/acpica/acpi_resource.c Mon Mar 31 17:04:04 2014 (r263974) +++ head/sys/dev/acpica/acpi_resource.c Mon Mar 31 19:37:39 2014 (r263975) @@ -183,6 +183,9 @@ acpi_parse_resource(ACPI_RESOURCE *res, struct acpi_parse_resource_set *set; struct acpi_resource_context *arc; UINT64 min, max, length, gran; +#ifdef ACPI_DEBUG + const char *name; +#endif device_t dev; arc = context; @@ -299,18 +302,27 @@ acpi_parse_resource(ACPI_RESOURCE *res, min = res->Data.Address16.Minimum; max = res->Data.Address16.Maximum; length = res->Data.Address16.AddressLength; +#ifdef ACPI_DEBUG + name = "Address16"; +#endif break; case ACPI_RESOURCE_TYPE_ADDRESS32: gran = res->Data.Address32.Granularity; min = res->Data.Address32.Minimum; max = res->Data.Address32.Maximum; length = res->Data.Address32.AddressLength; +#ifdef ACPI_DEBUG + name = "Address32"; +#endif break; case ACPI_RESOURCE_TYPE_ADDRESS64: gran = res->Data.Address64.Granularity; min = res->Data.Address64.Minimum; max = res->Data.Address64.Maximum; length = res->Data.Address64.AddressLength; +#ifdef ACPI_DEBUG + name = "Address64"; +#endif break; default: KASSERT(res->Type == ACPI_RESOURCE_TYPE_EXTENDED_ADDRESS64, @@ -319,6 +331,9 @@ acpi_parse_resource(ACPI_RESOURCE *res, min = res->Data.ExtAddress64.Minimum; max = res->Data.ExtAddress64.Maximum; length = res->Data.ExtAddress64.AddressLength; +#ifdef ACPI_DEBUG + name = "ExtAddress64"; +#endif break; } if (length <= 0)