Module Name: src Committed By: thorpej Date: Mon Mar 22 14:50:30 UTC 2021
Modified Files: src/sys/dev/marvell [thorpej-cfargs]: files.discovery Log Message: No need to define interface attributes separately from the devices that carry them if they are specific to that device; just declare the interface on the device directly. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.22.46.1 src/sys/dev/marvell/files.discovery Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/dev/marvell/files.discovery diff -u src/sys/dev/marvell/files.discovery:1.22 src/sys/dev/marvell/files.discovery:1.22.46.1 --- src/sys/dev/marvell/files.discovery:1.22 Fri Sep 6 00:56:12 2013 +++ src/sys/dev/marvell/files.discovery Mon Mar 22 14:50:30 2021 @@ -1,4 +1,4 @@ -# $NetBSD: files.discovery,v 1.22 2013/09/06 00:56:12 matt Exp $ +# $NetBSD: files.discovery,v 1.22.46.1 2021/03/22 14:50:30 thorpej Exp $ # # Config file and device description for machine-independent support for # the Marvell (formerly Galileo Technology) Discovery system controllers. @@ -23,8 +23,7 @@ defparam opt_marvell.h GT_MPSC_FREQUENCY defparam opt_marvell.h GT_MPP_WATCHDOG defflag opt_marvell.h GT_DEVBUS GT_ECC GT_COMM GT_WATCHDOG -define gt { [unit = -1], [offset = -1], [irq = -1] } -device gt: gt +device gt { [unit = -1], [offset = -1], [irq = -1] } file dev/marvell/gt.c gt # PCI Interface @@ -38,8 +37,7 @@ file dev/marvell/mvpex.c mvpex & (mvpex attach mvpex at gt with mvpex_gt # Fast ethernet -define gfec { [port = -1], [irq = -1] } -device gfec: gfec +device gfec { [port = -1], [irq = -1] } attach gfec at gt device gfe: ether, ifnet, arp, mii attach gfe at gfec @@ -50,8 +48,7 @@ device gtmpsc: tty attach gtmpsc at gt file dev/marvell/gtmpsc.c gtmpsc needs-flag -define obio { [offset = -1], [size = 0], [irq = -1] } -device obio: obio +device obio { [offset = -1], [size = 0], [irq = -1] } attach obio at gt file dev/marvell/obio.c obio @@ -60,8 +57,7 @@ attach mvsata at gt with mvsata_gt file dev/marvell/mvsata_mv.c mvsata_gt | mvsata_mbus # Gigabit Ethernet Controller Interface -define mvgbec { [port = -1], [irq = -1] } -device mvgbec: mvgbec +device mvgbec { [port = -1], [irq = -1] } attach mvgbec at gt with mvgbec_gt device mvgbe: ether, ifnet, arp, mii attach mvgbe at mvgbec