chiark / gitweb /
hwdb: keyboard update
authorKay Sievers <kay@vrfy.org>
Sun, 14 Jul 2013 22:56:18 +0000 (00:56 +0200)
committerKay Sievers <kay@vrfy.org>
Sun, 14 Jul 2013 22:56:18 +0000 (00:56 +0200)
hwdb/60-keyboard.hwdb

index 94357e7..dae8c85 100644 (file)
 # To debug key presses and access scan code mapping data of
 # an input device use the commonly available tool: evtest(1).
 
-###########################################################
-# Logitech
-###########################################################
+##########################################
+# Acer
+##########################################
 
-# Logitech Cordless Wave Pro
-keyboard:usb:v046DpC52[9b]*
- KEYBOARD_KEY_0c01b6=camera
- KEYBOARD_KEY_0c0183=media
- KEYBOARD_KEY_0c0184=wordprocessor
- KEYBOARD_KEY_0c0186=spreadsheet
- KEYBOARD_KEY_0c018e=calendar
- KEYBOARD_KEY_0c0223=homepage
- KEYBOARD_KEY_0c01bc=messenger
- KEYBOARD_KEY_0c018a=mail
- KEYBOARD_KEY_0c0221=search
- KEYBOARD_KEY_0c00b8=ejectcd
- KEYBOARD_KEY_0c022d=zoomin
- KEYBOARD_KEY_0c022e=zoomout
+# Acer platform kernel driver
+keyboard:name:Acer WMI hotkeys:dmi:bvn*:bvr*:bd*:svn*:pnAcer*:pvr*
+ KEYBOARD_KEY_82=f21
 
-###########################################################
-# Lenovo
-###########################################################
+# Aspire 5720
+keyboard:dmi:bvn*:bvr*:bd*:svnAcer*:pnAspire 5720*:pvr*
+keyboard:dmi:bvn*:bvr*:bd*:svnAcer*:pnZG8*:pvr*
+ KEYBOARD_KEY_84=bluetooth                              # sent when bluetooth module missing, and key pressed
+ KEYBOARD_KEY_92=media                                  # Acer arcade
+ KEYBOARD_KEY_d4=bluetooth                              # Bluetooth on
+ KEYBOARD_KEY_d9=bluetooth                              # Bluetooth off
+ KEYBOARD_KEY_f4=prog3                                  # e-key
 
-# thinkpad_acpi driver
-keyboard:name:ThinkPad Extra Buttons:dmi:bvn*:bvr*:bd*:svnLENOVO*:pn*
- KEYBOARD_KEY_01=screenlock
- KEYBOARD_KEY_02=battery
- KEYBOARD_KEY_03=sleep
- KEYBOARD_KEY_04=wlan
- KEYBOARD_KEY_06=switchvideomode
- KEYBOARD_KEY_07=f21
- KEYBOARD_KEY_08=f24
- KEYBOARD_KEY_0b=suspend
- KEYBOARD_KEY_0f=brightnessup
- KEYBOARD_KEY_10=brightnessdown
- KEYBOARD_KEY_11=kbdillumtoggle
- KEYBOARD_KEY_13=zoom
- KEYBOARD_KEY_14=volumeup
- KEYBOARD_KEY_15=volumedown
- KEYBOARD_KEY_16=mute
- KEYBOARD_KEY_17=prog1
- KEYBOARD_KEY_1a=f20
+# Aspire 5920g
+keyboard:dmi:bvn*:bvr*:bd*:svnAcer*:pnAspire 5920G:*
+ KEYBOARD_KEY_8a=media
+ KEYBOARD_KEY_92=media
+ KEYBOARD_KEY_a6=setup
+ KEYBOARD_KEY_b2=www
+ KEYBOARD_KEY_d9=bluetooth                              # (toggle) on-to-off
 
-#
-keyboard:name:Ideapad extra buttons:dmi:bvn*:bvr*:bd*:svnLENOVO*:pn*
- KEYBOARD_KEY_42=f23
- KEYBOARD_KEY_43=f22
+# Aspire 6920
+keyboard:dmi:bvn*:bvr*:bd*:svnAcer*:pnAspire 6920:*
+ KEYBOARD_KEY_d9=bluetooth                              # (toggle) on-to-off
+ KEYBOARD_KEY_92=media
+ KEYBOARD_KEY_9e=back
+ KEYBOARD_KEY_83=rewind
+ KEYBOARD_KEY_89=fastforward
 
-# ThinkPad Keyboard with TrackPoint
-keyboard:usb:v17EFp6009*
- KEYBOARD_KEY_090012=screenlock                         # Fn+F2
- KEYBOARD_KEY_090013=battery                            # Fn+F3
- KEYBOARD_KEY_090014=wlan                               # Fn+F5
- KEYBOARD_KEY_090016=switchvideomode                    # Fn+F7
- KEYBOARD_KEY_090017=f21                                # Fn+F8  touchpad toggle
- KEYBOARD_KEY_090019=suspend                            # Fn+F12
- KEYBOARD_KEY_09001a=brightnessup                       # Fn+Home
- KEYBOARD_KEY_09001b=brightnessdown                     # Fn+End
- KEYBOARD_KEY_09001d=zoom                               # Fn+Space
- KEYBOARD_KEY_090011=prog1                              # ThinkVantage button
- KEYBOARD_KEY_090015=camera                             # Fn+F6 headset/camera VoIP key  ??
- KEYBOARD_KEY_090010=f20                                # Microphone mute button; should be micmute
+# Aspire 8930
+keyboard:dmi:bvn*:bvr*:bd*:svnAcer*:pnAspire 8930:*
+ KEYBOARD_KEY_ca=prog3                                  # key 'HOLD' on CineDash Media Console
+ KEYBOARD_KEY_83=rewind
+ KEYBOARD_KEY_89=fastforward
+ KEYBOARD_KEY_92=media                                  # key 'ARCADE' on CineDash Media Console
+ KEYBOARD_KEY_9e=back
 
-# Lenovo 3000
-keyboard:dmi:bvn*:bvr*:bd*:svnLENOVO*:pn*3000*:pvr*
- KEYBOARD_KEY_8b=switchvideomode                        # Fn+F7 video
- KEYBOARD_KEY_96=wlan                                   # Fn+F5 wireless
- KEYBOARD_KEY_97=sleep                                  # Fn+F4 suspend
- KEYBOARD_KEY_98=suspend                                # Fn+F12 hibernate
- KEYBOARD_KEY_b4=prog1                                  # Lenovo Care
+# Travelmate C300
+keyboard:dmi:bvn*:bvr*:bd*:svnAcer*:pnTravelMate*C3[01]0*:pvr*
+ KEYBOARD_KEY_67=f24                                    # FIXME: rotate screen
+ KEYBOARD_KEY_68=up
+ KEYBOARD_KEY_69=down
+ KEYBOARD_KEY_6b=fn
+ KEYBOARD_KEY_6c=screenlock                             # FIXME: lock tablet device/buttons
 
-# lenovo-ideapad
-keyboard:dmi:bvn*:bvr*:bd*:svnLENOVO*:pn*IdeaPad*:pvr*
-keyboard:dmi:bvn*:bvr*:bd*:svnLENOVO*:pnS10-*:pvr*
- KEYBOARD_KEY_81=rfkill                                 # does nothing in BIOS
- KEYBOARD_KEY_83=display_off                            # BIOS toggles screen state
- KEYBOARD_KEY_b9=brightnessup                           # does nothing in BIOS
- KEYBOARD_KEY_ba=brightnessdown                         # does nothing in BIOS
- KEYBOARD_KEY_f1=camera                                 # BIOS toggles camera power
- KEYBOARD_KEY_f2=f21                                    # touchpad toggle (key alternately emits F2 and F3)
- KEYBOARD_KEY_f3=f21
+#
+keyboard:dmi:bvn*:bvr*:bd*:svnAcer*:pn*
+keyboard:dmi:bvn*:bvr*:bd*:svnGateway*:pnA0A1*:pvr*
+ KEYBOARD_KEY_a5=help                                   # Fn+F1
+ KEYBOARD_KEY_a6=setup                                  # Fn+F2 Acer eSettings
+ KEYBOARD_KEY_a7=battery                                # Fn+F3 Power Management
+ KEYBOARD_KEY_a9=switchvideomode                        # Fn+F5
+ KEYBOARD_KEY_b3=euro
+ KEYBOARD_KEY_b4=dollar
+ KEYBOARD_KEY_ce=brightnessup                           # Fn+Right
+ KEYBOARD_KEY_d4=bluetooth                              # (toggle) off-to-on
+ KEYBOARD_KEY_d5=wlan                                   # (toggle) on-to-off
+ KEYBOARD_KEY_d6=wlan                                   # (toggle) off-to-on
+ KEYBOARD_KEY_d7=bluetooth                              # (toggle) on-to-off
+ KEYBOARD_KEY_d8=bluetooth                              # (toggle) off-to-on
+ KEYBOARD_KEY_d9=brightnessup                           # Fn+Right
+ KEYBOARD_KEY_ee=brightnessup                           # Fn+Right
+ KEYBOARD_KEY_ef=brightnessdown                         # Fn+Left
+ KEYBOARD_KEY_f1=f22                                    # Fn+F7 Touchpad toggle (off-to-on)
+ KEYBOARD_KEY_f2=f23                                    # Fn+F7 Touchpad toggle (on-to-off)
+ KEYBOARD_KEY_f3=prog2                                  # "P2" programmable button
+ KEYBOARD_KEY_f4=prog1                                  # "P1" programmable button
+ KEYBOARD_KEY_f5=presentation
+ KEYBOARD_KEY_f8=fn
+ KEYBOARD_KEY_f9=f23                                    # Launch NTI shadow
 
