Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/rump/dev/lib/libwscons convert to ioconf & pseudo-root
details: https://anonhg.NetBSD.org/src/rev/80ea0c851e55
branches: trunk
changeset: 752849:80ea0c851e55
user: pooka <pooka%NetBSD.org@localhost>
date: Mon Mar 08 10:54:21 2010 +0000
description:
convert to ioconf & pseudo-root
diffstat:
sys/rump/dev/lib/libwscons/Makefile | 3 +-
sys/rump/dev/lib/libwscons/WSCONS.ioconf | 13 +
sys/rump/dev/lib/libwscons/component.c | 420 +------------------------------
sys/rump/dev/lib/libwscons/locators.h | 8 -
4 files changed, 18 insertions(+), 426 deletions(-)
diffs (truncated from 484 to 300 lines):
diff -r 067428caf3b4 -r 80ea0c851e55 sys/rump/dev/lib/libwscons/Makefile
--- a/sys/rump/dev/lib/libwscons/Makefile Mon Mar 08 10:53:03 2010 +0000
+++ b/sys/rump/dev/lib/libwscons/Makefile Mon Mar 08 10:54:21 2010 +0000
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2010/02/16 20:42:45 pooka Exp $
+# $NetBSD: Makefile,v 1.3 2010/03/08 10:54:21 pooka Exp $
#
.PATH: ${.CURDIR}/../../../../dev/wscons
LIB= rumpdev_wscons
+IOCONF= WSCONS.ioconf
SRCS= wsevent.c wskbd.c wskbdutil.c wsmouse.c
diff -r 067428caf3b4 -r 80ea0c851e55 sys/rump/dev/lib/libwscons/WSCONS.ioconf
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/rump/dev/lib/libwscons/WSCONS.ioconf Mon Mar 08 10:54:21 2010 +0000
@@ -0,0 +1,13 @@
+# $NetBSD: WSCONS.ioconf,v 1.1 2010/03/08 10:54:21 pooka Exp $
+#
+
+ioconf wscons
+
+include "conf/files"
+include "dev/usb/files.usb"
+
+pseudo-root ums*
+pseudo-root ukbd*
+
+wsmouse* at ums? mux 0
+wskbd* at ukbd? console ? mux 1
diff -r 067428caf3b4 -r 80ea0c851e55 sys/rump/dev/lib/libwscons/component.c
--- a/sys/rump/dev/lib/libwscons/component.c Mon Mar 08 10:53:03 2010 +0000
+++ b/sys/rump/dev/lib/libwscons/component.c Mon Mar 08 10:54:21 2010 +0000
@@ -1,425 +1,12 @@
-/* $NetBSD: component.c,v 1.2 2010/03/01 13:12:20 pooka Exp $ */
-
-/*
- * MACHINE GENERATED: DO NOT EDIT
- *
- * ioconf.c, from "TESTI_wscons"
- */
+/* $NetBSD: component.c,v 1.3 2010/03/08 10:54:21 pooka Exp $ */
#include <sys/param.h>
#include <sys/conf.h>
#include <sys/device.h>
#include <sys/mount.h>
+#include <sys/stat.h>
-static const struct cfiattrdata gpibdevcf_iattrdata = {
- "gpibdev", 1,
- {
- { "address", "-1", -1 },
- }
-};
-static const struct cfiattrdata acpibuscf_iattrdata = {
- "acpibus", 0, {
- { NULL, NULL, 0 },
- }
-};
-static const struct cfiattrdata caccf_iattrdata = {
- "cac", 1,
- {
- { "unit", "-1", -1 },
- }
-};
-static const struct cfiattrdata spicf_iattrdata = {
- "spi", 1,
- {
- { "slave", "NULL", 0 },
- }
-};
-static const struct cfiattrdata radiodevcf_iattrdata = {
- "radiodev", 0, {
- { NULL, NULL, 0 },
- }
-};
-static const struct cfiattrdata mlxcf_iattrdata = {
- "mlx", 1,
- {
- { "unit", "-1", -1 },
- }
-};
-static const struct cfiattrdata scsibuscf_iattrdata = {
- "scsibus", 2,
- {
- { "target", "-1", -1 },
- { "lun", "-1", -1 },
- }
-};
-static const struct cfiattrdata ucombuscf_iattrdata = {
- "ucombus", 1,
- {
- { "portno", "-1", -1 },
- }
-};
-static const struct cfiattrdata videobuscf_iattrdata = {
- "videobus", 0, {
- { NULL, NULL, 0 },
- }
-};
-static const struct cfiattrdata isabuscf_iattrdata = {
- "isabus", 0, {
- { NULL, NULL, 0 },
- }
-};
-static const struct cfiattrdata i2cbuscf_iattrdata = {
- "i2cbus", 0, {
- { NULL, NULL, 0 },
- }
-};
-static const struct cfiattrdata ata_hlcf_iattrdata = {
- "ata_hl", 1,
- {
- { "drive", "-1", -1 },
- }
-};
-static const struct cfiattrdata mainbuscf_iattrdata = {
- "mainbus", 0, {
- { NULL, NULL, 0 },
- }
-};
-static const struct cfiattrdata depcacf_iattrdata = {
- "depca", 0, {
- { NULL, NULL, 0 },
- }
-};
-static const struct cfiattrdata ppbuscf_iattrdata = {
- "ppbus", 0, {
- { NULL, NULL, 0 },
- }
-};
-static const struct cfiattrdata eisabuscf_iattrdata = {
- "eisabus", 0, {
- { NULL, NULL, 0 },
- }
-};
-static const struct cfiattrdata atapicf_iattrdata = {
- "atapi", 0, {
- { NULL, NULL, 0 },
- }
-};
-static const struct cfiattrdata atapibuscf_iattrdata = {
- "atapibus", 1,
- {
- { "drive", "-1", -1 },
- }
-};
-static const struct cfiattrdata usbroothubifcf_iattrdata = {
- "usbroothubif", 0, {
- { NULL, NULL, 0 },
- }
-};
-static const struct cfiattrdata altmemdevcf_iattrdata = {
- "altmemdev", 0, {
- { NULL, NULL, 0 },
- }
-};
-static const struct cfiattrdata tcbuscf_iattrdata = {
- "tcbus", 0, {
- { NULL, NULL, 0 },
- }
-};
-static const struct cfiattrdata onewirebuscf_iattrdata = {
- "onewirebus", 0, {
- { NULL, NULL, 0 },
- }
-};
-static const struct cfiattrdata gpiocf_iattrdata = {
- "gpio", 2,
- {
- { "offset", "-1", -1 },
- { "mask", "0", 0 },
- }
-};
-static const struct cfiattrdata cbbuscf_iattrdata = {
- "cbbus", 0, {
- { NULL, NULL, 0 },
- }
-};
-static const struct cfiattrdata gpiobuscf_iattrdata = {
- "gpiobus", 0, {
- { NULL, NULL, 0 },
- }
-};
-static const struct cfiattrdata drmcf_iattrdata = {
- "drm", 0, {
- { NULL, NULL, 0 },
- }
-};
-static const struct cfiattrdata pckbportcf_iattrdata = {
- "pckbport", 1,
- {
- { "slot", "-1", -1 },
- }
-};
-static const struct cfiattrdata irbuscf_iattrdata = {
- "irbus", 0, {
- { NULL, NULL, 0 },
- }
-};
-static const struct cfiattrdata aaccf_iattrdata = {
- "aac", 1,
- {
- { "unit", "-1", -1 },
- }
-};
-static const struct cfiattrdata pcibuscf_iattrdata = {
- "pcibus", 1,
- {
- { "bus", "-1", -1 },
- }
-};
-static const struct cfiattrdata usbififcf_iattrdata = {
- "usbifif", 6,
- {
- { "port", "-1", -1 },
- { "configuration", "-1", -1 },
- { "interface", "-1", -1 },
- { "vendor", "-1", -1 },
- { "product", "-1", -1 },
- { "release", "-1", -1 },
- }
-};
-static const struct cfiattrdata upccf_iattrdata = {
- "upc", 1,
- {
- { "offset", "-1", -1 },
- }
-};
-static const struct cfiattrdata iiccf_iattrdata = {
- "iic", 2,
- {
- { "addr", "-1", -1 },
- { "size", "-1", -1 },
- }
-};
-static const struct cfiattrdata onewirecf_iattrdata = {
- "onewire", 0, {
- { NULL, NULL, 0 },
- }
-};
-static const struct cfiattrdata mcabuscf_iattrdata = {
- "mcabus", 0, {
- { NULL, NULL, 0 },
- }
-};
-static const struct cfiattrdata wsdisplaydevcf_iattrdata = {
- "wsdisplaydev", 1,
- {
- { "kbdmux", "1", 1 },
- }
-};
-static const struct cfiattrdata miicf_iattrdata = {
- "mii", 1,
- {
- { "phy", "-1", -1 },
- }
-};
-static const struct cfiattrdata cpcbuscf_iattrdata = {
- "cpcbus", 2,
- {
- { "addr", "NULL", 0 },
- { "irq", "-1", -1 },
- }
-};
-static const struct cfiattrdata parportcf_iattrdata = {
- "parport", 0, {
- { NULL, NULL, 0 },
- }
-};
-static const struct cfiattrdata dbcoolcf_iattrdata = {
- "dbcool", 0, {
- { NULL, NULL, 0 },
- }
-};
-static const struct cfiattrdata usbdevifcf_iattrdata = {
- "usbdevif", 6,
- {
- { "port", "-1", -1 },
- { "configuration", "-1", -1 },
- { "interface", "-1", -1 },
- { "vendor", "-1", -1 },
- { "product", "-1", -1 },
- { "release", "-1", -1 },
- }
-};
-static const struct cfiattrdata wskbddevcf_iattrdata = {
- "wskbddev", 2,
- {
- { "console", "-1", -1 },
- { "mux", "1", 1 },
- }
-};
-static const struct cfiattrdata audiobuscf_iattrdata = {
- "audiobus", 0, {
- { NULL, NULL, 0 },
- }
Home |
Main Index |
Thread Index |
Old Index