[src/trunk]: src/sys Define a "scsi_core" attribute. Make the "scsi" attribu...

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

details:   https://anonhg.NetBSD.org/src/rev/68d01416b8e6
branches:  trunk
changeset: 538008:68d01416b8e6
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Wed Oct 09 20:23:56 2002 +0000

description:
Define a "scsi_core" attribute.  Make the "scsi" attribute depend on
"scsi_core".  Make all the files previously selected by the "scsi"
attribute selected by the "scsi_core" attribute.  Give the "scsibus"
device the "scsi_core" attribute.

diffstat:

 sys/conf/files              |   5 +++--
 sys/dev/scsipi/files.scsipi |  14 +++++++-------
 2 files changed, 10 insertions(+), 9 deletions(-)

diffs (50 lines):

diff -r 2f3aa7a79cfc -r 68d01416b8e6 sys/conf/files
--- a/sys/conf/files    Wed Oct 09 20:22:47 2002 +0000
+++ b/sys/conf/files    Wed Oct 09 20:23:56 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files,v 1.557 2002/10/05 15:16:10 tsutsui Exp $
+#      $NetBSD: files,v 1.558 2002/10/09 20:23:56 thorpej Exp $
 
 #      @(#)files.newconf       7.5 (Berkeley) 5/10/93
 
@@ -164,7 +164,8 @@
 define midibus         { }
 define midisyn
 define wdc_base
-define scsi            {[channel = -1]}
+define scsi_core
+define scsi            {[channel = -1]}: scsi_core
 define ata             {[channel = -1], [drive = -1]}
 define atapi           {[channel = -1]}
 define irbus           { }
diff -r 2f3aa7a79cfc -r 68d01416b8e6 sys/dev/scsipi/files.scsipi
--- a/sys/dev/scsipi/files.scsipi       Wed Oct 09 20:22:47 2002 +0000
+++ b/sys/dev/scsipi/files.scsipi       Wed Oct 09 20:23:56 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.scsipi,v 1.32 2002/05/16 02:59:57 thorpej Exp $
+#      $NetBSD: files.scsipi,v 1.33 2002/10/09 20:23:56 thorpej Exp $
 #
 # Config file and device description for machine-independent SCSI code.
 # Included by ports that need it.  Ports that use it must provide
@@ -14,15 +14,15 @@
                                SCSIPI_DEBUG_LUN
                                SCSIPI_DEBUG_FLAGS
 
-file   dev/scsipi/scsipiconf.c         scsi | atapibus
-file   dev/scsipi/scsipi_base.c        scsi | atapibus
-file   dev/scsipi/scsipi_ioctl.c       scsi | atapibus
-file   dev/scsipi/scsipi_verbose.c     (scsi | atapibus) & scsiverbose
-file   dev/scsipi/scsi_base.c          scsi 
+file   dev/scsipi/scsipiconf.c         scsi_core | atapibus
+file   dev/scsipi/scsipi_base.c        scsi_core | atapibus
+file   dev/scsipi/scsipi_ioctl.c       scsi_core | atapibus
+file   dev/scsipi/scsipi_verbose.c     (scsi_core | atapibus) & scsiverbose
+file   dev/scsipi/scsi_base.c          scsi_core 
 file   dev/scsipi/atapi_base.c         atapibus
 file   dev/scsipi/atapi_wdc.c          atapibus & wdc_base
 
-device scsibus {target = -1, lun = -1}
+device scsibus {target = -1, lun = -1}: scsi_core
 attach scsibus at scsi
 file   dev/scsipi/scsiconf.c           scsibus                 needs-flag