Module Name: src
Committed By: pooka
Date: Thu Feb 4 00:37:08 UTC 2010
Modified Files:
src/sys/rump/dev/wip/libucom: UCOM.ioconf
src/sys/rump/dev/wip/libukbd: UKBD.ioconf
src/sys/rump/dev/wip/libulpt: ULPT.ioconf
src/sys/rump/dev/wip/libumass: UMASS.ioconf
src/sys/rump/dev/wip/libums: UMS.ioconf
Added Files:
src/sys/rump/dev/wip: files.rump
Log Message:
Put common stuff in a single file which can be included.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/wip/files.rump
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/dev/wip/libucom/UCOM.ioconf
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/dev/wip/libukbd/UKBD.ioconf
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/dev/wip/libulpt/ULPT.ioconf
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/dev/wip/libumass/UMASS.ioconf
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/dev/wip/libums/UMS.ioconf
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/wip/libucom/UCOM.ioconf
diff -u src/sys/rump/dev/wip/libucom/UCOM.ioconf:1.1 src/sys/rump/dev/wip/libucom/UCOM.ioconf:1.2
--- src/sys/rump/dev/wip/libucom/UCOM.ioconf:1.1 Wed Feb 3 21:18:38 2010
+++ src/sys/rump/dev/wip/libucom/UCOM.ioconf Thu Feb 4 00:37:08 2010
@@ -1,33 +1,11 @@
-# $NetBSD: UCOM.ioconf,v 1.1 2010/02/03 21:18:38 pooka Exp $
+# $NetBSD: UCOM.ioconf,v 1.2 2010/02/04 00:37:08 pooka Exp $
#
ioconf ucom
include "conf/files"
include "dev/usb/files.usb"
-include "dev/scsipi/files.scsipi"
-
-device mainbus { }
-attach mainbus at root
-device rumpusbhc: usbus, usbroothub
-attach rumpusbhc at mainbus
-
-# ugen0 - ugen3
-mainbus0 at root
-rumpusbhc0 at mainbus0
-rumpusbhc1 at mainbus0
-rumpusbhc2 at mainbus0
-rumpusbhc3 at mainbus0
-
-# USB bus support
-usb* at rumpusbhc?
-
-# USB ROOT Hub
-#
-# Do *NOT* configure uhub @ uhub.
-# That is not compatible with ugen.
-#
-uhub* at usb?
+include "rump/dev/wip/files.rump"
uplcom* at uhub?
ucom* at uplcom? portno ?
Index: src/sys/rump/dev/wip/libukbd/UKBD.ioconf
diff -u src/sys/rump/dev/wip/libukbd/UKBD.ioconf:1.1 src/sys/rump/dev/wip/libukbd/UKBD.ioconf:1.2
--- src/sys/rump/dev/wip/libukbd/UKBD.ioconf:1.1 Wed Feb 3 21:18:38 2010
+++ src/sys/rump/dev/wip/libukbd/UKBD.ioconf Thu Feb 4 00:37:08 2010
@@ -1,32 +1,11 @@
-# $NetBSD: UKBD.ioconf,v 1.1 2010/02/03 21:18:38 pooka Exp $
+# $NetBSD: UKBD.ioconf,v 1.2 2010/02/04 00:37:08 pooka Exp $
#
ioconf ukbd
include "conf/files"
include "dev/usb/files.usb"
-
-device mainbus { }
-attach mainbus at root
-device rumpusbhc: usbus, usbroothub
-attach rumpusbhc at mainbus
-
-# ugen0 - ugen3
-mainbus0 at root
-rumpusbhc0 at mainbus0
-rumpusbhc1 at mainbus0
-rumpusbhc2 at mainbus0
-rumpusbhc3 at mainbus0
-
-# USB bus support
-usb* at rumpusbhc?
-
-# USB ROOT Hub
-#
-# Do *NOT* configure uhub @ uhub.
-# That is not compatible with ugen.
-#
-uhub* at usb?
+include "rump/dev/wip/files.rump"
# USB HID device
uhidev* at uhub? port ? configuration ? interface ?
Index: src/sys/rump/dev/wip/libulpt/ULPT.ioconf
diff -u src/sys/rump/dev/wip/libulpt/ULPT.ioconf:1.1 src/sys/rump/dev/wip/libulpt/ULPT.ioconf:1.2
--- src/sys/rump/dev/wip/libulpt/ULPT.ioconf:1.1 Wed Feb 3 21:18:38 2010
+++ src/sys/rump/dev/wip/libulpt/ULPT.ioconf Thu Feb 4 00:37:08 2010
@@ -1,31 +1,10 @@
-# $NetBSD: ULPT.ioconf,v 1.1 2010/02/03 21:18:38 pooka Exp $
+# $NetBSD: ULPT.ioconf,v 1.2 2010/02/04 00:37:08 pooka Exp $
#
ioconf ulpt
include "conf/files"
include "dev/usb/files.usb"
-
-device mainbus { }
-attach mainbus at root
-device rumpusbhc: usbus, usbroothub
-attach rumpusbhc at mainbus
-
-# ugen0 - ugen3
-mainbus0 at root
-rumpusbhc0 at mainbus0
-rumpusbhc1 at mainbus0
-rumpusbhc2 at mainbus0
-rumpusbhc3 at mainbus0
-
-# USB bus support
-usb* at rumpusbhc?
-
-# USB ROOT Hub
-#
-# Do *NOT* configure uhub @ uhub.
-# That is not compatible with ugen.
-#
-uhub* at usb?
+include "rump/dev/wip/files.rump"
ulpt* at uhub? port ? configuration ? interface ?
Index: src/sys/rump/dev/wip/libumass/UMASS.ioconf
diff -u src/sys/rump/dev/wip/libumass/UMASS.ioconf:1.1 src/sys/rump/dev/wip/libumass/UMASS.ioconf:1.2
--- src/sys/rump/dev/wip/libumass/UMASS.ioconf:1.1 Wed Feb 3 21:18:38 2010
+++ src/sys/rump/dev/wip/libumass/UMASS.ioconf Thu Feb 4 00:37:08 2010
@@ -1,4 +1,4 @@
-# $NetBSD: UMASS.ioconf,v 1.1 2010/02/03 21:18:38 pooka Exp $
+# $NetBSD: UMASS.ioconf,v 1.2 2010/02/04 00:37:08 pooka Exp $
#
ioconf umass
@@ -6,28 +6,7 @@
include "conf/files"
include "dev/usb/files.usb"
include "dev/scsipi/files.scsipi"
-
-device mainbus { }
-attach mainbus at root
-device rumpusbhc: usbus, usbroothub
-attach rumpusbhc at mainbus
-
-# ugen0 - ugen3
-mainbus0 at root
-rumpusbhc0 at mainbus0
-rumpusbhc1 at mainbus0
-rumpusbhc2 at mainbus0
-rumpusbhc3 at mainbus0
-
-# USB bus support
-usb* at rumpusbhc?
-
-# USB ROOT Hub
-#
-# Do *NOT* configure uhub @ uhub.
-# That is not compatible with ugen.
-#
-uhub* at usb?
+include "rump/dev/wip/files.rump"
# USB Mass Storage
umass* at uhub? port ? configuration ? interface ?
Index: src/sys/rump/dev/wip/libums/UMS.ioconf
diff -u src/sys/rump/dev/wip/libums/UMS.ioconf:1.1 src/sys/rump/dev/wip/libums/UMS.ioconf:1.2
--- src/sys/rump/dev/wip/libums/UMS.ioconf:1.1 Wed Feb 3 21:18:38 2010
+++ src/sys/rump/dev/wip/libums/UMS.ioconf Thu Feb 4 00:37:08 2010
@@ -1,32 +1,11 @@
-# $NetBSD: UMS.ioconf,v 1.1 2010/02/03 21:18:38 pooka Exp $
+# $NetBSD: UMS.ioconf,v 1.2 2010/02/04 00:37:08 pooka Exp $
#
ioconf ums
include "conf/files"
include "dev/usb/files.usb"
-
-device mainbus { }
-attach mainbus at root
-device rumpusbhc: usbus, usbroothub
-attach rumpusbhc at mainbus
-
-# ugen0 - ugen3
-mainbus0 at root
-rumpusbhc0 at mainbus0
-rumpusbhc1 at mainbus0
-rumpusbhc2 at mainbus0
-rumpusbhc3 at mainbus0
-
-# USB bus support
-usb* at rumpusbhc?
-
-# USB ROOT Hub
-#
-# Do *NOT* configure uhub @ uhub.
-# That is not compatible with ugen.
-#
-uhub* at usb?
+include "rump/dev/wip/files.rump"
# USB HID device
uhidev* at uhub? port ? configuration ? interface ?
Added files:
Index: src/sys/rump/dev/wip/files.rump
diff -u /dev/null src/sys/rump/dev/wip/files.rump:1.1
--- /dev/null Thu Feb 4 00:37:09 2010
+++ src/sys/rump/dev/wip/files.rump Thu Feb 4 00:37:08 2010
@@ -0,0 +1,24 @@
+# $NetBSD: files.rump,v 1.1 2010/02/04 00:37:08 pooka Exp $
+#
+
+device mainbus { }
+attach mainbus at root
+device rumpusbhc: usbus, usbroothub
+attach rumpusbhc at mainbus
+
+# ugen0 - ugen3
+mainbus0 at root
+rumpusbhc0 at mainbus0
+rumpusbhc1 at mainbus0
+rumpusbhc2 at mainbus0
+rumpusbhc3 at mainbus0
+
+# USB bus support
+usb* at rumpusbhc?
+
+# USB ROOT Hub
+#
+# Do *NOT* configure uhub @ uhub.
+# That is not compatible with ugen.
+#
+uhub* at usb?
