CVS commit: src/sys/dev/acpi

[Jukka Ruohonen]

Module Name:    src
Committed By:   jruoho
Date:           Sun Aug  8 18:47:54 UTC 2010

Modified Files:
        src/sys/dev/acpi: acpi_cpu.c acpi_cpu.h

Log Message:
jmcneill@: do not touch the bus_space(9) handle.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/acpi/acpi_cpu.c
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/acpi/acpi_cpu.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/dev/acpi/acpi_cpu.c
diff -u src/sys/dev/acpi/acpi_cpu.c:1.12 src/sys/dev/acpi/acpi_cpu.c:1.13
--- src/sys/dev/acpi/acpi_cpu.c:1.12	Sun Aug  8 16:58:42 2010
+++ src/sys/dev/acpi/acpi_cpu.c	Sun Aug  8 18:47:54 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_cpu.c,v 1.12 2010/08/08 16:58:42 jruoho Exp $ */
+/* $NetBSD: acpi_cpu.c,v 1.13 2010/08/08 18:47:54 jruoho Exp $ */
 
 /*-
  * Copyright (c) 2010 Jukka Ruohonen <jruoho...@iki.fi>
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_cpu.c,v 1.12 2010/08/08 16:58:42 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_cpu.c,v 1.13 2010/08/08 18:47:54 jruoho Exp $");
 
 #include <sys/param.h>
 #include <sys/cpu.h>
@@ -116,6 +116,7 @@
 
 	sc->sc_dev = self;
 	sc->sc_cold = false;
+	sc->sc_mapped = false;
 	sc->sc_iot = aa->aa_iot;
 	sc->sc_node = aa->aa_node;
 	sc->sc_cpuid = acpicpu_id(sc->sc_object.ao_procid);
@@ -150,8 +151,8 @@
 		rv = bus_space_map(sc->sc_iot, sc->sc_object.ao_pblkaddr,
 		    sc->sc_object.ao_pblklen, 0, &sc->sc_ioh);
 
-		if (rv != 0)
-			sc->sc_ioh = 0;
+		if (rv == 0)
+			sc->sc_mapped = true;
 	}
 
 	acpicpu_cstate_attach(self);
@@ -194,7 +195,7 @@
 	if (rv != 0)
 		return rv;
 
-	if (sc->sc_ioh != 0)
+	if (sc->sc_mapped != false)
 		bus_space_unmap(sc->sc_iot, sc->sc_ioh, addr);
 
 	mutex_destroy(&sc->sc_mtx);

Index: src/sys/dev/acpi/acpi_cpu.h
diff -u src/sys/dev/acpi/acpi_cpu.h:1.9 src/sys/dev/acpi/acpi_cpu.h:1.10
--- src/sys/dev/acpi/acpi_cpu.h:1.9	Sun Aug  8 16:58:42 2010
+++ src/sys/dev/acpi/acpi_cpu.h	Sun Aug  8 18:47:54 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_cpu.h,v 1.9 2010/08/08 16:58:42 jruoho Exp $ */
+/* $NetBSD: acpi_cpu.h,v 1.10 2010/08/08 18:47:54 jruoho Exp $ */
 
 /*-
  * Copyright (c) 2010 Jukka Ruohonen <jruoho...@iki.fi>
@@ -168,6 +168,7 @@
 	uint32_t		 sc_flags;
 	cpuid_t			 sc_cpuid;
 	bool			 sc_cold;
+	bool			 sc_mapped;
 };
 
 void		acpicpu_cstate_attach(device_t);