hal-info: Branch 'master' - 3 commits

Matthew Garrett mjg59 at kemper.freedesktop.org
Tue Jun 24 13:03:30 PDT 2008


 fdi/information/10freedesktop/30-keymap-acer.fdi |  286 ++---------------------
 fdi/information/10freedesktop/30-keymap-dell.fdi |  146 +----------
 fdi/information/10freedesktop/30-keymap-hp.fdi   |  137 ++---------
 3 files changed, 74 insertions(+), 495 deletions(-)

New commits:
commit 8916d1e767b79c340c4f21c339706c74ebb264d9
Author: Matthew Garrett <mjg59 at srcf.ucam.org>
Date:   Tue Jun 24 21:03:05 2008 +0100

    Make the HP keymap more generic

diff --git a/fdi/information/10freedesktop/30-keymap-hp.fdi b/fdi/information/10freedesktop/30-keymap-hp.fdi
index 9b811ad..fc714bd 100644
--- a/fdi/information/10freedesktop/30-keymap-hp.fdi
+++ b/fdi/information/10freedesktop/30-keymap-hp.fdi
@@ -5,117 +5,34 @@
 
     <!-- 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">
-        <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="dv2500">
-          <append key="input.keymap.data" type="strlist">e00a:screenlock</append> <!-- FnF6 (lock) -->
-          <append key="input.keymap.data" type="strlist">e031:help</append>	<!-- FnF1 (help) -->
-          <append key="input.keymap.data" type="strlist">e059:f22</append>	<!-- touchpad on  -->
-          <append key="input.keymap.data" type="strlist">e058:f22</append>	<!-- touchpad off -->
-          <append key="info.capabilities" type="strlist">input.keymap</append>
-        </match>
-	<match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="dv5000">
-          <append key="input.keymap.data" type="strlist">e031:help</append>     <!-- FnF1 (help) -->
-          <append key="input.keymap.data" type="strlist">e00a:screenlock</append> <!-- FnF6 (lock) -->
-          <append key="info.capabilities" type="strlist">input.keymap</append>
-        </match>
-        <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="dv6000;dv6500">
-          <append key="input.keymap.data" type="strlist">e008:f20</append>	<!-- FIXME: quick play -->
-          <append key="input.keymap.data" type="strlist">e00a:screenlock</append> <!-- FnF6 (lock) -->
-          <append key="input.keymap.data" type="strlist">e00e:f21</append>	<!-- FIXME: dvd -->
-          <append key="input.keymap.data" type="strlist">e031:help</append>	<!-- FnF1 (help) -->
-          <append key="input.keymap.data" type="strlist">e058:f22</append>	<!-- FIXME: touchpad off -->
-          <append key="input.keymap.data" type="strlist">e059:f22</append>	<!-- FIXME: touchpad on -->
-          <append key="info.capabilities" type="strlist">input.keymap</append>
-        </match>
-	<!-- HP 530 Notebook PC(GN797AA#AKB) -->
-        <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="HP 530 Notebook">
-          <append key="input.keymap.data" type="strlist">e00a:screenlock</append> <!-- FnF6 (lock) -->
-          <append key="info.capabilities" type="strlist">input.keymap</append>
-        </match>
-        <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="nc2400">
-          <append key="input.keymap.data" type="strlist">e001:fn_esc</append>	<!-- FnEsc -->
-          <append key="input.keymap.data" type="strlist">e008:presentation</append>	<!-- Presentation -->
-          <append key="input.keymap.data" type="strlist">e009:battery</append>	<!-- FnF8 (battery) -->
-          <append key="input.keymap.data" type="strlist">e00a:f22</append>	<!-- FnF6 -->
-          <append key="input.keymap.data" type="strlist">e059:info</append>	<!-- I key -->
-          <append key="info.capabilities" type="strlist">input.keymap</append>
-        </match>
-        <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="2510p">
-          <append key="input.keymap.data" type="strlist">e008:presentation</append>	<!-- Presentation -->
-          <append key="input.keymap.data" type="strlist">e009:battery</append>	<!-- FnF8 (battery) -->
-          <append key="input.keymap.data" type="strlist">e00a:f21</append>	<!-- FnF6 -->
-          <append key="input.keymap.data" type="strlist">e033:f22</append>     	<!-- FIXME: Auto brightness -->
-          <append key="input.keymap.data" type="strlist">e058:f23</append>	<!-- FIXME: touchpad off -->
-          <append key="input.keymap.data" type="strlist">e059:f23</append>	<!-- FIXME: touchpad on -->
-          <append key="info.capabilities" type="strlist">input.keymap</append>
-        </match>
-        <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="nx5000">
-          <append key="input.keymap.data" type="strlist">e001:fn_esc</append>	<!-- FnEsc -->
-          <append key="input.keymap.data" type="strlist">e008:tv</append>	<!-- SVideo/Presentation -->
-          <append key="input.keymap.data" type="strlist">e009:battery</append>	<!-- FnF8 (battery) -->
-          <append key="input.keymap.data" type="strlist">e00a:screenlock</append>	<!-- Lock -->
-          <append key="input.keymap.data" type="strlist">e057:wlan</append>	<!-- Wlan -->
-          <append key="info.capabilities" type="strlist">input.keymap</append>
-        </match>
-        <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="nc6120;nc6320">
-          <append key="input.keymap.data" type="strlist">e008:tv</append>	<!-- SVideo -->
-          <append key="input.keymap.data" type="strlist">e009:battery</append>	<!-- FnF8 (battery) -->
-          <append key="input.keymap.data" type="strlist">e059:www</append>	<!-- I key -->
-          <append key="info.capabilities" type="strlist">input.keymap</append>
-        </match>
-        <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="nc6400;nx6125">
-          <append key="input.keymap.data" type="strlist">e001:fn_esc</append>	<!-- FnEsc -->
-          <append key="input.keymap.data" type="strlist">e008:presentation</append>	<!-- presentation -->
-          <append key="input.keymap.data" type="strlist">e009:battery</append>	<!-- FnF8 (battery) -->
-          <append key="input.keymap.data" type="strlist">e059:info</append>	<!-- I key -->
-          <append key="info.capabilities" type="strlist">input.keymap</append>
-        </match>
-        <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="nc6230;nw8440;nx6325;6510b;6710b;6715;nx9420;8510w">
-          <append key="input.keymap.data" type="strlist">e001:fn_esc</append>	<!-- FnEsc -->
-          <append key="input.keymap.data" type="strlist">e008:presentation</append>	<!-- presentation -->
-          <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">e033:f22</append>      <!-- FIXME: Auto brightness -->
-          <append key="input.keymap.data" type="strlist">e059:info</append>	<!-- I key -->
-          <append key="info.capabilities" type="strlist">input.keymap</append>
-        </match>
-        <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="2710p;6910p">
-          <append key="input.keymap.data" type="strlist">e001:fn_esc</append>		<!-- FnEsc -->
-          <append key="input.keymap.data" type="strlist">e008:presentation</append>	<!-- presentation -->
-          <append key="input.keymap.data" type="strlist">e009:battery</append>		<!-- FnF8 (battery) -->
-          <append key="info.capabilities" type="strlist">input.keymap</append>
-        </match>
-        <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="nx7300;nx7400">
-          <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">e033:f22</append>     	<!-- FIXME: Auto brightness -->
-          <append key="info.capabilities" type="strlist">input.keymap</append>
-        </match>
-        <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="nx9105">
-          <append key="input.keymap.data" type="strlist">e001:fn_esc</append>	<!-- FnEsc -->
-          <append key="input.keymap.data" type="strlist">e00a:screenlock</append> <!-- FnF6 (lock) -->
-          <append key="input.keymap.data" type="strlist">e031:help</append>	<!-- FnF1 (help) -->
-          <append key="info.capabilities" type="strlist">input.keymap</append>
-        </match>
-	<match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="zd7000">
-          <append key="input.keymap.data" type="strlist">e008:player</append>    <!-- multi-media -->
-          <append key="input.keymap.data" type="strlist">e00a:screenlock</append><!-- Fn+lock -->
-          <append key="input.keymap.data" type="strlist">e00b:camera</append>    <!-- camera -->
-          <append key="input.keymap.data" type="strlist">e031:help</append>      <!-- Fn+F1 (help) -->
-          <append key="info.capabilities" type="strlist">input.keymap</append>
-        </match>
-        <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="tx1000">
-          <append key="input.keymap.data" type="strlist">e001:fn_esc</append>	<!-- FnEsc -->
-          <append key="input.keymap.data" type="strlist">e00a:screenlock</append> <!-- FnF6 (lock) -->
-          <append key="input.keymap.data" type="strlist">e031:help</append>	<!-- FnF1 (help) -->
-	  <append key="input.keymap.data" type="strlist">e00e:dvd</append>	<!-- Media Player: DVD mode -->
-	  <append key="input.keymap.data" type="strlist">e008:pc</append>	<!-- Media Player: Media Mode (PVR or PC?) -->
-          <append key="input.keymap.data" type="strlist">e059:f22</append>	<!-- touchpad on  -->
-          <append key="input.keymap.data" type="strlist">e058:f22</append>	<!-- touchpad off -->
-          <append key="info.capabilities" type="strlist">input.keymap</append>
-        </match>
+        <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_outof="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>
   </device>
commit 33ca5ca4178acdfb422316cf011009ab51174a1c
Author: Matthew Garrett <mjg59 at srcf.ucam.org>
Date:   Tue Jun 24 21:02:55 2008 +0100

    Make the Dell keymap more generic.

diff --git a/fdi/information/10freedesktop/30-keymap-dell.fdi b/fdi/information/10freedesktop/30-keymap-dell.fdi
index 3b13489..a5804db 100644
--- a/fdi/information/10freedesktop/30-keymap-dell.fdi
+++ b/fdi/information/10freedesktop/30-keymap-dell.fdi
@@ -7,130 +7,28 @@
     <match key="@input.originating_device:info.linux.driver" string="atkbd">
 
       <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" prefix="Dell">
-        <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" prefix="Latitude">
-          <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="D420;D820">
-            <append key="input.keymap.data" type="strlist">e005:brightnessdown</append> <!-- Fn+Down arrow Brightness Down -->
-            <append key="input.keymap.data" type="strlist">e006:brightnessup</append> <!-- Fn+Up arrow Brightness Up -->
-            <append key="input.keymap.data" type="strlist">e007:battery</append> <!-- Fn+F3 battery icon -->
-            <append key="input.keymap.data" type="strlist">e00a:suspend</append> <!-- Fn+F1 hibernate -->
-            <append key="input.keymap.data" type="strlist">e00b:displaytoggle</append> <!-- Fn+F8 CRT/LCD -->
-            <append key="input.keymap.data" type="strlist">e00f:switchvideomode</append> <!-- Fn+F7 aspect ratio -->
-            <append key="input.keymap.data" type="strlist">e013:f23</append> <!-- FIXME Fn+Left arrow Auto Brightness -->
-            <append key="info.capabilities" type="strlist">input.keymap</append>
-          </match>
-          <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="D610">
-            <append key="input.keymap.data" type="strlist">e005:brightnessdown</append> <!-- Fn+Down arrow Brightness Down -->
-            <append key="input.keymap.data" type="strlist">e006:brightnessup</append> <!-- Fn+Up arrow Brightness Up -->
-            <append key="input.keymap.data" type="strlist">e007:battery</append> <!-- Fn+F3 battery icon -->
-            <append key="input.keymap.data" type="strlist">e008:wlan</append> <!-- Fn+F2 Turn On/Off Wireless -->
-            <append key="input.keymap.data" type="strlist">e009:ejectclosecd</append> <!-- Fn+F10 Eject CD -->
-            <append key="input.keymap.data" type="strlist">e00a:suspend</append> <!-- Fn+F1 hibernate -->
-            <append key="input.keymap.data" type="strlist">e00b:displaytoggle</append> <!-- Fn+F8 CRT/LCD -->
-            <append key="info.capabilities" type="strlist">input.keymap</append>
-          </match>
-          <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="D620">
-            <append key="input.keymap.data" type="strlist">e005:brightnessdown</append> <!-- Fn+Down arrow Brightness Down -->
-            <append key="input.keymap.data" type="strlist">e006:brightnessup</append> <!-- Fn+Up arrow Brightness Up -->
-            <append key="input.keymap.data" type="strlist">e007:battery</append> <!-- Fn+F3 battery icon -->
-            <append key="input.keymap.data" type="strlist">e008:wlan</append> <!-- Turn On/Off Wireless -->
-            <append key="input.keymap.data" type="strlist">e00a:suspend</append> <!-- Fn+F1 hibernate -->
-            <append key="input.keymap.data" type="strlist">e00b:displaytoggle</append> <!-- Fn+F8 CRT/LCD -->
-            <append key="input.keymap.data" type="strlist">e00f:switchvideomode</append> <!-- Fn+F7 aspect ratio -->
-            <append key="input.keymap.data" type="strlist">e013:f23</append> <!-- Fn+Left arrow Auto Brightness -->
-            <append key="info.capabilities" type="strlist">input.keymap</append>
-          </match>
-          <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="D630">
-            <append key="input.keymap.data" type="strlist">e005:brightnessdown</append> <!-- Fn+Down arrow Brightness Down -->
-            <append key="input.keymap.data" type="strlist">e006:brightnessup</append> <!-- Fn+Up arrow Brightness Up -->
-            <append key="input.keymap.data" type="strlist">e007:battery</append> <!-- Fn+F3 battery icon -->
-            <append key="input.keymap.data" type="strlist">e008:wlan</append> <!-- Turn On/Off Wireless -->
-            <append key="input.keymap.data" type="strlist">e00a:suspend</append> <!-- Fn+F1 hibernate -->
-            <append key="input.keymap.data" type="strlist">e00b:displaytoggle</append> <!-- Fn+F8 CRT/LCD -->
-            <append key="input.keymap.data" type="strlist">e00f:switchvideomode</append> <!-- Fn+F7 aspect ratio -->
-            <append key="input.keymap.data" type="strlist">e011:prog1</append> <!-- Wifi Catcher (DELL Specific) -->
-            <append key="input.keymap.data" type="strlist">e013:f23</append> <!-- Fn+Left arrow Auto Brightness -->
-            <append key="info.capabilities" type="strlist">input.keymap</append>
-          </match>
-        </match> <!-- prefix="Latitude" -->
-
-	<!-- Dell Inspiron 9400, 640m, E1505/6400 -->
-        <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" prefix_outof="MP061;MXC061;MM061"> 
-          <append key="input.keymap.data" type="strlist">e005:brightnessdown</append> <!-- Fn+Down arrow Brightness Down -->
-          <append key="input.keymap.data" type="strlist">e006:brightnessup</append> <!-- Fn+Up arrow Brightness Up -->
-          <append key="input.keymap.data" type="strlist">e007:battery</append> <!-- Fn+F3 battery icon -->
-          <append key="input.keymap.data" type="strlist">e008:wlan</append> <!-- Fn+F2 Toggle WiFi -->
-          <append key="input.keymap.data" type="strlist">e008:bluetooth</append> <!-- FIXME Bluetooth switch (same as wireless) -->
-          <append key="input.keymap.data" type="strlist">e009:ejectclosecd</append> <!-- Fn+F10 Eject CD -->
-          <append key="input.keymap.data" type="strlist">e00a:suspend</append> <!-- Fn+F1 hibernate -->
-          <append key="input.keymap.data" type="strlist">e00b:switchvideomode</append> <!-- Fn+F8 CRT/LCD -->
-          <append key="input.keymap.data" type="strlist">e012:media</append> <!-- MediaDirect button (house icon) -->
-          <append key="info.capabilities" type="strlist">input.keymap</append>
-        </match>
-
-        <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" prefix="MXC062"> <!-- Dell XPS M1210 -->
-          <append key="input.keymap.data" type="strlist">e005:brightnessdown</append> <!-- Fn+Down arrow Brightness Down -->
-          <append key="input.keymap.data" type="strlist">e006:brightnessup</append> <!-- Fn+Up arrow Brightness Up -->
-          <append key="input.keymap.data" type="strlist">e007:battery</append> <!-- Fn+F3 Battery icon -->
-          <append key="input.keymap.data" type="strlist">e008:wlan</append> <!-- Wirelesss switch -->
-          <append key="input.keymap.data" type="strlist">e008:bluetooth</append> <!-- FIXME Bluetooth switch (same as wireless) -->
-          <append key="input.keymap.data" type="strlist">e00a:suspend</append> <!-- Fn+F1 Hibernate -->
-          <append key="input.keymap.data" type="strlist">e00b:switchvideomode</append> <!-- Fn+F8 CRT/LCD -->
-          <append key="input.keymap.data" type="strlist">e012:media</append> <!-- Dell MediaDirect button Opens Dell Media Experience (a sort of media player) -->
-          <append key="input.keymap.data" type="strlist">e015:camera</append> <!-- Shutter button Takes a picture if optional camera available -->
-          <append key="info.capabilities" type="strlist">input.keymap</append>
-        </match>
-
-        <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" prefix="Inspiron">
-          <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="8500">
-            <append key="input.keymap.data" type="strlist">e005:brightnessdown</append> <!-- Fn+Down arrow Brightness Down -->
-            <append key="input.keymap.data" type="strlist">e006:brightnessup</append> <!-- Fn+Up arrow Brightness Up -->
-            <append key="input.keymap.data" type="strlist">e007:battery</append> <!-- Fn+F3 battery icon -->
-            <append key="input.keymap.data" type="strlist">e008:wlan</append> <!-- Fn+F2 Toggle WiFi -->
-            <append key="input.keymap.data" type="strlist">e009:ejectclosecd</append> <!-- Fn+F10 Eject CD -->
-            <append key="info.capabilities" type="strlist">input.keymap</append>
-          </match>
-          <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="XPS Gen2;1501">
-            <append key="input.keymap.data" type="strlist">e005:brightnessdown</append> <!-- Fn+Down arrow Brightness Down -->
-            <append key="input.keymap.data" type="strlist">e006:brightnessup</append> <!-- Fn+Up arrow Brightness Up -->
-            <append key="input.keymap.data" type="strlist">e007:battery</append> <!-- Fn+F3 battery icon -->
-            <append key="input.keymap.data" type="strlist">e008:wlan</append> <!-- Fn+F2 Toggle WiFi -->
-            <append key="input.keymap.data" type="strlist">e009:ejectclosecd</append> <!-- Fn+F10 Eject CD -->
-            <append key="input.keymap.data" type="strlist">e00a:suspend</append> <!-- Fn+F1 Hibernate -->
-            <append key="input.keymap.data" type="strlist">e00b:switchvideomode</append> <!-- Fn+F8 CRT/LCD -->
-            <append key="info.capabilities" type="strlist">input.keymap</append>
-          </match>
-          <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="1520">
-            <append key="input.keymap.data" type="strlist">e005:brightnessdown</append> <!-- Fn+Down arrow Brightness Down -->
-            <append key="input.keymap.data" type="strlist">e006:brightnessup</append> <!-- Fn+Up arrow Brightness Up -->
-            <append key="input.keymap.data" type="strlist">e007:battery</append> <!-- Fn+F3 battery icon -->
-            <append key="input.keymap.data" type="strlist">e009:ejectclosecd</append> <!-- Fn+F10 Eject CD -->
-            <append key="input.keymap.data" type="strlist">e00a:suspend</append> <!-- Fn+F1 Hibernate -->
-            <append key="input.keymap.data" type="strlist">e00b:switchvideomode</append> <!-- Fn+F8 CRT/LCD -->
-            <append key="info.capabilities" type="strlist">input.keymap</append>
-          </match>
-        </match>
-
-        <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" prefix="Precision">
-          <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="M20">
-            <append key="input.keymap.data" type="strlist">e005:brightnessdown</append> <!-- Fn+Down arrow Brightness Down -->
-            <append key="input.keymap.data" type="strlist">e006:brightnessup</append> <!-- Fn+Up arrow Brightness Up -->
-            <append key="input.keymap.data" type="strlist">e007:battery</append> <!-- Fn+F3 battery icon -->
-            <append key="input.keymap.data" type="strlist">e008:wlan</append> <!-- Fn+F2 Turn On/Off Wireless -->
-            <append key="input.keymap.data" type="strlist">e009:ejectclosecd</append> <!-- Fn+F10 Eject CD -->
-            <append key="input.keymap.data" type="strlist">e00a:suspend</append> <!-- Fn+F1 hibernate -->
-            <append key="input.keymap.data" type="strlist">e00b:displaytoggle</append> <!-- Fn+F8 CRT/LCD -->
-            <append key="info.capabilities" type="strlist">input.keymap</append>
-          </match>
-          <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="M65">
-            <append key="input.keymap.data" type="strlist">e005:brightnessdown</append> <!-- Fn+Down arrow Brightness Down -->
-            <append key="input.keymap.data" type="strlist">e006:brightnessup</append> <!-- Fn+Up arrow Brightness Up -->
-            <append key="input.keymap.data" type="strlist">e007:battery</append> <!-- Fn+F3 battery icon -->
-            <append key="input.keymap.data" type="strlist">e00a:suspend</append> <!-- Fn+F1 hibernate -->
-            <append key="input.keymap.data" type="strlist">e00f:switchvideomode</append> <!-- Fn+F7 aspect ratio -->
-            <append key="input.keymap.data" type="strlist">e013:f23</append> <!-- Fn+Left arrow Auto Brightness -->
-            <append key="info.capabilities" type="strlist">input.keymap</append>
-          </match>
-        </match>
+        <append key="input.keymap.data" type="strlist">e001:playpause</append> <!-- Play/Pause -->
+        <append key="input.keymap.data" type="strlist">e002:stop</append> <!-- Stop -->
+        <append key="input.keymap.data" type="strlist">e003:previoussong</append> <!-- Previous song -->
+        <append key="input.keymap.data" type="strlist">e004:nextsong</append> <!-- Next song -->
+        <append key="input.keymap.data" type="strlist">e005:brightnessdown</append> <!-- Fn+Down arrow Brightness Down -->
+        <append key="input.keymap.data" type="strlist">e006:brightnessup</append> <!-- Fn+Up arrow Brightness Up -->
+        <append key="input.keymap.data" type="strlist">e007:battery</append> <!-- Fn+F3 battery icon -->
+        <append key="input.keymap.data" type="strlist">e008:wlan</append> <!-- Fn+F2 Turn On/Off Wireless -->
+        <append key="input.keymap.data" type="strlist">e009:ejectclosecd</append> <!-- Fn+F10 Eject CD -->
+        <append key="input.keymap.data" type="strlist">e00a:suspend</append> <!-- Fn+F1 hibernate -->
+        <append key="input.keymap.data" type="strlist">e00b:displaytoggle</append> <!-- Fn+F8 CRT/LCD -->
+        <append key="input.keymap.data" type="strlist">e00f:switchvideomode</append> <!-- Fn+F7 aspect ratio -->
+        <append key="input.keymap.data" type="strlist">e010:previoussong</append> <!-- Front panel previous song -->
+        <append key="input.keymap.data" type="strlist">e011:prog1</append> <!-- Wifi Catcher (DELL Specific) -->
+        <append key="input.keymap.data" type="strlist">e012:media</append> <!-- MediaDirect button (house icon) -->
+        <append key="input.keymap.data" type="strlist">e013:f23</append> <!-- FIXME Fn+Left arrow Auto Brightness -->
+        <append key="input.keymap.data" type="strlist">e015:camera</append> <!-- Shutter button Takes a picture if optional camera available -->
+        <append key="input.keymap.data" type="strlist">e019:nextsong</append> <!-- Front panel next song -->
+        <append key="input.keymap.data" type="strlist">e022:playpause</append> <!-- Front panel play/pause -->
+        <append key="input.keymap.data" type="strlist">e024:stop</append> <!-- Front panel stop -->
+        <append key="input.keymap.data" type="strlist">e06d:media</append> <!-- MediaDirect button -->
+        <append key="info.capabilities" type="strlist">input.keymap</append>
       </match>
     </match>
   </device>
commit 997e54ab92bf5f21396b7e9089c9d4398b32d1d4
Author: Matthew Garrett <mjg59 at srcf.ucam.org>
Date:   Tue Jun 24 21:02:32 2008 +0100

    Make the acer keymap file more generic. Should remove the need to add
    individual models.

diff --git a/fdi/information/10freedesktop/30-keymap-acer.fdi b/fdi/information/10freedesktop/30-keymap-acer.fdi
index abb8466..e544363 100644
--- a/fdi/information/10freedesktop/30-keymap-acer.fdi
+++ b/fdi/information/10freedesktop/30-keymap-acer.fdi
@@ -7,189 +7,33 @@
     <match key="@input.originating_device:info.linux.driver" string="atkbd">
 
       <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" prefix="Acer">
-        <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" prefix="Aspire">
-          <!-- Laptops without extra Euro and Dollar keys, pre mid-2004 & pre 'folio' design -->
-          <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="1510">
-            <append key="input.keymap.data" type="strlist">e025:help</append> <!-- Fn+F1 Hotkey help -->
-            <append key="input.keymap.data" type="strlist">e026:setup</append> <!-- Fn+F2 Acer eSettings -->
-            <append key="input.keymap.data" type="strlist">e027:battery</append> <!-- Fn+F3 Power Management -->
-            <append key="input.keymap.data" type="strlist">e073:prog2</append> <!-- "P2" programmable button -->
-            <append key="input.keymap.data" type="strlist">e074:prog1</append> <!-- "P1" programmable button -->
-            <append key="info.capabilities" type="strlist">input.keymap</append>
-          </match>
-          <!-- Laptops without extra Euro and Dollar keys -->
-          <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="1350;1360;1520">
-            <append key="input.keymap.data" type="strlist">e025:help</append> <!-- Fn+F1 Hotkey help -->
-            <append key="input.keymap.data" type="strlist">e026:setup</append> <!-- Fn+F2 Acer eSettings -->
-            <append key="input.keymap.data" type="strlist">e027:battery</append> <!-- Fn+F3 Power Management -->
-            <append key="input.keymap.data" type="strlist">e029:switchvideomode</append> <!-- Fn+F5 Display toggle -->
-            <append key="input.keymap.data" type="strlist">e055:wlan</append> <!-- Wireless (toggle) on-to-off -->
-            <append key="input.keymap.data" type="strlist">e056:wlan</append> <!-- Wireless (toggle) off-to-on -->
-            <append key="input.keymap.data" type="strlist">e057:bluetooth</append> <!-- Bluetooth (toggle) on-to-off -->
-            <append key="input.keymap.data" type="strlist">e058:bluetooth</append> <!-- Bluetooth (toggle) off-to-on -->
-            <append key="input.keymap.data" type="strlist">e071:f22</append> <!-- Fn+F7 Touchpad toggle (off-to-on) -->
-            <append key="input.keymap.data" type="strlist">e072:f22</append> <!-- Fn+F7 Touchpad toggle (on-to-off) -->
-            <append key="input.keymap.data" type="strlist">e073:prog2</append> <!-- "P" programmable button -->
-            <append key="input.keymap.data" type="strlist">e074:prog1</append> <!-- "e" Acer eManager button -->
-            <append key="info.capabilities" type="strlist">input.keymap</append>
-          </match>
-          <!-- Laptops with extra Euro and Dollar keys -->
-          <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="3020;3030;3040;3610;3620;4720;5020;5030;5040;7110;9410;9300;9420">
-            <append key="input.keymap.data" type="strlist">e025:help</append> <!-- Fn+F1 Hotkey help -->
-            <append key="input.keymap.data" type="strlist">e026:setup</append> <!-- Fn+F2 Acer eSettings -->
-            <append key="input.keymap.data" type="strlist">e027:battery</append> <!-- Fn+F3 Power Management -->
-            <append key="input.keymap.data" type="strlist">e029:switchvideomode</append> <!-- Fn+F5 Display toggle -->
-            <append key="input.keymap.data" type="strlist">e033:euro</append> <!-- Euro symbol -->
-            <append key="input.keymap.data" type="strlist">e034:dollar</append> <!-- Dollar symbol -->
-            <append key="input.keymap.data" type="strlist">e055:wlan</append> <!-- Wireless (toggle) on-to-off -->
-            <append key="input.keymap.data" type="strlist">e056:wlan</append> <!-- Wireless (toggle) off-to-on -->
-            <append key="input.keymap.data" type="strlist">e057:bluetooth</append> <!-- Bluetooth (toggle) on-to-off -->
-            <append key="input.keymap.data" type="strlist">e058:bluetooth</append> <!-- Bluetooth (toggle) off-to-on -->
-            <append key="input.keymap.data" type="strlist">e071:f22</append> <!-- Fn+F7 Touchpad toggle (off-to-on) -->
-            <append key="input.keymap.data" type="strlist">e072:f22</append> <!-- Fn+F7 Touchpad toggle (on-to-off) -->
-            <append key="input.keymap.data" type="strlist">e073:prog2</append> <!-- "P" programmable button -->
-            <append key="input.keymap.data" type="strlist">e074:prog1</append> <!-- "e" Acer eManager button -->
-            <append key="info.capabilities" type="strlist">input.keymap</append>
-          </match>
-          <!-- Laptops with extra Euro and Dollar keys, and Fn+Right (Brightness Up) needs mapping (type 1) -->
-          <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="1410;1640;1680;1690;3050;3680;5050;5570;5580;5600">
-            <append key="input.keymap.data" type="strlist">e025:help</append> <!-- Fn+F1 Hotkey help -->
-            <append key="input.keymap.data" type="strlist">e026:setup</append> <!-- Fn+F2 Acer eSettings -->
-            <append key="input.keymap.data" type="strlist">e027:battery</append> <!-- Fn+F3 Power Management -->
-            <append key="input.keymap.data" type="strlist">e029:switchvideomode</append> <!-- Fn+F5 Display toggle -->
-            <append key="input.keymap.data" type="strlist">e033:euro</append> <!-- Euro symbol -->
-            <append key="input.keymap.data" type="strlist">e034:dollar</append> <!-- Dollar symbol -->
-            <append key="input.keymap.data" type="strlist">e055:wlan</append> <!-- Wireless (toggle) on-to-off -->
-            <append key="input.keymap.data" type="strlist">e056:wlan</append> <!-- Wireless (toggle) off-to-on -->
-            <append key="input.keymap.data" type="strlist">e057:bluetooth</append> <!-- Bluetooth (toggle) on-to-off -->
-            <append key="input.keymap.data" type="strlist">e058:bluetooth</append> <!-- Bluetooth (toggle) off-to-on -->
-            <append key="input.keymap.data" type="strlist">e06e:brightnessup</append> <!-- Fn+Right Brightness Up -->
-            <append key="input.keymap.data" type="strlist">e06f:brightnessdown</append> <!-- Fn+Left Brightness Down -->
-            <append key="input.keymap.data" type="strlist">e071:f22</append> <!-- Fn+F7 Touchpad toggle (off-to-on) -->
-            <append key="input.keymap.data" type="strlist">e072:f23</append> <!-- Fn+F7 Touchpad toggle (on-to-off) -->
-            <append key="input.keymap.data" type="strlist">e073:prog2</append> <!-- "P" programmable button -->
-            <append key="input.keymap.data" type="strlist">e074:prog1</append> <!-- "e" Acer eManager button -->
-            <append key="info.capabilities" type="strlist">input.keymap</append>
-          </match>
-          <!-- Laptops with extra Euro and Dollar keys, and Fn+Right (Brightness Up) needs mapping (type 2) -->
-          <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="3100;3690;5100;5610;5630;5650;5680;9110">
-            <append key="input.keymap.data" type="strlist">e025:help</append> <!-- Fn+F1 Hotkey help -->
-            <append key="input.keymap.data" type="strlist">e026:setup</append> <!-- Fn+F2 Acer eSettings -->
-            <append key="input.keymap.data" type="strlist">e027:battery</append> <!-- Fn+F3 Power Management -->
-            <append key="input.keymap.data" type="strlist">e029:switchvideomode</append> <!-- Fn+F5 Display toggle -->
-            <append key="input.keymap.data" type="strlist">e033:euro</append> <!-- Euro symbol -->
-            <append key="input.keymap.data" type="strlist">e034:dollar</append> <!-- Dollar symbol -->
-            <append key="input.keymap.data" type="strlist">e055:wlan</append> <!-- Wireless (toggle) on-to-off -->
-            <append key="input.keymap.data" type="strlist">e056:wlan</append> <!-- Wireless (toggle) off-to-on -->
-            <append key="input.keymap.data" type="strlist">e057:bluetooth</append> <!-- Bluetooth (toggle) on-to-off -->
-            <append key="input.keymap.data" type="strlist">e058:bluetooth</append> <!-- Bluetooth (toggle) off-to-on -->
-            <append key="input.keymap.data" type="strlist">e059:brightnessup</append> <!-- Fn+Right Brightness Up -->
-            <append key="input.keymap.data" type="strlist">e06f:brightnessdown</append> <!-- Fn+Left Brightness Down -->
-            <append key="input.keymap.data" type="strlist">e071:f22</append> <!-- Fn+F7 Touchpad toggle (off-to-on) -->
-            <append key="input.keymap.data" type="strlist">e072:f23</append> <!-- Fn+F7 Touchpad toggle (on-to-off) -->
-            <append key="input.keymap.data" type="strlist">e073:prog2</append> <!-- "P" programmable button -->
-            <append key="input.keymap.data" type="strlist">e074:prog1</append> <!-- "e" Acer eManager button -->
-            <append key="info.capabilities" type="strlist">input.keymap</append>
-          </match>
-        </match>
+        <append key="input.keymap.data" type="strlist">e025:help</append> <!-- Fn+F1 Hotkey help -->
+        <append key="input.keymap.data" type="strlist">e026:setup</append> <!-- Fn+F2 Acer eSettings -->
+        <append key="input.keymap.data" type="strlist">e027:battery</append> <!-- Fn+F3 Power Management -->
+        <append key="input.keymap.data" type="strlist">e029:switchvideomode</append> <!-- Fn+F5 Display toggle -->
+        <append key="input.keymap.data" type="strlist">e033:euro</append> <!-- Euro symbol -->
+        <append key="input.keymap.data" type="strlist">e034:dollar</append> <!-- Dollar symbol -->
+        <append key="input.keymap.data" type="strlist">e054:bluetooth</append> <!-- Bluetooth (toggle) off-to-on -->
+        <append key="input.keymap.data" type="strlist">e055:wlan</append> <!-- Wireless (toggle) on-to-off -->
+        <append key="input.keymap.data" type="strlist">e056:wlan</append> <!-- Wireless (toggle) off-to-on -->
+        <append key="input.keymap.data" type="strlist">e057:bluetooth</append> <!-- Bluetooth (toggle) on-to-off -->
+        <append key="input.keymap.data" type="strlist">e058:bluetooth</append> <!-- Bluetooth (toggle) off-to-on -->
+        <append key="input.keymap.data" type="strlist">e059:brightnessup</append> <!-- Fn+Right Brightness Up -->
+        <append key="input.keymap.data" type="strlist">e06e:brightnessup</append> <!-- Fn+Right Brightness Up -->
+        <append key="input.keymap.data" type="strlist">e06f:brightnessdown</append> <!-- Fn+Left Brightness Down -->
+        <append key="input.keymap.data" type="strlist">e071:f22</append> <!-- Fn+F7 Touchpad toggle (off-to-on) -->
+        <append key="input.keymap.data" type="strlist">e072:f22</append> <!-- Fn+F7 Touchpad toggle (on-to-off) -->
+        <append key="input.keymap.data" type="strlist">e073:prog2</append> <!-- "P2" programmable button -->
+        <append key="input.keymap.data" type="strlist">e074:prog1</append> <!-- "P1" programmable button -->
+        <append key="input.keymap.data" type="strlist">e075:presentation</append> <!-- Minimise all Windows -->
+        <append key="input.keymap.data" type="strlist">e078:fn</append> <!-- Fn key -->
+        <append key="input.keymap.data" type="strlist">e079:sync</append> <!-- Launch NTI shadow -->
+        <append key="info.capabilities" type="strlist">input.keymap</append>
+
         <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" prefix="Extensa">
-          <!-- Laptops with extra Euro and Dollar keys -->
-          <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="4010">
-            <append key="input.keymap.data" type="strlist">e025:help</append> <!-- Fn+F1 Hotkey help -->
-            <append key="input.keymap.data" type="strlist">e026:setup</append> <!-- Fn+F2 Acer eSettings -->
-            <append key="input.keymap.data" type="strlist">e027:battery</append> <!-- Fn+F3 Power Management -->
-            <append key="input.keymap.data" type="strlist">e029:switchvideomode</append> <!-- Fn+F5 Display toggle -->
-            <append key="input.keymap.data" type="strlist">e033:euro</append> <!-- Euro symbol -->
-            <append key="input.keymap.data" type="strlist">e034:dollar</append> <!-- Dollar symbol -->
-            <append key="input.keymap.data" type="strlist">e055:wlan</append> <!-- Wireless (toggle) on-to-off -->
-            <append key="input.keymap.data" type="strlist">e056:wlan</append> <!-- Wireless (toggle) off-to-on -->
-            <append key="input.keymap.data" type="strlist">e057:bluetooth</append> <!-- Bluetooth (toggle) on-to-off -->
-            <append key="input.keymap.data" type="strlist">e058:bluetooth</append> <!-- Bluetooth (toggle) off-to-on -->
-            <append key="input.keymap.data" type="strlist">e071:f22</append> <!-- Fn+F7 Touchpad toggle (off-to-on) -->
-            <append key="input.keymap.data" type="strlist">e072:f22</append> <!-- Fn+F7 Touchpad toggle (on-to-off) -->
-            <append key="input.keymap.data" type="strlist">e073:prog2</append> <!-- "P" programmable button -->
-            <append key="input.keymap.data" type="strlist">e074:prog1</append> <!-- "e" Acer eManager button -->
-            <append key="info.capabilities" type="strlist">input.keymap</append>
-          </match>
-          <!-- Laptops with extra Euro and Dollar keys, and Fn+Right (Brightness Up) needs mapping (type 1) -->
-          <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="4100">
-            <append key="input.keymap.data" type="strlist">e025:help</append> <!-- Fn+F1 Hotkey help -->
-            <append key="input.keymap.data" type="strlist">e026:setup</append> <!-- Fn+F2 Acer eSettings -->
-            <append key="input.keymap.data" type="strlist">e027:battery</append> <!-- Fn+F3 Power Management -->
-            <append key="input.keymap.data" type="strlist">e029:switchvideomode</append> <!-- Fn+F5 Display toggle -->
-            <append key="input.keymap.data" type="strlist">e033:euro</append> <!-- Euro symbol -->
-            <append key="input.keymap.data" type="strlist">e034:dollar</append> <!-- Dollar symbol -->
-            <append key="input.keymap.data" type="strlist">e055:wlan</append> <!-- Wireless (toggle) on-to-off -->
-            <append key="input.keymap.data" type="strlist">e056:wlan</append> <!-- Wireless (toggle) off-to-on -->
-            <append key="input.keymap.data" type="strlist">e057:bluetooth</append> <!-- Bluetooth (toggle) on-to-off -->
-            <append key="input.keymap.data" type="strlist">e058:bluetooth</append> <!-- Bluetooth (toggle) off-to-on -->
-            <append key="input.keymap.data" type="strlist">e06e:brightnessup</append> <!-- Fn+Right Brightness Up -->
-            <append key="input.keymap.data" type="strlist">e06f:brightnessdown</append> <!-- Fn+Left Brightness Down -->
-            <append key="input.keymap.data" type="strlist">e071:f22</append> <!-- Fn+F7 Touchpad toggle (off-to-on) -->
-            <append key="input.keymap.data" type="strlist">e072:f23</append> <!-- Fn+F7 Touchpad toggle (on-to-off) -->
-            <append key="input.keymap.data" type="strlist">e073:prog2</append> <!-- "P" programmable button -->
-            <append key="input.keymap.data" type="strlist">e074:prog1</append> <!-- "e" Acer eManager button -->
-            <append key="info.capabilities" type="strlist">input.keymap</append>
-          </match>
           <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="5210;5220;5610;5620;5720">
-            <append key="input.keymap.data" type="strlist">e025:help</append> <!-- Fn+F1 Hotkey help -->
-            <append key="input.keymap.data" type="strlist">e026:setup</append> <!-- Fn+F2 Acer eSettings -->
-            <append key="input.keymap.data" type="strlist">e027:battery</append> <!-- Fn+F3 Power Management -->
-            <append key="input.keymap.data" type="strlist">e029:switchvideomode</append> <!-- Fn+F5 Display toggle -->
-            <append key="input.keymap.data" type="strlist">e033:euro</append> <!-- Euro symbol -->
-            <append key="input.keymap.data" type="strlist">e034:dollar</append> <!-- Dollar symbol -->
-            <append key="input.keymap.data" type="strlist">e054:bluetooth</append> <!-- Bluetooth (toggle) off-to-on -->
-            <append key="input.keymap.data" type="strlist">e055:wlan</append> <!-- Wireless (toggle) on-to-off -->
-            <append key="input.keymap.data" type="strlist">e056:wlan</append> <!-- Wireless (toggle) off-to-on -->
-            <append key="input.keymap.data" type="strlist">e06e:lock</append> <!--  Windows Lock function --> 
-            <append key="input.keymap.data" type="strlist">e071:f22</append> <!-- Fn+F7 Touchpad toggle (off-to-on) -->
-            <append key="input.keymap.data" type="strlist">e072:f23</append> <!-- Fn+F7 Touchpad toggle (on-to-off) -->
-            <append key="input.keymap.data" type="strlist">e073:prog2</append> <!-- "P" programmable button -->
-            <append key="input.keymap.data" type="strlist">e074:prog1</append> <!-- "e" Acer eManager button -->
-            <append key="input.keymap.data" type="strlist">e075:presentation</append> <!-- Minimise all Windows -->
-            <append key="input.keymap.data" type="strlist">e078:fn</append> <!-- Fn key -->
-            <append key="input.keymap.data" type="strlist">e079:sync</append> <!-- Launch NTI shadow -->
-            <append key="info.capabilities" type="strlist">input.keymap</append>
-          </match>
-        </match>
-        <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" prefix="Ferrari">
-          <!-- Laptops with extra Euro and Dollar keys -->
-          <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="1000;4000">
-            <append key="input.keymap.data" type="strlist">e025:help</append> <!-- Fn+F1 Hotkey help -->
-            <append key="input.keymap.data" type="strlist">e026:setup</append> <!-- Fn+F2 Acer eSettings -->
-            <append key="input.keymap.data" type="strlist">e027:battery</append> <!-- Fn+F3 Power Management -->
-            <append key="input.keymap.data" type="strlist">e029:switchvideomode</append> <!-- Fn+F5 Display toggle -->
-            <append key="input.keymap.data" type="strlist">e033:euro</append> <!-- Euro symbol -->
-            <append key="input.keymap.data" type="strlist">e034:dollar</append> <!-- Dollar symbol -->
-            <append key="input.keymap.data" type="strlist">e055:wlan</append> <!-- Wireless (toggle) on-to-off -->
-            <append key="input.keymap.data" type="strlist">e056:wlan</append> <!-- Wireless (toggle) off-to-on -->
-            <append key="input.keymap.data" type="strlist">e057:bluetooth</append> <!-- Bluetooth (toggle) on-to-off -->
-            <append key="input.keymap.data" type="strlist">e058:bluetooth</append> <!-- Bluetooth (toggle) off-to-on -->
-            <append key="input.keymap.data" type="strlist">e071:f22</append> <!-- Fn+F7 Touchpad toggle (off-to-on) -->
-            <append key="input.keymap.data" type="strlist">e072:f22</append> <!-- Fn+F7 Touchpad toggle (on-to-off) -->
-            <append key="input.keymap.data" type="strlist">e073:prog2</append> <!-- "P" programmable button -->
-            <append key="input.keymap.data" type="strlist">e074:prog1</append> <!-- "e" Acer eManager button -->
-            <append key="info.capabilities" type="strlist">input.keymap</append>
-          </match>
-          <!-- Laptops with extra Euro and Dollar keys, and Fn+Right (Brightness Up) needs mapping (type 1) -->
-          <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="5000">
-            <append key="input.keymap.data" type="strlist">e025:help</append> <!-- Fn+F1 Hotkey help -->
-            <append key="input.keymap.data" type="strlist">e026:setup</append> <!-- Fn+F2 Acer eSettings -->
-            <append key="input.keymap.data" type="strlist">e027:battery</append> <!-- Fn+F3 Power Management -->
-            <append key="input.keymap.data" type="strlist">e029:switchvideomode</append> <!-- Fn+F5 Display toggle -->
-            <append key="input.keymap.data" type="strlist">e033:euro</append> <!-- Euro symbol -->
-            <append key="input.keymap.data" type="strlist">e034:dollar</append> <!-- Dollar symbol -->
-            <append key="input.keymap.data" type="strlist">e055:wlan</append> <!-- Wireless (toggle) on-to-off -->
-            <append key="input.keymap.data" type="strlist">e056:wlan</append> <!-- Wireless (toggle) off-to-on -->
-            <append key="input.keymap.data" type="strlist">e057:bluetooth</append> <!-- Bluetooth (toggle) on-to-off -->
-            <append key="input.keymap.data" type="strlist">e058:bluetooth</append> <!-- Bluetooth (toggle) off-to-on -->
-            <append key="input.keymap.data" type="strlist">e06e:brightnessup</append> <!-- Fn+Right Brightness Up -->
-            <append key="input.keymap.data" type="strlist">e06f:brightnessdown</append> <!-- Fn+Left Brightness Down -->
-            <append key="input.keymap.data" type="strlist">e071:f22</append> <!-- Fn+F7 Touchpad toggle (off-to-on) -->
-            <append key="input.keymap.data" type="strlist">e072:f23</append> <!-- Fn+F7 Touchpad toggle (on-to-off) -->
-            <append key="input.keymap.data" type="strlist">e073:prog2</append> <!-- "P" programmable button -->
-            <append key="input.keymap.data" type="strlist">e074:prog1</append> <!-- "e" Acer eManager button -->
-            <append key="info.capabilities" type="strlist">input.keymap</append>
+            <remove key="input.keymap.data" type="strlist">e06e:brightnessup</remove>
+	    <append key="input.keymap.data" type="strlist">e06e:lock</append> <!--  Windows Lock function --> 
           </match>
         </match>
         <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" prefix="TravelMate">
@@ -200,86 +44,6 @@
             <append key="input.keymap.data" type="strlist">0x69:down</append> 
             <append key="input.keymap.data" type="strlist">0x6b:fn</append> 
             <append key="input.keymap.data" type="strlist">0x6c:f23</append> <!-- FIXME: lock tablet device/buttons-->
-            <append key="info.capabilities" type="strlist">input.keymap</append>
-          </match>
-          <!-- Laptops without extra Euro and Dollar keys -->
-	  <!-- TM6292 really does identify as 6292 instead of 6290 -->
-          <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="3000;6292">
-            <append key="input.keymap.data" type="strlist">e025:help</append> <!-- Fn+F1 Hotkey help -->
-            <append key="input.keymap.data" type="strlist">e026:setup</append> <!-- Fn+F2 Acer eSettings -->
-            <append key="input.keymap.data" type="strlist">e027:battery</append> <!-- Fn+F3 Power Management -->
-            <append key="input.keymap.data" type="strlist">e029:switchvideomode</append> <!-- Fn+F5 Display toggle -->
-            <append key="input.keymap.data" type="strlist">e055:wlan</append> <!-- Wireless (toggle) on-to-off -->
-            <append key="input.keymap.data" type="strlist">e056:wlan</append> <!-- Wireless (toggle) off-to-on -->
-            <append key="input.keymap.data" type="strlist">e057:bluetooth</append> <!-- Bluetooth (toggle) on-to-off -->
-            <append key="input.keymap.data" type="strlist">e058:bluetooth</append> <!-- Bluetooth (toggle) off-to-on -->
-            <append key="input.keymap.data" type="strlist">e06e:brightnessup</append> <!-- Fn+Right Brightness Up -->
-            <append key="input.keymap.data" type="strlist">e06f:brightnessdown</append> <!-- Fn+Left Brightness Down -->
-            <append key="input.keymap.data" type="strlist">e071:f22</append> <!-- Fn+F7 Touchpad toggle (off-to-on) -->
-            <append key="input.keymap.data" type="strlist">e072:f23</append> <!-- Fn+F7 Touchpad toggle (on-to-off) -->
-            <append key="input.keymap.data" type="strlist">e073:prog2</append> <!-- "P" programmable button -->
-            <append key="input.keymap.data" type="strlist">e074:prog1</append> <!-- "e" Acer eManager button -->
-            <append key="info.capabilities" type="strlist">input.keymap</append>
-          </match>
-          <!-- Laptops with extra Euro and Dollar keys, and Fn+Right (Brightness Up) needs mapping (type 1) -->
-          <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="2300;2400;2480;3200;3210;3220;3260;4000;4500;8100">
-            <append key="input.keymap.data" type="strlist">e025:help</append> <!-- Fn+F1 Hotkey help -->
-            <append key="input.keymap.data" type="strlist">e026:setup</append> <!-- Fn+F2 Acer eSettings -->
-            <append key="input.keymap.data" type="strlist">e027:battery</append> <!-- Fn+F3 Power Management -->
-            <append key="input.keymap.data" type="strlist">e029:switchvideomode</append> <!-- Fn+F5 Display toggle -->
-            <append key="input.keymap.data" type="strlist">e033:euro</append> <!-- Euro symbol -->
-            <append key="input.keymap.data" type="strlist">e034:dollar</append> <!-- Dollar symbol -->
-            <append key="input.keymap.data" type="strlist">e055:wlan</append> <!-- Wireless (toggle) on-to-off -->
-            <append key="input.keymap.data" type="strlist">e056:wlan</append> <!-- Wireless (toggle) off-to-on -->
-            <append key="input.keymap.data" type="strlist">e057:bluetooth</append> <!-- Bluetooth (toggle) on-to-off -->
-            <append key="input.keymap.data" type="strlist">e058:bluetooth</append> <!-- Bluetooth (toggle) off-to-on -->
-            <append key="input.keymap.data" type="strlist">e06e:brightnessup</append> <!-- Fn+Right Brightness Up -->
-            <append key="input.keymap.data" type="strlist">e06f:brightnessdown</append> <!-- Fn+Left Brightness Down -->
-            <append key="input.keymap.data" type="strlist">e071:f22</append> <!-- Fn+F7 Touchpad toggle (off-to-on) -->
-            <append key="input.keymap.data" type="strlist">e072:f23</append> <!-- Fn+F7 Touchpad toggle (on-to-off) -->
-            <append key="input.keymap.data" type="strlist">e073:prog2</append> <!-- "P" programmable button -->
-            <append key="input.keymap.data" type="strlist">e074:prog1</append> <!-- "e" Acer eManager button -->
-            <append key="info.capabilities" type="strlist">input.keymap</append>
-          </match>
-          <!-- Laptops with extra Euro and Dollar keys, and Fn+Right (Brightness Up) needs mapping (type 2) -->
-          <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="4650">
-            <append key="input.keymap.data" type="strlist">e025:help</append> <!-- Fn+F1 Hotkey help -->
-            <append key="input.keymap.data" type="strlist">e026:setup</append> <!-- Fn+F2 Acer eSettings -->
-            <append key="input.keymap.data" type="strlist">e027:battery</append> <!-- Fn+F3 Power Management -->
-            <append key="input.keymap.data" type="strlist">e029:switchvideomode</append> <!-- Fn+F5 Display toggle -->
-            <append key="input.keymap.data" type="strlist">e033:euro</append> <!-- Euro symbol -->
-            <append key="input.keymap.data" type="strlist">e034:dollar</append> <!-- Dollar symbol -->
-            <append key="input.keymap.data" type="strlist">e055:wlan</append> <!-- Wireless (toggle) on-to-off -->
-            <append key="input.keymap.data" type="strlist">e056:wlan</append> <!-- Wireless (toggle) off-to-on -->
-            <append key="input.keymap.data" type="strlist">e057:bluetooth</append> <!-- Bluetooth (toggle) on-to-off -->
-            <append key="input.keymap.data" type="strlist">e058:bluetooth</append> <!-- Bluetooth (toggle) off-to-on -->
-            <append key="input.keymap.data" type="strlist">e059:brightnessup</append> <!-- Fn+Right Brightness Up -->
-            <append key="input.keymap.data" type="strlist">e06f:brightnessdown</append> <!-- Fn+Left Brightness Down -->
-            <append key="input.keymap.data" type="strlist">e071:f22</append> <!-- Fn+F7 Touchpad toggle (off-to-on) -->
-            <append key="input.keymap.data" type="strlist">e072:f23</append> <!-- Fn+F7 Touchpad toggle (on-to-off) -->
-            <append key="input.keymap.data" type="strlist">e073:prog2</append> <!-- "P" programmable button -->
-            <append key="input.keymap.data" type="strlist">e074:prog1</append> <!-- "e" Acer eManager button -->
-            <append key="info.capabilities" type="strlist">input.keymap</append>
-          </match>
-          <!-- Laptops with extra Euro and Dollar keys, and Fn+Left (Brightness Down) needs mapping -->
-	  <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="5110;5610;5620">
-            <append key="input.keymap.data" type="strlist">e025:help</append> <!-- Fn+F1 Hotkey help -->
-            <append key="input.keymap.data" type="strlist">e026:setup</append> <!-- Fn+F2 Acer eSettings -->
-            <append key="input.keymap.data" type="strlist">e027:battery</append> <!-- Fn+F3 Power Management -->
-            <append key="input.keymap.data" type="strlist">e029:switchvideomode</append> <!-- Fn+F5 Display toggle -->
-            <append key="input.keymap.data" type="strlist">e033:euro</append> <!-- Euro symbol -->
-            <append key="input.keymap.data" type="strlist">e034:dollar</append> <!-- Dollar symbol -->
-            <append key="input.keymap.data" type="strlist">e055:wlan</append> <!-- Wireless (toggle) on-to-off -->
-            <append key="input.keymap.data" type="strlist">e056:wlan</append> <!-- Wireless (toggle) off-to-on -->
-            <append key="input.keymap.data" type="strlist">e057:bluetooth</append> <!-- Bluetooth (toggle) on-to-off -->
-            <append key="input.keymap.data" type="strlist">e058:bluetooth</append> <!-- Bluetooth (toggle) off-to-on -->
-            <append key="input.keymap.data" type="strlist">e059:brightnessdown</append> <!-- Fn+Left Brightness down -->
-            <append key="input.keymap.data" type="strlist">e06f:brightnessup</append> <!-- Fn+Left Brightness Up -->
-            <append key="input.keymap.data" type="strlist">e071:f22</append> <!-- Fn+F7 Touchpad toggle (off-to-on) -->
-            <append key="input.keymap.data" type="strlist">e072:f22</append> <!-- Fn+F7 Touchpad toggle (on-to-off) -->
-            <append key="input.keymap.data" type="strlist">e073:prog2</append> <!-- "P" programmable button -->
-            <append key="input.keymap.data" type="strlist">e074:prog1</append> <!-- "e" Acer eManager button -->
-            <append key="info.capabilities" type="strlist">input.keymap</append>
           </match>
         </match>
       </match>


More information about the hal-commit mailing list