PERFORCE change 174616 for review

[Hans Petter Selasky]

http://p4web.freebsd.org/chv.cgi?CH=174616

Change 174616 by hselasky at hselasky_laptop001 on 2010/02/12 09:05:16

	
	USB input:
		- add new quirk
	
	PR:		usb/116947

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/input/ukbd.c#44 edit
.. //depot/projects/usb/src/sys/dev/usb/quirk/usb_quirk.c#23 edit
.. //depot/projects/usb/src/sys/dev/usb/quirk/usb_quirk.h#9 edit
.. //depot/projects/usb/src/sys/dev/usb/usbdevs#104 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/input/ukbd.c#44 (text+ko) ====

@@ -867,6 +867,18 @@
 	 */
 	KBD_PROBE_DONE(kbd);
 
+	/*
+	 * Set boot protocol if we need the quirk.
+	 */
+	if (usb_test_quirk(uaa, UQ_KBD_BOOTPROTO)) {
+		err = usbd_req_set_protocol(sc->sc_udev, NULL, 
+			sc->sc_iface_index, 0);
+		if (err != USB_ERR_NORMAL_COMPLETION) {
+			DPRINTF("set protocol error=%s\n", usbd_errstr(err));
+			goto detach;
+		}
+	}
+
 	/* figure out if there is an ID byte in the data */
 	err = usbd_req_get_hid_desc(uaa->device, NULL, &hid_ptr,
 	    &hid_len, M_TEMP, uaa->info.bIfaceIndex);

==== //depot/projects/usb/src/sys/dev/usb/quirk/usb_quirk.c#23 (text+ko) ====

@@ -459,6 +459,7 @@
 	[UQ_BUS_POWERED]	= "UQ_BUS_POWERED",
 	[UQ_HID_IGNORE]		= "UQ_HID_IGNORE",
 	[UQ_KBD_IGNORE]		= "UQ_KBD_IGNORE",
+	[UQ_KBD_BOOTPROTO]	= "UQ_KBD_BOOTPROTO",
 	[UQ_MS_BAD_CLASS]	= "UQ_MS_BAD_CLASS",
 	[UQ_MS_LEADING_BYTE]	= "UQ_MS_LEADING_BYTE",
 	[UQ_MS_REVZ]		= "UQ_MS_REVZ",

==== //depot/projects/usb/src/sys/dev/usb/quirk/usb_quirk.h#9 (text+ko) ====

@@ -45,6 +45,7 @@
 	UQ_BUS_POWERED,		/* device is bus powered, despite claim */
 	UQ_HID_IGNORE,		/* device should be ignored by hid class */
 	UQ_KBD_IGNORE,		/* device should be ignored by kbd class */
+	UQ_KBD_BOOTPROTO,	/* device should set the boot protocol */
 	UQ_MS_BAD_CLASS,	/* doesn't identify properly */
 	UQ_MS_LEADING_BYTE,	/* mouse sends an unknown leading byte */
 	UQ_MS_REVZ,		/* mouse has Z-axis reversed */

==== //depot/projects/usb/src/sys/dev/usb/usbdevs#104 (text+ko) ====

@@ -2031,6 +2031,7 @@
 product MICROSOFT WLNOTEBOOK3	0x00d2	Wireless Optical Mouse 3000 (Model 1049)
 product MICROSOFT WLUSBMOUSE	0x00b9	Wireless USB Mouse
 product MICROSOFT XBOX360	0x0292	XBOX 360 WLAN
+product MICROSOFT NATURAL4000	0x00db	Natural Ergonomic Keyboard 4000
 
 /* Microtech products */
 product MICROTECH SCSIDB25	0x0004	USB-SCSI-DB25