[src/trunk]: src/sys/dev/usb Apple product 0x1000 is a Bluetooth HCI in HID-p...

[phx <phx%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/8d4322e5f15b
branches:  trunk
changeset: 759421:8d4322e5f15b
user:      phx <phx%NetBSD.org@localhost>
date:      Wed Dec 08 20:59:58 2010 +0000

description:
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.

diffstat:

 sys/dev/usb/usb_quirks.c |  5 ++---
 sys/dev/usb/usbdevs      |  4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diffs (44 lines):

diff -r 79ba44e90835 -r 8d4322e5f15b sys/dev/usb/usb_quirks.c
--- a/sys/dev/usb/usb_quirks.c  Wed Dec 08 20:23:12 2010 +0000
+++ b/sys/dev/usb/usb_quirks.c  Wed Dec 08 20:59:58 2010 +0000
@@ -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 }},
diff -r 79ba44e90835 -r 8d4322e5f15b sys/dev/usb/usbdevs
--- a/sys/dev/usb/usbdevs       Wed Dec 08 20:23:12 2010 +0000
+++ b/sys/dev/usb/usbdevs       Wed Dec 08 20:59:58 2010 +0000
@@ -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