-# Thinkpad X200_Tablet
-keyboard:dmi:bvn*:bvr*:bd*:svnLENOVO*:pnThinkPad X2* Tablet*:pvr*
- KEYBOARD_KEY_5d=menu
- KEYBOARD_KEY_63=fn
- KEYBOARD_KEY_66=screenlock
- KEYBOARD_KEY_67=cyclewindows                           # bezel circular arrow
- KEYBOARD_KEY_68=setup                                  # bezel setup / menu
- KEYBOARD_KEY_6c=direction                              # rotate screen
+#
+keyboard:dmi:bvn*:bvr*:bd*:svnAcer*:pn*5210*:pvr*
+keyboard:dmi:bvn*:bvr*:bd*:svnAcer*:pn*5220*:pvr*
+keyboard:dmi:bvn*:bvr*:bd*:svnAcer*:pn*5610*:pvr*
+keyboard:dmi:bvn*:bvr*:bd*:svnAcer*:pn*5620*:pvr*
+keyboard:dmi:bvn*:bvr*:bd*:svnAcer*:pn*5720*:pvr*
+ KEYBOARD_KEY_ee=screenlock
 
-# ThinkPad X6 Tablet
-keyboard:dmi:bvn*:bvr*:bd*:svnLENOVO*:pnThinkPad X6*:pvr*
- KEYBOARD_KEY_6c=f21                                    # rotate
- KEYBOARD_KEY_68=screenlock                             # screenlock
- KEYBOARD_KEY_6b=esc                                    # escape
- KEYBOARD_KEY_6d=right                                  # right on d-pad
- KEYBOARD_KEY_6e=left                                   # left on d-pad
- KEYBOARD_KEY_71=up                                     # up on d-pad
- KEYBOARD_KEY_6f=down                                   # down on d-pad
- KEYBOARD_KEY_69=enter                                  # enter on d-pad
+#
+keyboard:dmi:bvn*:bvr*:bd*:svnAcer*:pnTravelMate*6292*:pvr*
+keyboard:dmi:bvn*:bvr*:bd*:svnAcer*:pnTravelMate*8471*:pvr*
+keyboard:dmi:bvn*:bvr*:bd*:svnAcer*:pnTravelMate*4720*:pvr*
+keyboard:dmi:bvn*:bvr*:bd*:svnAcer*:pnTravelMate*7720*:pvr*
+keyboard:dmi:bvn*:bvr*:bd*:svnAcer*:pnAspire 1810T*:pvr*
+keyboard:dmi:bvn*:bvr*:bd*:svnAcer*:pnAO751h:*
+keyboard:dmi:bvn*:bvr*:bd*:svnAcer*:pnAO531h:*
+ KEYBOARD_KEY_d9=bluetooth
 
-# IdeaPad
-keyboard:dmi:bvn*:bvr*:bd*:svnLENOVO*:pn*IdeaPad Y550*:pvr*
- KEYBOARD_KEY_95=media
- KEYBOARD_KEY_a3=play
+#
+keyboard:dmi:bvn*:bvr*:bd*:svnAcer*:pnTravelMate*4720*:pvr*
+ KEYBOARD_KEY_b2=www
+ KEYBOARD_KEY_ee=screenlock
 
-# V480
-keyboard:dmi:bvn*:bvr*:bd*:svnLENOVO*:pn*Lenovo V480*:pvr*
- KEYBOARD_KEY_f1=f21
+#
+keyboard:dmi:bvn*:bvr*:bd*:svnAcer*:pnTravelMate 6593:*
+keyboard:dmi:bvn*:bvr*:bd*:svnAcer*:pnAspire 1640:*
+ KEYBOARD_KEY_b2=www
+ KEYBOARD_KEY_ee=screenlock"
 
-# IdeaPad
-keyboard:dmi:bvn*:bvr*:bd*:svnLENOVO*:pn*IdeaPad U300s*:pvr*
- KEYBOARD_KEY_f1=f21
- KEYBOARD_KEY_ce=f20
+###########################################################
+# Alienware
+###########################################################
+
+keyboard:dmi:bvn*:bvr*:bd*:svnAlienware*:pn*
+ KEYBOARD_KEY_8a=ejectcd
 
 ###########################################################
-# IBM
+# Asus
 ###########################################################
 
-# thinkpad_acpi driver
-keyboard:name:ThinkPad Extra Buttons:dmi:bvn*:bvr*:bd*:svnIBM*:pn*:pvr*
- KEYBOARD_KEY_01=battery                                # Fn+F2
- KEYBOARD_KEY_02=screenlock                             # Fn+F3
- KEYBOARD_KEY_03=sleep                                  # Fn+F4
- KEYBOARD_KEY_04=wlan                                   # Fn+F5
- KEYBOARD_KEY_06=switchvideomode                        # Fn+F7
- KEYBOARD_KEY_07=zoom                                   # Fn+F8 screen expand
- KEYBOARD_KEY_08=f24                                    # Fn+F9 undock
- KEYBOARD_KEY_0b=suspend                                # Fn+F12
- KEYBOARD_KEY_0f=brightnessup                           # Fn+Home
- KEYBOARD_KEY_10=brightnessdown                         # Fn+End
- KEYBOARD_KEY_11=kbdillumtoggle                         # Fn+PgUp - ThinkLight
- KEYBOARD_KEY_13=zoom                                   # Fn+Space
- KEYBOARD_KEY_14=volumeup
- KEYBOARD_KEY_15=volumedown
- KEYBOARD_KEY_16=mute
- KEYBOARD_KEY_17=prog1                                  # ThinkPad/ThinkVantage button (high keycode: "vendor")
+keyboard:dmi:bvn*:bvr*:bd*:svnASUS:*
+ KEYBOARD_KEY_ed=volumeup
+ KEYBOARD_KEY_ee=volumedown
+ KEYBOARD_KEY_ef=mute
 
-# IBM Thinkpad USB Keyboard Trackpoint
-usb:v04B3p301[89]*
- KEYBOARD_KEY_900f0=screenlock
- KEYBOARD_KEY_900f1=wlan
- KEYBOARD_KEY_900f2=switchvideomode
- KEYBOARD_KEY_900f3=suspend
- KEYBOARD_KEY_900f4=brightnessup
- KEYBOARD_KEY_900f5=brightnessdown
- KEYBOARD_KEY_900f8=zoom
+###########################################################
+# BenQ
+###########################################################
+
+keyboard:dmi:bvn*:bvr*:bd*:svn*BenQ*:pn*Joybook R22*:pvr*
+ KEYBOARD_KEY_6e=wlan
 
 ###########################################################
-# SONY
+# Compal
 ###########################################################
 
-# sony-laptop driver
-keyboard:name:Sony Vaio Keys:dmi:bvn*:bvr*:bd*:svnSony*:pn*
- KEYBOARD_KEY_06=mute                                   # Fn+F2
- KEYBOARD_KEY_07=volumedown                             # Fn+F3
- KEYBOARD_KEY_08=volumeup                               # Fn+F4
- KEYBOARD_KEY_09=brightnessdown                         # Fn+F5
- KEYBOARD_KEY_0a=brightnessup                           # Fn+F6
- KEYBOARD_KEY_0b=switchvideomode                        # Fn+F7
- KEYBOARD_KEY_0e=zoom                                   # Fn+F10
- KEYBOARD_KEY_10=suspend                                # Fn+F12
+keyboard:dmi:bvn*:bvr*:bd*:svnCOMPAL:pnHEL80I:*
+ KEYBOARD_KEY_84=wlan
 
-keyboard:name:Sony Vaio Keys:dmi:bvn*:bvr*:bd*:svnSony*:pn*PCG-C1*:pvr*
-keyboard:name:Sony Vaio Keys:dmi:bvn*:bvr*:bd*:svnSony*:pn*PCG-K25*:pvr*
-keyboard:name:Sony Vaio Keys:dmi:bvn*:bvr*:bd*:svnSony*:pn*PCG-F[1-6]*:pvr*
-keyboard:name:Sony Vaio Keys:dmi:bvn*:bvr*:bd*:svnSony*:pn*PCG-FX*:pvr*
-keyboard:name:Sony Vaio Keys:dmi:bvn*:bvr*:bd*:svnSony*:pn*PCG-FRV*:pvr*
-keyboard:name:Sony Vaio Keys:dmi:bvn*:bvr*:bd*:svnSony*:pn*PCG-GR*:pvr*
-keyboard:name:Sony Vaio Keys:dmi:bvn*:bvr*:bd*:svnSony*:pn*PCG-TR*:pvr*
-keyboard:name:Sony Vaio Keys:dmi:bvn*:bvr*:bd*:svnSony*:pn*PCG-NV*:pvr*
-keyboard:name:Sony Vaio Keys:dmi:bvn*:bvr*:bd*:svnSony*:pn*PCG-Z*:pvr*
-keyboard:name:Sony Vaio Keys:dmi:bvn*:bvr*:bd*:svnSony*:pn*VGN-S360*:pvr*
- KEYBOARD_KEY_06=battery
- KEYBOARD_KEY_07=mute
+###########################################################
+# COMPAQ
+###########################################################
 
-keyboard:name:Sony Vaio Keys:dmi:bvn*:bvr*:bd*:svnSony*:pnVGN-AR71*:pvr*
-keyboard:name:Sony Vaio Keys:dmi:bvn*:bvr*:bd*:svnSony*:pnVGN-FW*:pvr*
-keyboard:name:Sony Vaio Keys:dmi:bvn*:bvr*:bd*:svnSony*:pnVGN-Z21*:pvr*
- KEYBOARD_KEY_00=brightnessdown                         # Fn+F5
- KEYBOARD_KEY_10=brightnessup                           # Fn+F6
- KEYBOARD_KEY_11=switchvideomode                        # Fn+F7
- KEYBOARD_KEY_12=zoomout
- KEYBOARD_KEY_14=zoomin
- KEYBOARD_KEY_15=suspend                                # Fn+F12
- KEYBOARD_KEY_17=prog1
- KEYBOARD_KEY_20=media
+keyboard:dmi:bvn*:bvr*:bd*:svnCompaq*:pn*E500*:pvr*
+keyboard:dmi:bvn*:bvr*:bd*:svnCompaq*:pn*Evo N*:pvr*
+ KEYBOARD_KEY_a3=www                                    # I key
+ KEYBOARD_KEY_9a=search
+ KEYBOARD_KEY_9e=email
+ KEYBOARD_KEY_9f=homepage
 
