hal-info: Branch 'master' - 3 commits

[Martin Pitt]

 fdi/information/10freedesktop/30-keymap-hp.fdi   |    9 +++++++++
 fdi/information/10freedesktop/30-keymap-misc.fdi |   12 ++++++++++++
 2 files changed, 21 insertions(+)

New commits:
commit 9f39fc54abb664ea85541484fba142c6157fe73a
Author: Mario Limonciello <mario_limonciello at dell.com>
Date:   Wed Jan 28 10:45:57 2009 +0100

    add keymap for Fujitsu AMILO Pa 2548
    
    Add keymap for Fujitsu AMILO Pa 2548, as reported by Mario
    Limonciello. (This was taken from Debian's hotkey-setup package.)

diff --git a/fdi/information/10freedesktop/30-keymap-misc.fdi b/fdi/information/10freedesktop/30-keymap-misc.fdi
index de71c13..dcf19ac 100644
--- a/fdi/information/10freedesktop/30-keymap-misc.fdi
+++ b/fdi/information/10freedesktop/30-keymap-misc.fdi
@@ -19,6 +19,11 @@
 	  <append key="input.keymap.data" type="strlist">e074:f21</append> <!-- FIXME: silent-mode decrease CPU/GPU clock -->
           <append key="input.keymap.data" type="strlist">e077:switchvideomode</append> <!-- Fn+F3 switch screen -->
         </match>
+        <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="AMILO Pa 2548">
+	  <append key="input.keymap.data" type="strlist">e060:volumedown</append>
+	  <append key="input.keymap.data" type="strlist">e061:volumeup</append>
+	  <append key="input.keymap.data" type="strlist">e065:prog1</append>
+        </match>
         <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="AMILO Pro Edition V3505">
           <append key="input.keymap.data" type="strlist">e025:help</append> <!-- Fn-F1 help -->
           <append key="input.keymap.data" type="strlist">e029:switchvideomode</append> <!-- Fn-F3 Display toggle -->
commit 026974548992e666c2fe20761172af09ddf94b52
Author: Mario Limonciello <mario_limonciello at dell.com>
Date:   Wed Jan 28 10:44:44 2009 +0100

    add keymaps for HP Tablet laptops
    
    Add keymap for HP Tablet laptops, as reported by Mario Limonciello.
    (This was taken from Debian's hotkey-setup package.)

diff --git a/fdi/information/10freedesktop/30-keymap-hp.fdi b/fdi/information/10freedesktop/30-keymap-hp.fdi
index 21429d2..1d15ce9 100644
--- a/fdi/information/10freedesktop/30-keymap-hp.fdi
+++ b/fdi/information/10freedesktop/30-keymap-hp.fdi
@@ -18,6 +18,15 @@
           <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="Tablet">
+            <append key="input.keymap.data" type="strlist">e002:prog2</append>   <!-- Funny Key -->
+            <append key="input.keymap.data" type="strlist">e003:prog1</append>   <!-- Q -->
+            <append key="input.keymap.data" type="strlist">e004:tab</append>     <!-- Tab -->
+            <append key="input.keymap.data" type="strlist">e005:esc</append>     <!-- Esc -->
+            <append key="input.keymap.data" type="strlist">e006:pageup</append>  <!-- PgUp -->
+            <append key="input.keymap.data" type="strlist">e007:pagedown</append>  <!-- PgDown -->
+          </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:player</append> <!-- FIXME: quick play -->
commit 6900fa403af47552bc6038ba31d43a48e404e8ef
Author: Mario Limonciello <mario_limonciello at dell.com>
Date:   Wed Jan 28 10:41:40 2009 +0100

    add keymap for ASUS notebooks
    
    Add keymap for ASUS notebooks, as reported by Mario Limonciello. (This
    was taken from Debian's hotkey-setup package.)

diff --git a/fdi/information/10freedesktop/30-keymap-misc.fdi b/fdi/information/10freedesktop/30-keymap-misc.fdi
index e07928f..de71c13 100644
--- a/fdi/information/10freedesktop/30-keymap-misc.fdi
+++ b/fdi/information/10freedesktop/30-keymap-misc.fdi
@@ -153,6 +153,13 @@
 	</match>
       </match>
 
+      <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" string="ASUS">
+          <append key="input.keymap.data" type="strlist">e06f:mute</append>
+          <append key="input.keymap.data" type="strlist">e06d:volumeup</append>
+          <append key="input.keymap.data" type="strlist">e06e:volumedown</append>
+      </match>
+
+
       <!-- set the common key now --> 
       <match key="input.keymap.data" exists="true">
 	<match key="input.keymap.data" contains_not="input.keymap">