Made all header files idempotent and moved incorrect common data from

headers into a related source file.  Also fixed a bug in ed_probe() where
it was possible to fall off the end of the function

8 files changed, 36 insertions, 8 deletions

diff --git a/sys/amd64/isa/isa.h b/sys/amd64/isa/isa.h
index 24dc5cd..3c982d7 100644
--- a/sys/amd64/isa/isa.h
+++ b/sys/amd64/isa/isa.h
@@ -34,9 +34,12 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa.h	5.7 (Berkeley) 5/9/91
- *	$Id$
+ *	$Id: isa.h,v 1.2 1993/10/16 13:45:57 rgrimes Exp $
  */
 
+#ifndef _I386_ISA_ISA_H_
+#define _I386_ISA_ISA_H_ 1
+
 /*
  * ISA Bus conventions
  */
@@ -178,3 +181,4 @@ int isa_irq_pending __P((struct isa_device *dvp));
 #define	WEITEK_FPU	0xC0000000	/* WTL 2167 */
 #define	CYRIX_EMC	0xC0000000	/* Cyrix EMC */
 #endif	COMPAQ_RAMRELOC
+#endif /* _I386_ISA_ISA_H_ */
diff --git a/sys/dev/ed/if_ed.c b/sys/dev/ed/if_ed.c
index 91eb929..5cbf73c 100644
--- a/sys/dev/ed/if_ed.c
+++ b/sys/dev/ed/if_ed.c
@@ -20,7 +20,7 @@
  */
 
 /*
- * $Id: if_ed.c,v 2.11 1993/10/23 04:21:03 davidg Exp davidg $
+ * $Id: if_ed.c,v 1.21 1993/10/23 04:52:41 davidg Exp $
  */
 
 /*
@@ -240,6 +240,8 @@ ed_probe(isa_dev)
 
 	if (nports = ed_probe_Novell(isa_dev))
 		return (nports);
+
+	return 0;		/* Added by GW: don't fall off the end */
 }
 
 /*
diff --git a/sys/i386/isa/if_ed.c b/sys/i386/isa/if_ed.c
index 91eb929..5cbf73c 100644
--- a/sys/i386/isa/if_ed.c
+++ b/sys/i386/isa/if_ed.c
@@ -20,7 +20,7 @@
  */
 
 /*
- * $Id: if_ed.c,v 2.11 1993/10/23 04:21:03 davidg Exp davidg $
+ * $Id: if_ed.c,v 1.21 1993/10/23 04:52:41 davidg Exp $
  */
 
 /*
@@ -240,6 +240,8 @@ ed_probe(isa_dev)
 
 	if (nports = ed_probe_Novell(isa_dev))
 		return (nports);
+
+	return 0;		/* Added by GW: don't fall off the end */
 }
 
 /*
diff --git a/sys/i386/isa/isa.h b/sys/i386/isa/isa.h
index 24dc5cd..3c982d7 100644
--- a/sys/i386/isa/isa.h
+++ b/sys/i386/isa/isa.h
@@ -34,9 +34,12 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa.h	5.7 (Berkeley) 5/9/91
- *	$Id$
+ *	$Id: isa.h,v 1.2 1993/10/16 13:45:57 rgrimes Exp $
  */
 
+#ifndef _I386_ISA_ISA_H_
+#define _I386_ISA_ISA_H_ 1
+
 /*
  * ISA Bus conventions
  */
@@ -178,3 +181,4 @@ int isa_irq_pending __P((struct isa_device *dvp));
 #define	WEITEK_FPU	0xC0000000	/* WTL 2167 */
 #define	CYRIX_EMC	0xC0000000	/* Cyrix EMC */
 #endif	COMPAQ_RAMRELOC
+#endif /* _I386_ISA_ISA_H_ */
diff --git a/sys/i386/isa/isa_device.h b/sys/i386/isa/isa_device.h
index 4405c70..d11f8b4 100644
--- a/sys/i386/isa/isa_device.h
+++ b/sys/i386/isa/isa_device.h
@@ -31,9 +31,12 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa_device.h	7.1 (Berkeley) 5/9/91
- *	$Id$
+ *	$Id: isa_device.h,v 1.2 1993/10/16 13:45:59 rgrimes Exp $
  */
 
+#ifndef _I386_ISA_ISA_DEVICE_H_
+#define _I386_ISA_ISA_DEVICE_H_ 1
+
 /*
  * ISA Bus Autoconfiguration
  */
@@ -72,3 +75,4 @@ extern struct isa_device isa_devtab_bio[], isa_devtab_tty[], isa_devtab_net[],
 		isa_devtab_null[];
 
 extern struct isa_device *find_isadev(/* table, driver, unit*/);
+#endif /* _I386_ISA_ISA_DEVICE_H_ */
diff --git a/sys/i386/isa/kbd.h b/sys/i386/isa/kbd.h
index 66e5224..b7b6009 100644
--- a/sys/i386/isa/kbd.h
+++ b/sys/i386/isa/kbd.h
@@ -1,9 +1,12 @@
 /*
  * Keyboard definitions
  *	from: unknown origin, 386BSD 0.1
- *	$Id$
+ *	$Id: kbd.h,v 1.2 1993/10/16 13:46:04 rgrimes Exp $
  */
 
+#ifndef _I386_ISA_KBD_H_
+#define _I386_ISA_KBD_H_ 1
+
 /* Reference:	IBM AT Technical Reference Manual, 
  * pp. 1-38 to 1-43, 4-3 to 4-22 
  */
@@ -50,3 +53,4 @@
 #define KBR_BATFAIL	0xFC	/* BAT failed */
 #define KBR_DIAGFAIL	0xFD	/* Diagnostic failed response */
 #define	KBR_RESEND	0xFE	/* Keyboard needs resend of command */
+#endif /* _I386_ISA_KBD_H_ */
diff --git a/sys/i386/isa/rtc.h b/sys/i386/isa/rtc.h
index 3f7b4c2..12d81b3 100644
--- a/sys/i386/isa/rtc.h
+++ b/sys/i386/isa/rtc.h
@@ -34,9 +34,12 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)rtc.h	7.1 (Berkeley) 5/12/91
- *	$Id$
+ *	$Id: rtc.h,v 1.2 1993/10/16 13:46:16 rgrimes Exp $
  */
 
+#ifndef _I386_ISA_RTC_H_
+#define _I386_ISA_RTC_H_ 1
+
 /*
  * RTC Register locations
  */
@@ -84,3 +87,4 @@
 #define RTC_EXTHI	0x18	/* low byte of extended mem size */
 
 #define RTC_CENTURY	0x32	/* current century - please increment in Dec99*/
+#endif /* _I386_ISA_RTC_H_ */
diff --git a/sys/isa/rtc.h b/sys/isa/rtc.h
index 3f7b4c2..12d81b3 100644
--- a/sys/isa/rtc.h
+++ b/sys/isa/rtc.h
@@ -34,9 +34,12 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)rtc.h	7.1 (Berkeley) 5/12/91
- *	$Id$
+ *	$Id: rtc.h,v 1.2 1993/10/16 13:46:16 rgrimes Exp $
  */
 
+#ifndef _I386_ISA_RTC_H_
+#define _I386_ISA_RTC_H_ 1
+
 /*
  * RTC Register locations
  */
@@ -84,3 +87,4 @@
 #define RTC_EXTHI	0x18	/* low byte of extended mem size */
 
 #define RTC_CENTURY	0x32	/* current century - please increment in Dec99*/
+#endif /* _I386_ISA_RTC_H_ */