Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=fe56caa97e626cc6d6e18adbd5ccd1a9aa9a4fcf
Commit:     fe56caa97e626cc6d6e18adbd5ccd1a9aa9a4fcf
Parent:     b0e668240949f69e84d69f998aa9af759e8be635
Author:     Robert Schedel <[EMAIL PROTECTED]>
AuthorDate: Wed Dec 26 00:57:40 2007 +0100
Committer:  Jiri Kosina <[EMAIL PROTECTED]>
CommitDate: Mon Jan 28 14:51:22 2008 +0100

    HID: Support Samsung IR remote
    
    Samsung USB remotes (0419:0001) are rejected by kernel 2.6.23, because the
    report descriptor from the remote contains a 48 bit HID report field. HID 
1.11
    states: Fields may span at most 4 bytes.
    
    This patch, based on 2.6.23, fixes this by modifying the internal report
    descriptor in hid-quirks.c. Additional user space support (e.g. LIRC) is
    required to fetch the information from the hiddev interface.
    
    The burden to reconstruct the data is moved into userspace (lirc through 
hiddev).
    There is no need to set HID_QUIRK_HIDDEV quirk, as the device has also 
output
    applications, which trigger the creation of hiddev device automatically.
    
    Signed-off-by: Robert Schedel <[EMAIL PROTECTED]>
    Signed-off-by: Jiri Kosina <[EMAIL PROTECTED]>
---
 drivers/hid/usbhid/hid-quirks.c |   36 ++++++++++++++++++++++++++++++++++++
 include/linux/hid.h             |    1 +
 2 files changed, 37 insertions(+), 0 deletions(-)

diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c
index 68b38fd..30f63e9 100644
--- a/drivers/hid/usbhid/hid-quirks.c
+++ b/drivers/hid/usbhid/hid-quirks.c
@@ -341,6 +341,9 @@
 #define USB_VENDOR_ID_SAITEK           0x06a3
 #define USB_DEVICE_ID_SAITEK_RUMBLEPAD 0xff17
 
+#define USB_VENDOR_ID_SAMSUNG          0x0419
+#define USB_DEVICE_ID_SAMSUNG_IR_REMOTE        0x0001
+
 #define USB_VENDOR_ID_SONY                     0x054c
 #define USB_DEVICE_ID_SONY_PS3_CONTROLLER      0x0268
 
@@ -673,6 +676,8 @@ static const struct hid_rdesc_blacklist {
 
        { USB_VENDOR_ID_PETALYNX, USB_DEVICE_ID_PETALYNX_MAXTER_REMOTE, 
HID_QUIRK_RDESC_PETALYNX },
 
+       { USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_IR_REMOTE, 
HID_QUIRK_RDESC_SAMSUNG_REMOTE },
+
        { USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_1, 
HID_QUIRK_RDESC_SWAPPED_MIN_MAX },
        { USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_2, 
HID_QUIRK_RDESC_SWAPPED_MIN_MAX },
 
@@ -947,6 +952,33 @@ static void usbhid_fixup_logitech_descriptor(unsigned char 
*rdesc, int rsize)
        }
 }
 
+/*
+ * Samsung IrDA remote controller (reports as Cypress USB Mouse).
+ *
+ * Vendor specific report #4 has a size of 48 bit,
+ * and therefore is not accepted when inspecting the descriptors.
+ * As a workaround we reinterpret the report as:
+ *   Variable type, count 6, size 8 bit, log. maximum 255
+ * The burden to reconstruct the data is moved into user space.
+ */
+static void usbhid_fixup_samsung_irda_descriptor(unsigned char *rdesc,
+                                                 int rsize)
+{
+       if (rsize >= 182 && rdesc[175] == 0x25
+                        && rdesc[176] == 0x40
+                        && rdesc[177] == 0x75
+                        && rdesc[178] == 0x30
+                        && rdesc[179] == 0x95
+                        && rdesc[180] == 0x01
+                        && rdesc[182] == 0x40) {
+               printk(KERN_INFO "Fixing up Samsung IrDA report descriptor\n");
+               rdesc[176] = 0xff;
+               rdesc[178] = 0x08;
+               rdesc[180] = 0x06;
+               rdesc[182] = 0x42;
+       }
+}
+
 /* Petalynx Maxter Remote has maximum for consumer page set too low */
 static void usbhid_fixup_petalynx_descriptor(unsigned char *rdesc, int rsize)
 {
@@ -1026,6 +1058,10 @@ static void __usbhid_fixup_report_descriptor(__u32 
quirks, char *rdesc, unsigned
 
        if (quirks & HID_QUIRK_RDESC_BUTTON_CONSUMER)
                usbhid_fixup_button_consumer_descriptor(rdesc, rsize);
+
+       if (quirks & HID_QUIRK_RDESC_SAMSUNG_REMOTE)
+               usbhid_fixup_samsung_irda_descriptor(rdesc, rsize);
+
 }
 
 /**
diff --git a/include/linux/hid.h b/include/linux/hid.h
index 6a70b78..3902690 100644
--- a/include/linux/hid.h
+++ b/include/linux/hid.h
@@ -295,6 +295,7 @@ struct hid_item {
 #define HID_QUIRK_RDESC_PETALYNX               0x00000008
 #define HID_QUIRK_RDESC_MACBOOK_JIS            0x00000010
 #define HID_QUIRK_RDESC_BUTTON_CONSUMER                0x00000020
+#define HID_QUIRK_RDESC_SAMSUNG_REMOTE         0x00000040
 
 /*
  * This is the global environment of the parser. This information is
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to