X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=hwdb%2F60-keyboard.hwdb;h=0ee65d792a32d0cdf6ea111832a0402bef0717ac;hb=1ec96668dd0dcb19cc2f7b99cbf73df0d769c97d;hp=1068dedb3b8dc7b281564a97478588e0397014d1;hpb=97a9313cafccf772ce03f5ebd36fe4d9d8412583;p=elogind.git

diff --git a/hwdb/60-keyboard.hwdb b/hwdb/60-keyboard.hwdb
index 1068dedb3..0ee65d792 100644
--- a/hwdb/60-keyboard.hwdb
+++ b/hwdb/60-keyboard.hwdb
@@ -448,7 +448,7 @@ keyboard:name:ThinkPad Extra Buttons:dmi:bvn*:bvr*:bd*:svnIBM*:pn*:pvr*
  KEYBOARD_KEY_17=prog1                                  # ThinkPad/ThinkVantage button (high keycode: "vendor")
 
 # IBM Thinkpad USB Keyboard Trackpoint
-usb:v04B3p301[89]*
+keyboard:usb:v04B3p301[89]*
  KEYBOARD_KEY_900f0=screenlock
  KEYBOARD_KEY_900f1=wlan
  KEYBOARD_KEY_900f2=switchvideomode
@@ -567,8 +567,57 @@ keyboard:dmi:bvn*:bvr*:bd*:svnLENOVO*:pn*IdeaPad U300s*:pvr*
 # Logitech
 ###########################################################
 
-# Logitech Cordless Wave Pro
-keyboard:usb:v046DpC52[9b]*
+# iTouch
+keyboard:usb:v046DpC308*
+ KEYBOARD_KEY_90001=shop                                # Shopping
+ KEYBOARD_KEY_90002=config                              # iTouch
+ KEYBOARD_KEY_90003=finance                             # Finance
+ KEYBOARD_KEY_90004=prog1                               # My Sites
+ KEYBOARD_KEY_90005=prog2                               # Community
+ KEYBOARD_KEY_C0183=media                               # Media
+
+# Cordless Desktop S510
+keyboard:usb:v046DpC50C*
+ KEYBOARD_KEY_d4=zoomin
+ KEYBOARD_KEY_cc=zoomout
+
+# Wave cordless
+keyboard:usb:v046DpC317*
+ KEYBOARD_KEY_9001c=scale                               # expo
+ KEYBOARD_KEY_9001f=zoomout
+ KEYBOARD_KEY_90020=zoomin
+ KEYBOARD_KEY_9003d=prog1                               # gadget
+ KEYBOARD_KEY_90005=camera
+ KEYBOARD_KEY_90018=media
+ KEYBOARD_KEY_90041=wordprocessor
+ KEYBOARD_KEY_90042=spreadsheet
+ KEYBOARD_KEY_90043=calendar
+ KEYBOARD_KEY_90044=prog2                               # fn+f4 (program a)
+ KEYBOARD_KEY_90045=prog3                               # fn+f5 (program b)
+ KEYBOARD_KEY_90046=prog4                               # fn+f6 (program c)
+ KEYBOARD_KEY_90048=messenger                           # fn+f8 (msn messenger)
+ KEYBOARD_KEY_9002d=search                              # fn+f10 (search www)
+ KEYBOARD_KEY_9004b=find                                # fn+f11 (search pc)
+ KEYBOARD_KEY_9004c=ejectclosecd
+
+# Wave cordless
+keyboard:usb:v046DpC517*
+ KEYBOARD_KEY_c101f=zoomout
+ KEYBOARD_KEY_c1020=zoomin
+ KEYBOARD_KEY_c1005=camera
+ KEYBOARD_KEY_c0183=media
+ KEYBOARD_KEY_c1041=wordprocessor
+ KEYBOARD_KEY_c1042=spreadsheet
+ KEYBOARD_KEY_c1043=calendar
+ KEYBOARD_KEY_c1044=prog2                               # fn+f4 (program a)
+ KEYBOARD_KEY_c1045=prog3                               # fn+f5 (program b)
+ KEYBOARD_KEY_c1046=prog4                               # fn+f6 (program c)
+ KEYBOARD_KEY_c1048=messenger                           # fn+f8 (msn messenger)
+ KEYBOARD_KEY_c104a=find                                # fn+f10 (search www)
+ KEYBOARD_KEY_c104c=ejectclosecd
+
+# Cordless Wave Pro
+keyboard:usb:v046DpC52[9B]*
  KEYBOARD_KEY_0c01b6=camera
  KEYBOARD_KEY_0c0183=media
  KEYBOARD_KEY_0c0184=wordprocessor