From 31774c91a77f8e603f35ba5dc61f3cefbacc99cc Mon Sep 17 00:00:00 2001
From: Poul-Henning Kamp <phk@FreeBSD.org>
Date: Sun, 10 Dec 1995 13:33:49 +0000
Subject: [PATCH] Staticize and cleanup. Make debug variable sysctl aware in
 1742.

---
 sys/dev/eisa/eisaconf.c  | 15 ++-------------
 sys/i386/eisa/aha1742.c  | 12 +++++++-----
 sys/i386/eisa/eisaconf.c | 15 ++-------------
 3 files changed, 11 insertions(+), 31 deletions(-)

diff --git a/sys/dev/eisa/eisaconf.c b/sys/dev/eisa/eisaconf.c
index f3c0a0aa99c5..b50186c8ba82 100644
--- a/sys/dev/eisa/eisaconf.c
+++ b/sys/dev/eisa/eisaconf.c
@@ -18,7 +18,7 @@
  * 4. Modifications may be freely made to this file if the above conditions
  *    are met.
  *
- *	$Id: eisaconf.c,v 1.9 1995/11/29 10:12:34 phk Exp $
+ *	$Id: eisaconf.c,v 1.10 1995/11/29 17:40:47 bde Exp $
  */
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -461,19 +461,8 @@ eisa_registerdev(e_dev, driver, kdc_template)
 	return (0);
 }
 
-/*
- * Provide EISA-specific device information to user programs using the
- * hw.devconf interface.
- */
-int
-eisa_externalize(struct eisa_device *e_dev, struct sysctl_req *req)
-{
-	return (SYSCTL_OUT(req, e_dev, sizeof *e_dev));
-}
-
-
 int
 eisa_generic_externalize(struct kern_devconf *kdc, struct sysctl_req *req)
 {
-    return eisa_externalize(kdc->kdc_eisa, req);
+    return (SYSCTL_OUT(req, kdc->kdc_eisa, sizeof(struct eisa_device)));
 }
diff --git a/sys/i386/eisa/aha1742.c b/sys/i386/eisa/aha1742.c
index 583735ea9d0d..f882572dcc69 100644
--- a/sys/i386/eisa/aha1742.c
+++ b/sys/i386/eisa/aha1742.c
@@ -14,7 +14,7 @@
  *
  * commenced: Sun Sep 27 18:14:01 PDT 1992
  *
- *      $Id: aha1742.c,v 1.42 1995/12/06 23:52:35 bde Exp $
+ *      $Id: aha1742.c,v 1.43 1995/12/07 12:45:23 davidg Exp $
  */
 
 #include <sys/types.h>
@@ -22,6 +22,8 @@
 #ifdef	KERNEL			/* don't laugh, it compiles as a program too.. look */
 #include "ahb.h"
 #include <sys/param.h>
+#include <sys/kernel.h>
+#include <sys/sysctl.h>
 #include <sys/systm.h>
 #include <sys/errno.h>
 #include <sys/ioctl.h>
@@ -32,7 +34,6 @@
 #include <machine/clock.h>
 
 #include <vm/vm.h>
-#include <vm/vm_param.h>
 #include <vm/pmap.h>
 
 #include <i386/eisa/eisaconf.h>
@@ -244,7 +245,7 @@ struct ecb {
 	physaddr hashkey;	/* physaddr of this struct */
 };
 
-struct ahb_data {
+static struct ahb_data {
 	int	unit;
 	int     flags;
 #define	AHB_INIT	0x01;
@@ -274,6 +275,8 @@ static u_int32		ahb_adapter_info();
 
 static  u_long		ahb_unit = 0;
 static 	int		ahb_debug = 0;
+SYSCTL_INT(_debug, OID_AUTO, ahb_debug, CTLFLAG_RW, &ahb_debug, 0, "");
+
 #define AHB_SHOWECBS 0x01
 #define AHB_SHOWINTS 0x02
 #define AHB_SHOWCMDS 0x04
@@ -971,8 +974,7 @@ ahb_init(unit)
 	u_char intdef;
 	struct ahb_data *ahb = ahbdata[unit];
 	int     port = ahb->baseport;
-	int     i;
-	int     stport = port + G2STAT;
+
 	/*
 	 * Assume we have a board at this stage
 	 * setup dma channel from jumpers and save int
diff --git a/sys/i386/eisa/eisaconf.c b/sys/i386/eisa/eisaconf.c
index f3c0a0aa99c5..b50186c8ba82 100644
--- a/sys/i386/eisa/eisaconf.c
+++ b/sys/i386/eisa/eisaconf.c
@@ -18,7 +18,7 @@
  * 4. Modifications may be freely made to this file if the above conditions
  *    are met.
  *
- *	$Id: eisaconf.c,v 1.9 1995/11/29 10:12:34 phk Exp $
+ *	$Id: eisaconf.c,v 1.10 1995/11/29 17:40:47 bde Exp $
  */
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -461,19 +461,8 @@ eisa_registerdev(e_dev, driver, kdc_template)
 	return (0);
 }
 
-/*
- * Provide EISA-specific device information to user programs using the
- * hw.devconf interface.
- */
-int
-eisa_externalize(struct eisa_device *e_dev, struct sysctl_req *req)
-{
-	return (SYSCTL_OUT(req, e_dev, sizeof *e_dev));
-}
-
-
 int
 eisa_generic_externalize(struct kern_devconf *kdc, struct sysctl_req *req)
 {
-    return eisa_externalize(kdc->kdc_eisa, req);
+    return (SYSCTL_OUT(req, kdc->kdc_eisa, sizeof(struct eisa_device)));
 }