Module Name: src
Committed By: pooka
Date: Mon Mar 1 11:34:27 UTC 2010
Modified Files:
src/sys/rump/dev/lib/libucom: Makefile UCOM.ioconf ucom_at_usb.c
Log Message:
add u3g
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/rump/dev/lib/libucom/Makefile \
src/sys/rump/dev/lib/libucom/UCOM.ioconf
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/dev/lib/libucom/ucom_at_usb.c
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/lib/libucom/Makefile
diff -u src/sys/rump/dev/lib/libucom/Makefile:1.2 src/sys/rump/dev/lib/libucom/Makefile:1.3
--- src/sys/rump/dev/lib/libucom/Makefile:1.2 Tue Feb 16 20:42:45 2010
+++ src/sys/rump/dev/lib/libucom/Makefile Mon Mar 1 11:34:27 2010
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.2 2010/02/16 20:42:45 pooka Exp $
+# $NetBSD: Makefile,v 1.3 2010/03/01 11:34:27 pooka Exp $
#
.PATH: ${.CURDIR}/../../../../dev/usb ${.CURDIR}/../../../../kern
LIB= rumpdev_ucom
-SRCS= ucom.c uplcom.c
+SRCS= ucom.c uplcom.c u3g.c
SRCS+= ucom_at_usb.c
SRCS+= tty.c tty_conf.c tty_tty.c tty_subr.c
Index: src/sys/rump/dev/lib/libucom/UCOM.ioconf
diff -u src/sys/rump/dev/lib/libucom/UCOM.ioconf:1.2 src/sys/rump/dev/lib/libucom/UCOM.ioconf:1.3
--- src/sys/rump/dev/lib/libucom/UCOM.ioconf:1.2 Fri Feb 12 04:20:51 2010
+++ src/sys/rump/dev/lib/libucom/UCOM.ioconf Mon Mar 1 11:34:27 2010
@@ -1,4 +1,4 @@
-# $NetBSD: UCOM.ioconf,v 1.2 2010/02/12 04:20:51 pooka Exp $
+# $NetBSD: UCOM.ioconf,v 1.3 2010/03/01 11:34:27 pooka Exp $
#
ioconf ucom
@@ -7,5 +7,12 @@
include "dev/usb/files.usb"
include "rump/dev/files.rump"
+# I/O DATA USB-RSAQ2 serial adapter
uplcom* at uhub?
ucom* at uplcom? portno ?
+
+# USB 3G datacards
+u3g* at uhub? port ?
+u3ginit* at uhub? port ?
+
+ucom* at u3g?
Index: src/sys/rump/dev/lib/libucom/ucom_at_usb.c
diff -u src/sys/rump/dev/lib/libucom/ucom_at_usb.c:1.1 src/sys/rump/dev/lib/libucom/ucom_at_usb.c:1.2
--- src/sys/rump/dev/lib/libucom/ucom_at_usb.c:1.1 Thu Feb 11 02:22:09 2010
+++ src/sys/rump/dev/lib/libucom/ucom_at_usb.c Mon Mar 1 11:34:27 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ucom_at_usb.c,v 1.1 2010/02/11 02:22:09 pooka Exp $ */
+/* $NetBSD: ucom_at_usb.c,v 1.2 2010/03/01 11:34:27 pooka Exp $ */
#include <sys/param.h>
#include <sys/types.h>
@@ -41,6 +41,12 @@
FLAWLESSCALL(config_cfdriver_attach(&uplcom_cd));
FLAWLESSCALL(config_cfattach_attach("uplcom", &uplcom_ca));
+ FLAWLESSCALL(config_cfdriver_attach(&u3ginit_cd));
+ FLAWLESSCALL(config_cfattach_attach("u3ginit", &u3ginit_ca));
+
+ FLAWLESSCALL(config_cfdriver_attach(&u3g_cd));
+ FLAWLESSCALL(config_cfattach_attach("u3g", &u3g_ca));
+
FLAWLESSCALL(config_cfdriver_attach(&ucom_cd));
FLAWLESSCALL(config_cfattach_attach("ucom", &ucom_ca));