Module Name: src
Committed By: pooka
Date: Mon Mar 22 14:47:02 UTC 2010
Modified Files:
src/sys/rump/dev/lib/libubt: Makefile UBT.ioconf ubt_at_usb.c
Log Message:
Include bthub support.
As mario knows, it should be in another component, but just cram
it here for now until someone solves kernel module dependencies
for us.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/dev/lib/libubt/Makefile \
src/sys/rump/dev/lib/libubt/UBT.ioconf \
src/sys/rump/dev/lib/libubt/ubt_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/libubt/Makefile
diff -u src/sys/rump/dev/lib/libubt/Makefile:1.1 src/sys/rump/dev/lib/libubt/Makefile:1.2
--- src/sys/rump/dev/lib/libubt/Makefile:1.1 Mon Mar 22 12:14:51 2010
+++ src/sys/rump/dev/lib/libubt/Makefile Mon Mar 22 14:47:02 2010
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.1 2010/03/22 12:14:51 pooka Exp $
+# $NetBSD: Makefile,v 1.2 2010/03/22 14:47:02 pooka Exp $
#
-.PATH: ${.CURDIR}/../../../../dev/usb
+.PATH: ${.CURDIR}/../../../../dev/usb ${.CURDIR}/../../../../dev/bluetooth
LIB= rumpdev_ubt
IOCONF= UBT.ioconf
-SRCS= ubt.c
+SRCS= ubt.c bthub.c
SRCS+= ubt_at_usb.c
Index: src/sys/rump/dev/lib/libubt/UBT.ioconf
diff -u src/sys/rump/dev/lib/libubt/UBT.ioconf:1.1 src/sys/rump/dev/lib/libubt/UBT.ioconf:1.2
--- src/sys/rump/dev/lib/libubt/UBT.ioconf:1.1 Mon Mar 22 12:14:51 2010
+++ src/sys/rump/dev/lib/libubt/UBT.ioconf Mon Mar 22 14:47:02 2010
@@ -1,10 +1,11 @@
-# $NetBSD: UBT.ioconf,v 1.1 2010/03/22 12:14:51 pooka Exp $
+# $NetBSD: UBT.ioconf,v 1.2 2010/03/22 14:47:02 pooka Exp $
#
ioconf ubt
include "conf/files"
include "dev/usb/files.usb"
+include "dev/bluetooth/files.bluetooth"
include "rump/dev/files.rump"
pseudo-root uhub*
Index: src/sys/rump/dev/lib/libubt/ubt_at_usb.c
diff -u src/sys/rump/dev/lib/libubt/ubt_at_usb.c:1.1 src/sys/rump/dev/lib/libubt/ubt_at_usb.c:1.2
--- src/sys/rump/dev/lib/libubt/ubt_at_usb.c:1.1 Mon Mar 22 12:14:51 2010
+++ src/sys/rump/dev/lib/libubt/ubt_at_usb.c Mon Mar 22 14:47:02 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ubt_at_usb.c,v 1.1 2010/03/22 12:14:51 pooka Exp $ */
+/* $NetBSD: ubt_at_usb.c,v 1.2 2010/03/22 14:47:02 pooka Exp $ */
#include <sys/param.h>
#include <sys/types.h>
@@ -25,4 +25,7 @@
FLAWLESSCALL(config_cfdriver_attach(&ubt_cd));
FLAWLESSCALL(config_cfattach_attach("ubt", &ubt_ca));
+
+ FLAWLESSCALL(config_cfdriver_attach(&bthub_cd));
+ FLAWLESSCALL(config_cfattach_attach("bthub", &bthub_ca));
}
