hal-info: Branch 'master'

[Martin Pitt]

 fdi/information/10freedesktop/30-keymap-hp.fdi |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit cca4309f32c6d8ccf3645879285e859becd0c66e
Author: Stephen Sugden <glurgle at gmail.com>
Date:   Mon May 11 08:48:04 2009 +0200

    add keymap for HP TX2
    
    Add keymap for HP TX2. Also fix the "auto brightness" substitute key on other
    models from f21 to f23 to be consistent with other mappings, as per
    recommendation on
    http://people.freedesktop.org/~hughsient/quirk/quirk-keymap-try.html.
    
    Reported on hal ML.

diff --git a/fdi/information/10freedesktop/30-keymap-hp.fdi b/fdi/information/10freedesktop/30-keymap-hp.fdi
index bb10734..60e48fd 100644
--- a/fdi/information/10freedesktop/30-keymap-hp.fdi
+++ b/fdi/information/10freedesktop/30-keymap-hp.fdi
@@ -14,7 +14,7 @@
           <append key="input.keymap.data" type="strlist">e00c:media</append>      <!-- music -->
           <append key="input.keymap.data" type="strlist">e00e:dvd</append>      <!-- dvd -->
           <append key="input.keymap.data" type="strlist">e031:help</append>     <!-- FnF1 (help) -->
-          <append key="input.keymap.data" type="strlist">e033:f21</append>      <!-- FIXME: Auto brightness -->
+          <append key="input.keymap.data" type="strlist">e033:f23</append>      <!-- FIXME: Auto brightness -->
           <append key="input.keymap.data" type="strlist">e057:wlan</append>     <!-- Wlan -->
 	  <append key="input.keymap.data" type="strlist">e012:brightnessdown</append>	<!-- FnF7 (FnF9 on 6730b) (brightness down) -->
 	  <append key="input.keymap.data" type="strlist">e017:brightnessup</append>	<!-- FnF8 (FnF10 on 6730b) (brightness up) -->
@@ -30,6 +30,12 @@
             <append key="input.keymap.data" type="strlist">e007:pagedown</append>  <!-- PgDown -->
           </match>
 
+          <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_ncase="tx2">	
+            <append key="input.keymap.data" type="strlist">e042:media</append>
+            <append key="input.keymap.data" type="strlist">e058:f22</append>      <!-- Toggle touchpad button on tx2 (OFF)  -->
+            <append key="input.keymap.data" type="strlist">e059:f22</append>      <!-- Toggle touchpad button on tx2 (ON) -->
+          </match>
+
 	  <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_ncase="Pavilion">
             <!-- Home and entertainment machines -->
             <append key="input.keymap.data" type="strlist">e008:media</append> <!-- FIXME: quick play -->