hal-info: Branch 'master'

[Martin Pitt]

 fdi/information/10freedesktop/30-keymap-misc.fdi |   11 +++++++++++
 1 file changed, 11 insertions(+)

New commits:
commit 94c6c46c3710c7faf7462ff9e7c19a4ff6705efd
Author: Martin Pitt <martin.pitt at ubuntu.com>
Date:   Tue Oct 7 20:38:12 2008 +0200

    add keymap for Samsung Q1 Ultra
    
    Add keymap for the Samsung Q1 Ultra. Contributed by the Ubuntu mobile
    team.

diff --git a/fdi/information/10freedesktop/30-keymap-misc.fdi b/fdi/information/10freedesktop/30-keymap-misc.fdi
index 1279456..b8c138a 100644
--- a/fdi/information/10freedesktop/30-keymap-misc.fdi
+++ b/fdi/information/10freedesktop/30-keymap-misc.fdi
@@ -124,6 +124,17 @@
 	  <append key="input.keymap.data" type="strlist">0077:f21</append> <!-- FIXME: Touchpad on -->
 	  <append key="input.keymap.data" type="strlist">0079:f21</append> <!-- FIXME: Touchpad off -->
         </match>
+        <!-- Samsung Q1 Ultra -->
+        <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" string="SQ1US">
+          <append key="input.keymap.data" type="strlist">e054:menu</append> <!-- Menu: mute -->
+          <append key="input.keymap.data" type="strlist">e058:f1</append> <!-- Up arrow: mute -->
+          <append key="input.keymap.data" type="strlist">e059:f10</append> <!-- Right arrow: mute -->
+          <append key="input.keymap.data" type="strlist">e056:f3</append> <!-- Down arrow: mute -->
+          <append key="input.keymap.data" type="strlist">e057:f9</append> <!-- Left arrow: mute -->
+          <append key="input.keymap.data" type="strlist">e064:f5</append> <!-- Shutter key: mute -->
+          <append key="input.keymap.data" type="strlist">e06e:f11</append> <!-- UDF key: mute -->
+          <append key="info.capabilities" type="strlist">input.keymap</append>
+        </match>
       </match>
 
       <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" string="TOSHIBA">