hal-info: Branch 'master'

Danny Kukawka dkukawka at kemper.freedesktop.org
Fri Oct 24 02:23:34 PDT 2008


 fdi/information/10freedesktop/30-keymap-hp.fdi |   71 +++++++++++++------------
 1 file changed, 39 insertions(+), 32 deletions(-)

New commits:
commit 709d54ad6b99efbe7e8f90bf537f45e2452b188b
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Fri Oct 24 11:22:56 2008 +0200

    fixed HP keymap to match for now only laptops
    
    Fixed HP keymap to match for now only laptops to prevent trouble
    e.g. with workstations.

diff --git a/fdi/information/10freedesktop/30-keymap-hp.fdi b/fdi/information/10freedesktop/30-keymap-hp.fdi
index b8987f7..21429d2 100644
--- a/fdi/information/10freedesktop/30-keymap-hp.fdi
+++ b/fdi/information/10freedesktop/30-keymap-hp.fdi
@@ -6,38 +6,45 @@
     <!-- These are raw scancodes produced by the atkbd driver -->
     <match key="@input.originating_device:info.linux.driver" string="atkbd">
       <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" prefix="Hewlett-Packard">
-        <append key="input.keymap.data" type="strlist">e001:fn_esc</append>   <!-- FnEsc -->
-        <append key="input.keymap.data" type="strlist">e009:battery</append>  <!-- FnF8 (battery) -->
-        <append key="input.keymap.data" type="strlist">e00a:screenlock</append> <!-- FnF6 (lock) -->
-        <append key="input.keymap.data" type="strlist">e00b:camera</append>     <!-- camera -->
-        <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">e057:wlan</append>     <!-- Wlan -->
-        <append key="info.capabilities" type="strlist">input.keymap</append>
-	<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:player</append> <!-- FIXME: quick play -->
-          <append key="input.keymap.data" type="strlist">e058:f22</append>    <!-- touchpad off -->
-          <append key="input.keymap.data" type="strlist">e059:f23</append>    <!-- touchpad on  -->
-        </match>
-	<match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_ncase="Compaq">
-          <!-- Business and enterprise machines -->
-          <append key="input.keymap.data" type="strlist">e008:presentation</append>   <!-- Presentation -->
-          <append key="input.keymap.data" type="strlist">e059:info</append>   <!-- I key -->
-        </match>
-        <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="6730s">
-          <!-- HP Compaq 6730s -->
-          <append key="input.keymap.data" type="strlist">e012:brightnessdown</append>	<!-- FnF7 (brightness down) -->
-          <append key="input.keymap.data" type="strlist">e017:brightnessup</append>	<!-- FnF8 (brightness up) -->
-        </match>
-	<match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="2510p">
-          <!-- The 2510p seems to be unique in having a touchpad disable button despite being an enterprise model -->
-          <remove key="input.keymap.data" type="strlist">e059:info</remove>
-          <append key="input.keymap.data" type="strlist">e058:f22</append>    <!-- touchpad off -->
-          <append key="input.keymap.data" type="strlist">e059:f23</append>    <!-- touchpad on  -->
-	</match>
+	<match key="/org/freedesktop/Hal/devices/computer:system.formfactor" string="laptop">
+          <append key="input.keymap.data" type="strlist">e001:fn_esc</append>   <!-- FnEsc -->
+          <append key="input.keymap.data" type="strlist">e009:battery</append>  <!-- FnF8 (battery) -->
+          <append key="input.keymap.data" type="strlist">e00a:screenlock</append> <!-- FnF6 (lock) -->
+          <append key="input.keymap.data" type="strlist">e00b:camera</append>     <!-- camera -->
+          <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">e057:wlan</append>     <!-- Wlan -->
+          <append key="info.capabilities" type="strlist">input.keymap</append>
+
+	  <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:player</append> <!-- FIXME: quick play -->
+            <append key="input.keymap.data" type="strlist">e058:f22</append>    <!-- touchpad off -->
+            <append key="input.keymap.data" type="strlist">e059:f23</append>    <!-- touchpad on  -->
+          </match>
+
+	  <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_ncase="Compaq">
+            <!-- Business and enterprise machines -->
+            <append key="input.keymap.data" type="strlist">e008:presentation</append>   <!-- Presentation -->
+            <append key="input.keymap.data" type="strlist">e059:info</append>   <!-- I key -->
+          </match>
+
+          <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="6730s">
+            <!-- HP Compaq 6730s -->
+            <append key="input.keymap.data" type="strlist">e012:brightnessdown</append>	<!-- FnF7 (brightness down) -->
+            <append key="input.keymap.data" type="strlist">e017:brightnessup</append>	<!-- FnF8 (brightness up) -->
+          </match>
+
+	  <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="2510p">
+            <!-- The 2510p seems to be unique in having a touchpad disable button despite being an enterprise model -->
+            <remove key="input.keymap.data" type="strlist">e059:info</remove>
+            <append key="input.keymap.data" type="strlist">e058:f22</append>    <!-- touchpad off -->
+            <append key="input.keymap.data" type="strlist">e059:f23</append>    <!-- touchpad on  -->
+	  </match>
+
+      	</match>
       </match>
     </match>
   </device>


More information about the hal-commit mailing list