Merge Perforce changeset 219952 to head:

  Make different bus attachments for Altera and Terasice
  device drivers share the same devclass_t.

Sponsored by:	DARPA, AFRL

8 files changed, 9 insertions, 8 deletions

diff --git a/sys/dev/terasic/de4led/terasic_de4led.c b/sys/dev/terasic/de4led/terasic_de4led.c
index 1fb92d2..bcef7af 100644
--- a/sys/dev/terasic/de4led/terasic_de4led.c
+++ b/sys/dev/terasic/de4led/terasic_de4led.c
@@ -43,6 +43,8 @@ __FBSDID("$FreeBSD$");
 #include <dev/led/led.h>
 #include <dev/terasic/de4led/terasic_de4led.h>
 
+devclass_t	terasic_de4led_devclass;
+
 static void
 terasic_de4led_update(struct terasic_de4led_softc *sc)
 {
diff --git a/sys/dev/terasic/de4led/terasic_de4led.h b/sys/dev/terasic/de4led/terasic_de4led.h
index 89461d1..4475e9b 100644
--- a/sys/dev/terasic/de4led/terasic_de4led.h
+++ b/sys/dev/terasic/de4led/terasic_de4led.h
@@ -72,4 +72,6 @@ struct terasic_de4led_softc {
 void	terasic_de4led_attach(struct terasic_de4led_softc *sc);
 void	terasic_de4led_detach(struct terasic_de4led_softc *sc);
 
+extern devclass_t	terasic_de4led_devclass;
+
 #endif /* _DEV_TERASIC_DE4LED_H_ */
diff --git a/sys/dev/terasic/de4led/terasic_de4led_fdt.c b/sys/dev/terasic/de4led/terasic_de4led_fdt.c
index d3c50b1..0888d6d 100644
--- a/sys/dev/terasic/de4led/terasic_de4led_fdt.c
+++ b/sys/dev/terasic/de4led/terasic_de4led_fdt.c
@@ -114,7 +114,5 @@ static driver_t terasic_de4led_fdt_driver = {
 	sizeof(struct terasic_de4led_softc),
 };
 
-static devclass_t terasic_de4led_devclass;
-
 DRIVER_MODULE(terasic_de4led, simplebus, terasic_de4led_fdt_driver,
     terasic_de4led_devclass, 0, 0);
diff --git a/sys/dev/terasic/de4led/terasic_de4led_nexus.c b/sys/dev/terasic/de4led/terasic_de4led_nexus.c
index 92da503..870d412 100644
--- a/sys/dev/terasic/de4led/terasic_de4led_nexus.c
+++ b/sys/dev/terasic/de4led/terasic_de4led_nexus.c
@@ -106,7 +106,5 @@ static driver_t terasic_de4led_nexus_driver = {
 	sizeof(struct terasic_de4led_softc),
 };
 
-static devclass_t terasic_de4led_devclass;
-
 DRIVER_MODULE(terasic_de4led, nexus, terasic_de4led_nexus_driver,
     terasic_de4led_devclass, 0, 0);
diff --git a/sys/dev/terasic/mtl/terasic_mtl.c b/sys/dev/terasic/mtl/terasic_mtl.c
index 48e60c7..5305172 100644
--- a/sys/dev/terasic/mtl/terasic_mtl.c
+++ b/sys/dev/terasic/mtl/terasic_mtl.c
@@ -63,6 +63,9 @@ __FBSDID("$FreeBSD$");
  * attached as they may be called even if the attach routine hasn't been, on
  * an error.
  */
+
+devclass_t	terasic_mtl_devclass;
+
 int
 terasic_mtl_attach(struct terasic_mtl_softc *sc)
 {
diff --git a/sys/dev/terasic/mtl/terasic_mtl.h b/sys/dev/terasic/mtl/terasic_mtl.h
index ae41067..e07bbf4 100644
--- a/sys/dev/terasic/mtl/terasic_mtl.h
+++ b/sys/dev/terasic/mtl/terasic_mtl.h
@@ -159,6 +159,8 @@ struct terasic_mtl_softc {
 int	terasic_mtl_attach(struct terasic_mtl_softc *sc);
 void	terasic_mtl_detach(struct terasic_mtl_softc *sc);
 
+extern devclass_t	terasic_mtl_devclass;
+
 /*
  * Sub-driver setup routines.
  */
diff --git a/sys/dev/terasic/mtl/terasic_mtl_fdt.c b/sys/dev/terasic/mtl/terasic_mtl_fdt.c
index 82fa720..7ffffb2 100644
--- a/sys/dev/terasic/mtl/terasic_mtl_fdt.c
+++ b/sys/dev/terasic/mtl/terasic_mtl_fdt.c
@@ -196,7 +196,5 @@ static driver_t terasic_mtl_fdt_driver = {
 	sizeof(struct terasic_mtl_softc),
 };
 
-static devclass_t terasic_mtl_devclass;
-
 DRIVER_MODULE(mtl, simplebus, terasic_mtl_fdt_driver, terasic_mtl_devclass, 0,
     0);
diff --git a/sys/dev/terasic/mtl/terasic_mtl_nexus.c b/sys/dev/terasic/mtl/terasic_mtl_nexus.c
index 4a6f2ba..2dff7db 100644
--- a/sys/dev/terasic/mtl/terasic_mtl_nexus.c
+++ b/sys/dev/terasic/mtl/terasic_mtl_nexus.c
@@ -190,7 +190,5 @@ static driver_t terasic_mtl_nexus_driver = {
 	sizeof(struct terasic_mtl_softc),
 };
 
-static devclass_t terasic_mtl_devclass;
-
 DRIVER_MODULE(mtl, nexus, terasic_mtl_nexus_driver, terasic_mtl_devclass, 0,
     0);