On Monday 29 October 2012 04:48:24 Eitan Adler wrote:
> Author: eadler
> Date: Mon Oct 29 03:48:24 2012
> New Revision: 242280
> URL: http://svn.freebsd.org/changeset/base/242280
> 
> Log:
>   MFC r241843:
>       Make uhid attach to devices that look like keyboards
>       or mice if the quirk which prevents higher level
>       drivers from attaching is set.
> 
>   PR:         usb/172458
>   Approved by:        cperciva (implicit)
> 
> Modified:
>   stable/8/sys/dev/usb/input/uhid.c
> Directory Properties:
>   stable/8/sys/   (props changed)
>   stable/8/sys/dev/   (props changed)
>   stable/8/sys/dev/usb/   (props changed)
> 
> Modified: stable/8/sys/dev/usb/input/uhid.c
> ===========================================================================
> === --- stable/8/sys/dev/usb/input/uhid.c     Mon Oct 29 03:45:38
> 2012  (r242279) +++ stable/8/sys/dev/usb/input/uhid.c Mon Oct 29 03:48:24
> 2012  (r242280) @@ -691,10 +691,11 @@ uhid_probe(device_t dev)
>        */
>       if ((uaa->info.bInterfaceClass == UICLASS_HID) &&
>           (uaa->info.bInterfaceSubClass == UISUBCLASS_BOOT) &&
> -         ((uaa->info.bInterfaceProtocol == UIPROTO_BOOT_KEYBOARD) ||
> -          (uaa->info.bInterfaceProtocol == UIPROTO_MOUSE))) {
> +         (((uaa->info.bInterfaceProtocol == UIPROTO_BOOT_KEYBOARD) &&
> +           !usb_test_quirk(uaa, UQ_KBD_IGNORE)) ||
> +          ((uaa->info.bInterfaceProtocol == UIPROTO_MOUSE) &&
> +           !usb_test_quirk(uaa, UQ_UMS_IGNORE))))
>               return (ENXIO);
> -     }
> 
>       return (BUS_PROBE_GENERIC);
>  }

Hi,

You need to MFC this aswell. Else it won't build.

http://svn.freebsd.org/changeset/base/240667

--HPS
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to