Date: Sun, 6 Jan 2013 13:50:08 GMT From: Robert Watson <rwatson@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 219952 for review Message-ID: <201301061350.r06Do82G057887@skunkworks.freebsd.org>
index | next in thread | raw e-mail
http://p4web.freebsd.org/@@219952?ac=10 Change 219952 by rwatson@rwatson_zenith_cl_cam_ac_uk on 2013/01/06 13:49:33 Make different bus attachments for Altera and Terasice device drivers share the same devclass_t. Affected files ... .. //depot/projects/ctsrd/beribsd/src/sys/dev/altera/avgen/altera_avgen.c#9 edit .. //depot/projects/ctsrd/beribsd/src/sys/dev/altera/avgen/altera_avgen.h#5 edit .. //depot/projects/ctsrd/beribsd/src/sys/dev/altera/avgen/altera_avgen_fdt.c#3 edit .. //depot/projects/ctsrd/beribsd/src/sys/dev/altera/avgen/altera_avgen_nexus.c#3 edit .. //depot/projects/ctsrd/beribsd/src/sys/dev/altera/jtag_uart/altera_jtag_uart.h#7 edit .. //depot/projects/ctsrd/beribsd/src/sys/dev/altera/jtag_uart/altera_jtag_uart_cons.c#8 edit .. //depot/projects/ctsrd/beribsd/src/sys/dev/altera/jtag_uart/altera_jtag_uart_fdt.c#3 edit .. //depot/projects/ctsrd/beribsd/src/sys/dev/altera/jtag_uart/altera_jtag_uart_nexus.c#4 edit .. //depot/projects/ctsrd/beribsd/src/sys/dev/altera/sdcard/altera_sdcard.c#6 edit .. //depot/projects/ctsrd/beribsd/src/sys/dev/altera/sdcard/altera_sdcard.h#13 edit .. //depot/projects/ctsrd/beribsd/src/sys/dev/altera/sdcard/altera_sdcard_fdt.c#3 edit .. //depot/projects/ctsrd/beribsd/src/sys/dev/altera/sdcard/altera_sdcard_nexus.c#4 edit .. //depot/projects/ctsrd/beribsd/src/sys/dev/isf/isf.c#12 edit .. //depot/projects/ctsrd/beribsd/src/sys/dev/isf/isf.h#9 edit .. //depot/projects/ctsrd/beribsd/src/sys/dev/isf/isf_fdt.c#3 edit .. //depot/projects/ctsrd/beribsd/src/sys/dev/isf/isf_nexus.c#6 edit .. //depot/projects/ctsrd/beribsd/src/sys/dev/terasic/de4led/terasic_de4led.c#6 edit .. //depot/projects/ctsrd/beribsd/src/sys/dev/terasic/de4led/terasic_de4led.h#4 edit .. //depot/projects/ctsrd/beribsd/src/sys/dev/terasic/de4led/terasic_de4led_fdt.c#4 edit .. //depot/projects/ctsrd/beribsd/src/sys/dev/terasic/de4led/terasic_de4led_nexus.c#3 edit .. //depot/projects/ctsrd/beribsd/src/sys/dev/terasic/mtl/terasic_mtl.c#6 edit .. //depot/projects/ctsrd/beribsd/src/sys/dev/terasic/mtl/terasic_mtl.h#8 edit .. //depot/projects/ctsrd/beribsd/src/sys/dev/terasic/mtl/terasic_mtl_fdt.c#4 edit .. //depot/projects/ctsrd/beribsd/src/sys/dev/terasic/mtl/terasic_mtl_nexus.c#4 edit Differences ... ==== //depot/projects/ctsrd/beribsd/src/sys/dev/altera/avgen/altera_avgen.c#9 (text+ko) ==== @@ -60,6 +60,8 @@ * 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; ==== //depot/projects/ctsrd/beribsd/src/sys/dev/altera/avgen/altera_avgen.h#5 (text+ko) ==== @@ -82,4 +82,6 @@ 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_ */ ==== //depot/projects/ctsrd/beribsd/src/sys/dev/altera/avgen/altera_avgen_fdt.c#3 (text+ko) ==== @@ -150,7 +150,5 @@ sizeof(struct altera_avgen_softc), }; -static devclass_t altera_avgen_devclass; - DRIVER_MODULE(avgen, simplebus, altera_avgen_fdt_driver, altera_avgen_devclass, 0, 0); ==== //depot/projects/ctsrd/beribsd/src/sys/dev/altera/avgen/altera_avgen_nexus.c#3 (text+ko) ==== @@ -137,7 +137,5 @@ sizeof(struct altera_avgen_softc), }; -static devclass_t altera_avgen_devclass; - DRIVER_MODULE(avgen, nexus, altera_avgen_nexus_driver, altera_avgen_devclass, 0, 0); ==== //depot/projects/ctsrd/beribsd/src/sys/dev/altera/jtag_uart/altera_jtag_uart.h#7 (text+ko) ==== @@ -194,4 +194,6 @@ 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_ */ ==== //depot/projects/ctsrd/beribsd/src/sys/dev/altera/jtag_uart/altera_jtag_uart_cons.c#8 (text+ko) ==== @@ -32,6 +32,7 @@ __FBSDID("$FreeBSD: src/sys/dev/altera/jtag_uart/altera_jtag_uart_cons.c,v 1.2 2012/09/14 21:28:56 eadler Exp $"); #include <sys/param.h> +#include <sys/bus.h> #include <sys/cons.h> #include <sys/endian.h> #include <sys/kdb.h> @@ -46,6 +47,8 @@ #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 ==== //depot/projects/ctsrd/beribsd/src/sys/dev/altera/jtag_uart/altera_jtag_uart_fdt.c#3 (text+ko) ==== @@ -143,7 +143,5 @@ 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); ==== //depot/projects/ctsrd/beribsd/src/sys/dev/altera/jtag_uart/altera_jtag_uart_nexus.c#4 (text+ko) ==== @@ -137,7 +137,5 @@ 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); ==== //depot/projects/ctsrd/beribsd/src/sys/dev/altera/sdcard/altera_sdcard.c#6 (text+ko) ==== @@ -70,6 +70,7 @@ * 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) ==== //depot/projects/ctsrd/beribsd/src/sys/dev/altera/sdcard/altera_sdcard.h#13 (text+ko) ==== @@ -244,4 +244,6 @@ 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_ */ ==== //depot/projects/ctsrd/beribsd/src/sys/dev/altera/sdcard/altera_sdcard_fdt.c#3 (text+ko) ==== @@ -116,7 +116,5 @@ 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); ==== //depot/projects/ctsrd/beribsd/src/sys/dev/altera/sdcard/altera_sdcard_nexus.c#4 (text+ko) ==== @@ -110,7 +110,5 @@ 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); ==== //depot/projects/ctsrd/beribsd/src/sys/dev/isf/isf.c#12 (text+ko) ==== @@ -150,6 +150,7 @@ * physical package, due to variable block size support in the StrataFlash * part. */ +devclass_t isf_devclass; static uint16_t isf_read_reg(struct isf_softc *sc, uint16_t reg) ==== //depot/projects/ctsrd/beribsd/src/sys/dev/isf/isf.h#9 (text+ko) ==== @@ -87,6 +87,8 @@ int isf_attach(struct isf_softc *sc); void isf_detach(struct isf_softc *sc); + +extern devclass_t isf_devclass; #endif /* _KERNEL */ #endif /* _DEV_ISF_H_ */ ==== //depot/projects/ctsrd/beribsd/src/sys/dev/isf/isf_fdt.c#3 (text+ko) ==== @@ -121,6 +121,4 @@ sizeof(struct isf_softc), }; -static devclass_t isf_devclass; - DRIVER_MODULE(isf, simplebus, isf_fdt_driver, isf_devclass, 0, 0); ==== //depot/projects/ctsrd/beribsd/src/sys/dev/isf/isf_nexus.c#6 (text+ko) ==== @@ -115,6 +115,4 @@ sizeof(struct isf_softc), }; -static devclass_t isf_devclass; - DRIVER_MODULE(isf, nexus, isf_nexus_driver, isf_devclass, 0, 0); ==== //depot/projects/ctsrd/beribsd/src/sys/dev/terasic/de4led/terasic_de4led.c#6 (text+ko) ==== @@ -43,6 +43,8 @@ #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) { ==== //depot/projects/ctsrd/beribsd/src/sys/dev/terasic/de4led/terasic_de4led.h#4 (text+ko) ==== @@ -70,4 +70,6 @@ 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_ */ ==== //depot/projects/ctsrd/beribsd/src/sys/dev/terasic/de4led/terasic_de4led_fdt.c#4 (text+ko) ==== @@ -114,7 +114,5 @@ 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); ==== //depot/projects/ctsrd/beribsd/src/sys/dev/terasic/de4led/terasic_de4led_nexus.c#3 (text+ko) ==== @@ -106,7 +106,5 @@ 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); ==== //depot/projects/ctsrd/beribsd/src/sys/dev/terasic/mtl/terasic_mtl.c#6 (text+ko) ==== @@ -63,6 +63,9 @@ * 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) { ==== //depot/projects/ctsrd/beribsd/src/sys/dev/terasic/mtl/terasic_mtl.h#8 (text+ko) ==== @@ -159,6 +159,8 @@ 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. */ ==== //depot/projects/ctsrd/beribsd/src/sys/dev/terasic/mtl/terasic_mtl_fdt.c#4 (text+ko) ==== @@ -196,7 +196,5 @@ sizeof(struct terasic_mtl_softc), }; -static devclass_t terasic_mtl_devclass; - DRIVER_MODULE(mtl, simplebus, terasic_mtl_fdt_driver, terasic_mtl_devclass, 0, 0); ==== //depot/projects/ctsrd/beribsd/src/sys/dev/terasic/mtl/terasic_mtl_nexus.c#4 (text+ko) ==== @@ -190,7 +190,5 @@ sizeof(struct terasic_mtl_softc), }; -static devclass_t terasic_mtl_devclass; - DRIVER_MODULE(mtl, nexus, terasic_mtl_nexus_driver, terasic_mtl_devclass, 0, 0);help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201301061350.r06Do82G057887>