From 728aa6ee0142a88f101414011d9633e4c03b11d4 Mon Sep 17 00:00:00 2001
From: Sascha Wildner <swildner@dragonflybsd.org>
Date: Sun, 25 Nov 2007 00:13:28 +0000
Subject: [PATCH] Adjust acpi.c and bios.c to use kfreeenv()/ktestenv() and
 remove the freeenv/testenv compatibility defines.

---
 share/man/man9/kenv.9         | 15 +--------------
 sys/dev/acpica5/acpi.c        | 38 +++++++++++++++++++-------------------
 sys/platform/pc32/i386/bios.c |  6 +++---
 sys/sys/systm.h               |  5 +----
 4 files changed, 24 insertions(+), 40 deletions(-)

diff --git a/share/man/man9/kenv.9 b/share/man/man9/kenv.9
index f8c875a768..1472107c32 100644
--- a/share/man/man9/kenv.9
+++ b/share/man/man9/kenv.9
@@ -28,7 +28,7 @@
 .\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $DragonFly: src/share/man/man9/kenv.9,v 1.7 2007/07/14 21:48:15 swildner Exp $
+.\" $DragonFly: src/share/man/man9/kenv.9,v 1.8 2007/11/25 00:13:28 swildner Exp $
 .\"
 .Dd January 16, 2007
 .Dt KENV 9
@@ -136,19 +136,6 @@ If successful, it returns
 .It Va kern.environment
 Current static kernel environment query OID.
 .El
-.Sh COMPATIBILITY
-For compatibility reasons,
-.Fn freeenv
-and
-.Fn testenv
-are mapped to
-.Fn kfreeenv
-and
-.Fn ktestenv
-respectively.
-However, this compatibility is set to be removed in the future, so new
-consumers should use the right calls.
-Also, existing code needs to be converted.
 .Sh FILES
 .Bl -tag -width ".Pa sys/kern/kern_environment.c"
 .It Pa sys/kern/kern_environment.c
diff --git a/sys/dev/acpica5/acpi.c b/sys/dev/acpica5/acpi.c
index 5246dd03d3..667f30e3fe 100644
--- a/sys/dev/acpica5/acpi.c
+++ b/sys/dev/acpica5/acpi.c
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	$FreeBSD: src/sys/dev/acpica/acpi.c,v 1.160 2004/06/14 03:52:19 njl Exp $
- *	$DragonFly: src/sys/dev/acpica5/acpi.c,v 1.32 2007/10/23 03:04:48 y0netan1 Exp $
+ *	$DragonFly: src/sys/dev/acpica5/acpi.c,v 1.33 2007/11/25 00:13:28 swildner Exp $
  */
 
 #include "opt_acpi.h"
@@ -273,7 +273,7 @@ acpi_Startup(void)
     if (debugpoint) {
 	if (!strcmp(debugpoint, "init"))
 	    acpi_EnterDebugger();
-	freeenv(debugpoint);
+	kfreeenv(debugpoint);
     }
 #endif
     error = AcpiInitializeTables(NULL, 16, TRUE);
@@ -448,7 +448,7 @@ acpi_attach(device_t dev)
     if (debugpoint) {
 	if (!strcmp(debugpoint, "tables"))
 	    acpi_EnterDebugger();
-	freeenv(debugpoint);
+	kfreeenv(debugpoint);
     }
 #endif
 
@@ -481,7 +481,7 @@ acpi_attach(device_t dev)
     if (debugpoint) {
 	if (!strcmp(debugpoint, "spaces"))
 	    acpi_EnterDebugger();
-	freeenv(debugpoint);
+	kfreeenv(debugpoint);
     }
 #endif
     /* Install the default address space handlers. */
@@ -527,11 +527,11 @@ acpi_attach(device_t dev)
     if (debugpoint) {
 	if (!strcmp(debugpoint, "enable"))
 	    acpi_EnterDebugger();
-	freeenv(debugpoint);
+	kfreeenv(debugpoint);
     }
 #endif
     flags = 0;
-    if (testenv("debug.acpi.avoid"))
+    if (ktestenv("debug.acpi.avoid"))
 	flags = ACPI_NO_DEVICE_INIT | ACPI_NO_OBJECT_INIT;
     if (ACPI_FAILURE(status = AcpiEnableSubsystem(flags))) {
 	device_printf(dev, "Could not enable ACPI: %s\n",
@@ -601,7 +601,7 @@ acpi_attach(device_t dev)
 	sc->acpi_verbose = 1;
     if ((env = kgetenv("hw.acpi.verbose")) && strcmp(env, "0")) {
 	sc->acpi_verbose = 1;
-	freeenv(env);
+	kfreeenv(env);
     }
 
     /* Only enable S4BIOS by default if the FACS says it is available. */
@@ -639,7 +639,7 @@ acpi_attach(device_t dev)
     if (debugpoint) {
 	if (!strcmp(debugpoint, "probe"))
 	    acpi_EnterDebugger();
-	freeenv(debugpoint);
+	kfreeenv(debugpoint);
     }
 #endif
 
@@ -674,7 +674,7 @@ acpi_attach(device_t dev)
     if (debugpoint) {
 	if (strcmp(debugpoint, "running") == 0)
 	    acpi_EnterDebugger();
-	freeenv(debugpoint);
+	kfreeenv(debugpoint);
     }
 #endif
 
@@ -2438,12 +2438,12 @@ acpi_avoid(ACPI_HANDLE handle)
 	while ((cp[len] != 0) && !isspace(cp[len]))
 	    len++;
 	if (!strncmp(cp, np, len)) {
-	    freeenv(env);
+	    kfreeenv(env);
 	    return(1);
 	}
 	cp += len;
     }
-    freeenv(env);
+    kfreeenv(env);
 
     return (0);
 }
