diff options
author | rwatson <rwatson@FreeBSD.org> | 2013-01-13 16:57:11 +0000 |
---|---|---|
committer | rwatson <rwatson@FreeBSD.org> | 2013-01-13 16:57:11 +0000 |
commit | 247875210d7ec5d2e7810928c3c2fcfcbd68aa39 (patch) | |
tree | d188388bf21575a35eb67a05d08585127e2d3917 /sys/dev/altera | |
parent | d4d853b37bcd2c8c7506b0a6e69457e99855f244 (diff) | |
download | FreeBSD-src-247875210d7ec5d2e7810928c3c2fcfcbd68aa39.zip FreeBSD-src-247875210d7ec5d2e7810928c3c2fcfcbd68aa39.tar.gz |
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
Diffstat (limited to 'sys/dev/altera')
-rw-r--r-- | sys/dev/altera/avgen/altera_avgen.c | 2 | ||||
-rw-r--r-- | sys/dev/altera/avgen/altera_avgen.h | 2 | ||||
-rw-r--r-- | sys/dev/altera/avgen/altera_avgen_fdt.c | 2 | ||||
-rw-r--r-- | sys/dev/altera/avgen/altera_avgen_nexus.c | 2 | ||||
-rw-r--r-- | sys/dev/altera/jtag_uart/altera_jtag_uart.h | 2 | ||||
-rw-r--r-- | sys/dev/altera/jtag_uart/altera_jtag_uart_cons.c | 3 | ||||
-rw-r--r-- | sys/dev/altera/jtag_uart/altera_jtag_uart_fdt.c | 2 | ||||
-rw-r--r-- | sys/dev/altera/jtag_uart/altera_jtag_uart_nexus.c | 2 | ||||
-rw-r--r-- | sys/dev/altera/sdcard/altera_sdcard.c | 1 | ||||
-rw-r--r-- | sys/dev/altera/sdcard/altera_sdcard.h | 2 | ||||
-rw-r--r-- | sys/dev/altera/sdcard/altera_sdcard_fdt.c | 2 | ||||
-rw-r--r-- | sys/dev/altera/sdcard/altera_sdcard_nexus.c | 2 |
12 files changed, 12 insertions, 12 deletions
diff --git a/sys/dev/altera/avgen/altera_avgen.c b/sys/dev/altera/avgen/altera_avgen.c index d9d5017..5429c9d 100644 --- a/sys/dev/altera/avgen/altera_avgen.c +++ b/sys/dev/altera/avgen/altera_avgen.c @@ -60,6 +60,8 @@ __FBSDID("$FreeBSD$"); * system-on-chip bus environments would work fine with the same code. */ +devclass_t altera_avgen_devclass; + static d_mmap_t altera_avgen_mmap; static d_read_t altera_avgen_read; static d_write_t altera_avgen_write; diff --git a/sys/dev/altera/avgen/altera_avgen.h b/sys/dev/altera/avgen/altera_avgen.h index f49ec23..fb25a3c 100644 --- a/sys/dev/altera/avgen/altera_avgen.h +++ b/sys/dev/altera/avgen/altera_avgen.h @@ -82,4 +82,6 @@ int altera_avgen_attach(struct altera_avgen_softc *sc, const char *str_devname, int devunit); void altera_avgen_detach(struct altera_avgen_softc *sc); +extern devclass_t altera_avgen_devclass; + #endif /* _DEV_ALTERA_AVALON_H_ */ diff --git a/sys/dev/altera/avgen/altera_avgen_fdt.c b/sys/dev/altera/avgen/altera_avgen_fdt.c index 226d69e..2762ff4 100644 --- a/sys/dev/altera/avgen/altera_avgen_fdt.c +++ b/sys/dev/altera/avgen/altera_avgen_fdt.c @@ -150,7 +150,5 @@ static driver_t altera_avgen_fdt_driver = { sizeof(struct altera_avgen_softc), }; -static devclass_t altera_avgen_devclass; - DRIVER_MODULE(avgen, simplebus, altera_avgen_fdt_driver, altera_avgen_devclass, 0, 0); diff --git a/sys/dev/altera/avgen/altera_avgen_nexus.c b/sys/dev/altera/avgen/altera_avgen_nexus.c index 38dd446..d0e4f9b 100644 --- a/sys/dev/altera/avgen/altera_avgen_nexus.c +++ b/sys/dev/altera/avgen/altera_avgen_nexus.c @@ -137,7 +137,5 @@ static driver_t altera_avgen_nexus_driver = { sizeof(struct altera_avgen_softc), }; -static devclass_t altera_avgen_devclass; - DRIVER_MODULE(avgen, nexus, altera_avgen_nexus_driver, altera_avgen_devclass, 0, 0); diff --git a/sys/dev/altera/jtag_uart/altera_jtag_uart.h b/sys/dev/altera/jtag_uart/altera_jtag_uart.h index 1ff3bcb..5b5b29f 100644 --- a/sys/dev/altera/jtag_uart/altera_jtag_uart.h +++ b/sys/dev/altera/jtag_uart/altera_jtag_uart.h @@ -194,4 +194,6 @@ extern u_int aju_cons_jtag_missed; int altera_jtag_uart_attach(struct altera_jtag_uart_softc *sc); void altera_jtag_uart_detach(struct altera_jtag_uart_softc *sc); +extern devclass_t altera_jtag_uart_devclass; + #endif /* _DEV_ALTERA_JTAG_UART_H_ */ diff --git a/sys/dev/altera/jtag_uart/altera_jtag_uart_cons.c b/sys/dev/altera/jtag_uart/altera_jtag_uart_cons.c index 679ebe2..ae84597 100644 --- a/sys/dev/altera/jtag_uart/altera_jtag_uart_cons.c +++ b/sys/dev/altera/jtag_uart/altera_jtag_uart_cons.c @@ -32,6 +32,7 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> +#include <sys/bus.h> #include <sys/cons.h> #include <sys/endian.h> #include <sys/kdb.h> @@ -46,6 +47,8 @@ __FBSDID("$FreeBSD$"); #include <dev/altera/jtag_uart/altera_jtag_uart.h> +devclass_t altera_jtag_uart_devclass; + /* * One-byte buffer as we can't check whether the UART is readable without * actually reading from it, synchronised by a spinlock; this lock also diff --git a/sys/dev/altera/jtag_uart/altera_jtag_uart_fdt.c b/sys/dev/altera/jtag_uart/altera_jtag_uart_fdt.c index 2b1e38d..47f39a4 100644 --- a/sys/dev/altera/jtag_uart/altera_jtag_uart_fdt.c +++ b/sys/dev/altera/jtag_uart/altera_jtag_uart_fdt.c @@ -143,7 +143,5 @@ static driver_t altera_jtag_uart_fdt_driver = { sizeof(struct altera_jtag_uart_softc), }; -static devclass_t altera_jtag_uart_devclass; - DRIVER_MODULE(altera_jtag_uart, simplebus, altera_jtag_uart_fdt_driver, altera_jtag_uart_devclass, 0, 0); diff --git a/sys/dev/altera/jtag_uart/altera_jtag_uart_nexus.c b/sys/dev/altera/jtag_uart/altera_jtag_uart_nexus.c index 2592249..2fe772a 100644 --- a/sys/dev/altera/jtag_uart/altera_jtag_uart_nexus.c +++ b/sys/dev/altera/jtag_uart/altera_jtag_uart_nexus.c @@ -137,7 +137,5 @@ static driver_t altera_jtag_uart_nexus_driver = { sizeof(struct altera_jtag_uart_softc), }; -static devclass_t altera_jtag_uart_devclass; - DRIVER_MODULE(altera_jtag_uart, nexus, altera_jtag_uart_nexus_driver, altera_jtag_uart_devclass, 0, 0); diff --git a/sys/dev/altera/sdcard/altera_sdcard.c b/sys/dev/altera/sdcard/altera_sdcard.c index 4572206..f64b9c5 100644 --- a/sys/dev/altera/sdcard/altera_sdcard.c +++ b/sys/dev/altera/sdcard/altera_sdcard.c @@ -70,6 +70,7 @@ __FBSDID("$FreeBSD$"); * 3. Handle read-only SD Cards. * 4. Tune timeouts based on real-world SD Card speeds. */ +devclass_t altera_sdcard_devclass; void altera_sdcard_attach(struct altera_sdcard_softc *sc) diff --git a/sys/dev/altera/sdcard/altera_sdcard.h b/sys/dev/altera/sdcard/altera_sdcard.h index 4a491c4..a0029a8 100644 --- a/sys/dev/altera/sdcard/altera_sdcard.h +++ b/sys/dev/altera/sdcard/altera_sdcard.h @@ -244,4 +244,6 @@ void altera_sdcard_start(struct altera_sdcard_softc *sc); void altera_sdcard_disk_insert(struct altera_sdcard_softc *sc); void altera_sdcard_disk_remove(struct altera_sdcard_softc *sc); +extern devclass_t altera_sdcard_devclass; + #endif /* _DEV_ALTERA_SDCARD_H_ */ diff --git a/sys/dev/altera/sdcard/altera_sdcard_fdt.c b/sys/dev/altera/sdcard/altera_sdcard_fdt.c index ca7be1c..027ca2d 100644 --- a/sys/dev/altera/sdcard/altera_sdcard_fdt.c +++ b/sys/dev/altera/sdcard/altera_sdcard_fdt.c @@ -116,7 +116,5 @@ static driver_t altera_sdcard_fdt_driver = { sizeof(struct altera_sdcard_softc), }; -static devclass_t altera_sdcard_devclass; - DRIVER_MODULE(altera_sdcard, simplebus, altera_sdcard_fdt_driver, altera_sdcard_devclass, 0, 0); diff --git a/sys/dev/altera/sdcard/altera_sdcard_nexus.c b/sys/dev/altera/sdcard/altera_sdcard_nexus.c index e0fddcb..88abe1f 100644 --- a/sys/dev/altera/sdcard/altera_sdcard_nexus.c +++ b/sys/dev/altera/sdcard/altera_sdcard_nexus.c @@ -110,7 +110,5 @@ static driver_t altera_sdcard_nexus_driver = { sizeof(struct altera_sdcard_softc), }; -static devclass_t altera_sdcard_devclass; - DRIVER_MODULE(altera_sdcard, nexus, altera_sdcard_nexus_driver, altera_sdcard_devclass, 0, 0); |