Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/rump/dev/wip These "wip" components have been in progres...



details:   https://anonhg.NetBSD.org/src/rev/a812638a23cb
branches:  trunk
changeset: 810301:a812638a23cb
user:      pooka <pooka%NetBSD.org@localhost>
date:      Mon Aug 24 23:21:16 2015 +0000

description:
These "wip" components have been in progress for >5 years.  There hasn't
been much progress.  Let's just kill them, they're not even build-tested.

diffstat:

 sys/rump/dev/wip/Makefile               |    6 -
 sys/rump/dev/wip/Makefile.inc           |    8 --
 sys/rump/dev/wip/libukbd/Makefile       |   21 ------
 sys/rump/dev/wip/libukbd/UKBD.ioconf    |   24 ------
 sys/rump/dev/wip/libukbd/ukbd_at_usb.c  |   18 -----
 sys/rump/dev/wip/libums/Makefile        |   20 -----
 sys/rump/dev/wip/libums/UMS.ioconf      |   24 ------
 sys/rump/dev/wip/libums/ums_at_usb.c    |   19 -----
 sys/rump/dev/wip/libusbrum/Makefile     |   15 ----
 sys/rump/dev/wip/libusbrum/rum_at_usb.c |  111 --------------------------------
 10 files changed, 0 insertions(+), 266 deletions(-)

diffs (truncated from 306 to 300 lines):