-keyboard:name:Sony Vaio Keys:dmi:bvn*:bvr*:bd*:svnSony*:pnVPC*:pvr*
- KEYBOARD_KEY_05=f21                                    # Fn+F1 -> KEY_F21 (The actual touchpad toggle)
- KEYBOARD_KEY_0d=zoomout                                # Fn+F9
- KEYBOARD_KEY_0e=zoomin                                 # Fn+F10
+###########################################################
+# Dell
+###########################################################
+
+keyboard:dmi:bvn*:bvr*:bd*:svnDell:pvr*
+ KEYBOARD_KEY_81=playpause                              # Play/Pause
+ KEYBOARD_KEY_82=stopcd                                 # Stop
+ KEYBOARD_KEY_83=previoussong                           # Previous song
+ KEYBOARD_KEY_84=nextsong                               # Next song
+ KEYBOARD_KEY_85=brightnessdown                         # Fn+Down Brightness Down
+ KEYBOARD_KEY_86=brightnessup                           # Fn+Up Brightness Up
+ KEYBOARD_KEY_87=battery                                # Fn+F3 battery icon
+ KEYBOARD_KEY_88=unknown                                # Fn+F2 Turn On/Off Wireless - handled in hardware
+ KEYBOARD_KEY_89=ejectclosecd                           # Fn+F10 Eject CD
+ KEYBOARD_KEY_8a=suspend                                # Fn+F1 hibernate
+ KEYBOARD_KEY_8b=switchvideomode                        # Fn+F8 CRT/LCD (high keycode: "displaytoggle")
+ KEYBOARD_KEY_8c=f23                                    # Fn+Right Auto Brightness
+ KEYBOARD_KEY_8F=switchvideomode                        # Fn+F7 aspect ratio
+ KEYBOARD_KEY_90=previoussong                           # Front panel previous song
+ KEYBOARD_KEY_91=prog1                                  # Wi-Fi Catcher (Dell-specific)
+ KEYBOARD_KEY_92=media                                  # MediaDirect button (house icon)
+ KEYBOARD_KEY_93=f23                                    # FIXME Fn+Left Auto Brightness
+ KEYBOARD_KEY_95=camera                                 # Shutter button - Takes a picture if optional camera available
+ KEYBOARD_KEY_97=email                                  # Tablet email button
+ KEYBOARD_KEY_98=f21                                    # FIXME: Tablet screen rotation
+ KEYBOARD_KEY_99=nextsong                               # Front panel next song
+ KEYBOARD_KEY_9a=setup                                  # Tablet tools button
+ KEYBOARD_KEY_9b=switchvideomode                        # Display toggle button
+ KEYBOARD_KEY_9e=f21                                    # Touchpad toggle
+ KEYBOARD_KEY_a2=playpause                              # Front panel play/pause
+ KEYBOARD_KEY_a4=stopcd                                 # Front panel stop
+ KEYBOARD_KEY_ed=media                                  # MediaDirect button
+ KEYBOARD_KEY_d8=screenlock                             # FIXME: Tablet lock button
+ KEYBOARD_KEY_d9=f21                                    # Touchpad toggle
+
+#
+keyboard:dmi:bvn*:bvr*:bd*:svnDell:pnInspiron 910:pvr*
+keyboard:dmi:bvn*:bvr*:bd*:svnDell:pnInspiron 101[012]:pvr*
+keyboard:dmi:bvn*:bvr*:bd*:svnDell:pnInspiron 1110:pvr*
+keyboard:dmi:bvn*:bvr*:bd*:svnDell:pnInspiron 1210:pvr*
+ KEYBOARD_KEY_84=wlan
+
+# Latitude XT2
+keyboard:dmi:bvn*:bvr*:bd*:svnDell:pnLatitude XT2:pvr*
+ KEYBOARD_KEY_9b=up                                     # tablet rocker up
+ KEYBOARD_KEY_9e=enter                                  # tablet rocker press
+ KEYBOARD_KEY_9f=back                                   # tablet back
+ KEYBOARD_KEY_a3=down                                   # tablet rocker down
+
+keyboard:dmi:bvn*:bvr*:bd*:svnDell Inc.:pnStudio 155[78]:pvr*
+ KEYBOARD_KEY_a0=!                                      # mute
+ KEYBOARD_KEY_ae=!                                      # volume down
+ KEYBOARD_KEY_b0=!                                      # volume up
+
+# Dell Touchpad
+keyboard:dmi:bvn*:bvr*:bd*:svnDell Inc.:pn:*Latitude*:pvr*
+keyboard:dmi:bvn*:bvr*:bd*:svnDell Inc.:pn:*Precision*:pvr*
+ KEYBOARD_KEY_9e=!
+
+# Dell XPS
+keyboard:dmi:bvn*:bvr*:bd*:svnDell Inc.:pnXPS*:pvr*
+ KEYBOARD_KEY_8c=!
+
+###########################################################
+# Everex
+###########################################################
+
+keyboard:dmi:bvn*:bvr*:bd*:svnEverex:pnXT5000*:pvr*
+ KEYBOARD_KEY_5c=media
+ KEYBOARD_KEY_65=f21                                    # Fn+F5 Touchpad toggle
+ KEYBOARD_KEY_67=prog3                                  # Fan speed control button
+ KEYBOARD_KEY_6f=brightnessup
+ KEYBOARD_KEY_7f=brightnessdown
+ KEYBOARD_KEY_b2=www
+ KEYBOARD_KEY_ec=mail
+
+##########################################
+# Fujitsu
+##########################################
+
+keyboard:dmi:bvn*:bvr*:bd*:svnFUJITSU*:pnAMILO*M*:pvr*
+ KEYBOARD_KEY_97=prog2
+ KEYBOARD_KEY_9f=prog1
+
+keyboard:dmi:bvn*:bvr*:bd*:svnFUJITSU*:pnAmilo Li 1718:*
+ KEYBOARD_KEY_d6=wlan
+
+# Amilo Li 2732
+keyboard:dmi:bvn*:bvr*:bd*:svnFUJITSU*:pnAMILO Li 2732:*
+ KEYBOARD_KEY_d9=brightnessdown                         # Fn+F8 brightness down
+ KEYBOARD_KEY_ef=brightnessup                           # Fn+F9 brightness up
+ KEYBOARD_KEY_a9=switchvideomode                        # Fn+F10 Cycle between available video outputs
+
+# Amilo Pa 2548
+keyboard:dmi:bvn*:bvr*:bd*:svnFUJITSU*:pn*AMILO Pa 2548*:pvr*
+ KEYBOARD_KEY_e0=volumedown
+ KEYBOARD_KEY_e1=volumeup
+ KEYBOARD_KEY_e5=prog1
+
+# Amilo Pro Edition V3505
+keyboard:dmi:bvn*:bvr*:bd*:svnFUJITSU*:pn*AMILO Pro Edition V3505*:pvr*
+ KEYBOARD_KEY_a5=help                                   # Fn+F1
+ KEYBOARD_KEY_a9=switchvideomode                        # Fn+F3
+ KEYBOARD_KEY_d9=brightnessdown                         # Fn+F8
+ KEYBOARD_KEY_e0=brightnessup                           # Fn+F9
+
+# Amilo Pro v3205
+keyboard:dmi:bvn*:bvr*:bd*:svnFUJITSU*:pn*AMILO Pro V3205*:pvr*
+ KEYBOARD_KEY_f4=f21                                    # FIXME: silent-mode decrease CPU/GPU clock
+ KEYBOARD_KEY_f7=switchvideomode                        # Fn+F3
+
+# Amilo Si 1520
+keyboard:dmi:bvn*:bvr*:bd*:svnFUJITSU*:pn*Amilo Si 1520*:pvr*
+ KEYBOARD_KEY_e1=wlan
+ KEYBOARD_KEY_f3=wlan
+ KEYBOARD_KEY_ee=brightnessdown
+ KEYBOARD_KEY_e0=brightnessup
+ KEYBOARD_KEY_e2=bluetooth
+ KEYBOARD_KEY_f7=video
+
+# Esprimo Mobile V5
+keyboard:dmi:bvn*:bvr*:bd*:svnFUJITSU*:pn*ESPRIMO Mobile V5*:pvr*
+ KEYBOARD_KEY_a9=switchvideomode
+ KEYBOARD_KEY_d9=brightnessdown
+ KEYBOARD_KEY_df=sleep
+ KEYBOARD_KEY_ef=brightnessup
+
+# Esprimo Mobile V6
+keyboard:dmi:bvn*:bvr*:bd*:svnFUJITSU*:pn*ESPRIMO Mobile V6*:pvr*
+ KEYBOARD_KEY_ce=brightnessup
+ KEYBOARD_KEY_ef=brightnessdown
+
+###########################################################
+# Genius
+###########################################################
+
+# Slimstar 320
+keyboard:usb:v0458p0708d*dc*dsc*dp*ic*isc*ip*in01*
+ KEYBOARD_KEY_0900f0=scrollup
+ KEYBOARD_KEY_0900f1=scrolldown
+ KEYBOARD_KEY_0900f3=back
+ KEYBOARD_KEY_0900f2=forward
+ KEYBOARD_KEY_0900f5=wordprocessor
+ KEYBOARD_KEY_0900f6=spreadsheet
+ KEYBOARD_KEY_0900f4=presentation
+ KEYBOARD_KEY_0c0223=www
+ KEYBOARD_KEY_0900f7=chat
+ KEYBOARD_KEY_0900fb=prog1
+ KEYBOARD_KEY_0900f8=close
+ KEYBOARD_KEY_0900f9=graphicseditor
+ KEYBOARD_KEY_0900fd=scale
+ KEYBOARD_KEY_0900fc=screenlock
 
 ###########################################################
 # Hewlett Packard
@@ -321,347 +425,203 @@ keyboard:dmi:bvn*:bvr*:bd*:svnHewlett-Packard*:pnHDX9494NR:pvr*
  KEYBOARD_KEY_d9=!f22                                   # touchpad on
 
 ###########################################################
