X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=hwdb%2F60-keyboard.hwdb;h=a77aa00d48fd31fd8b11ff6677c423b82240cd31;hb=2dd30e7da94b32df03451df8cf602e9454a376cb;hp=dae8c8531094a03db1b71edb9b47569369bd6ea1;hpb=aedc2eddd16e48d468e6ad0aea2caf00c7d37365;p=elogind.git

diff --git a/hwdb/60-keyboard.hwdb b/hwdb/60-keyboard.hwdb
index dae8c8531..a77aa00d4 100644
--- a/hwdb/60-keyboard.hwdb
+++ b/hwdb/60-keyboard.hwdb
@@ -144,7 +144,7 @@ keyboard:dmi:bvn*:bvr*:bd*:svnAcer*:pnTravelMate*4720*:pvr*
 keyboard:dmi:bvn*:bvr*:bd*:svnAcer*:pnTravelMate 6593:*
 keyboard:dmi:bvn*:bvr*:bd*:svnAcer*:pnAspire 1640:*
  KEYBOARD_KEY_b2=www
- KEYBOARD_KEY_ee=screenlock"
+ KEYBOARD_KEY_ee=screenlock
 
 ###########################################################
 # Alienware
@@ -319,6 +319,13 @@ keyboard:dmi:bvn*:bvr*:bd*:svnFUJITSU*:pn*ESPRIMO Mobile V6*:pvr*
  KEYBOARD_KEY_ce=brightnessup
  KEYBOARD_KEY_ef=brightnessdown
 
+###########################################################
+# GIGABYTE
+###########################################################
+
+keyboard:dmi:bvn*:bvr*:bd*:svnGIGABYTE:pnU2442:*
+ KEYBOARD_KEY_a0=!                                      # mute
+
 ###########################################################
 # Genius
 ###########################################################
@@ -392,6 +399,10 @@ keyboard:dmi:bvn*:bvr*:bd*:svnHewlett-Packard*:pnHP G60 Notebook PC:pvr*
  KEYBOARD_KEY_d8=!f23                                   # touchpad off
  KEYBOARD_KEY_d9=!f22                                   # touchpad on
 
+# 2570p
+keyboard:dmi:bvn*:bvr*:bd*:svnHewlett-Packard*:pn*2570p*:pvr*
+ KEYBOARD_KEY_f8=wlan                                   # Wireless HW switch button
+
 # TX2
 keyboard:dmi:bvn*:bvr*:bd*:svnHewlett-Packard*:pn*[tT][xX]2*:pvr*
  KEYBOARD_KEY_c2=media
@@ -448,7 +459,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 +578,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
@@ -582,6 +642,12 @@ keyboard:usb:v046DpC52[9b]*
  KEYBOARD_KEY_0c022d=zoomin
  KEYBOARD_KEY_0c022e=zoomout
 
+# Logitech Presenter R400
+keyboard:usb:v046DpC52Dd*dc*dsc*dp*ic*isc*ip*in00*
+ KEYBOARD_KEY_070029=presentation
+ KEYBOARD_KEY_07003e=presentation
+ KEYBOARD_KEY_070037=displaytoggle
+
 ###########################################################
 # Maxdata
 ###########################################################
@@ -797,7 +863,6 @@ keyboard:dmi:bvn*:bvr*:bd*:svn[sS][aA][mM][sS][uU][nN][gG]*:pn*200E[45]*:pvr*
 # Series 9
 keyboard:dmi:bvn*:bvr*:bd*:svn[sS][aA][mM][sS][uU][nN][gG]*:pn*90X3A*:pvr*
 keyboard:dmi:bvn*:bvr*:bd*:svn[sS][aA][mM][sS][uU][nN][gG]*:pn*900X[34]*:pvr*
-keyboard:dmi:bvn*:bvr*:bd*:svn[sS][aA][mM][sS][uU][nN][gG]*:pn*900XC3*:pvr*
  KEYBOARD_KEY_ce=!                                      # Fn+F8 keyboard backlight up
  KEYBOARD_KEY_8d=!                                      # Fn+F7 keyboard backlight down
  KEYBOARD_KEY_96=!                                      # Fn+F1 performance mode (?)