[src/trunk]: src/sys/rump/dev move files.rump out of wip

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

details:   https://anonhg.NetBSD.org/src/rev/6d90010bf5db
branches:  trunk
changeset: 752052:6d90010bf5db
user:      pooka <pooka%NetBSD.org@localhost>
date:      Fri Feb 12 04:20:51 2010 +0000

description:
move files.rump out of wip

diffstat:

 sys/rump/dev/files.rump                |  24 ++++++++++++++++++++++++
 sys/rump/dev/lib/libucom/UCOM.ioconf   |   4 ++--
 sys/rump/dev/lib/libulpt/ULPT.ioconf   |   4 ++--
 sys/rump/dev/lib/libumass/UMASS.ioconf |  10 ++++------
 sys/rump/dev/wip/files.rump            |  24 ------------------------
 5 files changed, 32 insertions(+), 34 deletions(-)

diffs (121 lines):

diff -r 26ed2601b127 -r 6d90010bf5db sys/rump/dev/files.rump
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/rump/dev/files.rump   Fri Feb 12 04:20:51 2010 +0000
@@ -0,0 +1,24 @@
+#      $NetBSD: files.rump,v 1.1 2010/02/12 04:20:51 pooka Exp $
+#
+
+device mainbus { }
+attach mainbus at root
+device ugenhc: usbus, usbroothub
+attach ugenhc at mainbus
+
+# ugen0 - ugen3
+mainbus0 at root
+ugenhc0 at mainbus0
+ugenhc1 at mainbus0
+ugenhc2 at mainbus0
+ugenhc3 at mainbus0
+
+# USB bus support
+usb*    at ugenhc?
+
+# USB ROOT Hub
+#
+# Do *NOT* configure uhub @ uhub.
+# That is not compatible with ugen.
+#
+uhub*   at usb?
diff -r 26ed2601b127 -r 6d90010bf5db sys/rump/dev/lib/libucom/UCOM.ioconf
--- a/sys/rump/dev/lib/libucom/UCOM.ioconf      Fri Feb 12 04:01:07 2010 +0000
+++ b/sys/rump/dev/lib/libucom/UCOM.ioconf      Fri Feb 12 04:20:51 2010 +0000
@@ -1,11 +1,11 @@
-#      $NetBSD: UCOM.ioconf,v 1.1 2010/02/11 02:22:09 pooka Exp $
+#      $NetBSD: UCOM.ioconf,v 1.2 2010/02/12 04:20:51 pooka Exp $
 #
 
 ioconf ucom
 
 include "conf/files"
 include "dev/usb/files.usb"
-include "rump/dev/wip/files.rump"
+include "rump/dev/files.rump"
 
 uplcom*        at uhub?
 ucom*  at uplcom? portno ?
diff -r 26ed2601b127 -r 6d90010bf5db sys/rump/dev/lib/libulpt/ULPT.ioconf
--- a/sys/rump/dev/lib/libulpt/ULPT.ioconf      Fri Feb 12 04:01:07 2010 +0000
+++ b/sys/rump/dev/lib/libulpt/ULPT.ioconf      Fri Feb 12 04:20:51 2010 +0000
@@ -1,10 +1,10 @@
-#      $NetBSD: ULPT.ioconf,v 1.1 2010/02/11 02:22:09 pooka Exp $
+#      $NetBSD: ULPT.ioconf,v 1.2 2010/02/12 04:20:51 pooka Exp $
 #
 
 ioconf ulpt
 
 include "conf/files"
 include "dev/usb/files.usb"
-include "rump/dev/wip/files.rump"
+include "rump/dev/files.rump"
 
 ulpt*   at uhub? port ? configuration ? interface ?
diff -r 26ed2601b127 -r 6d90010bf5db sys/rump/dev/lib/libumass/UMASS.ioconf
--- a/sys/rump/dev/lib/libumass/UMASS.ioconf    Fri Feb 12 04:01:07 2010 +0000
+++ b/sys/rump/dev/lib/libumass/UMASS.ioconf    Fri Feb 12 04:20:51 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: UMASS.ioconf,v 1.1 2010/02/11 02:22:09 pooka Exp $
+#      $NetBSD: UMASS.ioconf,v 1.2 2010/02/12 04:20:51 pooka Exp $
 #
 
 #
@@ -13,7 +13,7 @@
 include "conf/files"
 include "dev/usb/files.usb"
 include "dev/scsipi/files.scsipi"
-include "rump/dev/wip/files.rump"
+include "rump/dev/files.rump"
 
 # USB Mass Storage
 umass* at uhub? port ? configuration ? interface ?
@@ -21,11 +21,9 @@
 # SCSI support
 scsibus* at scsi?
 sd*    at scsibus? target ? lun ?
+cd*    at scsibus? target ? lun ? 
 
 # ATAPI support
 atapibus* at atapi?
-sd*    at atapibus? drive ? flags 0x0000
-
-# cd drives (untested!)
-cd*    at scsibus? target ? lun ?
+sd*    at atapibus? drive ? flags 0x0000 
 cd*    at atapibus? drive ? flags 0x0000
diff -r 26ed2601b127 -r 6d90010bf5db sys/rump/dev/wip/files.rump
--- a/sys/rump/dev/wip/files.rump       Fri Feb 12 04:01:07 2010 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-#      $NetBSD: files.rump,v 1.2 2010/02/10 02:26:23 pooka Exp $
-#
-
-device mainbus { }
-attach mainbus at root
-device ugenhc: usbus, usbroothub
-attach ugenhc at mainbus
-
-# ugen0 - ugen3
-mainbus0 at root
-ugenhc0 at mainbus0
-ugenhc1 at mainbus0
-ugenhc2 at mainbus0
-ugenhc3 at mainbus0
-
-# USB bus support
-usb*    at ugenhc?
-
-# USB ROOT Hub
-#
-# Do *NOT* configure uhub @ uhub.
-# That is not compatible with ugen.
-#
-uhub*   at usb?