-# COMPAQ
-###########################################################
-
-keyboard:dmi:bvn*:bvr*:bd*:svnCompaq*:pn*E500*:pvr*
-keyboard:dmi:bvn*:bvr*:bd*:svnCompaq*:pn*Evo N*:pvr*
- KEYBOARD_KEY_a3=www                                    # I key
- KEYBOARD_KEY_9a=search
- KEYBOARD_KEY_9e=email
- KEYBOARD_KEY_9f=homepage
-
-###########################################################
-# Samsung
-###########################################################
-
-keyboard:dmi:bvn*:bvr*:bd*:svn[sS][aA][mM][sS][uU][nN][gG]*:pvr*
- KEYBOARD_KEY_74=prog1                                  # User key
- KEYBOARD_KEY_75=www
- KEYBOARD_KEY_78=mail
- KEYBOARD_KEY_82=!switchvideomode                       # Fn+F4 CRT/LCD (high keycode: "displaytoggle")
- KEYBOARD_KEY_83=!battery                               # Fn+F2
- KEYBOARD_KEY_84=!prog1                                 # Fn+F5 backlight on/off
- KEYBOARD_KEY_86=!wlan                                  # Fn+F9
- KEYBOARD_KEY_88=!brightnessup                          # Fn+Up
- KEYBOARD_KEY_89=!brightnessdown                        # Fn+Down
- KEYBOARD_KEY_b1=!prog2                                 # Fn+F7 run Samsung Magic Doctor (keypressed event is generated twice)
- KEYBOARD_KEY_b3=!prog3                                 # Fn+F8 switch power mode (battery/dynamic/performance)
- KEYBOARD_KEY_b4=!wlan                                  # Fn+F9 (X60P)
- KEYBOARD_KEY_f7=!f22                                   # Fn+F10 Touchpad on
- KEYBOARD_KEY_f9=!f23                                   # Fn+F10 Touchpad off
-
-# Series 3
-keyboard:dmi:bvn*:bvr*:bd*:svn[sS][aA][mM][sS][uU][nN][gG]*:pn*300E[457]*:pvr*
-keyboard:dmi:bvn*:bvr*:bd*:svn[sS][aA][mM][sS][uU][nN][gG]*:pn*200E[45]*:pvr*
- KEYBOARD_KEY_ce=!                                      # Fn+F1  launch control setting
- KEYBOARD_KEY_d5=!                                      # Fn+F12 Wi-Fi toggle
-
-# 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 (?)
- KEYBOARD_KEY_97=!                                      # Fn+F12 Wi-Fi toggle
- KEYBOARD_KEY_d5=!                                      # Fn+F6 battery life extender
-
-# SQ1US
-keyboard:dmi:bvn*:bvr*:bd*:svn[sS][aA][mM][sS][uU][nN][gG]*:pnSQ1US:pvr*
- KEYBOARD_KEY_d4=menu
- KEYBOARD_KEY_d8=f1
- KEYBOARD_KEY_d9=f10
- KEYBOARD_KEY_d6=f3
- KEYBOARD_KEY_d7=f9
- KEYBOARD_KEY_e4=f5
- KEYBOARD_KEY_ee=f11
-
-# SX20S
-keyboard:dmi:bvn*:bvr*:bd*:svn[sS][aA][mM][sS][uU][nN][gG]*:pn*SX20S*:pvr*
- KEYBOARD_KEY_74=mute
- KEYBOARD_KEY_75=mute
- KEYBOARD_KEY_77=f22                                    # Touchpad on
- KEYBOARD_KEY_79=f23                                    # Touchpad off
-
-keyboard:dmi:bvn*:bvr*:bd*:svn[sS][aA][mM][sS][uU][nN][gG]*:pn*700Z*:pvr*
- KEYBOARD_KEY_ba=ejectcd
- KEYBOARD_KEY_96=keyboardbrightnessup
- KEYBOARD_KEY_97=keyboardbrightnessdown
-
-keyboard:dmi:bvn*:bvr*:bd*:svn[sS][aA][mM][sS][uU][nN][gG]*:pn*700T*:pvr*
- KEYBOARD_KEY_ad=leftmeta
-
-###########################################################
-# Dell
+# IBM
 ###########################################################
 
-keyboard:dmi:bvn*:bvr*:bd*:svnDell:pvr*
- KEYBOARD_KEY_81=playpause                              # Play/Pause
- KEYBOARD_KEY_82=stopcd                                 # Stop
- KEYBOARD_KEY_83=previoussong                           # Previous song
- KEYBOARD_KEY_84=nextsong                               # Next song
- KEYBOARD_KEY_85=brightnessdown                         # Fn+Down Brightness Down
- KEYBOARD_KEY_86=brightnessup                           # Fn+Up Brightness Up
- KEYBOARD_KEY_87=battery                                # Fn+F3 battery icon
- KEYBOARD_KEY_88=unknown                                # Fn+F2 Turn On/Off Wireless - handled in hardware
- KEYBOARD_KEY_89=ejectclosecd                           # Fn+F10 Eject CD
- KEYBOARD_KEY_8a=suspend                                # Fn+F1 hibernate
- KEYBOARD_KEY_8b=switchvideomode                        # Fn+F8 CRT/LCD (high keycode: "displaytoggle")
- KEYBOARD_KEY_8c=f23                                    # Fn+Right Auto Brightness
- KEYBOARD_KEY_8F=switchvideomode                        # Fn+F7 aspect ratio
- KEYBOARD_KEY_90=previoussong                           # Front panel previous song
- KEYBOARD_KEY_91=prog1                                  # Wi-Fi Catcher (Dell-specific)
- KEYBOARD_KEY_92=media                                  # MediaDirect button (house icon)
- KEYBOARD_KEY_93=f23                                    # FIXME Fn+Left Auto Brightness
- KEYBOARD_KEY_95=camera                                 # Shutter button - Takes a picture if optional camera available
- KEYBOARD_KEY_97=email                                  # Tablet email button
- KEYBOARD_KEY_98=f21                                    # FIXME: Tablet screen rotation
- KEYBOARD_KEY_99=nextsong                               # Front panel next song
- KEYBOARD_KEY_9a=setup                                  # Tablet tools button
- KEYBOARD_KEY_9b=switchvideomode                        # Display toggle button
- KEYBOARD_KEY_9e=f21                                    # Touchpad toggle
- KEYBOARD_KEY_a2=playpause                              # Front panel play/pause
- KEYBOARD_KEY_a4=stopcd                                 # Front panel stop
- KEYBOARD_KEY_ed=media                                  # MediaDirect button
- KEYBOARD_KEY_d8=screenlock                             # FIXME: Tablet lock button
- KEYBOARD_KEY_d9=f21                                    # Touchpad toggle
-
-#
-keyboard:dmi:bvn*:bvr*:bd*:svnDell:pnInspiron 910:pvr*
-keyboard:dmi:bvn*:bvr*:bd*:svnDell:pnInspiron 101[012]:pvr*
-keyboard:dmi:bvn*:bvr*:bd*:svnDell:pnInspiron 1110:pvr*
-keyboard:dmi:bvn*:bvr*:bd*:svnDell:pnInspiron 1210:pvr*
- KEYBOARD_KEY_84=wlan
-
-# Latitude XT2
-keyboard:dmi:bvn*:bvr*:bd*:svnDell:pnLatitude XT2:pvr*
- KEYBOARD_KEY_9b=up                                     # tablet rocker up
- KEYBOARD_KEY_9e=enter                                  # tablet rocker press
- KEYBOARD_KEY_9f=back                                   # tablet back
- KEYBOARD_KEY_a3=down                                   # tablet rocker down
-
-keyboard:dmi:bvn*:bvr*:bd*:svnDell Inc.:pnStudio 155[78]:pvr*
- KEYBOARD_KEY_a0=!                                      # mute
- KEYBOARD_KEY_ae=!                                      # volume down
- KEYBOARD_KEY_b0=!                                      # volume up
-
-# Dell Touchpad
-keyboard:dmi:bvn*:bvr*:bd*:svnDell Inc.:pn:*Latitude*:pvr*
-keyboard:dmi:bvn*:bvr*:bd*:svnDell Inc.:pn:*Precision*:pvr*
- KEYBOARD_KEY_9e=!
+# thinkpad_acpi driver
+keyboard:name:ThinkPad Extra Buttons:dmi:bvn*:bvr*:bd*:svnIBM*:pn*:pvr*
+ KEYBOARD_KEY_01=battery                                # Fn+F2
+ KEYBOARD_KEY_02=screenlock                             # Fn+F3
+ KEYBOARD_KEY_03=sleep                                  # Fn+F4
+ KEYBOARD_KEY_04=wlan                                   # Fn+F5
+ KEYBOARD_KEY_06=switchvideomode                        # Fn+F7
+ KEYBOARD_KEY_07=zoom                                   # Fn+F8 screen expand
+ KEYBOARD_KEY_08=f24                                    # Fn+F9 undock
+ KEYBOARD_KEY_0b=suspend                                # Fn+F12
+ KEYBOARD_KEY_0f=brightnessup                           # Fn+Home
+ KEYBOARD_KEY_10=brightnessdown                         # Fn+End
+ KEYBOARD_KEY_11=kbdillumtoggle                         # Fn+PgUp - ThinkLight
+ KEYBOARD_KEY_13=zoom                                   # Fn+Space
+ KEYBOARD_KEY_14=volumeup
+ KEYBOARD_KEY_15=volumedown
+ KEYBOARD_KEY_16=mute
+ KEYBOARD_KEY_17=prog1                                  # ThinkPad/ThinkVantage button (high keycode: "vendor")
 
-# Dell XPS
-keyboard:dmi:bvn*:bvr*:bd*:svnDell Inc.:pnXPS*:pvr*
- KEYBOARD_KEY_8c=!
+# IBM Thinkpad USB Keyboard Trackpoint
+usb:v04B3p301[89]*
+ KEYBOARD_KEY_900f0=screenlock
+ KEYBOARD_KEY_900f1=wlan
+ KEYBOARD_KEY_900f2=switchvideomode
+ KEYBOARD_KEY_900f3=suspend
+ KEYBOARD_KEY_900f4=brightnessup
+ KEYBOARD_KEY_900f5=brightnessdown
+ KEYBOARD_KEY_900f8=zoom
 
 ###########################################################
-# Microsoft
+# Inventec
 ###########################################################
 
