extern decl of cfdata from device.h conflicted with static one in-here

8 files changed, 31 insertions, 31 deletions

diff --git a/sys/arch/amiga/dev/grf.c b/sys/arch/amiga/dev/grf.c
index 2069c00a94e..3366f4ec3a6 100644
--- a/sys/arch/amiga/dev/grf.c
+++ b/sys/arch/amiga/dev/grf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: grf.c,v 1.6 1996/11/23 21:45:10 kstailey Exp $	*/
+/*	$OpenBSD: grf.c,v 1.7 1996/11/24 20:23:40 niklas Exp $	*/
 /*	$NetBSD: grf.c,v 1.27 1996/05/19 20:06:20 is Exp $	*/
 
 /*
@@ -113,7 +113,7 @@ struct cfdriver grf_cd = {
 /*
  * only used in console init.
  */
-static struct cfdata *cfdata;
+static struct cfdata *grf_cfdata;
 
 /*
  * match if the unit of grf matches its perspective 
@@ -128,7 +128,7 @@ grfmatch(pdp, match, auxp)
 
 	if (cfp->cf_unit != ((struct grf_softc *)pdp)->g_unit)
 		return(0);
-	cfdata = cfp;
+	grf_cfdata = cfp;
 	return(1);
 }
 
@@ -168,7 +168,7 @@ grfattach(pdp, dp, auxp)
 	/*
 	 * try and attach an ite
 	 */
-	amiga_config_found(cfdata, dp, gp, grfprint);
+	amiga_config_found(grf_cfdata, dp, gp, grfprint);
 }
 
 int
diff --git a/sys/arch/amiga/dev/grf_cc.c b/sys/arch/amiga/dev/grf_cc.c
index 0e9e409a3c0..94b68bfb9d3 100644
--- a/sys/arch/amiga/dev/grf_cc.c
+++ b/sys/arch/amiga/dev/grf_cc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: grf_cc.c,v 1.4 1996/11/23 21:45:10 kstailey Exp $	*/
+/*	$OpenBSD: grf_cc.c,v 1.5 1996/11/24 20:23:41 niklas Exp $	*/
 /*	$NetBSD: grf_cc.c,v 1.19 1996/04/21 21:11:08 veego Exp $	*/
 
 /*
@@ -77,7 +77,7 @@ struct cfdriver grfcc_cd = {
 /* 
  * only used in console init
  */
-static struct cfdata *cfdata;
+static struct cfdata *grfcc_cfdata;
 
 /*
  * we make sure to only init things once.  this is somewhat
@@ -110,7 +110,7 @@ grfccmatch(pdp, match, auxp)
 			return(0);
 		if (amiga_realconfig == 0) {
 			ccconunit = cfp->cf_unit;
-			cfdata = cfp;
+			grfcc_cfdata = cfp;
 		}
 	}
 	return(1);
@@ -152,7 +152,7 @@ grfccattach(pdp, dp, auxp)
 	/*
 	 * attach grf
 	 */
-	amiga_config_found(cfdata, &gp->g_device, gp, grfccprint);
+	amiga_config_found(grfcc_cfdata, &gp->g_device, gp, grfccprint);
 }
 
 int
diff --git a/sys/arch/amiga/dev/grf_cl.c b/sys/arch/amiga/dev/grf_cl.c
index c7a1e6aa06b..a3c01db9bcb 100644
--- a/sys/arch/amiga/dev/grf_cl.c
+++ b/sys/arch/amiga/dev/grf_cl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: grf_cl.c,v 1.7 1996/11/23 21:45:11 kstailey Exp $	*/
+/*	$OpenBSD: grf_cl.c,v 1.8 1996/11/24 20:23:42 niklas Exp $	*/
 /*      $NetBSD: grf_cl.c,v 1.11.4.1 1996/05/27 10:50:40 is Exp $        */
 
 /*
@@ -180,7 +180,7 @@ struct cfattach grfcl_ca = {
 struct cfdriver grfcl_cd = {
 	NULL, "grfcl", DV_DULL, NULL, 0
 };
-static struct cfdata *cfdata;
+static struct cfdata *grfcl_cfdata;
 
 int
 grfclmatch(pdp, match, auxp)
@@ -263,7 +263,7 @@ grfclmatch(pdp, match, auxp)
 
 #ifdef CL5426CONSOLE
 	if (amiga_realconfig == 0) {
-		cfdata = cfp;
+		grfcl_cfdata = cfp;
 	}
 #endif
 
@@ -321,7 +321,7 @@ grfclattach(pdp, dp, auxp)
 	/*
 	 * attach grf (once)
 	 */