diff -r 39db43628c10 -r a812638a23cb sys/rump/dev/wip/Makefile
--- a/sys/rump/dev/wip/Makefile Mon Aug 24 23:19:33 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-#      $NetBSD: Makefile,v 1.7 2010/02/11 02:22:10 pooka Exp $
-#
-
-SUBDIR=        libusbrum libums libukbd
-
-.include <bsd.subdir.mk>
diff -r 39db43628c10 -r a812638a23cb sys/rump/dev/wip/Makefile.inc
--- a/sys/rump/dev/wip/Makefile.inc     Mon Aug 24 23:19:33 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-#      $NetBSD: Makefile.inc,v 1.2 2010/03/08 10:56:12 pooka Exp $
-#
-
-RUMPTOP=       ${.CURDIR}/../../..
-
-CPPFLAGS+=     -I${RUMPTOP}/librump/rumpdev -I${RUMPTOP}/librump/rumpkern
-
-.include "${RUMPTOP}/Makefile.rump"
diff -r 39db43628c10 -r a812638a23cb sys/rump/dev/wip/libukbd/Makefile
--- a/sys/rump/dev/wip/libukbd/Makefile Mon Aug 24 23:19:33 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-#      $NetBSD: Makefile,v 1.4 2010/03/01 15:41:15 pooka Exp $
-#
-
-.PATH: ${.CURDIR}/../../../../dev/usb ${.CURDIR}/../../../../kern      \
-       ${.CURDIR}/../../../../dev/wscons
-
-LIB=   rumpdev_ukbd
-IOCONF= UKBD.ioconf
-
-SRCS=  ukbd.c ukbdmap.c
-
-SRCS+=  hid.c uhidev.c uhid.c
-SRCS+= ukbd_at_usb.c
-
-# XXX
-SRCS+=  tty.c tty_conf.c tty_tty.c tty_subr.c
-
-CPPFLAGS+=     -I${RUMPTOP}/librump/rumpvfs
-
-.include <bsd.lib.mk>
-.include <bsd.klinks.mk>
diff -r 39db43628c10 -r a812638a23cb sys/rump/dev/wip/libukbd/UKBD.ioconf
--- a/sys/rump/dev/wip/libukbd/UKBD.ioconf      Mon Aug 24 23:19:33 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-#      $NetBSD: UKBD.ioconf,v 1.4 2010/03/08 10:57:25 pooka Exp $
-#
-
-ioconf ukbd
-
-include "conf/files"
-include "dev/usb/files.usb"
-include "rump/dev/files.rump"
-
-pseudo-root uhub*
-
-# USB HID device
-uhidev* at uhub? port ? configuration ? interface ?
-
-# USB Keyboards
-ukbd*   at uhidev? reportid ?
-wskbd*  at ukbd? console ? mux 1
-
-# USB Mice
-ums*    at uhidev? reportid ?
-wsmouse* at ums? mux 0
-
-# USB Generic HID devices
-uhid*   at uhidev? reportid ?   
diff -r 39db43628c10 -r a812638a23cb sys/rump/dev/wip/libukbd/ukbd_at_usb.c
--- a/sys/rump/dev/wip/libukbd/ukbd_at_usb.c    Mon Aug 24 23:19:33 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-/*     $NetBSD: ukbd_at_usb.c,v 1.5 2010/03/25 19:54:08 pooka Exp $    */
-
-#include <sys/param.h>
-#include <sys/conf.h>
-#include <sys/device.h>
-#include <sys/mount.h>
-
-#include "ioconf.c"
-
-#include "rump_private.h"
-#include "rump_dev_private.h"
-
-RUMP_COMPONENT(RUMP_COMPONENT_DEV)
-{
-
-       config_init_component(cfdriver_comp_ukbd,
-           cfattach_comp_ukbd, cfdata_ukbd);
-}
diff -r 39db43628c10 -r a812638a23cb sys/rump/dev/wip/libums/Makefile
--- a/sys/rump/dev/wip/libums/Makefile  Mon Aug 24 23:19:33 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-#      $NetBSD: Makefile,v 1.4 2010/03/01 15:41:15 pooka Exp $
-#
-
-.PATH: ${.CURDIR}/../../../../dev/usb ${.CURDIR}/../../../../kern
-
-LIB=   rumpdev_ums
-IOCONF= UMS.ioconf
-
-SRCS=  ums.c
-
-SRCS+=  hid.c uhidev.c uhid.c
-SRCS+= ums_at_usb.c
-
-# XXX
-SRCS+=  tty.c tty_conf.c tty_tty.c tty_subr.c
-
-CPPFLAGS+=     -I${RUMPTOP}/librump/rumpvfs
-
-.include <bsd.lib.mk>
-.include <bsd.klinks.mk>
diff -r 39db43628c10 -r a812638a23cb sys/rump/dev/wip/libums/UMS.ioconf
--- a/sys/rump/dev/wip/libums/UMS.ioconf        Mon Aug 24 23:19:33 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-#      $NetBSD: UMS.ioconf,v 1.4 2010/03/08 10:57:25 pooka Exp $
-#
-
-ioconf ums
-
-include "conf/files"
-include "dev/usb/files.usb"
-include "rump/dev/files.rump"
-
-pseudo-root uhub*
-
-# USB HID device
-uhidev* at uhub? port ? configuration ? interface ?
-
-# USB Keyboards
-ukbd*   at uhidev? reportid ?
-wskbd*  at ukbd? console ? mux 1
-
-# USB Mice
-ums*    at uhidev? reportid ?
-wsmouse* at ums? mux 0
-
-# USB Generic HID devices
-uhid*   at uhidev? reportid ?   
diff -r 39db43628c10 -r a812638a23cb sys/rump/dev/wip/libums/ums_at_usb.c
--- a/sys/rump/dev/wip/libums/ums_at_usb.c      Mon Aug 24 23:19:33 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-/*     $NetBSD: ums_at_usb.c,v 1.5 2010/03/25 19:54:08 pooka Exp $     */
-
-#include <sys/param.h>
-#include <sys/conf.h>
-#include <sys/device.h>
-#include <sys/mount.h>
-
-#include "ioconf.c"
-
-#include "rump_private.h"
-#include "rump_dev_private.h"
-#include "rump_vfs_private.h"
-
-RUMP_COMPONENT(RUMP_COMPONENT_DEV)
-{
-
-       config_init_component(cfdriver_comp_ums,
-           cfattach_comp_ums, cfdata_ums);
-}
diff -r 39db43628c10 -r a812638a23cb sys/rump/dev/wip/libusbrum/Makefile
--- a/sys/rump/dev/wip/libusbrum/Makefile       Mon Aug 24 23:19:33 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-#      $NetBSD: Makefile,v 1.2 2010/02/16 20:42:45 pooka Exp $
-#
-
-.PATH: ${.CURDIR}/../../../../dev/usb
-
-LIB=   rumpdev_usbrum
-
-SRCS=   if_rum.c
-
-SRCS+= rum_at_usb.c
-
-CPPFLAGS+=     -I${.CURDIR}/opt -I${RUMPTOP}/librump/rumpnet/opt
-
-.include <bsd.lib.mk>
-.include <bsd.klinks.mk>
diff -r 39db43628c10 -r a812638a23cb sys/rump/dev/wip/libusbrum/rum_at_usb.c
--- a/sys/rump/dev/wip/libusbrum/rum_at_usb.c   Mon Aug 24 23:19:33 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,111 +0,0 @@
-/*     $NetBSD: rum_at_usb.c,v 1.4 2010/03/08 10:36:10 pooka Exp $     */
-
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/conf.h>
-#include <sys/device.h>
-#include <sys/kmem.h>
-
-/*
- * rum @ usb
- *
- * handwritten device configuration.... 'nuf said
- *
- * I could convert this to use the new ioconf keyword in config,
- * except I don't have the hardware for testing anymore ...
- */
-
-static const struct cfiattrdata uroothub_iattrdata = {
-       "usbroothubif", 0, {
-               { NULL, NULL, 0 },
-       }
-};
-static const struct cfiattrdata *const usb_attrs[] = {
-       &uroothub_iattrdata,
-       NULL,
-};
-CFDRIVER_DECL(usb, DV_DULL, usb_attrs);
-
-static const struct cfiattrdata usbdevif_iattrdata = {
-       "usbdevif", 0, {
-               { NULL, NULL, 0 },
-       }
-};
-static const struct cfiattrdata usbifif_iattrdata = {
-       "usbifif", 0, {
-               { NULL, NULL, 0 },
-       }
-};
-static const struct cfiattrdata *const uhub_attrs[] = {
-       &usbdevif_iattrdata,
-       &usbifif_iattrdata,
-       NULL,
-};
-CFDRIVER_DECL(uhub, DV_DULL, uhub_attrs);
-
-CFDRIVER_DECL(rum, DV_IFNET, NULL);
-
-struct cfparent ugenhc_pspec = {
-       "usbus",
-       "ugenhc",
-       DVUNIT_ANY
-};
-
-struct cfdata usb_cfdata[] = {
-       { "usb", "usb", 0, FSTATE_STAR, NULL, 0, &ugenhc_pspec },
-};
-
-struct cfparent usb_pspec = {
-       "usbroothubif",
-       "usb",
-       DVUNIT_ANY
-};
-
-struct cfdata uhub_cfdata[] = {
-       { "uhub", "uroothub", 0, FSTATE_STAR, NULL, 0, &usb_pspec },
-};
-
-struct cfparent usbifif_pspec = {
-       "usbifif",
-       "uhub",
-       DVUNIT_ANY
-};
-
-struct cfparent usbdevif_pspec = {
-       "usbdevif",
-       "uhub",
-       DVUNIT_ANY
-};
-
-struct cfdata rum_cfdata[] = {
-       { "rum", "rum", 0, FSTATE_STAR, NULL, 0, &usbdevif_pspec },
-};
-
-#include "rump_private.h"
-#include "rump_dev_private.h"
-
-#define FLAWLESSCALL(call)                                             \
-do {                                                                   \
-       int att_error;                                                  \
-       if ((att_error = call) != 0)                                    \
-               panic("\"%s\" failed", #call);                          \
-} while (/*CONSTCOND*/0)
-
-RUMP_COMPONENT(RUMP_COMPONENT_DEV)
-{
-       extern struct cfattach usb_ca, uhub_ca, uroothub_ca, rum_ca;
-
-       FLAWLESSCALL(config_cfdriver_attach(&usb_cd));
-       FLAWLESSCALL(config_cfattach_attach("usb", &usb_ca));
-       FLAWLESSCALL(config_cfdata_attach(usb_cfdata, 0));
-
-       FLAWLESSCALL(config_cfdriver_attach(&uhub_cd));
-       FLAWLESSCALL(config_cfattach_attach("uhub", &uhub_ca));
-       FLAWLESSCALL(config_cfdata_attach(uhub_cfdata, 0));
-



Home | Main Index | Thread Index | Old Index