-# Microsoft Natural Ergonomic Keyboard 4000
-keyboard:usb:v045Ep00DB*
- KEYBOARD_KEY_c022d=zoomin
- KEYBOARD_KEY_c022e=zoomout
+# Symphony
+keyboard:dmi:bvn*:bvr*:bd*:svnINVENTEC:pnSYMPHONY 6.0/7.0:pvr*
+ KEYBOARD_KEY_f3=prog2
+ KEYBOARD_KEY_f4=prog1
 
 ###########################################################
-# MSI
+# Lenovo
 ###########################################################
 
-keyboard:name:MSI Laptop hotkeys:dmi:bvn*:bvr*:bd*:svn*:pnM[iI][cC][rR][oO]-S[tT][aA][rR]*:pvr*
- KEYBOARD_KEY_0213=f22
- KEYBOARD_KEY_0214=f23
-
-##########################################
-# Acer
-##########################################
-
-# Acer platform kernel driver
-keyboard:name:Acer WMI hotkeys:dmi:bvn*:bvr*:bd*:svn*:pnAcer*:pvr*
- KEYBOARD_KEY_82=f21
-
-# Aspire 5720
-keyboard:dmi:bvn*:bvr*:bd*:svnAcer*:pnAspire 5720*:pvr*
-keyboard:dmi:bvn*:bvr*:bd*:svnAcer*:pnZG8*:pvr*
- KEYBOARD_KEY_84=bluetooth                              # sent when bluetooth module missing, and key pressed
- KEYBOARD_KEY_92=media                                  # Acer arcade
- KEYBOARD_KEY_d4=bluetooth                              # Bluetooth on
- KEYBOARD_KEY_d9=bluetooth                              # Bluetooth off
- KEYBOARD_KEY_f4=prog3                                  # e-key
-
-# Aspire 5920g
-keyboard:dmi:bvn*:bvr*:bd*:svnAcer*:pnAspire 5920G:*
- KEYBOARD_KEY_8a=media
- KEYBOARD_KEY_92=media
- KEYBOARD_KEY_a6=setup
- KEYBOARD_KEY_b2=www
- KEYBOARD_KEY_d9=bluetooth                              # (toggle) on-to-off
-
-# Aspire 6920
-keyboard:dmi:bvn*:bvr*:bd*:svnAcer*:pnAspire 6920:*
- KEYBOARD_KEY_d9=bluetooth                              # (toggle) on-to-off
- KEYBOARD_KEY_92=media
- KEYBOARD_KEY_9e=back
- KEYBOARD_KEY_83=rewind
- KEYBOARD_KEY_89=fastforward
-
-# Aspire 8930
-keyboard:dmi:bvn*:bvr*:bd*:svnAcer*:pnAspire 8930:*
- KEYBOARD_KEY_ca=prog3                                  # key 'HOLD' on CineDash Media Console
- KEYBOARD_KEY_83=rewind
- KEYBOARD_KEY_89=fastforward
- KEYBOARD_KEY_92=media                                  # key 'ARCADE' on CineDash Media Console
- KEYBOARD_KEY_9e=back
-
-# Travelmate C300
-keyboard:dmi:bvn*:bvr*:bd*:svnAcer*:pnTravelMate*C3[01]0*:pvr*
- KEYBOARD_KEY_67=f24                                    # FIXME: rotate screen
- KEYBOARD_KEY_68=up
- KEYBOARD_KEY_69=down
- KEYBOARD_KEY_6b=fn
- KEYBOARD_KEY_6c=screenlock                             # FIXME: lock tablet device/buttons
-
-#
-keyboard:dmi:bvn*:bvr*:bd*:svnAcer*:pn*
-keyboard:dmi:bvn*:bvr*:bd*:svnGateway*:pnA0A1*:pvr*
- KEYBOARD_KEY_a5=help                                   # Fn+F1
- KEYBOARD_KEY_a6=setup                                  # Fn+F2 Acer eSettings
- KEYBOARD_KEY_a7=battery                                # Fn+F3 Power Management
- KEYBOARD_KEY_a9=switchvideomode                        # Fn+F5
- KEYBOARD_KEY_b3=euro
- KEYBOARD_KEY_b4=dollar
- KEYBOARD_KEY_ce=brightnessup                           # Fn+Right
- KEYBOARD_KEY_d4=bluetooth                              # (toggle) off-to-on
- KEYBOARD_KEY_d5=wlan                                   # (toggle) on-to-off
- KEYBOARD_KEY_d6=wlan                                   # (toggle) off-to-on
- KEYBOARD_KEY_d7=bluetooth                              # (toggle) on-to-off
- KEYBOARD_KEY_d8=bluetooth                              # (toggle) off-to-on
- KEYBOARD_KEY_d9=brightnessup                           # Fn+Right
- KEYBOARD_KEY_ee=brightnessup                           # Fn+Right
- KEYBOARD_KEY_ef=brightnessdown                         # Fn+Left
- KEYBOARD_KEY_f1=f22                                    # Fn+F7 Touchpad toggle (off-to-on)
- KEYBOARD_KEY_f2=f23                                    # Fn+F7 Touchpad toggle (on-to-off)
- KEYBOARD_KEY_f3=prog2                                  # "P2" programmable button
- KEYBOARD_KEY_f4=prog1                                  # "P1" programmable button
- KEYBOARD_KEY_f5=presentation
- KEYBOARD_KEY_f8=fn
- KEYBOARD_KEY_f9=f23                                    # Launch NTI shadow
-
-#
-keyboard:dmi:bvn*:bvr*:bd*:svnAcer*:pn*5210*:pvr*
-keyboard:dmi:bvn*:bvr*:bd*:svnAcer*:pn*5220*:pvr*
-keyboard:dmi:bvn*:bvr*:bd*:svnAcer*:pn*5610*:pvr*
-keyboard:dmi:bvn*:bvr*:bd*:svnAcer*:pn*5620*:pvr*
-keyboard:dmi:bvn*:bvr*:bd*:svnAcer*:pn*5720*:pvr*
- KEYBOARD_KEY_ee=screenlock
-
-#
-keyboard:dmi:bvn*:bvr*:bd*:svnAcer*:pnTravelMate*6292*:pvr*
-keyboard:dmi:bvn*:bvr*:bd*:svnAcer*:pnTravelMate*8471*:pvr*
-keyboard:dmi:bvn*:bvr*:bd*:svnAcer*:pnTravelMate*4720*:pvr*
-keyboard:dmi:bvn*:bvr*:bd*:svnAcer*:pnTravelMate*7720*:pvr*
-keyboard:dmi:bvn*:bvr*:bd*:svnAcer*:pnAspire 1810T*:pvr*
-keyboard:dmi:bvn*:bvr*:bd*:svnAcer*:pnAO751h:*
-keyboard:dmi:bvn*:bvr*:bd*:svnAcer*:pnAO531h:*
- KEYBOARD_KEY_d9=bluetooth
-
-#
-keyboard:dmi:bvn*:bvr*:bd*:svnAcer*:pnTravelMate*4720*:pvr*
- KEYBOARD_KEY_b2=www
- KEYBOARD_KEY_ee=screenlock
+# thinkpad_acpi driver
+keyboard:name:ThinkPad Extra Buttons:dmi:bvn*:bvr*:bd*:svnLENOVO*:pn*
+ KEYBOARD_KEY_01=screenlock
+ KEYBOARD_KEY_02=battery
+ KEYBOARD_KEY_03=sleep
+ KEYBOARD_KEY_04=wlan
+ KEYBOARD_KEY_06=switchvideomode
+ KEYBOARD_KEY_07=f21
+ KEYBOARD_KEY_08=f24
+ KEYBOARD_KEY_0b=suspend
+ KEYBOARD_KEY_0f=brightnessup
+ KEYBOARD_KEY_10=brightnessdown
+ KEYBOARD_KEY_11=kbdillumtoggle
+ KEYBOARD_KEY_13=zoom
+ KEYBOARD_KEY_14=volumeup
+ KEYBOARD_KEY_15=volumedown
+ KEYBOARD_KEY_16=mute
+ KEYBOARD_KEY_17=prog1
+ KEYBOARD_KEY_1a=f20
 
 #
-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:name:Ideapad extra buttons:dmi:bvn*:bvr*:bd*:svnLENOVO*:pn*
+ KEYBOARD_KEY_42=f23
+ KEYBOARD_KEY_43=f22
 
-##########################################
-# Fujitsu
-##########################################
+# ThinkPad Keyboard with TrackPoint
+keyboard:usb:v17EFp6009*
+ KEYBOARD_KEY_090012=screenlock                         # Fn+F2
+ KEYBOARD_KEY_090013=battery                            # Fn+F3
+ KEYBOARD_KEY_090014=wlan                               # Fn+F5
+ KEYBOARD_KEY_090016=switchvideomode                    # Fn+F7
+ KEYBOARD_KEY_090017=f21                                # Fn+F8  touchpad toggle
+ KEYBOARD_KEY_090019=suspend                            # Fn+F12
+ KEYBOARD_KEY_09001a=brightnessup                       # Fn+Home
+ KEYBOARD_KEY_09001b=brightnessdown                     # Fn+End
+ KEYBOARD_KEY_09001d=zoom                               # Fn+Space
+ KEYBOARD_KEY_090011=prog1                              # ThinkVantage button
+ KEYBOARD_KEY_090015=camera                             # Fn+F6 headset/camera VoIP key  ??
+ KEYBOARD_KEY_090010=f20                                # Microphone mute button; should be micmute
 
-keyboard:dmi:bvn*:bvr*:bd*:svnFUJITSU*:pnAMILO*M*:pvr*
- KEYBOARD_KEY_97=prog2
- KEYBOARD_KEY_9f=prog1
+# Lenovo 3000
+keyboard:dmi:bvn*:bvr*:bd*:svnLENOVO*:pn*3000*:pvr*
+ KEYBOARD_KEY_8b=switchvideomode                        # Fn+F7 video
+ KEYBOARD_KEY_96=wlan                                   # Fn+F5 wireless
+ KEYBOARD_KEY_97=sleep                                  # Fn+F4 suspend
+ KEYBOARD_KEY_98=suspend                                # Fn+F12 hibernate
+ KEYBOARD_KEY_b4=prog1                                  # Lenovo Care
 
