hal: Branch 'master'

[Richard Hughes]

 fdi/information/10freedesktop/30-keymap-module-thinkpad-acpi.fdi |   19 ++++++++++
 1 files changed, 19 insertions(+)

New commits:
diff-tree a9ed9e4516020c107db694a54edbfde178a84483 (from 0e9cfc96276fed06d195bb1c954d36c98c146c76)
Author: Richard Hughes <richard at hughsie.com>
Date:   Fri Jul 20 20:28:48 2007 +0100

    add keymap for T6 range
    
    - Add a T6x section
      system.hardware.vendor = 'LENOVO'  (string)
      system.hardware.version = 'ThinkPad T60'  (string)
    
    2) Things I added that aren't in the other maps:
    
      0x11 -> kbdillumtoggle (for the thinklight)
      0x14/15/16 -> volume up/down/mute (don't know if these work right, as they aren't
      generating either unknown key events or acpi events at the moment)

diff --git a/fdi/information/10freedesktop/30-keymap-module-thinkpad-acpi.fdi b/fdi/information/10freedesktop/30-keymap-module-thinkpad-acpi.fdi
index 2c9e8dd..0a7435a 100644
--- a/fdi/information/10freedesktop/30-keymap-module-thinkpad-acpi.fdi
+++ b/fdi/information/10freedesktop/30-keymap-module-thinkpad-acpi.fdi
@@ -160,6 +160,25 @@
           <append key="input.keymap.data" type="strlist">0x17:vendor</append> <!-- ThinkPad/ThinkVantage button -->
           <append key="info.capabilities" type="strlist">input.keymap</append>
         </match>
+        <match key="/org/freedesktop/Hal/devices/computer:system.hardware.version" contains="T6">
+          <append key="input.keymap.data" type="strlist">0x01:screenlock</append> <!-- Fn+F2 lock -->
+          <append key="input.keymap.data" type="strlist">0x02:battery</append> <!-- Fn+F3 battery -->
+          <append key="input.keymap.data" type="strlist">0x03:sleep</append> <!-- Fn+F4 suspend -->
+          <append key="input.keymap.data" type="strlist">0x04:radio</append> <!-- Fn+F5 wifi -->
+          <append key="input.keymap.data" type="strlist">0x06:switchvideomode</append> <!-- Fn+F7 switch video output device -->
+          <append key="input.keymap.data" type="strlist">0x07:f22</append> <!-- Fn+F8 touchpadtoggle -->
+          <append key="input.keymap.data" type="strlist">0x08:f24</append> <!-- Fn+F9 undock -->
+          <append key="input.keymap.data" type="strlist">0x0b:suspend</append> <!-- Fn+F12 hibernate -->
+          <append key="input.keymap.data" type="strlist">0x0f:brightnessup</append> <!-- Fn+Home -->
+          <append key="input.keymap.data" type="strlist">0x10:brightnessdown</append> <!-- Fn+End -->
+          <append key="input.keymap.data" type="strlist">0x11:kbdillumtoggle</append> <!-- Fn+PgUp - ThinkLight -->
+          <append key="input.keymap.data" type="strlist">0x14:volumeup</append> <!-- Volume Up button -->
+	  <append key="input.keymap.data" type="strlist">0x15:volumedown</append> <!-- Volume Down button -->
+          <append key="input.keymap.data" type="strlist">0x16:mute</append> <!-- Mute button -->
+          <append key="input.keymap.data" type="strlist">0x13:zoom</append> <!-- Fn+Space -->
+          <append key="input.keymap.data" type="strlist">0x17:vendor</append> <!-- ThinkPad/ThinkVantage button -->
+          <append key="info.capabilities" type="strlist">input.keymap</append>
+        </match>
         <match key="/org/freedesktop/Hal/devices/computer:system.hardware.version" contains="R6">
           <append key="input.keymap.data" type="strlist">0x01:screenlock</append> <!-- Fn+F2 lock -->
           <append key="input.keymap.data" type="strlist">0x02:battery</append> <!-- Fn+F3 battery -->