[Glibc-bsd-commits] r3524 - in trunk/kfreebsd-8/debian: . patches

[Robert Millan]

Author: rmh
Date: 2011-07-03 11:53:34 +0000 (Sun, 03 Jul 2011)
New Revision: 3524

Added:
   trunk/kfreebsd-8/debian/patches/000_uhid_nomatch.diff
Modified:
   trunk/kfreebsd-8/debian/changelog
   trunk/kfreebsd-8/debian/patches/series
Log:
  * 000_uhid_nomatch.diff: Cherry-pick from HEAD (Fix for "nomatch" event
    for ums and ukbd drivers when uhid is loaded).

Modified: trunk/kfreebsd-8/debian/changelog
===================================================================
--- trunk/kfreebsd-8/debian/changelog	2011-07-03 11:48:27 UTC (rev 3523)
+++ trunk/kfreebsd-8/debian/changelog	2011-07-03 11:53:34 UTC (rev 3524)
@@ -9,8 +9,10 @@
     them.
   * Extend ldscript non-kFreeBSD fix to support mipsel.
   * Allow building module-less kernels (needed for mipsel).
+  * 000_uhid_nomatch.diff: Cherry-pick from HEAD (Fix for "nomatch" event
+    for ums and ukbd drivers when uhid is loaded).
 
- -- Robert Millan <rmh at debian.org>  Sat, 02 Jul 2011 15:27:28 +0200
+ -- Robert Millan <rmh at debian.org>  Sun, 03 Jul 2011 13:49:31 +0200
 
 kfreebsd-8 (8.2-3) unstable; urgency=medium
 

Added: trunk/kfreebsd-8/debian/patches/000_uhid_nomatch.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/000_uhid_nomatch.diff	                        (rev 0)
+++ trunk/kfreebsd-8/debian/patches/000_uhid_nomatch.diff	2011-07-03 11:53:34 UTC (rev 3524)
@@ -0,0 +1,22 @@
+--- a/sys/dev/usb/input/uhid.c
++++ b/sys/dev/usb/input/uhid.c
+@@ -642,6 +642,19 @@
+ 	if (usb_test_quirk(uaa, UQ_HID_IGNORE)) {
+ 		return (ENXIO);
+ 	}
++
++	/*
++	 * Don't attach to mouse and keyboard devices, hence then no
++	 * "nomatch" event is generated and then ums and ukbd won't
++	 * attach properly when loaded.
++	 */
++	if ((uaa->info.bInterfaceClass == UICLASS_HID) &&
++	    (uaa->info.bInterfaceSubClass == UISUBCLASS_BOOT) &&
++	    ((uaa->info.bInterfaceProtocol == UIPROTO_BOOT_KEYBOARD) ||
++	     (uaa->info.bInterfaceProtocol == UIPROTO_MOUSE))) {
++		return (ENXIO);
++	}
++
+ 	return (BUS_PROBE_GENERIC);
+ }
+ 

Modified: trunk/kfreebsd-8/debian/patches/series
===================================================================
--- trunk/kfreebsd-8/debian/patches/series	2011-07-03 11:48:27 UTC (rev 3523)
+++ trunk/kfreebsd-8/debian/patches/series	2011-07-03 11:53:34 UTC (rev 3524)
@@ -2,6 +2,7 @@
 000_t_delta_warning.diff
 000_msk_backport_from_HEAD.diff
 000_net80211_disclosure.diff
+000_uhid_nomatch.diff
 001_misc.diff
 003_glibc_dev_aicasm.diff
 004_xargs.diff