-keyboard:dmi:bvn*:bvr*:bd*:svnFUJITSU*:pnAmilo Li 1718:*
- KEYBOARD_KEY_d6=wlan
+# lenovo-ideapad
+keyboard:dmi:bvn*:bvr*:bd*:svnLENOVO*:pn*IdeaPad*:pvr*
+keyboard:dmi:bvn*:bvr*:bd*:svnLENOVO*:pnS10-*:pvr*
+ KEYBOARD_KEY_81=rfkill                                 # does nothing in BIOS
+ KEYBOARD_KEY_83=display_off                            # BIOS toggles screen state
+ KEYBOARD_KEY_b9=brightnessup                           # does nothing in BIOS
+ KEYBOARD_KEY_ba=brightnessdown                         # does nothing in BIOS
+ KEYBOARD_KEY_f1=camera                                 # BIOS toggles camera power
+ KEYBOARD_KEY_f2=f21                                    # touchpad toggle (key alternately emits F2 and F3)
+ KEYBOARD_KEY_f3=f21
 
-# Amilo Li 2732
-keyboard:dmi:bvn*:bvr*:bd*:svnFUJITSU*:pnAMILO Li 2732:*
- KEYBOARD_KEY_d9=brightnessdown                         # Fn+F8 brightness down
- KEYBOARD_KEY_ef=brightnessup                           # Fn+F9 brightness up
- KEYBOARD_KEY_a9=switchvideomode                        # Fn+F10 Cycle between available video outputs
+# Thinkpad X200_Tablet
+keyboard:dmi:bvn*:bvr*:bd*:svnLENOVO*:pnThinkPad X2* Tablet*:pvr*
+ KEYBOARD_KEY_5d=menu
+ KEYBOARD_KEY_63=fn
+ KEYBOARD_KEY_66=screenlock
+ KEYBOARD_KEY_67=cyclewindows                           # bezel circular arrow
+ KEYBOARD_KEY_68=setup                                  # bezel setup / menu
+ KEYBOARD_KEY_6c=direction                              # rotate screen
 
-# Amilo Pa 2548
-keyboard:dmi:bvn*:bvr*:bd*:svnFUJITSU*:pn*AMILO Pa 2548*:pvr*
- KEYBOARD_KEY_e0=volumedown
- KEYBOARD_KEY_e1=volumeup
- KEYBOARD_KEY_e5=prog1
+# ThinkPad X6 Tablet
+keyboard:dmi:bvn*:bvr*:bd*:svnLENOVO*:pnThinkPad X6*:pvr*
+ KEYBOARD_KEY_6c=f21                                    # rotate
+ KEYBOARD_KEY_68=screenlock                             # screenlock
+ KEYBOARD_KEY_6b=esc                                    # escape
+ KEYBOARD_KEY_6d=right                                  # right on d-pad
+ KEYBOARD_KEY_6e=left                                   # left on d-pad
+ KEYBOARD_KEY_71=up                                     # up on d-pad
+ KEYBOARD_KEY_6f=down                                   # down on d-pad
+ KEYBOARD_KEY_69=enter                                  # enter on d-pad
 
-# Amilo Pro Edition V3505
-keyboard:dmi:bvn*:bvr*:bd*:svnFUJITSU*:pn*AMILO Pro Edition V3505*:pvr*
- KEYBOARD_KEY_a5=help                                   # Fn+F1
- KEYBOARD_KEY_a9=switchvideomode                        # Fn+F3
- KEYBOARD_KEY_d9=brightnessdown                         # Fn+F8
- KEYBOARD_KEY_e0=brightnessup                           # Fn+F9
+# IdeaPad
+keyboard:dmi:bvn*:bvr*:bd*:svnLENOVO*:pn*IdeaPad Y550*:pvr*
+ KEYBOARD_KEY_95=media
+ KEYBOARD_KEY_a3=play
 
-# Amilo Pro v3205
-keyboard:dmi:bvn*:bvr*:bd*:svnFUJITSU*:pn*AMILO Pro V3205*:pvr*
- KEYBOARD_KEY_f4=f21                                    # FIXME: silent-mode decrease CPU/GPU clock
- KEYBOARD_KEY_f7=switchvideomode                        # Fn+F3
+# V480
+keyboard:dmi:bvn*:bvr*:bd*:svnLENOVO*:pn*Lenovo V480*:pvr*
+ KEYBOARD_KEY_f1=f21
 
-# Amilo Si 1520
-keyboard:dmi:bvn*:bvr*:bd*:svnFUJITSU*:pn*Amilo Si 1520*:pvr*
- KEYBOARD_KEY_e1=wlan
- KEYBOARD_KEY_f3=wlan
- KEYBOARD_KEY_ee=brightnessdown
- KEYBOARD_KEY_e0=brightnessup
- KEYBOARD_KEY_e2=bluetooth
- KEYBOARD_KEY_f7=video
+# IdeaPad
+keyboard:dmi:bvn*:bvr*:bd*:svnLENOVO*:pn*IdeaPad U300s*:pvr*
+ KEYBOARD_KEY_f1=f21
+ KEYBOARD_KEY_ce=f20
 
-# Esprimo Mobile V5
-keyboard:dmi:bvn*:bvr*:bd*:svnFUJITSU*:pn*ESPRIMO Mobile V5*:pvr*
- KEYBOARD_KEY_a9=switchvideomode
- KEYBOARD_KEY_d9=brightnessdown
- KEYBOARD_KEY_df=sleep
- KEYBOARD_KEY_ef=brightnessup
+###########################################################
+# Logitech
+###########################################################
 
-# Esprimo Mobile V6
-keyboard:dmi:bvn*:bvr*:bd*:svnFUJITSU*:pn*ESPRIMO Mobile V6*:pvr*
- KEYBOARD_KEY_ce=brightnessup
- KEYBOARD_KEY_ef=brightnessdown
+# Logitech Cordless Wave Pro
+keyboard:usb:v046DpC52[9b]*
+ KEYBOARD_KEY_0c01b6=camera
+ KEYBOARD_KEY_0c0183=media
+ KEYBOARD_KEY_0c0184=wordprocessor
+ KEYBOARD_KEY_0c0186=spreadsheet
+ KEYBOARD_KEY_0c018e=calendar
+ KEYBOARD_KEY_0c0223=homepage
+ KEYBOARD_KEY_0c01bc=messenger
+ KEYBOARD_KEY_0c018a=mail
+ KEYBOARD_KEY_0c0221=search
+ KEYBOARD_KEY_0c00b8=ejectcd
+ KEYBOARD_KEY_0c022d=zoomin
+ KEYBOARD_KEY_0c022e=zoomout
 
 ###########################################################
-# Toshiba
+# Maxdata
 ###########################################################
 
-# Satellite A100
-keyboard:dmi:bvn*:bvr*:bd*:svnTOSHIBA*:pnSATELLITE A100:pvr*
- KEYBOARD_KEY_a4=stopcd
- KEYBOARD_KEY_b2=www
+# Pro 7000
+keyboard:dmi:bvn*:bvr*:bd*:svnMAXDATA:pnPro 7000*:pvr*
+ KEYBOARD_KEY_97=prog2
+ KEYBOARD_KEY_9f=prog1
+ KEYBOARD_KEY_a0=mute                                   # Fn+F5
+ KEYBOARD_KEY_82=www
+ KEYBOARD_KEY_ec=email
+ KEYBOARD_KEY_ae=volumedown                             # Fn+Down
+ KEYBOARD_KEY_b0=volumeup                               # Fn+Up
+ KEYBOARD_KEY_df=suspend                                # Fn+F2
+ KEYBOARD_KEY_f5=help
 
-# Satellite A110
-keyboard:dmi:bvn*:bvr*:bd*:svnTOSHIBA*:pnSatellite A110:pvr*
- KEYBOARD_KEY_92=stop
- KEYBOARD_KEY_93=www
- KEYBOARD_KEY_94=media
- KEYBOARD_KEY_9e=f22                                    # Touchpad on
- KEYBOARD_KEY_9f=f23                                    # Touchpad off
- KEYBOARD_KEY_b9=nextsong
- KEYBOARD_KEY_d9=brightnessup
- KEYBOARD_KEY_ee=screenlock
- KEYBOARD_KEY_f4=previoussong
- KEYBOARD_KEY_f7=playpause
+###########################################################
+# Medion
+###########################################################
 
-# Satellite M30X
-keyboard:dmi:bvn*:bvr*:bd*:svnTOSHIBA*:pnSatellite M30X:pvr*
- KEYBOARD_KEY_ef=brightnessdown
- KEYBOARD_KEY_d9=brightnessup
- KEYBOARD_KEY_ee=screenlock
- KEYBOARD_KEY_93=media
- KEYBOARD_KEY_9e=f22                                    # touchpad enable
- KEYBOARD_KEY_9f=f23                                    # touchpad disable
+# FID2060
+keyboard:dmi:bvn*:bvr*:bd*:svnMEDION*:pn*FID2060*:pvr*
+ KEYBOARD_KEY_6b=channeldown                            # Thottle Down
+ KEYBOARD_KEY_6d=channelup                              # Thottle Up
+
+# NB-A555
+keyboard:dmi:bvn*:bvr*:bd*:svnMEDIONNB:pnA555*:pvr*
+ KEYBOARD_KEY_63=www                                    # N button
+ KEYBOARD_KEY_66=prog1                                  # link 1 button
+ KEYBOARD_KEY_67=email                                  # envelope button
+ KEYBOARD_KEY_69=prog2                                  # link 2 button
+
+###########################################################
+# Microsoft
+###########################################################
+
+# Microsoft Natural Ergonomic Keyboard 4000
+keyboard:usb:v045Ep00DB*
+ KEYBOARD_KEY_c022d=zoomin
+ KEYBOARD_KEY_c022e=zoomout
 
 ###########################################################
 # Micro Star
@@ -689,89 +649,24 @@ keyboard:dmi:bvn*:bvr*:bd*:svnMICRO-STAR*:pnGE70*:pvr*
 keyboard:dmi:bvn*:bvr*:bd*:svnMicro-Star*:pn*:pvr*
  KEYBOARD_KEY_c2=ejectcd
 
