Module Name: src
Committed By: phx
Date: Wed Dec 8 20:59:58 UTC 2010
Modified Files:
src/sys/dev/usb: usb_quirks.c usbdevs
Log Message:
Apple product 0x1000 is a Bluetooth HCI in HID-proxy mode, which was the
reason it appears as keyboard- and mouse-HID. Do not ignore it.
To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.71 src/sys/dev/usb/usb_quirks.c
cvs rdiff -u -r1.569 -r1.570 src/sys/dev/usb/usbdevs
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/usb_quirks.c
diff -u src/sys/dev/usb/usb_quirks.c:1.70 src/sys/dev/usb/usb_quirks.c:1.71
--- src/sys/dev/usb/usb_quirks.c:1.70 Tue Nov 30 11:35:30 2010
+++ src/sys/dev/usb/usb_quirks.c Wed Dec 8 20:59:58 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: usb_quirks.c,v 1.70 2010/11/30 11:35:30 phx Exp $ */
+/* $NetBSD: usb_quirks.c,v 1.71 2010/12/08 20:59:58 phx Exp $ */
/* $FreeBSD: src/sys/dev/usb/usb_quirks.c,v 1.30 2003/01/02 04:15:55 imp Exp $ */
/*
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usb_quirks.c,v 1.70 2010/11/30 11:35:30 phx Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb_quirks.c,v 1.71 2010/12/08 20:59:58 phx Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -56,7 +56,6 @@
} usb_quirks[] = {
/* Devices which should be ignored by uhid */
{ USB_VENDOR_APC, USB_PRODUCT_APC_UPS, ANY, { UQ_HID_IGNORE }},
- { USB_VENDOR_APPLE, USB_PRODUCT_APPLE_ADB, ANY, { UQ_HID_IGNORE }},
{ USB_VENDOR_CYBERPOWER, USB_PRODUCT_CYBERPOWER_UPS, ANY, { UQ_HID_IGNORE }},
{ USB_VENDOR_MGE, USB_PRODUCT_MGE_UPS1, ANY, { UQ_HID_IGNORE }},
{ USB_VENDOR_MGE, USB_PRODUCT_MGE_UPS2, ANY, { UQ_HID_IGNORE }},
Index: src/sys/dev/usb/usbdevs
diff -u src/sys/dev/usb/usbdevs:1.569 src/sys/dev/usb/usbdevs:1.570
--- src/sys/dev/usb/usbdevs:1.569 Tue Nov 30 11:25:25 2010
+++ src/sys/dev/usb/usbdevs Wed Dec 8 20:59:58 2010
@@ -1,4 +1,4 @@
-$NetBSD: usbdevs,v 1.569 2010/11/30 11:25:25 phx Exp $
+$NetBSD: usbdevs,v 1.570 2010/12/08 20:59:58 phx Exp $
/*
* Copyright (c) 1998-2004 The NetBSD Foundation, Inc.
@@ -777,7 +777,7 @@
product APPLE FOUNTAIN_TP 0x030a Apple Internal Trackpad (Fountain)
product APPLE GEYSER1_TP 0x030b Apple Internal Trackpad (Geyser)
product APPLE MAGICMOUSE 0x030d Magic Mouse
-product APPLE ADB 0x1000 Internal ADB device
+product APPLE BLUETOOTH_HIDMODE 0x1000 Bluetooth HCI (HID-proxy mode)
product APPLE EXT_KBD_HUB 0x1003 Hub in Apple Extended USB Keyboard
product APPLE SPEAKERS 0x1101 Speakers
product APPLE IPHONE 0x1290 iPhone
