From 6299b067d045b0a710fe6e9e1d134f1028679c7f Mon Sep 17 00:00:00 2001
From: joerg <joerg@FreeBSD.org>
Date: Thu, 13 Mar 1997 18:04:05 +0000
Subject: [PATCH] Various stylistic improvements regarding num_eisa_slots &
 co.:

. properly declare the variable in in a .h file, as opposed to
  using a private extern declaration in userconfig.c;
. move the definition of EISA_SLOTS and therefore the inclusion of
  opt_eisa.h into eisaconf.c.
---
 sys/dev/eisa/eisaconf.c    | 10 ++++++++--
 sys/dev/eisa/eisaconf.h    |  8 ++------
 sys/i386/eisa/eisaconf.c   | 10 ++++++++--
 sys/i386/eisa/eisaconf.h   |  8 ++------
 sys/i386/i386/userconfig.c | 11 +++++++----
 5 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/sys/dev/eisa/eisaconf.c b/sys/dev/eisa/eisaconf.c
index 657b9b3be9ce..4c0900569a49 100644
--- a/sys/dev/eisa/eisaconf.c
+++ b/sys/dev/eisa/eisaconf.c
@@ -28,8 +28,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: eisaconf.c,v 1.26 1997/02/22 09:32:02 peter Exp $
  */
+
+#include "opt_eisa.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
@@ -96,7 +99,10 @@ static struct {
 #define	MAX_COL 80
 } reg_state;
 
-/* XXX Global variable, so UserConfig can change it. */
+/* Global variable, so UserConfig can change it. */
+#ifndef EISA_SLOTS
+#define EISA_SLOTS 10   /* PCI clashes with higher ones.. fix later */
+#endif
 int num_eisa_slots = EISA_SLOTS;
 		
 /*
diff --git a/sys/dev/eisa/eisaconf.h b/sys/dev/eisa/eisaconf.h
index a9921136a58a..38cfa94c3db8 100644
--- a/sys/dev/eisa/eisaconf.h
+++ b/sys/dev/eisa/eisaconf.h
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: eisaconf.h,v 1.14 1997/02/22 09:32:03 peter Exp $
+ *	$Id: eisaconf.h,v 1.15 1997/03/12 17:41:24 joerg Exp $
  */
 
 #ifndef _I386_EISA_EISACONF_H_
@@ -36,11 +36,6 @@
 
 #include <sys/queue.h>
 
-#include "opt_eisa.h"
-
-#ifndef EISA_SLOTS
-#define EISA_SLOTS 10   /* PCI clashes with higher ones.. fix later */
-#endif
 #define EISA_SLOT_SIZE 0x1000
 
 #define EISA_MFCTR_CHAR0(ID) (char)(((ID>>26) & 0x1F) | '@')  /* Bits 26-30 */
@@ -51,6 +46,7 @@
 #define EISA_REVISION_ID(ID) (u_char)(ID & 0x0F)              /* Bits  0-3  */
 
 extern struct linker_set eisadriver_set;
+extern int num_eisa_slots;
 
 typedef u_int32_t eisa_id_t;
 
diff --git a/sys/i386/eisa/eisaconf.c b/sys/i386/eisa/eisaconf.c
index 657b9b3be9ce..4c0900569a49 100644
--- a/sys/i386/eisa/eisaconf.c
+++ b/sys/i386/eisa/eisaconf.c
@@ -28,8 +28,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: eisaconf.c,v 1.26 1997/02/22 09:32:02 peter Exp $
  */
+
+#include "opt_eisa.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
@@ -96,7 +99,10 @@ static struct {
 #define	MAX_COL 80
 } reg_state;
 
-/* XXX Global variable, so UserConfig can change it. */
+/* Global variable, so UserConfig can change it. */
+#ifndef EISA_SLOTS
+#define EISA_SLOTS 10   /* PCI clashes with higher ones.. fix later */
+#endif
 int num_eisa_slots = EISA_SLOTS;
 		
 /*
diff --git a/sys/i386/eisa/eisaconf.h b/sys/i386/eisa/eisaconf.h
index a9921136a58a..38cfa94c3db8 100644
--- a/sys/i386/eisa/eisaconf.h
+++ b/sys/i386/eisa/eisaconf.h
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: eisaconf.h,v 1.14 1997/02/22 09:32:03 peter Exp $
+ *	$Id: eisaconf.h,v 1.15 1997/03/12 17:41:24 joerg Exp $
  */
 
 #ifndef _I386_EISA_EISACONF_H_
@@ -36,11 +36,6 @@
 
 #include <sys/queue.h>
 
-#include "opt_eisa.h"
-
-#ifndef EISA_SLOTS
-#define EISA_SLOTS 10   /* PCI clashes with higher ones.. fix later */
-#endif
 #define EISA_SLOT_SIZE 0x1000
 
 #define EISA_MFCTR_CHAR0(ID) (char)(((ID>>26) & 0x1F) | '@')  /* Bits 26-30 */
@@ -51,6 +46,7 @@
 #define EISA_REVISION_ID(ID) (u_char)(ID & 0x0F)              /* Bits  0-3  */
 
 extern struct linker_set eisadriver_set;
+extern int num_eisa_slots;
 
 typedef u_int32_t eisa_id_t;
 
diff --git a/sys/i386/i386/userconfig.c b/sys/i386/i386/userconfig.c
index 90066548bad5..96a54c832a55 100644
--- a/sys/i386/i386/userconfig.c
+++ b/sys/i386/i386/userconfig.c
@@ -46,7 +46,7 @@
  ** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  ** THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  **
- **      $Id: userconfig.c,v 1.83 1997/02/22 09:32:59 peter Exp $
+ **      $Id: userconfig.c,v 1.84 1997/03/11 07:11:46 msmith Exp $
  **/
 
 /**
@@ -2358,7 +2358,7 @@ visuserconfig(void)
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: userconfig.c,v 1.83 1997/02/22 09:32:59 peter Exp $
+ *      $Id: userconfig.c,v 1.84 1997/03/11 07:11:46 msmith Exp $
  */
 
 #include "scbus.h"
@@ -2418,11 +2418,14 @@ static int introfunc(CmdParm *);
 
 static int lineno;
 
-/* XXX hack */
 #include "eisa.h"
+
 #if NEISA > 0
-extern int num_eisa_slots;
+
+#include <i386/eisa/eisaconf.h>
+
 static int set_num_eisa_slots(CmdParm *);
+
 #endif /* NEISA > 0 */
 
 static CmdParm addr_parms[] = {