-#
-keyboard:dmi:bvn*:bvr*:bd*:svnMICRO-STAR*:pn*U-100*:pvr*
-keyboard:dmi:bvn*:bvr*:bd*:svnMICRO-STAR*:pn*U100*:pvr*
-keyboard:dmi:bvn*:bvr*:bd*:svnMICRO-STAR*:pn*N033:*
- KEYBOARD_KEY_f7=reserved
- KEYBOARD_KEY_f8=reserved
-
-#
-keyboard:dmi:bvn*:bvr*:bd*:svnMICRO-STAR*:pnU90/U100:*
- KEYBOARD_KEY_e4=reserved
-
-###########################################################
-# Medion
-###########################################################
-
-# FID2060
-keyboard:dmi:bvn*:bvr*:bd*:svnMEDION*:pn*FID2060*:pvr*
- KEYBOARD_KEY_6b=channeldown                            # Thottle Down
- KEYBOARD_KEY_6d=channelup                              # Thottle Up
-
-# NB-A555
-keyboard:dmi:bvn*:bvr*:bd*:svnMEDIONNB:pnA555*:pvr*
- KEYBOARD_KEY_63=www                                    # N button
- KEYBOARD_KEY_66=prog1                                  # link 1 button
- KEYBOARD_KEY_67=email                                  # envelope button
- KEYBOARD_KEY_69=prog2                                  # link 2 button
-
-###########################################################
-# Genius
-###########################################################
-
-# Slimstar 320
-keyboard:usb:v0458p0708d*dc*dsc*dp*ic*isc*ip*in01*
- KEYBOARD_KEY_0900f0=scrollup
- KEYBOARD_KEY_0900f1=scrolldown
- KEYBOARD_KEY_0900f3=back
- KEYBOARD_KEY_0900f2=forward
- KEYBOARD_KEY_0900f5=wordprocessor
- KEYBOARD_KEY_0900f6=spreadsheet
- KEYBOARD_KEY_0900f4=presentation
- KEYBOARD_KEY_0c0223=www
- KEYBOARD_KEY_0900f7=chat
- KEYBOARD_KEY_0900fb=prog1
- KEYBOARD_KEY_0900f8=close
- KEYBOARD_KEY_0900f9=graphicseditor
- KEYBOARD_KEY_0900fd=scale
- KEYBOARD_KEY_0900fc=screenlock
-
-###########################################################
-# Asus
-###########################################################
-
-keyboard:dmi:bvn*:bvr*:bd*:svnASUS:*
- KEYBOARD_KEY_ed=volumeup
- KEYBOARD_KEY_ee=volumedown
- KEYBOARD_KEY_ef=mute
-
-###########################################################
-# VIA
-###########################################################
-
-keyboard:dmi:bvn*:bvr*:bd*:svnVIA:pnK8N800:pvr*
- KEYBOARD_KEY_81=prog1
-
-###########################################################
-# Everex
-###########################################################
+#
+keyboard:dmi:bvn*:bvr*:bd*:svnMICRO-STAR*:pn*U-100*:pvr*
+keyboard:dmi:bvn*:bvr*:bd*:svnMICRO-STAR*:pn*U100*:pvr*
+keyboard:dmi:bvn*:bvr*:bd*:svnMICRO-STAR*:pn*N033:*
+ KEYBOARD_KEY_f7=reserved
+ KEYBOARD_KEY_f8=reserved
 
-keyboard:dmi:bvn*:bvr*:bd*:svnEverex:pnXT5000*:pvr*
- KEYBOARD_KEY_5c=media
- KEYBOARD_KEY_65=f21                                    # Fn+F5 Touchpad toggle
- KEYBOARD_KEY_67=prog3                                  # Fan speed control button
- KEYBOARD_KEY_6f=brightnessup
- KEYBOARD_KEY_7f=brightnessdown
- KEYBOARD_KEY_b2=www
- KEYBOARD_KEY_ec=mail
+#
+keyboard:dmi:bvn*:bvr*:bd*:svnMICRO-STAR*:pnU90/U100:*
+ KEYBOARD_KEY_e4=reserved
 
 ###########################################################
-# Compal
+# MSI
 ###########################################################
 
-keyboard:dmi:bvn*:bvr*:bd*:svnCOMPAL:pnHEL80I:*
- KEYBOARD_KEY_84=wlan
+keyboard:name:MSI Laptop hotkeys:dmi:bvn*:bvr*:bd*:svn*:pnM[iI][cC][rR][oO]-S[tT][aA][rR]*:pvr*
+ KEYBOARD_KEY_0213=f22
+ KEYBOARD_KEY_0214=f23
 
 ###########################################################
 # OLPC
@@ -835,40 +730,6 @@ keyboard:dmi:bvn*:bvr*:bd*:svnOLPC:pnXO:*
  KEYBOARD_KEY_e8=kp1                                    # end
 
 ###########################################################
-# Alienware
-###########################################################
-
-keyboard:dmi:bvn*:bvr*:bd*:svnAlienware*:pn*
- KEYBOARD_KEY_8a=ejectcd
-
-###########################################################
-# Zepto
-###########################################################
-
-# Znote
-keyboard:dmi:bvn*:bvr*:bd*:svnZepto:pnZnote:*
- KEYBOARD_KEY_93=switchvideomode                        # Fn+F3 Toggle Video Output
- KEYBOARD_KEY_95=brightnessdown                         # Fn+F4 Brightness Down
- KEYBOARD_KEY_91=brightnessup                           # Fn+F5 Brightness Up
- KEYBOARD_KEY_a5=f23                                    # Fn+F6 Disable Touchpad
- KEYBOARD_KEY_a6=f22                                    # Fn+F6 Enable Touchpad
- KEYBOARD_KEY_a7=bluetooth                              # Fn+F10 Enable Bluetooth
- KEYBOARD_KEY_a9=bluetooth                              # Fn+F10 Disable Bluetooth
- KEYBOARD_KEY_f1=wlan                                   # RF Switch Off
- KEYBOARD_KEY_f2=wlan                                   # RF Switch On
- KEYBOARD_KEY_f4=prog1                                  # P1 Button
- KEYBOARD_KEY_f3=prog2                                  # P2 Button
- KEYBOARD_KEY_a0=!                                      # mute
- KEYBOARD_KEY_ae=!                                      # volume down
- KEYBOARD_KEY_b0=!                                      # volume up
-
-# Znote 6615WD
-keyboard:dmi:bvn*:bvr*:bd*:svnZepto:pnZnote 6615WD:*
- KEYBOARD_KEY_a0=!                                      # mute
- KEYBOARD_KEY_ae=!                                      # volume down
- KEYBOARD_KEY_b0=!                                      # volume up
-
-###########################################################
 # Onkyo
 ###########################################################
 
@@ -889,6 +750,18 @@ keyboard:dmi:bvn*:bvr*:bd*:svnONKYO CORPORATION:pnONKYOPC:*
  KEYBOARD_KEY_fb=wlan                                   # Fn+J
 
 ###########################################################
+# OQO
+###########################################################
+
+# Model 2
+keyboard:dmi:bvn*:bvr*:bd*:svnOQO Inc.*:pnOQO Model 2*:pvr*
+ KEYBOARD_KEY_8e=wlan
+ KEYBOARD_KEY_f0=switchvideomode
+ KEYBOARD_KEY_f1=mute
+ KEYBOARD_KEY_f2=volumedown
+ KEYBOARD_KEY_f3=volumeup
+
+###########################################################
 # Quanta
 ###########################################################
 
@@ -896,48 +769,175 @@ keyboard:dmi:bvn*:bvr*:bd*:svn*:pn*:pvr*:rvnQuanta:rn30B7:rvr65.2B:*
  KEYBOARD_KEY_88=media                                  # "quick play
 
 ###########################################################
-# BenQ
+# Samsung
 ###########################################################
 
-keyboard:dmi:bvn*:bvr*:bd*:svn*BenQ*:pn*Joybook R22*:pvr*
- KEYBOARD_KEY_6e=wlan
+keyboard:dmi:bvn*:bvr*:bd*:svn[sS][aA][mM][sS][uU][nN][gG]*:pvr*
+ KEYBOARD_KEY_74=prog1                                  # User key
+ KEYBOARD_KEY_75=www
+ KEYBOARD_KEY_78=mail
+ KEYBOARD_KEY_82=!switchvideomode                       # Fn+F4 CRT/LCD (high keycode: "displaytoggle")
+ KEYBOARD_KEY_83=!battery                               # Fn+F2
+ KEYBOARD_KEY_84=!prog1                                 # Fn+F5 backlight on/off
+ KEYBOARD_KEY_86=!wlan                                  # Fn+F9
+ KEYBOARD_KEY_88=!brightnessup                          # Fn+Up
+ KEYBOARD_KEY_89=!brightnessdown                        # Fn+Down
+ KEYBOARD_KEY_b1=!prog2                                 # Fn+F7 run Samsung Magic Doctor (keypressed event is generated twice)
+ KEYBOARD_KEY_b3=!prog3                                 # Fn+F8 switch power mode (battery/dynamic/performance)
+ KEYBOARD_KEY_b4=!wlan                                  # Fn+F9 (X60P)
+ KEYBOARD_KEY_f7=!f22                                   # Fn+F10 Touchpad on
+ KEYBOARD_KEY_f9=!f23                                   # Fn+F10 Touchpad off
+
+# Series 3
+keyboard:dmi:bvn*:bvr*:bd*:svn[sS][aA][mM][sS][uU][nN][gG]*:pn*300E[457]*:pvr*
+keyboard:dmi:bvn*:bvr*:bd*:svn[sS][aA][mM][sS][uU][nN][gG]*:pn*200E[45]*:pvr*
+ KEYBOARD_KEY_ce=!                                      # Fn+F1  launch control setting
+ KEYBOARD_KEY_d5=!                                      # Fn+F12 Wi-Fi toggle
+
+# 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 (?)
+ KEYBOARD_KEY_97=!                                      # Fn+F12 Wi-Fi toggle
+ KEYBOARD_KEY_d5=!                                      # Fn+F6 battery life extender
+
+# SQ1US
+keyboard:dmi:bvn*:bvr*:bd*:svn[sS][aA][mM][sS][uU][nN][gG]*:pnSQ1US:pvr*
+ KEYBOARD_KEY_d4=menu
+ KEYBOARD_KEY_d8=f1
+ KEYBOARD_KEY_d9=f10
+ KEYBOARD_KEY_d6=f3
+ KEYBOARD_KEY_d7=f9
+ KEYBOARD_KEY_e4=f5
+ KEYBOARD_KEY_ee=f11
+
+# SX20S
+keyboard:dmi:bvn*:bvr*:bd*:svn[sS][aA][mM][sS][uU][nN][gG]*:pn*SX20S*:pvr*
+ KEYBOARD_KEY_74=mute
+ KEYBOARD_KEY_75=mute
+ KEYBOARD_KEY_77=f22                                    # Touchpad on
+ KEYBOARD_KEY_79=f23                                    # Touchpad off
+
+keyboard:dmi:bvn*:bvr*:bd*:svn[sS][aA][mM][sS][uU][nN][gG]*:pn*700Z*:pvr*
+ KEYBOARD_KEY_ba=ejectcd
+ KEYBOARD_KEY_96=keyboardbrightnessup
+ KEYBOARD_KEY_97=keyboardbrightnessdown
+
+keyboard:dmi:bvn*:bvr*:bd*:svn[sS][aA][mM][sS][uU][nN][gG]*:pn*700T*:pvr*
+ KEYBOARD_KEY_ad=leftmeta
 
 ###########################################################
