Mon Mar 1 11:34:27 2010 UTC ()
add u3g


(pooka)
diff -r1.2 -r1.3 src/sys/rump/dev/lib/libucom/Makefile
diff -r1.2 -r1.3 src/sys/rump/dev/lib/libucom/UCOM.ioconf
diff -r1.1 -r1.2 src/sys/rump/dev/lib/libucom/ucom_at_usb.c
cvs diff -r1.2 -r1.3 src/sys/rump/dev/lib/libucom/Makefile (expand / switch to unified diff)

--- src/sys/rump/dev/lib/libucom/Makefile 2010/02/16 20:42:45 1.2
+++ src/sys/rump/dev/lib/libucom/Makefile 2010/03/01 11:34:27 1.3
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.2 2010/02/16 20:42:45 pooka Exp $ 1# $NetBSD: Makefile,v 1.3 2010/03/01 11:34:27 pooka Exp $
2# 2#
3 3
4.PATH: ${.CURDIR}/../../../../dev/usb ${.CURDIR}/../../../../kern 4.PATH: ${.CURDIR}/../../../../dev/usb ${.CURDIR}/../../../../kern
5 5
6LIB= rumpdev_ucom 6LIB= rumpdev_ucom
7 7
8SRCS= ucom.c uplcom.c 8SRCS= ucom.c uplcom.c u3g.c
9 9
10SRCS+= ucom_at_usb.c 10SRCS+= ucom_at_usb.c
11SRCS+= tty.c tty_conf.c tty_tty.c tty_subr.c 11SRCS+= tty.c tty_conf.c tty_tty.c tty_subr.c
12 12
13IOCONFIG= UCOM.ioconf 13IOCONFIG= UCOM.ioconf
14 14
15CPPFLAGS+= -I${RUMPTOP}/librump/rumpvfs 15CPPFLAGS+= -I${RUMPTOP}/librump/rumpvfs
16 16
17.include <bsd.lib.mk> 17.include <bsd.lib.mk>
18.include <bsd.klinks.mk> 18.include <bsd.klinks.mk>
cvs diff -r1.2 -r1.3 src/sys/rump/dev/lib/libucom/UCOM.ioconf (expand / switch to unified diff)

--- src/sys/rump/dev/lib/libucom/UCOM.ioconf 2010/02/12 04:20:51 1.2
+++ src/sys/rump/dev/lib/libucom/UCOM.ioconf 2010/03/01 11:34:27 1.3
@@ -1,11 +1,18 @@ @@ -1,11 +1,18 @@
1# $NetBSD: UCOM.ioconf,v 1.2 2010/02/12 04:20:51 pooka Exp $ 1# $NetBSD: UCOM.ioconf,v 1.3 2010/03/01 11:34:27 pooka Exp $
2# 2#
3 3
4ioconf ucom 4ioconf ucom
5 5
6include "conf/files" 6include "conf/files"
7include "dev/usb/files.usb" 7include "dev/usb/files.usb"
8include "rump/dev/files.rump" 8include "rump/dev/files.rump"
9 9
 10# I/O DATA USB-RSAQ2 serial adapter
10uplcom* at uhub? 11uplcom* at uhub?
11ucom* at uplcom? portno ? 12ucom* at uplcom? portno ?
 13
 14# USB 3G datacards
 15u3g* at uhub? port ?
 16u3ginit* at uhub? port ?
 17
 18ucom* at u3g?
cvs diff -r1.1 -r1.2 src/sys/rump/dev/lib/libucom/ucom_at_usb.c (expand / switch to unified diff)

