3 files changed, 3 insertions, 84 deletions

diff --git a/sys/amd64/isa/isa.c b/sys/amd64/isa/isa.c
index 7eeda5d694a4..21d653ba083b 100644
--- a/sys/amd64/isa/isa.c
+++ b/sys/amd64/isa/isa.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa.c	7.2 (Berkeley) 5/13/91
- *	$Id: isa.c,v 1.53 1995/10/22 15:07:43 bde Exp $
+ *	$Id: isa.c,v 1.54 1995/10/31 21:03:57 peter Exp $
  */
 
 /*
@@ -241,10 +241,6 @@ haveseen(dvp, tmpdvp, checkbits)
  * Search through all the isa_devtab_* tables looking for anything that
  * conflicts with the current device.
  */
-#include "eisa.h"
-#if NEISA > 0
-extern struct isa_device isa_devtab_eisa[];
-#endif
 
 int
 haveseen_isadev(dvp, checkbits)
@@ -274,13 +270,6 @@ haveseen_isadev(dvp, checkbits)
 		if (status)
 			return status;
 	}
-#if NEISA > 0
-	for (tmpdvp = isa_devtab_eisa; tmpdvp->id_driver; tmpdvp++) {
-		status |= haveseen(dvp, tmpdvp, checkbits);
-		if (status)
-			return status;
-	}
-#endif
 	return(status);
 }
 
@@ -530,27 +519,6 @@ isa_externalize(struct isa_device *id, void *userp, size_t *maxlen)
 }
 
 /*
- * Do the same thing for EISA information.  EISA information is currently
- * the same as ISA information plus a slot number, but could be extended in
- * the future.
- */
-int
-eisa_externalize(struct isa_device *id, int slot, void *userp, size_t *maxlen)
-{
-	int rv;
-
-	if(*maxlen < (sizeof *id) + (sizeof slot)) {
-		return ENOMEM;
-	}
-	*maxlen -= (sizeof *id) + (sizeof slot);
-
-	rv = copyout(id, userp, sizeof *id);
-	if(rv) return rv;
-
-	return copyout(&slot, (char *)userp + sizeof *id, sizeof slot);
-}
-
-/*
  * This is used to forcibly reconfigure an ISA device.  It currently just
  * returns an error 'cos you can't do that yet.  It is here to demonstrate
  * what the `internalize' routine is supposed to do.
@@ -584,13 +552,6 @@ isa_generic_externalize(struct proc *p, struct kern_devconf *kdc,
 	return isa_externalize(kdc->kdc_isa, userp, &l);
 }
 
-int
-eisa_generic_externalize(struct proc *p, struct kern_devconf *kdc,
-			 void *userp, size_t l)
-{
-	return eisa_externalize(kdc->kdc_isa, -1, userp, &l);
-}
-
 /*
  * Fill in default interrupt table (in case of spuruious interrupt
  * during configuration of kernel, setup interrupt control unit
diff --git a/sys/i386/isa/isa.c b/sys/i386/isa/isa.c
index 7eeda5d694a4..21d653ba083b 100644
--- a/sys/i386/isa/isa.c
+++ b/sys/i386/isa/isa.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa.c	7.2 (Berkeley) 5/13/91
- *	$Id: isa.c,v 1.53 1995/10/22 15:07:43 bde Exp $
+ *	$Id: isa.c,v 1.54 1995/10/31 21:03:57 peter Exp $
  */
 
 /*
@@ -241,10 +241,6 @@ haveseen(dvp, tmpdvp, checkbits)
  * Search through all the isa_devtab_* tables looking for anything that
  * conflicts with the current device.
  */
-#include "eisa.h"
-#if NEISA > 0
-extern struct isa_device isa_devtab_eisa[];
-#endif
 
 int
 haveseen_isadev(dvp, checkbits)
@@ -274,13 +270,6 @@ haveseen_isadev(dvp, checkbits)
 		if (status)
 			return status;
 	}
-#if NEISA > 0
-	for (tmpdvp = isa_devtab_eisa; tmpdvp->id_driver; tmpdvp++) {
-		status |= haveseen(dvp, tmpdvp, checkbits);
-		if (status)
-			return status;
-	}
-#endif
 	return(status);
 }
 
@@ -530,27 +519,6 @@ isa_externalize(struct isa_device *id, void *userp, size_t *maxlen)
 }
 
 /*
- * Do the same thing for EISA information.  EISA information is currently
- * the same as ISA information plus a slot number, but could be extended in
- * the future.
- */
-int
-eisa_externalize(struct isa_device *id, int slot, void *userp, size_t *maxlen)
-{
-	int rv;
-
-	if(*maxlen < (sizeof *id) + (sizeof slot)) {
-		return ENOMEM;
-	}
-	*maxlen -= (sizeof *id) + (sizeof slot);
-
-	rv = copyout(id, userp, sizeof *id);
-	if(rv) return rv;
-
-	return copyout(&slot, (char *)userp + sizeof *id, sizeof slot);
-}
-
-/*
  * This is used to forcibly reconfigure an ISA device.  It currently just
  * returns an error 'cos you can't do that yet.  It is here to demonstrate
  * what the `internalize' routine is supposed to do.
@@ -584,13 +552,6 @@ isa_generic_externalize(struct proc *p, struct kern_devconf *kdc,
 	return isa_externalize(kdc->kdc_isa, userp, &l);
 }
 
-int
-eisa_generic_externalize(struct proc *p, struct kern_devconf *kdc,
-			 void *userp, size_t l)
-{
-	return eisa_externalize(kdc->kdc_isa, -1, userp, &l);
-}
-
 /*
  * Fill in default interrupt table (in case of spuruious interrupt
  * during configuration of kernel, setup interrupt control unit
diff --git a/sys/i386/isa/isa_device.h b/sys/i386/isa/isa_device.h
index d201daec70a5..3ce038583782 100644
--- a/sys/i386/isa/isa_device.h
+++ b/sys/i386/isa/isa_device.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa_device.h	7.1 (Berkeley) 5/9/91
- *	$Id: isa_device.h,v 1.23 1995/05/11 07:41:52 jkh Exp $
+ *	$Id: isa_device.h,v 1.24 1995/09/10 21:35:10 bde Exp $
  */
 
 #ifndef _I386_ISA_ISA_DEVICE_H_
@@ -110,7 +110,6 @@ struct isa_driver {
 };
 
 #define ISA_EXTERNALLEN (sizeof(struct isa_device))
-#define EISA_EXTERNALLEN (sizeof(struct isa_device) + sizeof(int))
 
 #ifdef KERNEL
 
@@ -159,11 +158,9 @@ int update_intr_masks __P((void));
 
 extern int isa_externalize(struct isa_device *, void *, size_t *);
 extern int isa_internalize(struct isa_device *, void **, size_t *);
-extern int eisa_externalize(struct isa_device *, int, void *, size_t *);
 
 struct kern_devconf;
 extern int isa_generic_externalize(struct proc *, struct kern_devconf *, void *, size_t);
-extern int eisa_generic_externalize(struct proc *,struct kern_devconf *, void *, size_t);
 extern struct kern_devconf kdc_isa0;
 #endif /* KERNEL */