Mega commit for sysctl.

Convert the remaining sysctl stuff to the new way of doing things.
the devconf stuff is the reason for the large number of files.
Cleaned up some compiler warnings while I were there.

2 files changed, 10 insertions, 19 deletions

diff --git a/sys/dev/eisa/eisaconf.c b/sys/dev/eisa/eisaconf.c
index d1b37efe114d..b83cc493d45a 100644
--- a/sys/dev/eisa/eisaconf.c
+++ b/sys/dev/eisa/eisaconf.c
@@ -18,11 +18,12 @@
  * 4. Modifications may be freely made to this file if the above conditions
  *    are met.
  *
- *	$Id: eisaconf.c,v 1.6 1995/11/09 22:43:25 gibbs Exp $
+ *	$Id: eisaconf.c,v 1.7 1995/11/10 01:32:12 gibbs Exp $
  */
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
+#include <sys/sysctl.h>
 #include <sys/conf.h>
 #include <sys/malloc.h>
 #include <sys/devconf.h>
@@ -464,25 +465,14 @@ eisa_registerdev(e_dev, driver, kdc_template)
  * hw.devconf interface.
  */
 int
-eisa_externalize(e_dev, userp, maxlen)
-	struct eisa_device *e_dev;
-	void *userp;
-	size_t *maxlen;
+eisa_externalize(struct eisa_device *e_dev, struct sysctl_req *req)
 {
-	if (*maxlen < sizeof *e_dev) {
-		return ENOMEM;
-	}
-	*maxlen -= sizeof *e_dev;
-	return (copyout(e_dev, userp, sizeof *e_dev));
+	return (SYSCTL_OUT(req, e_dev, sizeof *e_dev));
 }
 
 
 int
-eisa_generic_externalize(p, kdc, userp, l)
-	struct proc *p;
-	struct kern_devconf *kdc;
-	void *userp;
-	size_t l;
+eisa_generic_externalize(struct kern_devconf *kdc, struct sysctl_req *req)
 {
-    return eisa_externalize(kdc->kdc_eisa, userp, &l);
+    return eisa_externalize(kdc->kdc_eisa, req);
 }
diff --git a/sys/dev/eisa/eisaconf.h b/sys/dev/eisa/eisaconf.h
index b76284681311..7d79d89dfdc7 100644
--- a/sys/dev/eisa/eisaconf.h
+++ b/sys/dev/eisa/eisaconf.h
@@ -18,7 +18,7 @@
  * 4. Modifications may be freely made to this file if the above conditions
  *    are met.
  *
- *	$Id: eisaconf.h,v 1.3 1995/11/05 04:42:50 gibbs Exp $
+ *	$Id: eisaconf.h,v 1.4 1995/11/06 05:21:01 gibbs Exp $
  */
 
 #ifndef _I386_EISA_EISACONF_H_
@@ -85,9 +85,10 @@ int eisa_reg_iospace __P((struct eisa_device *, u_long, int));
 int eisa_registerdev __P((struct eisa_device *, struct eisa_driver *, struct kern_devconf *));
 
 
-extern int eisa_externalize __P((struct eisa_device *, void *, size_t *));
+struct sysctl_req;
+int eisa_externalize (struct eisa_device *, struct sysctl_req*);
 
-extern int eisa_generic_externalize __P((struct proc *,struct kern_devconf *, void *, size_t));
+int eisa_generic_externalize (struct kern_devconf *, struct sysctl_req *);
 extern struct kern_devconf kdc_eisa0;
 
 #define EISA_EXTERNALLEN (sizeof(struct eisa_device))