--- src/sys/rump/dev/lib/libucom/ucom_at_usb.c 2010/02/11 02:22:09 1.1
+++ src/sys/rump/dev/lib/libucom/ucom_at_usb.c 2010/03/01 11:34:27 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: ucom_at_usb.c,v 1.1 2010/02/11 02:22:09 pooka Exp $ */ 1/* $NetBSD: ucom_at_usb.c,v 1.2 2010/03/01 11:34:27 pooka Exp $ */
2 2
3#include <sys/param.h> 3#include <sys/param.h>
4#include <sys/types.h> 4#include <sys/types.h>
5#include <sys/conf.h> 5#include <sys/conf.h>
6#include <sys/device.h> 6#include <sys/device.h>
7#include <sys/kmem.h> 7#include <sys/kmem.h>
8#include <sys/stat.h> 8#include <sys/stat.h>
9 9
10#include "ioconf.c" 10#include "ioconf.c"
11 11
12#include "rump_dev_private.h" 12#include "rump_dev_private.h"
13#include "rump_vfs_private.h" 13#include "rump_vfs_private.h"
14 14
@@ -31,26 +31,32 @@ rump_device_configuration(void) @@ -31,26 +31,32 @@ rump_device_configuration(void)
31 31
32 FLAWLESSCALL(config_cfdriver_attach(&mainbus_cd)); 32 FLAWLESSCALL(config_cfdriver_attach(&mainbus_cd));
33 FLAWLESSCALL(config_cfattach_attach("mainbus", &mainbus_ca)); 33 FLAWLESSCALL(config_cfattach_attach("mainbus", &mainbus_ca));
34 34
35 FLAWLESSCALL(config_cfdriver_attach(&ugenhc_cd)); 35 FLAWLESSCALL(config_cfdriver_attach(&ugenhc_cd));
36 FLAWLESSCALL(config_cfattach_attach("ugenhc", &ugenhc_ca)); 36 FLAWLESSCALL(config_cfattach_attach("ugenhc", &ugenhc_ca));
37 37
38 FLAWLESSCALL(config_cfdriver_attach(&usb_cd)); 38 FLAWLESSCALL(config_cfdriver_attach(&usb_cd));
39 FLAWLESSCALL(config_cfattach_attach("usb", &usb_ca)); 39 FLAWLESSCALL(config_cfattach_attach("usb", &usb_ca));
40 40
41 FLAWLESSCALL(config_cfdriver_attach(&uplcom_cd)); 41 FLAWLESSCALL(config_cfdriver_attach(&uplcom_cd));
42 FLAWLESSCALL(config_cfattach_attach("uplcom", &uplcom_ca)); 42 FLAWLESSCALL(config_cfattach_attach("uplcom", &uplcom_ca));
43 43
 44 FLAWLESSCALL(config_cfdriver_attach(&u3ginit_cd));
 45 FLAWLESSCALL(config_cfattach_attach("u3ginit", &u3ginit_ca));
 46
 47 FLAWLESSCALL(config_cfdriver_attach(&u3g_cd));
 48 FLAWLESSCALL(config_cfattach_attach("u3g", &u3g_ca));
 49
44 FLAWLESSCALL(config_cfdriver_attach(&ucom_cd)); 50 FLAWLESSCALL(config_cfdriver_attach(&ucom_cd));
45 FLAWLESSCALL(config_cfattach_attach("ucom", &ucom_ca)); 51 FLAWLESSCALL(config_cfattach_attach("ucom", &ucom_ca));
46 52
47 FLAWLESSCALL(config_cfdriver_attach(&uhub_cd)); 53 FLAWLESSCALL(config_cfdriver_attach(&uhub_cd));
48 FLAWLESSCALL(config_cfattach_attach("uhub", &uroothub_ca)); 54 FLAWLESSCALL(config_cfattach_attach("uhub", &uroothub_ca));
49 55
50 bmaj = cmaj = -1; 56 bmaj = cmaj = -1;
51 FLAWLESSCALL(devsw_attach("ucom", NULL, &bmaj, &ucom_cdevsw, &cmaj)); 57 FLAWLESSCALL(devsw_attach("ucom", NULL, &bmaj, &ucom_cdevsw, &cmaj));
52 58
53 FLAWLESSCALL(rump_vfs_makedevnodes(S_IFCHR, "/dev/ttyU", '0', 59 FLAWLESSCALL(rump_vfs_makedevnodes(S_IFCHR, "/dev/ttyU", '0',
54 cmaj, 0, 1)); 60 cmaj, 0, 1));
55 FLAWLESSCALL(rump_vfs_makedevnodes(S_IFCHR, "/dev/dtyU", '0', 61 FLAWLESSCALL(rump_vfs_makedevnodes(S_IFCHR, "/dev/dtyU", '0',
56 cmaj, 0x80000, 1)); 62 cmaj, 0x80000, 1));