[src/trunk]: src/sys "attach radio at radio":

[drochner <drochner%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/625331aaf3c4
branches:  trunk
changeset: 520328:625331aaf3c4
user:      drochner <drochner%NetBSD.org@localhost>
date:      Mon Jan 07 17:44:42 2002 +0000

description:
"attach radio at radio":
using one word as both attribute and device doesn't work well,
radio.c is pulled in even with no such device in the configuration,
and the kernel doesn't link due to missing "radio_cd".
So call the attribute "radiodev" to avoid confusion.

diffstat:

 sys/conf/files        |   6 +++---
 sys/dev/isa/files.isa |  10 +++++-----
 sys/dev/pci/files.pci |   6 +++---
 sys/dev/usb/files.usb |   4 ++--
 4 files changed, 13 insertions(+), 13 deletions(-)

diffs (105 lines):

diff -r d077a050b3a8 -r 625331aaf3c4 sys/conf/files
--- a/sys/conf/files    Mon Jan 07 17:36:40 2002 +0000
+++ b/sys/conf/files    Mon Jan 07 17:44:42 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files,v 1.488 2002/01/04 02:42:23 deberg Exp $
+#      $NetBSD: files,v 1.489 2002/01/07 17:44:42 drochner Exp $
 
 #      @(#)files.newconf       7.5 (Berkeley) 5/10/93
 
@@ -202,7 +202,7 @@
 define atapi           {[channel = -1]}
 define mii             {[phy = -1]}
 define irbus           { }
-define radio           { }
+define radiodev        { }
 
 # audio device attributes
 #
@@ -812,7 +812,7 @@
 
 # radio devices, attaches to radio hardware driver
 device radio
-attach radio at radio
+attach radio at radiodev
 
 # IEEE 1394 controllers
 # (These need to be here since it will have both PCI and CardBus attachments)
diff -r d077a050b3a8 -r 625331aaf3c4 sys/dev/isa/files.isa
--- a/sys/dev/isa/files.isa     Mon Jan 07 17:36:40 2002 +0000
+++ b/sys/dev/isa/files.isa     Mon Jan 07 17:44:42 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.isa,v 1.121 2002/01/01 21:51:41 augustss Exp $
+#      $NetBSD: files.isa,v 1.122 2002/01/07 17:44:44 drochner Exp $
 #
 # Config file and device description for machine-independent ISA code.
 # Included by ports that need it.  Requires that the SCSI files be
@@ -415,22 +415,22 @@
 file   dev/isa/weasel_isa.c            pcweasel                needs-flag
 
 # Sound Forte RadioLink SF16-FMR2 FM Radio Card
-device sf2r: radio, tea5757
+device sf2r: radiodev, tea5757
 attach sf2r at isa
 file   dev/isa/sf16fmr2.c              sf2r
 
 # Aztech/PackardBell FM Radio Card
-device az: radio, lm700x
+device az: radiodev, lm700x
 attach az at isa
 file   dev/isa/aztech.c                az
 
 # AIMS Lab Radiotrack & compatible
-device rt: radio, lm700x
+device rt: radiodev, lm700x
 attach rt at isa
 file   dev/isa/radiotrack.c            rt
 
 # AIMS Lab Radiotrack II FM Radio Card
-device rtii: radio, tea5757
+device rtii: radiodev, tea5757
 attach rtii at isa
 file   dev/isa/radiotrack2.c           rtii
 
diff -r d077a050b3a8 -r 625331aaf3c4 sys/dev/pci/files.pci
--- a/sys/dev/pci/files.pci     Mon Jan 07 17:36:40 2002 +0000
+++ b/sys/dev/pci/files.pci     Mon Jan 07 17:44:42 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.pci,v 1.157 2002/01/07 11:58:28 tron Exp $
+#      $NetBSD: files.pci,v 1.158 2002/01/07 17:44:45 drochner Exp $
 #
 # Config file and device description for machine-independent PCI code.
 # Included by ports that need it.  Requires that the SCSI files be
@@ -151,12 +151,12 @@
 file   dev/pci/trm.c                   trm
 
 # Guillemot Maxi Radio FM 2000 Radio Card
-device mr: radio
+device mr: radiodev
 attach mr at pci
 file   dev/pci/maxiradio.c             mr
 
 # MediaForte SoundForte SF64-PCR Radio card
-#device        sf4r: radio, tea5757
+#device        sf4r: radiodev, tea5757
 #attach        sf4r at pci
 #file  dev/pci/sf64pcr.c               sf4r
 
diff -r d077a050b3a8 -r 625331aaf3c4 sys/dev/usb/files.usb
--- a/sys/dev/usb/files.usb     Mon Jan 07 17:36:40 2002 +0000
+++ b/sys/dev/usb/files.usb     Mon Jan 07 17:44:42 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.usb,v 1.39 2002/01/03 18:54:32 augustss Exp $
+#      $NetBSD: files.usb,v 1.40 2002/01/07 17:44:45 drochner Exp $
 #
 # Config file and device description for machine-independent USB code.
 # Included by ports that need it.  Ports that use it must provide
@@ -127,7 +127,7 @@
 file   dev/usb/uyap.c                  uyap
 
 # D-Link DSB-R100 FM radio
-device udsbr: radio
+device udsbr: radiodev
 attach udsbr at uhub
 file   dev/usb/udsbr.c                 udsbr