@@ -2462,7 +2462,7 @@ acpi_disabled(char *subsys)
     if ((env = kgetenv("debug.acpi.disabled")) == NULL)
 	return (0);
     if (strcmp(env, "all") == 0) {
-	freeenv(env);
+	kfreeenv(env);
 	return (1);
     }
 
@@ -2477,12 +2477,12 @@ acpi_disabled(char *subsys)
 	while (cp[len] != '\0' && !isspace(cp[len]))
 	    len++;
 	if (strncmp(cp, subsys, len) == 0) {
-	    freeenv(env);
+	    kfreeenv(env);
 	    return (1);
 	}
 	cp += len;
     }
-    freeenv(env);
+    kfreeenv(env);
 
     return (0);
 }
@@ -2501,7 +2501,7 @@ acpi_enabled(char *subsys)
     if ((env = kgetenv("debug.acpi.enabled")) == NULL)
 	return (0);
     if (strcmp(env, "all") == 0) {
-	freeenv(env);
+	kfreeenv(env);
 	return (1);
     }
 
@@ -2516,12 +2516,12 @@ acpi_enabled(char *subsys)
 	while (cp[len] != '\0' && !isspace(cp[len]))
 	    len++;
 	if (strncmp(cp, subsys, len) == 0) {
-	    freeenv(env);
+	    kfreeenv(env);
 	    return (1);
 	}
 	cp += len;
     }
-    freeenv(env);
+    kfreeenv(env);
 
     return (0);
 }
@@ -2893,13 +2893,13 @@ acpi_set_debugging(void *junk)
 	if (strcmp("NONE", layer) != 0)
 	    kprintf(" layer '%s'", layer);
 	acpi_parse_debug(layer, &dbg_layer[0], &AcpiDbgLayer);
-	freeenv(layer);
+	kfreeenv(layer);
     }
     if (level != NULL) {
 	if (strcmp("NONE", level) != 0)
 	    kprintf(" level '%s'", level);
 	acpi_parse_debug(level, &dbg_level[0], &AcpiDbgLevel);
-	freeenv(level);
+	kfreeenv(level);
     }
     kprintf("\n");
 }
diff --git a/sys/platform/pc32/i386/bios.c b/sys/platform/pc32/i386/bios.c
index 7518b72c1b..16f51c7a6e 100644
--- a/sys/platform/pc32/i386/bios.c
+++ b/sys/platform/pc32/i386/bios.c
@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/i386/i386/bios.c,v 1.29.2.3 2001/07/19 18:07:35 imp Exp $
- * $DragonFly: src/sys/platform/pc32/i386/bios.c,v 1.15 2007/04/30 07:18:55 dillon Exp $
+ * $DragonFly: src/sys/platform/pc32/i386/bios.c,v 1.16 2007/11/25 00:13:28 swildner Exp $
  */
 
 /*
@@ -101,7 +101,7 @@ bios32_init(void *junk)
 		    kprintf("pcibios: PCI BIOS entry at 0x%x\n", PCIbios.entry);
 	    }
 	    if (p != NULL)
-		freeenv(p);
+		kfreeenv(p);
 	} else {
 	    kprintf("bios32: Bad BIOS32 Service Directory\n");
 	}
@@ -138,7 +138,7 @@ bios32_init(void *junk)
 	}
     }
     if (p != NULL)
-	freeenv(p);
+	kfreeenv(p);
     if (bootverbose) {
 	    /* look for other know signatures */
 	    kprintf("Other BIOS signatures found:\n");
diff --git a/sys/sys/systm.h b/sys/sys/systm.h
index 8d279bb338..3d9836c24f 100644
--- a/sys/sys/systm.h
+++ b/sys/sys/systm.h
@@ -37,7 +37,7 @@
  *
  *	@(#)systm.h	8.7 (Berkeley) 3/29/95
  * $FreeBSD: src/sys/sys/systm.h,v 1.111.2.18 2002/12/17 18:04:02 sam Exp $
- * $DragonFly: src/sys/sys/systm.h,v 1.76 2007/11/24 23:12:36 swildner Exp $
+ * $DragonFly: src/sys/sys/systm.h,v 1.77 2007/11/25 00:13:28 swildner Exp $
  */
 
 #ifndef _SYS_SYSTM_H_
@@ -242,9 +242,6 @@ int	ksetenv(const char *name, const char *value);
 int	kunsetenv(const char *name);
 void	kfreeenv(char *env);
 int	ktestenv(const char *name);
-/* XXX TGEN Get rid of these compat defines. */
-#define	testenv	ktestenv
-#define	freeenv kfreeenv
 int	kgetenv_int (const char *name, int *data);
 int	kgetenv_string (const char *name, char *data, int size);
 int	kgetenv_quad (const char *name, quad_t *data);
-- 
2.11.4.GIT