[src/trunk]: src/sys/rump/dev/wip/libumass Replace totally handwritten ioconf...

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

details:   https://anonhg.NetBSD.org/src/rev/aa1369af9dcc
branches:  trunk
changeset: 750177:aa1369af9dcc
user:      pooka <pooka%NetBSD.org@localhost>
date:      Sat Dec 19 11:55:23 2009 +0000

description:
Replace totally handwritten ioconf.c with only a semi handwritten
one, partially now generated with config(1).

diffstat:

 sys/rump/dev/wip/libumass/sd_at_scsibus_at_umass.c |  579 ++++++++++++++++----
 1 files changed, 457 insertions(+), 122 deletions(-)

diffs (truncated from 614 to 300 lines):

diff -r b89c8cb67d10 -r aa1369af9dcc sys/rump/dev/wip/libumass/sd_at_scsibus_at_umass.c
--- a/sys/rump/dev/wip/libumass/sd_at_scsibus_at_umass.c        Sat Dec 19 11:48:30 2009 +0000
+++ b/sys/rump/dev/wip/libumass/sd_at_scsibus_at_umass.c        Sat Dec 19 11:55:23 2009 +0000
@@ -1,4 +1,458 @@
-/*     $NetBSD: sd_at_scsibus_at_umass.c,v 1.4 2009/12/04 17:37:05 pooka Exp $ */
+/*     $NetBSD: sd_at_scsibus_at_umass.c,v 1.5 2009/12/19 11:55:23 pooka Exp $ */
+
+/*
+ * MACHINE GENERATED: DO NOT EDIT
+ *
+ * ioconf.c, from the following config:
+ *
+ * === SNIP ===
+
+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
+
+mainbus0 at root
+rumpusbhc* at mainbus0
+
+# USB bus support
+usb*    at rumpusbhc?
+
+# USB Hubs
+uhub*   at usb?
+uhub*   at uhub? port ?
+
+# USB Mass Storage
+umass*  at uhub? port ? configuration ? interface ?
+scsibus* at scsi?
+sd*     at scsibus? target ? lun ?
+
+ * === UNSNIP ===
+ */
+
+#include <sys/param.h>
+#include <sys/conf.h>
+#include <sys/device.h>
+#include <sys/mount.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 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 },
+       }
+};
+static const struct cfiattrdata btbuscf_iattrdata = {
+       "btbus", 0, {
+               { NULL, NULL, 0 },
+       }
+};
+static const struct cfiattrdata midibuscf_iattrdata = {
+       "midibus", 0, {
+               { NULL, NULL, 0 },
+       }