Merge branch 'master' of git://git.theshell.com/dragonfly

diff --git a/sys/bus/usb/usb_quirks.c b/sys/bus/usb/usb_quirks.c
index 4ef50d3..a222f32 100644 (file)
--- a/sys/bus/usb/usb_quirks.c
+++ b/sys/bus/usb/usb_quirks.c
@@ -163,6 +163,11 @@ static const struct usbd_quirk_entry {
  /* MGE UPS Systems ProtectionCenter */
  { .idVendor = 0x0463, .idProduct = 0xffff, .bcdDevice = ANY,
    .quirks   = { UQ_HID_IGNORE }},
+
+ /* Apple usb keyboard */
+ { .idVendor = 0x05ac, .idProduct = 0x0221, .bcdDevice = ANY,
+   .quirks   = { UQ_NO_SET_PROTO}},
+
  { 0, 0, 0, { 0 } }
 };
 

diff --git a/sys/dev/usbmisc/ukbd/ukbd.c b/sys/dev/usbmisc/ukbd/ukbd.c
index f4e4148..7d92b45 100644 (file)
--- a/sys/dev/usbmisc/ukbd/ukbd.c
+++ b/sys/dev/usbmisc/ukbd/ukbd.c
@@ -89,8 +89,6 @@ SYSCTL_INT(_hw_usb_ukbd, OID_AUTO, debug, CTLFLAG_RW,
 #define DPRINTFN(n,x)
 #endif
 
-#define UPROTO_BOOT_KEYBOARD 1
-
 #define NKEYCODE 6
 
 struct ukbd_data {
@@ -1422,7 +1420,7 @@ probe_keyboard(struct usb_attach_arg *uaa, int flags)
        if (id
            && id->bInterfaceClass == UICLASS_HID
            && id->bInterfaceSubClass == UISUBCLASS_BOOT
-           && id->bInterfaceProtocol == UPROTO_BOOT_KEYBOARD)
+           && id->bInterfaceProtocol == UIPROTO_BOOT_KEYBOARD)
                return 0;       /* found it */
 
        return EINVAL;