Module Name: src
Committed By: pooka
Date: Fri Feb 12 04:20:51 UTC 2010
Modified Files:
src/sys/rump/dev/lib/libucom: UCOM.ioconf
src/sys/rump/dev/lib/libulpt: ULPT.ioconf
src/sys/rump/dev/lib/libumass: UMASS.ioconf
Added Files:
src/sys/rump/dev: files.rump
Removed Files:
src/sys/rump/dev/wip: files.rump
Log Message:
move files.rump out of wip
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/files.rump
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/dev/lib/libucom/UCOM.ioconf
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/dev/lib/libulpt/ULPT.ioconf
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/dev/lib/libumass/UMASS.ioconf
cvs rdiff -u -r1.2 -r0 src/sys/rump/dev/wip/files.rump
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/dev/lib/libucom/UCOM.ioconf
diff -u src/sys/rump/dev/lib/libucom/UCOM.ioconf:1.1 src/sys/rump/dev/lib/libucom/UCOM.ioconf:1.2
--- src/sys/rump/dev/lib/libucom/UCOM.ioconf:1.1 Thu Feb 11 02:22:09 2010
+++ src/sys/rump/dev/lib/libucom/UCOM.ioconf Fri Feb 12 04:20:51 2010
@@ -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 ?
Index: src/sys/rump/dev/lib/libulpt/ULPT.ioconf
diff -u src/sys/rump/dev/lib/libulpt/ULPT.ioconf:1.1 src/sys/rump/dev/lib/libulpt/ULPT.ioconf:1.2
--- src/sys/rump/dev/lib/libulpt/ULPT.ioconf:1.1 Thu Feb 11 02:22:09 2010
+++ src/sys/rump/dev/lib/libulpt/ULPT.ioconf Fri Feb 12 04:20:51 2010
@@ -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 ?
Index: src/sys/rump/dev/lib/libumass/UMASS.ioconf
diff -u src/sys/rump/dev/lib/libumass/UMASS.ioconf:1.1 src/sys/rump/dev/lib/libumass/UMASS.ioconf:1.2
--- src/sys/rump/dev/lib/libumass/UMASS.ioconf:1.1 Thu Feb 11 02:22:09 2010
+++ src/sys/rump/dev/lib/libumass/UMASS.ioconf Fri Feb 12 04:20:51 2010
@@ -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
Added files:
Index: src/sys/rump/dev/files.rump
diff -u /dev/null src/sys/rump/dev/files.rump:1.1
--- /dev/null Fri Feb 12 04:20:51 2010
+++ src/sys/rump/dev/files.rump Fri Feb 12 04:20:51 2010
@@ -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?