-# Maxdata
+# SONY
 ###########################################################
 
-# Pro 7000
-keyboard:dmi:bvn*:bvr*:bd*:svnMAXDATA:pnPro 7000*:pvr*
- KEYBOARD_KEY_97=prog2
- KEYBOARD_KEY_9f=prog1
- KEYBOARD_KEY_a0=mute                                   # Fn+F5
- KEYBOARD_KEY_82=www
- KEYBOARD_KEY_ec=email
- KEYBOARD_KEY_ae=volumedown                             # Fn+Down
- KEYBOARD_KEY_b0=volumeup                               # Fn+Up
- KEYBOARD_KEY_df=suspend                                # Fn+F2
- KEYBOARD_KEY_f5=help
+# sony-laptop driver
+keyboard:name:Sony Vaio Keys:dmi:bvn*:bvr*:bd*:svnSony*:pn*
+ KEYBOARD_KEY_06=mute                                   # Fn+F2
+ KEYBOARD_KEY_07=volumedown                             # Fn+F3
+ KEYBOARD_KEY_08=volumeup                               # Fn+F4
+ KEYBOARD_KEY_09=brightnessdown                         # Fn+F5
+ KEYBOARD_KEY_0a=brightnessup                           # Fn+F6
+ KEYBOARD_KEY_0b=switchvideomode                        # Fn+F7
+ KEYBOARD_KEY_0e=zoom                                   # Fn+F10
+ KEYBOARD_KEY_10=suspend                                # Fn+F12
+
+keyboard:name:Sony Vaio Keys:dmi:bvn*:bvr*:bd*:svnSony*:pn*PCG-C1*:pvr*
+keyboard:name:Sony Vaio Keys:dmi:bvn*:bvr*:bd*:svnSony*:pn*PCG-K25*:pvr*
+keyboard:name:Sony Vaio Keys:dmi:bvn*:bvr*:bd*:svnSony*:pn*PCG-F[1-6]*:pvr*
+keyboard:name:Sony Vaio Keys:dmi:bvn*:bvr*:bd*:svnSony*:pn*PCG-FX*:pvr*
+keyboard:name:Sony Vaio Keys:dmi:bvn*:bvr*:bd*:svnSony*:pn*PCG-FRV*:pvr*
+keyboard:name:Sony Vaio Keys:dmi:bvn*:bvr*:bd*:svnSony*:pn*PCG-GR*:pvr*
+keyboard:name:Sony Vaio Keys:dmi:bvn*:bvr*:bd*:svnSony*:pn*PCG-TR*:pvr*
+keyboard:name:Sony Vaio Keys:dmi:bvn*:bvr*:bd*:svnSony*:pn*PCG-NV*:pvr*
+keyboard:name:Sony Vaio Keys:dmi:bvn*:bvr*:bd*:svnSony*:pn*PCG-Z*:pvr*
+keyboard:name:Sony Vaio Keys:dmi:bvn*:bvr*:bd*:svnSony*:pn*VGN-S360*:pvr*
+ KEYBOARD_KEY_06=battery
+ KEYBOARD_KEY_07=mute
+
+keyboard:name:Sony Vaio Keys:dmi:bvn*:bvr*:bd*:svnSony*:pnVGN-AR71*:pvr*
+keyboard:name:Sony Vaio Keys:dmi:bvn*:bvr*:bd*:svnSony*:pnVGN-FW*:pvr*
+keyboard:name:Sony Vaio Keys:dmi:bvn*:bvr*:bd*:svnSony*:pnVGN-Z21*:pvr*
+ KEYBOARD_KEY_00=brightnessdown                         # Fn+F5
+ KEYBOARD_KEY_10=brightnessup                           # Fn+F6
+ KEYBOARD_KEY_11=switchvideomode                        # Fn+F7
+ KEYBOARD_KEY_12=zoomout
+ KEYBOARD_KEY_14=zoomin
+ KEYBOARD_KEY_15=suspend                                # Fn+F12
+ KEYBOARD_KEY_17=prog1
+ KEYBOARD_KEY_20=media
+
+keyboard:name:Sony Vaio Keys:dmi:bvn*:bvr*:bd*:svnSony*:pnVPC*:pvr*
+ KEYBOARD_KEY_05=f21                                    # Fn+F1 -> KEY_F21 (The actual touchpad toggle)
+ KEYBOARD_KEY_0d=zoomout                                # Fn+F9
+ KEYBOARD_KEY_0e=zoomin                                 # Fn+F10
 
 ###########################################################
-# OQO
+# Toshiba
 ###########################################################
 
-# Model 2
-keyboard:dmi:bvn*:bvr*:bd*:svnOQO Inc.*:pnOQO Model 2*:pvr*
- KEYBOARD_KEY_8e=wlan
- KEYBOARD_KEY_f0=switchvideomode
- KEYBOARD_KEY_f1=mute
- KEYBOARD_KEY_f2=volumedown
- KEYBOARD_KEY_f3=volumeup
+# Satellite A100
+keyboard:dmi:bvn*:bvr*:bd*:svnTOSHIBA*:pnSATELLITE A100:pvr*
+ KEYBOARD_KEY_a4=stopcd
+ KEYBOARD_KEY_b2=www
+
+# Satellite A110
+keyboard:dmi:bvn*:bvr*:bd*:svnTOSHIBA*:pnSatellite A110:pvr*
+ KEYBOARD_KEY_92=stop
+ KEYBOARD_KEY_93=www
+ KEYBOARD_KEY_94=media
+ KEYBOARD_KEY_9e=f22                                    # Touchpad on
+ KEYBOARD_KEY_9f=f23                                    # Touchpad off
+ KEYBOARD_KEY_b9=nextsong
+ KEYBOARD_KEY_d9=brightnessup
+ KEYBOARD_KEY_ee=screenlock
+ KEYBOARD_KEY_f4=previoussong
+ KEYBOARD_KEY_f7=playpause
+
+# Satellite M30X
+keyboard:dmi:bvn*:bvr*:bd*:svnTOSHIBA*:pnSatellite M30X:pvr*
+ KEYBOARD_KEY_ef=brightnessdown
+ KEYBOARD_KEY_d9=brightnessup
+ KEYBOARD_KEY_ee=screenlock
+ KEYBOARD_KEY_93=media
+ KEYBOARD_KEY_9e=f22                                    # touchpad enable
+ KEYBOARD_KEY_9f=f23                                    # touchpad disable
 
 ###########################################################
-# Inventec
+# VIA
 ###########################################################
 
-# Symphony
-keyboard:dmi:bvn*:bvr*:bd*:svnINVENTEC:pnSYMPHONY 6.0/7.0:pvr*
- KEYBOARD_KEY_f3=prog2
- KEYBOARD_KEY_f4=prog1
+keyboard:dmi:bvn*:bvr*:bd*:svnVIA:pnK8N800:pvr*
+ KEYBOARD_KEY_81=prog1
+
+###########################################################
+# Zepto
+###########################################################
+
+# Znote
+keyboard:dmi:bvn*:bvr*:bd*:svnZepto:pnZnote:*
+ KEYBOARD_KEY_93=switchvideomode                        # Fn+F3 Toggle Video Output
+ KEYBOARD_KEY_95=brightnessdown                         # Fn+F4 Brightness Down
+ KEYBOARD_KEY_91=brightnessup                           # Fn+F5 Brightness Up
+ KEYBOARD_KEY_a5=f23                                    # Fn+F6 Disable Touchpad
+ KEYBOARD_KEY_a6=f22                                    # Fn+F6 Enable Touchpad
+ KEYBOARD_KEY_a7=bluetooth                              # Fn+F10 Enable Bluetooth
+ KEYBOARD_KEY_a9=bluetooth                              # Fn+F10 Disable Bluetooth
+ KEYBOARD_KEY_f1=wlan                                   # RF Switch Off
+ KEYBOARD_KEY_f2=wlan                                   # RF Switch On
+ KEYBOARD_KEY_f4=prog1                                  # P1 Button
+ KEYBOARD_KEY_f3=prog2                                  # P2 Button
+ KEYBOARD_KEY_a0=!                                      # mute
+ KEYBOARD_KEY_ae=!                                      # volume down
+ KEYBOARD_KEY_b0=!                                      # volume up
+
+# Znote 6615WD
+keyboard:dmi:bvn*:bvr*:bd*:svnZepto:pnZnote 6615WD:*
+ KEYBOARD_KEY_a0=!                                      # mute
+ KEYBOARD_KEY_ae=!                                      # volume down
+ KEYBOARD_KEY_b0=!                                      # volume up
 
 ###########################################################
 # Other