Module Name: src
Committed By: jmcneill
Date: Sat Jul 30 12:19:13 UTC 2011
Modified Files:
src/sys/arch/i386/conf: ALL XBOX
src/sys/dev/usb: files.usb
Removed Files:
src/sys/dev/usb: xboxcontroller.c
Log Message:
remove xboxcontroller; use the uhidev driver instead
To generate a diff of this commit:
cvs rdiff -u -r1.315 -r1.316 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/i386/conf/XBOX
cvs rdiff -u -r1.112 -r1.113 src/sys/dev/usb/files.usb
cvs rdiff -u -r1.14 -r0 src/sys/dev/usb/xboxcontroller.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/arch/i386/conf/ALL
diff -u src/sys/arch/i386/conf/ALL:1.315 src/sys/arch/i386/conf/ALL:1.316
--- src/sys/arch/i386/conf/ALL:1.315 Sat Jul 23 21:12:58 2011
+++ src/sys/arch/i386/conf/ALL Sat Jul 30 12:19:12 2011
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.315 2011/07/23 21:12:58 jakllsch Exp $
+# $NetBSD: ALL,v 1.316 2011/07/30 12:19:12 jmcneill Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
@@ -17,7 +17,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ALL-$Revision: 1.315 $"
+#ident "ALL-$Revision: 1.316 $"
maxusers 64 # estimated number of users
@@ -1343,10 +1343,6 @@
udsbr* at uhub? port ?
radio* at udsbr?
-# XBOX controller
-xboxcontroller* at uhub? port ?
-wsmouse* at xboxcontroller? mux 0
-
# USB Generic driver
ugen* at uhub? port ?
Index: src/sys/arch/i386/conf/XBOX
diff -u src/sys/arch/i386/conf/XBOX:1.26 src/sys/arch/i386/conf/XBOX:1.27
--- src/sys/arch/i386/conf/XBOX:1.26 Sat May 28 13:01:50 2011
+++ src/sys/arch/i386/conf/XBOX Sat Jul 30 12:19:12 2011
@@ -1,4 +1,4 @@
-# $NetBSD: XBOX,v 1.26 2011/05/28 13:01:50 ryo Exp $
+# $NetBSD: XBOX,v 1.27 2011/07/30 12:19:12 jmcneill Exp $
#
# XBOX -- A basic Microsoft XBox kernel config file.
#
@@ -238,10 +238,6 @@
uvscom* at uhub? port ? # SUNTAC Slipper U VS-10U serial adapter
ucom* at uvscom? portno ?
-# Xbox Controller
-xboxcontroller* at uhub? port ? configuration ?
-wsmouse* at xboxcontroller? mux 0
-
# USB Generic driver
ugen* at uhub? port ?
Index: src/sys/dev/usb/files.usb
diff -u src/sys/dev/usb/files.usb:1.112 src/sys/dev/usb/files.usb:1.113
--- src/sys/dev/usb/files.usb:1.112 Sat Jul 23 20:52:15 2011
+++ src/sys/dev/usb/files.usb Sat Jul 30 12:19:12 2011
@@ -1,4 +1,4 @@
-# $NetBSD: files.usb,v 1.112 2011/07/23 20:52:15 jakllsch Exp $
+# $NetBSD: files.usb,v 1.113 2011/07/30 12:19:12 jmcneill Exp $
#
# Config file and device description for machine-independent USB code.
# Included by ports that need it. Ports that use it must provide
@@ -373,11 +373,6 @@
attach utoppy at usbdevif
file dev/usb/utoppy.c utoppy
-# Microsoft Xbox controller (gamepad)
-device xboxcontroller: wsmousedev
-attach xboxcontroller at usbdevif
-file dev/usb/xboxcontroller.c xboxcontroller
-
# Zydas ZD1211
device zyd: ether, ifnet, arp, wlan, firmload
attach zyd at usbdevif
