HID: hid-samsung: add support for Creative Desktop Wireless 6000
PATCH v4 1/1 HID: hid-samsung: add support for Creative Desktop Wireless 6000
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]>
As requested by Jiri Kosina, made key mapping code more concise i.e. ignored checkpatch.pl's wingeing about code style.
drivers/hid/hid-core.c +1 -0
@@ -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
@@ -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 +90 -12
177 lines not on this page · raw message
drivers/hid/Kconfig +1 -1
@@ -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
___________________________________________________________
All new Yahoo! Mail "The new Interface is stunning in its simplicity and ease of use." - PC Magazine
http://uk.docs.yahoo.com/nowyoucan.html
Jiri Kosina
AppliedQuoted 4 lines · 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.
Quoted 8 lines
Signed-off-by Don Prince <[email protected]>---
Added comments as requested by Robert Schedel <[email protected]>
As requested by Jiri Kosina, made key mapping code more concise i.e. ignored checkpatch.pl's wingeing about code style.
Applied, thanks.
Signature · 2 lines
Jiri Kosina SUSE Labs, Novell Inc.
Hello,
sorry for one late observation:
Quoted 12 lines · 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.
Signed-off-by Don Prince <[email protected]>---
Added comments as requested by Robert Schedel <[email protected]>
As requested by Jiri Kosina, made key mapping code more concise i.e. ignored checkpatch.pl's wingeing about code style.
[...]
drivers/hid/hid-samsung.c static void samsung_report_fixup(struct · line 121
Quoted 9 lines
drivers/hid/hid-samsung.c +9
-0+switch (usage->hid &HID_USAGE ) { +/* report 2 */ +case 0x0b5 :samsung_kbd_mouse_map_key_clear (KEY_NEXTSONG );break ; +case 0x0b6 :samsung_kbd_mouse_map_key_clear (KEY_PREVIOUSSONG );break ; +case 0x0b7 :samsung_kbd_mouse_map_key_clear (KEY_STOPCD );break ; +case 0x0cd :samsung_kbd_mouse_map_key_clear (KEY_PLAYPAUSE );break ; +case 0x0e2 :samsung_kbd_mouse_map_key_clear (KEY_MUTE );break ; +case 0x0e9 :samsung_kbd_mouse_map_key_clear (KEY_VOLUMEUP );break ; +case 0x0ea :samsung_kbd_mouse_map_key_clear (KEY_VOLUMEDOWN );break ;
Those seven are identical to hid-input.c mapping (HUT 1.1 compliant) and could simply be deleted. Daisy chaining via default case below, right?
drivers/hid/hid-samsung.c static void samsung_report_fixup(struct · line 134
Quoted 13 lines
drivers/hid/hid-samsung.c +13
-0+case 0x183 :samsung_kbd_mouse_map_key_clear (KEY_MEDIA );break ; +case 0x195 :samsung_kbd_mouse_map_key_clear (KEY_EMAIL );break ; +case 0x196 :samsung_kbd_mouse_map_key_clear (KEY_CALC );break ; +case 0x197 :samsung_kbd_mouse_map_key_clear (KEY_COMPUTER );break ; +case 0x22b :samsung_kbd_mouse_map_key_clear (KEY_SEARCH );break ; +case 0x22c :samsung_kbd_mouse_map_key_clear (KEY_WWW );break ; +case 0x22d :samsung_kbd_mouse_map_key_clear (KEY_BACK );break ; +case 0x22e :samsung_kbd_mouse_map_key_clear (KEY_FORWARD );break ; +case 0x22f :samsung_kbd_mouse_map_key_clear (KEY_FAVORITES );break ; +case 0x230 :samsung_kbd_mouse_map_key_clear (KEY_REFRESH );break ; +case 0x231 :samsung_kbd_mouse_map_key_clear (KEY_STOP );break ; +default : +return 0 ;
Regards,
Robert Schedel
Quoted 21 lines · Robert Schedel
Hello,
sorry for one late observation:
Quoted 13 lines · 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.
Signed-off-by Don Prince <[email protected]>---
Added comments as requested by Robert Schedel <[email protected]>
As requested by Jiri Kosina, made key mapping code more concise i.e. ignored checkpatch.pl's wingeing about code style.
[...]
Quoted 13 lines
drivers/hid/hid-samsung.c static void samsung_report_fixup(struct · line 121
Quoted 10 lines
drivers/hid/hid-samsung.c +9
-0+switch (usage->hid &HID_USAGE ) { +/* report 2 */ +case 0x0b5 :samsung_kbd_mouse_map_key_clear (KEY_NEXTSONG );break ; +case 0x0b6 :samsung_kbd_mouse_map_key_clear (KEY_PREVIOUSSONG );break ; +case 0x0b7 :samsung_kbd_mouse_map_key_clear (KEY_STOPCD );break ; +case 0x0cd :samsung_kbd_mouse_map_key_clear (KEY_PLAYPAUSE );break ; +case 0x0e2 :samsung_kbd_mouse_map_key_clear (KEY_MUTE );break ; +case 0x0e9 :samsung_kbd_mouse_map_key_clear (KEY_VOLUMEUP );break ; +case 0x0ea :samsung_kbd_mouse_map_key_clear (KEY_VOLUMEDOWN );break ;Those seven are identical to
hid-input.cmapping (HUT 1.1 compliant) and could simply be deleted. Daisy chaining via default case below, right?
Yes they (the seven) are redundant. They work with default behaviour.
Quoted 8 lines
Quoted 8 lines
drivers/hid/hid-samsung.c +8
-0+case 0x183 :samsung_kbd_mouse_map_key_clear (KEY_MEDIA );break ; +case 0x195 :samsung_kbd_mouse_map_key_clear (KEY_EMAIL );break ; +case 0x196 :samsung_kbd_mouse_map_key_clear (KEY_CALC );break ; +case 0x197 :samsung_kbd_mouse_map_key_clear (KEY_COMPUTER );break ; +case 0x22b :samsung_kbd_mouse_map_key_clear (KEY_SEARCH );break ; +case 0x22c :samsung_kbd_mouse_map_key_clear (KEY_WWW );break ; +case 0x22d :samsung_kbd_mouse_map_key_clear (KEY_BACK );break ; +case 0x22e :samsung_kbd_mouse_map_key_clear (KEY_FORWARD );break ;
Quoted 10 lines
drivers/hid/hid-samsung.c static void samsung_report_fixup(struct · line 134
Quoted 6 lines
drivers/hid/hid-samsung.c +5
-0+case 0x22f :samsung_kbd_mouse_map_key_clear (KEY_FAVORITES );break ; +case 0x230 :samsung_kbd_mouse_map_key_clear (KEY_REFRESH );break ; +case 0x231 :samsung_kbd_mouse_map_key_clear (KEY_STOP );break ; +default : +return 0 ;Regards,
Robert Schedel
___________________________________________________________
Yahoo! Messenger - with free PC-PC calling and photo sharing. http://uk.messenger.yahoo.com