From owner-svn-src-all@FreeBSD.ORG Sun Jan 13 16:57:16 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id A8777F75; Sun, 13 Jan 2013 16:57:16 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 83377F06; Sun, 13 Jan 2013 16:57:16 +0000 (UTC) Received: from svn.freebsd.org (svn.FreeBSD.org [8.8.178.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0DGvGxL020368; Sun, 13 Jan 2013 16:57:16 GMT (envelope-from rwatson@svn.freebsd.org) Received: (from rwatson@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0DGvBL0020335; Sun, 13 Jan 2013 16:57:11 GMT (envelope-from rwatson@svn.freebsd.org) Message-Id: <201301131657.r0DGvBL0020335@svn.freebsd.org> From: Robert Watson Date: Sun, 13 Jan 2013 16:57:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r245380 - in head/sys/dev: altera/avgen altera/jtag_uart altera/sdcard isf terasic/de4led terasic/mtl X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Jan 2013 16:57:16 -0000 Author: rwatson Date: Sun Jan 13 16:57:11 2013 New Revision: 245380 URL: http://svnweb.freebsd.org/changeset/base/245380 Log: 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 Modified: head/sys/dev/altera/avgen/altera_avgen.c head/sys/dev/altera/avgen/altera_avgen.h head/sys/dev/altera/avgen/altera_avgen_fdt.c head/sys/dev/altera/avgen/altera_avgen_nexus.c head/sys/dev/altera/jtag_uart/altera_jtag_uart.h head/sys/dev/altera/jtag_uart/altera_jtag_uart_cons.c head/sys/dev/altera/jtag_uart/altera_jtag_uart_fdt.c head/sys/dev/altera/jtag_uart/altera_jtag_uart_nexus.c head/sys/dev/altera/sdcard/altera_sdcard.c head/sys/dev/altera/sdcard/altera_sdcard.h head/sys/dev/altera/sdcard/altera_sdcard_fdt.c head/sys/dev/altera/sdcard/altera_sdcard_nexus.c head/sys/dev/isf/isf.c head/sys/dev/isf/isf.h head/sys/dev/isf/isf_fdt.c head/sys/dev/isf/isf_nexus.c head/sys/dev/terasic/de4led/terasic_de4led.c head/sys/dev/terasic/de4led/terasic_de4led.h head/sys/dev/terasic/de4led/terasic_de4led_fdt.c head/sys/dev/terasic/de4led/terasic_de4led_nexus.c head/sys/dev/terasic/mtl/terasic_mtl.c head/sys/dev/terasic/mtl/terasic_mtl.h head/sys/dev/terasic/mtl/terasic_mtl_fdt.c head/sys/dev/terasic/mtl/terasic_mtl_nexus.c Modified: head/sys/dev/altera/avgen/altera_avgen.c ============================================================================== --- head/sys/dev/altera/avgen/altera_avgen.c Sun Jan 13 16:53:31 2013 (r245379) +++ head/sys/dev/altera/avgen/altera_avgen.c Sun Jan 13 16:57:11 2013 (r245380) @@ -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; Modified: head/sys/dev/altera/avgen/altera_avgen.h ============================================================================== --- head/sys/dev/altera/avgen/altera_avgen.h Sun Jan 13 16:53:31 2013 (r245379) +++ head/sys/dev/altera/avgen/altera_avgen.h Sun Jan 13 16:57:11 2013 (r245380) @@ -82,4 +82,6 @@ int altera_avgen_attach(struct altera_av 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_ */ Modified: head/sys/dev/altera/avgen/altera_avgen_fdt.c ============================================================================== --- head/sys/dev/altera/avgen/altera_avgen_fdt.c Sun Jan 13 16:53:31 2013 (r245379) +++ head/sys/dev/altera/avgen/altera_avgen_fdt.c Sun Jan 13 16:57:11 2013 (r245380) @@ -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); Modified: head/sys/dev/altera/avgen/altera_avgen_nexus.c ============================================================================== --- head/sys/dev/altera/avgen/altera_avgen_nexus.c Sun Jan 13 16:53:31 2013 (r245379) +++ head/sys/dev/altera/avgen/altera_avgen_nexus.c Sun Jan 13 16:57:11 2013 (r245380) @@ -137,7 +137,5 @@ static driver_t altera_avgen_nexus_drive sizeof(struct altera_avgen_softc), }; -static devclass_t altera_avgen_devclass; - DRIVER_MODULE(avgen, nexus, altera_avgen_nexus_driver, altera_avgen_devclass, 0, 0); Modified: head/sys/dev/altera/jtag_uart/altera_jtag_uart.h ============================================================================== --- head/sys/dev/altera/jtag_uart/altera_jtag_uart.h Sun Jan 13 16:53:31 2013 (r245379) +++ head/sys/dev/altera/jtag_uart/altera_jtag_uart.h Sun Jan 13 16:57:11 2013 (r245380) @@ -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_ */ Modified: head/sys/dev/altera/jtag_uart/altera_jtag_uart_cons.c ============================================================================== --- head/sys/dev/altera/jtag_uart/altera_jtag_uart_cons.c Sun Jan 13 16:53:31 2013 (r245379) +++ head/sys/dev/altera/jtag_uart/altera_jtag_uart_cons.c Sun Jan 13 16:57:11 2013 (r245380) @@ -32,6 +32,7 @@ __FBSDID("$FreeBSD$"); #include +#include #include #include #include @@ -46,6 +47,8 @@ __FBSDID("$FreeBSD$"); #include +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 Modified: head/sys/dev/altera/jtag_uart/altera_jtag_uart_fdt.c ============================================================================== --- head/sys/dev/altera/jtag_uart/altera_jtag_uart_fdt.c Sun Jan 13 16:53:31 2013 (r245379) +++ head/sys/dev/altera/jtag_uart/altera_jtag_uart_fdt.c Sun Jan 13 16:57:11 2013 (r245380) @@ -143,7 +143,5 @@ static driver_t altera_jtag_uart_fdt_dri 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); Modified: head/sys/dev/altera/jtag_uart/altera_jtag_uart_nexus.c ============================================================================== --- head/sys/dev/altera/jtag_uart/altera_jtag_uart_nexus.c Sun Jan 13 16:53:31 2013 (r245379) +++ head/sys/dev/altera/jtag_uart/altera_jtag_uart_nexus.c Sun Jan 13 16:57:11 2013 (r245380) @@ -137,7 +137,5 @@ static driver_t altera_jtag_uart_nexus_d 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); Modified: head/sys/dev/altera/sdcard/altera_sdcard.c ============================================================================== --- head/sys/dev/altera/sdcard/altera_sdcard.c Sun Jan 13 16:53:31 2013 (r245379) +++ head/sys/dev/altera/sdcard/altera_sdcard.c Sun Jan 13 16:57:11 2013 (r245380) @@ -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) Modified: head/sys/dev/altera/sdcard/altera_sdcard.h ============================================================================== --- head/sys/dev/altera/sdcard/altera_sdcard.h Sun Jan 13 16:53:31 2013 (r245379) +++ head/sys/dev/altera/sdcard/altera_sdcard.h Sun Jan 13 16:57:11 2013 (r245380) @@ -244,4 +244,6 @@ void altera_sdcard_start(struct altera_s 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_ */ Modified: head/sys/dev/altera/sdcard/altera_sdcard_fdt.c ============================================================================== --- head/sys/dev/altera/sdcard/altera_sdcard_fdt.c Sun Jan 13 16:53:31 2013 (r245379) +++ head/sys/dev/altera/sdcard/altera_sdcard_fdt.c Sun Jan 13 16:57:11 2013 (r245380) @@ -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); Modified: head/sys/dev/altera/sdcard/altera_sdcard_nexus.c ============================================================================== --- head/sys/dev/altera/sdcard/altera_sdcard_nexus.c Sun Jan 13 16:53:31 2013 (r245379) +++ head/sys/dev/altera/sdcard/altera_sdcard_nexus.c Sun Jan 13 16:57:11 2013 (r245380) @@ -110,7 +110,5 @@ static driver_t altera_sdcard_nexus_driv 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); Modified: head/sys/dev/isf/isf.c ============================================================================== --- head/sys/dev/isf/isf.c Sun Jan 13 16:53:31 2013 (r245379) +++ head/sys/dev/isf/isf.c Sun Jan 13 16:57:11 2013 (r245380) @@ -150,6 +150,7 @@ static void isf_task(void *arg); * 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) Modified: head/sys/dev/isf/isf.h ============================================================================== --- head/sys/dev/isf/isf.h Sun Jan 13 16:53:31 2013 (r245379) +++ head/sys/dev/isf/isf.h Sun Jan 13 16:57:11 2013 (r245380) @@ -89,6 +89,8 @@ struct isf_softc { 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_ */ Modified: head/sys/dev/isf/isf_fdt.c ============================================================================== --- head/sys/dev/isf/isf_fdt.c Sun Jan 13 16:53:31 2013 (r245379) +++ head/sys/dev/isf/isf_fdt.c Sun Jan 13 16:57:11 2013 (r245380) @@ -121,6 +121,4 @@ static driver_t isf_fdt_driver = { sizeof(struct isf_softc), }; -static devclass_t isf_devclass; - DRIVER_MODULE(isf, simplebus, isf_fdt_driver, isf_devclass, 0, 0); Modified: head/sys/dev/isf/isf_nexus.c ============================================================================== --- head/sys/dev/isf/isf_nexus.c Sun Jan 13 16:53:31 2013 (r245379) +++ head/sys/dev/isf/isf_nexus.c Sun Jan 13 16:57:11 2013 (r245380) @@ -115,6 +115,4 @@ static driver_t isf_nexus_driver = { sizeof(struct isf_softc), }; -static devclass_t isf_devclass; - DRIVER_MODULE(isf, nexus, isf_nexus_driver, isf_devclass, 0, 0); Modified: head/sys/dev/terasic/de4led/terasic_de4led.c ============================================================================== --- head/sys/dev/terasic/de4led/terasic_de4led.c Sun Jan 13 16:53:31 2013 (r245379) +++ head/sys/dev/terasic/de4led/terasic_de4led.c Sun Jan 13 16:57:11 2013 (r245380) @@ -43,6 +43,8 @@ __FBSDID("$FreeBSD$"); #include #include +devclass_t terasic_de4led_devclass; + static void terasic_de4led_update(struct terasic_de4led_softc *sc) { Modified: head/sys/dev/terasic/de4led/terasic_de4led.h ============================================================================== --- head/sys/dev/terasic/de4led/terasic_de4led.h Sun Jan 13 16:53:31 2013 (r245379) +++ head/sys/dev/terasic/de4led/terasic_de4led.h Sun Jan 13 16:57:11 2013 (r245380) @@ -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_ */ Modified: head/sys/dev/terasic/de4led/terasic_de4led_fdt.c ============================================================================== --- head/sys/dev/terasic/de4led/terasic_de4led_fdt.c Sun Jan 13 16:53:31 2013 (r245379) +++ head/sys/dev/terasic/de4led/terasic_de4led_fdt.c Sun Jan 13 16:57:11 2013 (r245380) @@ -114,7 +114,5 @@ static driver_t terasic_de4led_fdt_drive 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); Modified: head/sys/dev/terasic/de4led/terasic_de4led_nexus.c ============================================================================== --- head/sys/dev/terasic/de4led/terasic_de4led_nexus.c Sun Jan 13 16:53:31 2013 (r245379) +++ head/sys/dev/terasic/de4led/terasic_de4led_nexus.c Sun Jan 13 16:57:11 2013 (r245380) @@ -106,7 +106,5 @@ static driver_t terasic_de4led_nexus_dri 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); Modified: head/sys/dev/terasic/mtl/terasic_mtl.c ============================================================================== --- head/sys/dev/terasic/mtl/terasic_mtl.c Sun Jan 13 16:53:31 2013 (r245379) +++ head/sys/dev/terasic/mtl/terasic_mtl.c Sun Jan 13 16:57:11 2013 (r245380) @@ -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) { Modified: head/sys/dev/terasic/mtl/terasic_mtl.h ============================================================================== --- head/sys/dev/terasic/mtl/terasic_mtl.h Sun Jan 13 16:53:31 2013 (r245379) +++ head/sys/dev/terasic/mtl/terasic_mtl.h Sun Jan 13 16:57:11 2013 (r245380) @@ -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. */ Modified: head/sys/dev/terasic/mtl/terasic_mtl_fdt.c ============================================================================== --- head/sys/dev/terasic/mtl/terasic_mtl_fdt.c Sun Jan 13 16:53:31 2013 (r245379) +++ head/sys/dev/terasic/mtl/terasic_mtl_fdt.c Sun Jan 13 16:57:11 2013 (r245380) @@ -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); Modified: head/sys/dev/terasic/mtl/terasic_mtl_nexus.c ============================================================================== --- head/sys/dev/terasic/mtl/terasic_mtl_nexus.c Sun Jan 13 16:53:31 2013 (r245379) +++ head/sys/dev/terasic/mtl/terasic_mtl_nexus.c Sun Jan 13 16:57:11 2013 (r245380) @@ -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);