Skip to contentSkip to conversation

HID: hid-samsung: add support for Creative Desktop Wireless 6000

PATCH Superseded Don Prince 3 participants 4 messages May 16, 2010 HID

v1 of 4 Superseded Latest is v4 →

lore
Share & tools
lore

Don Prince

author
#0 lore raw

PATCH 1/1 HID: hid-samsung: add support for Creative Desktop Wireless 6000

Add support for the Creative Desktop Wireless 6000 keyboard/mouse bundle's multimedia buttons which are not currently handled by the default/samsung HID driver.

---

drivers/hid/hid-core.c +1 -0
diff -X /opt/scripts/diff-exclude.txt -Npaur a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
@@ -1343,6 +1343,7 @@ static const struct hid_device_id hid_bl
 	{ HID_USB_DEVICE(USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_PIXART_IMAGING_INC_OPTICAL_TOUCH_SCREEN) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_IR_REMOTE) },
+	{ HID_USB_DEVICE(USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_WIRELESS_KBD_MOUSE) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER) },
 	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_VAIO_VGX_MOUSE) },
drivers/hid/hid-ids.h +1 -0
diff -X /opt/scripts/diff-exclude.txt -Npaur a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
@@ -409,6 +409,7 @@
 
 #define USB_VENDOR_ID_SAMSUNG		0x0419
 #define USB_DEVICE_ID_SAMSUNG_IR_REMOTE	0x0001
+#define USB_DEVICE_ID_SAMSUNG_WIRELESS_KBD_MOUSE	0x0600
 
 #define USB_VENDOR_ID_SONY			0x054c
 #define USB_DEVICE_ID_SONY_VAIO_VGX_MOUSE	0x024b
drivers/hid/hid-samsung.c +115 -10

194 lines not on this page · raw message

drivers/hid/Kconfig +1 -1
diff -X /opt/scripts/diff-exclude.txt -Npaur a/drivers/hid/Kconfig b/drivers/hid/Kconfig
@@ -273,7 +273,7 @@ config HID_SAMSUNG
 	depends on USB_HID
 	default !EMBEDDED
 	---help---
-	Support for Samsung InfraRed remote control.
+	Support for Samsung InfraRed remote control or keyboards.
 
 config HID_SONY
 	tristate "Sony" if EMBEDDED

___________________________________________________________
Try the all-new Yahoo! Mail. "The New Version is radically easier to use" � The Wall Street Journal
http://uk.docs.yahoo.com/nowyoucan.html

#1 lore raw

Hello,

Quoted 8 lines · Don Prince

Add support for the Creative Desktop Wireless 6000 keyboard/mouse bundle's multimedia buttons which are not currently handled by the default/samsung HID driver.

---
[...]

As originator of the "old" 0419:0001 IrDA driver parts had a short look at it:
- Merging with old code looks OK. Tested with old 0419:0001 (184) device, still functional.
- 0419:0600 not yet known in usb.ids, might be worth a contribution
- As you merged in a new device, and for explaining why this handling was added, my suggestion is to adapt the existing comments, e.g.:

/*
* This driver supports several HID devices:
*
* [0419:0001] Samsung IrDA remote controller (reports as Cypress USB Mouse). *
* There are several variants:
*
* 1. 184 byte report descriptor
[...]
* [0419:0600] Creative Desktop Wireless 6000 keyboard/mouse combo *
* Several key mappings used from the consumer usage page
* deviate from the USB HUT 1.12 standard.
*/

Of course some HID maintainer should also review it, for general policy.

Regards,
Robert Schedel

#2 lore raw
Quoted 33 lines · Robert Schedel

Hello,

Quoted 9 lines · Don Prince

Add support for the Creative Desktop Wireless 6000 keyboard/mouse bundle's multimedia buttons which are not currently handled by the default/samsung HID driver.

---
[...]

As originator of the "old" 0419:0001 IrDA driver parts had a short look at it:
- Merging with old code looks OK. Tested with old 0419:0001 (184) device, still functional.
- 0419:0600 not yet known in usb.ids, might be worth a contribution
- As you merged in a new device, and for explaining why this handling was added, my suggestion is to adapt the existing comments, e.g.:

/*
* This driver supports several HID devices:
*
* [0419:0001] Samsung IrDA remote controller (reports as Cypress USB Mouse). *
* There are several variants:
*
* 1. 184 byte report descriptor
[...]
* [0419:0600] Creative Desktop Wireless 6000 keyboard/mouse combo *
* Several key mappings used from the consumer usage page
* deviate from the USB HUT 1.12 standard.
*/

Quoted 6 lines

Of course some HID maintainer should also review it, for general policy.

Regards,
Robert Schedel

Ok I'll add some comments and re-submit patch as v2.

Regards

Don Prince

author
#3 lore raw

PATCH v2 1/1 HID: hid-samsung: add support for Creative Desktop Wireless 6000

In reply to Don Prince

Add support for the multimedia buttons of the Creative Desktop Wireless 6000 keyboard/mouse combo which are not currently handled by the default/samsung HID driver.

---

Added comments as requested by Robert Schedel <[email protected]>

---

drivers/hid/hid-core.c +1 -0
diff -X /opt/scripts/diff-exclude.txt -Npaur a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
@@ -1343,6 +1343,7 @@ static const struct hid_device_id hid_bl
 	{ HID_USB_DEVICE(USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_PIXART_IMAGING_INC_OPTICAL_TOUCH_SCREEN) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_IR_REMOTE) },
+	{ HID_USB_DEVICE(USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_WIRELESS_KBD_MOUSE) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER) },
 	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_VAIO_VGX_MOUSE) },
drivers/hid/hid-ids.h +1 -0
diff -X /opt/scripts/diff-exclude.txt -Npaur a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
@@ -409,6 +409,7 @@
 
 #define USB_VENDOR_ID_SAMSUNG		0x0419
 #define USB_DEVICE_ID_SAMSUNG_IR_REMOTE	0x0001
+#define USB_DEVICE_ID_SAMSUNG_WIRELESS_KBD_MOUSE	0x0600
 
 #define USB_VENDOR_ID_SONY			0x054c
 #define USB_DEVICE_ID_SONY_VAIO_VGX_MOUSE	0x024b
drivers/hid/hid-samsung.c +126 -12

213 lines not on this page · raw message

drivers/hid/Kconfig +1 -1
diff -X /opt/scripts/diff-exclude.txt -Npaur a/drivers/hid/Kconfig b/drivers/hid/Kconfig
@@ -273,7 +273,7 @@ config HID_SAMSUNG
 	depends on USB_HID
 	default !EMBEDDED
 	---help---
-	Support for Samsung InfraRed remote control.
+	Support for Samsung InfraRed remote control or keyboards.
 
 config HID_SONY
 	tristate "Sony" if EMBEDDED

___________________________________________________________
To help you stay safe and secure online, we've developed the all new Yahoo! Security Centre. http://uk.security.yahoo.com