Re: svn commit: r242280 - stable/8/sys/dev/usb/input

2012-10-29 Thread Hans Petter Selasky 
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

Re: svn commit: r242280 - stable/8/sys/dev/usb/input

2012-10-29 Thread Hans Petter Selasky 
Hi,

I just did the MFC.

Hint: It might be worth to diff -ur sys/dev/usb from 8,9 towards 10-current to 
see what you are missing sometimes.

--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

Re: svn commit: r242280 - stable/8/sys/dev/usb/input

2012-10-29 Thread Konstantin Belousov 
On Mon, Oct 29, 2012 at 09:20:13AM +0100, Hans Petter Selasky wrote:
 Hi,
 
 I just did the MFC.
 
 Hint: It might be worth to diff -ur sys/dev/usb from 8,9 towards 10-current 
 to 
 see what you are missing sometimes.

It is worth to do the builds and tests before committing. I prefer the
word 'must' there, in fact. Directed at Eitan.


pgpOVFdpkfbi1.pgp
Description: PGP signature

Re: svn commit: r242280 - stable/8/sys/dev/usb/input

2012-10-29 Thread Eitan Adler 
On 29 October 2012 04:20, Hans Petter Selasky hsela...@c2i.net wrote:
 Hi,

 I just did the MFC.

Thanks.

 Hint: It might be worth to diff -ur sys/dev/usb from 8,9 towards 10-current to
 see what you are missing sometimes.

Will do in the future.


-- 
Eitan Adler
Source, Ports, Doc committer
Bugmeister, Ports Security teams
___
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

svn commit: r242280 - stable/8/sys/dev/usb/input

2012-10-28 Thread Eitan Adler 
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);
 }
___
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