-	if (amiga_config_found(cfdata, &gp->g_device, gp, grfclprint)) {
+	if (amiga_config_found(grfcl_cfdata, &gp->g_device, gp, grfclprint)) {
 		attachflag = 1;
 		printf("grfcl: %dMB ", cl_fbsize / 0x100000);
 		switch (cltype) {
diff --git a/sys/arch/amiga/dev/grf_cv.c b/sys/arch/amiga/dev/grf_cv.c
index d104c2891b9..b37595238c4 100644
--- a/sys/arch/amiga/dev/grf_cv.c
+++ b/sys/arch/amiga/dev/grf_cv.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: grf_cv.c,v 1.12 1996/11/23 21:45:13 kstailey Exp $	*/
+/*	$OpenBSD: grf_cv.c,v 1.13 1996/11/24 20:23:44 niklas Exp $	*/
 /*	$NetBSD: grf_cv.c,v 1.14 1996/05/19 21:05:27 veego Exp $	*/
 
 /*
@@ -267,7 +267,7 @@ struct cfattach grfcv_ca = {
 struct cfdriver grfcv_cd = {
 	NULL, "grfcv", DV_DULL, NULL, 0
 };
-static struct cfdata *cfdata;
+static struct cfdata *grfcv_cfdata;
 
 
 /*
@@ -332,7 +332,7 @@ grfcvmatch(pdp, match, auxp)
 #ifdef CV64CONSOLE
 	if (amiga_realconfig == 0) {
 		cvcons_unit = cfp->cf_unit;
-		cfdata = cfp;
+		grfcv_cfdata = cfp;
 	}
 #endif
 
@@ -400,7 +400,7 @@ grfcvattach(pdp, dp, auxp)
 	/*
 	 * attach grf
 	 */
-	if (amiga_config_found(cfdata, &gp->g_device, gp, grfcvprint)) {
+	if (amiga_config_found(grfcv_cfdata, &gp->g_device, gp, grfcvprint)) {
 		if (dp != NULL)
 			printf("grfcv: CyberVision64 with %dMB being used\n", cv_fbsize/0x100000);
 		attachflag = 1;
diff --git a/sys/arch/amiga/dev/grf_et.c b/sys/arch/amiga/dev/grf_et.c
index 0f48bafb3d8..968fe19114d 100644
--- a/sys/arch/amiga/dev/grf_et.c
+++ b/sys/arch/amiga/dev/grf_et.c
@@ -179,7 +179,7 @@ struct cfdriver grfet_cd = {
 	NULL, "grfet", DV_DULL, NULL, 0
 };
 
-static struct cfdata *cfdata;
+static struct cfdata *grfet_cfdata;
 
 int
 grfetmatch(pdp, match, auxp)
@@ -258,7 +258,7 @@ grfetmatch(pdp, match, auxp)
 
 #ifdef TSENGCONSOLE
 	if (amiga_realconfig == 0) {
-		cfdata = cfp;
+		grfet_cfdata = cfp;
 	}
 #endif
 
@@ -317,7 +317,7 @@ grfetattach(pdp, dp, auxp)
 	/*
 	 * attach grf (once)
 	 */
-	if (amiga_config_found(cfdata, &gp->g_device, gp, grfetprint)) {
+	if (amiga_config_found(grfet_cfdata, &gp->g_device, gp, grfetprint)) {
 		attachflag = 1;
 		printf("grfet: %dMB ", et_fbsize / 0x100000);
 		switch (ettype) {
diff --git a/sys/arch/amiga/dev/grf_rh.c b/sys/arch/amiga/dev/grf_rh.c
index 9044229085f..180929648d1 100644
--- a/sys/arch/amiga/dev/grf_rh.c
+++ b/sys/arch/amiga/dev/grf_rh.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: grf_rh.c,v 1.10 1996/11/23 21:45:15 kstailey Exp $	*/
+/*	$OpenBSD: grf_rh.c,v 1.11 1996/11/24 20:23:47 niklas Exp $	*/
 /*	$NetBSD: grf_rh.c,v 1.17.4.3 1996/09/06 00:40:22 jtc Exp $	*/
 
 /*
@@ -1536,7 +1536,7 @@ struct cfdriver grfrh_cd = {
 	NULL, "grfrh", DV_DULL, NULL, 0
 };
 
-static struct cfdata *cfdata;
+static struct cfdata *grfrh_cfdata;
 
 int
 grfrhmatch(pdp, match, auxp)
@@ -1571,7 +1571,7 @@ grfrhmatch(pdp, match, auxp)
 #ifdef RETINACONSOLE
 		if (amiga_realconfig == 0) {
 			rhconunit = cfp->cf_unit;
-			cfdata = cfp;
+			grfrh_cfdata = cfp;
 		}
 	}
 #endif
@@ -1614,7 +1614,7 @@ grfrhattach(pdp, dp, auxp)
 	/*
 	 * attach grf
 	 */
-	amiga_config_found(cfdata, &gp->g_device, gp, grfrhprint);
+	amiga_config_found(grfrh_cfdata, &gp->g_device, gp, grfrhprint);
 }
 
 int
diff --git a/sys/arch/amiga/dev/grf_rt.c b/sys/arch/amiga/dev/grf_rt.c
index 734a450b33b..5b8cf875a26 100644
--- a/sys/arch/amiga/dev/grf_rt.c
+++ b/sys/arch/amiga/dev/grf_rt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: grf_rt.c,v 1.8 1996/11/23 21:45:16 kstailey Exp $	*/
+/*	$OpenBSD: grf_rt.c,v 1.9 1996/11/24 20:23:48 niklas Exp $	*/
 /*	$NetBSD: grf_rt.c,v 1.27.4.1 1996/05/26 17:26:43 is Exp $	*/
 
 /*
@@ -792,7 +792,7 @@ struct cfdriver grfrt_cd = {
 /*
  * only used in console init
  */
-static struct cfdata *cfdata;
+static struct cfdata *grfrt_cfdata;
 
 /*
  * we make sure to only init things once.  this is somewhat
@@ -838,7 +838,7 @@ grfrtmatch(pdp, match, auxp)
 #ifdef RETINACONSOLE
 		if (amiga_realconfig == 0) {
 			rtconunit = cfp->cf_unit;
-			cfdata = cfp;
+			grfrt_cfdata = cfp;
 		}
 	}
 #endif
@@ -886,7 +886,7 @@ grfrtattach(pdp, dp, auxp)
 	/*
 	 * attach grf
 	 */
-	amiga_config_found(cfdata, &gp->g_device, gp, grfrtprint);
+	amiga_config_found(grfrt_cfdata, &gp->g_device, gp, grfrtprint);
 }
 
 int
diff --git a/sys/arch/amiga/dev/grf_ul.c b/sys/arch/amiga/dev/grf_ul.c
index e50d8e5cbab..e1b396dd37b 100644
--- a/sys/arch/amiga/dev/grf_ul.c
+++ b/sys/arch/amiga/dev/grf_ul.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: grf_ul.c,v 1.10 1996/11/23 21:45:17 kstailey Exp $	*/
+/*	$OpenBSD: grf_ul.c,v 1.11 1996/11/24 20:23:49 niklas Exp $	*/
 /*	$NetBSD: grf_ul.c,v 1.17 1996/05/09 20:31:25 is Exp $	*/
 
 #define UL_DEBUG
@@ -454,7 +454,7 @@ struct cfdriver grful_cd = {
 /*
  * only used in console init
  */
-static struct cfdata *cfdata;
+static struct cfdata *grful_cfdata;
 
 /*
  * we make sure to only init things once.  this is somewhat
@@ -497,7 +497,7 @@ grfulmatch(pdp, match, auxp)
 #ifdef ULOWELLCONSOLE 
 		if (amiga_realconfig == 0) {
 			ulconunit = cfp->cf_unit;
-			cfdata = cfp;
+			grful_cfdata = cfp;
 		} 
 	}
 #endif
@@ -566,7 +566,7 @@ grfulattach(pdp, dp, auxp)
 	/*
 	 * attach grf
 	 */
-	amiga_config_found(cfdata, &gp->g_device, gp, grfulprint);
+	amiga_config_found(grful_cfdata, &gp->g_device, gp, grfulprint);
 }
 
 int