hal: Branch 'master'

Richard Hughes hughsient at kemper.freedesktop.org
Tue Jul 10 09:49:15 PDT 2007


 fdi/information/10freedesktop/30-keymap-dell.fdi |   83 +++++++++++++----------
 1 files changed, 47 insertions(+), 36 deletions(-)

New commits:
diff-tree f6a3238fa22256e17864c27e37167830aa8fc4d4 (from 1400fe3e994f8984a3f5e83e77cf8124d5fd655a)
Author: Thorsten Leemhuis <fedora at leemhuis.info>
Date:   Tue Jul 10 17:43:50 2007 +0100

    add keymap for dell D630
    
    I created a keymap file for my Dell D630. Find it attached as
    hal-info-keymap-dell-d630.patch.
    
    I've (Richard Hughes) also rearranged the Dell file to be spaces only,
    and to have the entries in correct match order. Sanity is restored

diff --git a/fdi/information/10freedesktop/30-keymap-dell.fdi b/fdi/information/10freedesktop/30-keymap-dell.fdi
index 792146b..81164f8 100644
--- a/fdi/information/10freedesktop/30-keymap-dell.fdi
+++ b/fdi/information/10freedesktop/30-keymap-dell.fdi
@@ -8,28 +8,16 @@
 
       <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="D420">
-	    <append key="input.keymap.data" type="strlist">e007:battery</append> <!-- Fn+F3 battery icon -->
-	    <append key="input.keymap.data" type="strlist">e00f:switchvideomode</append> <!-- Fn+F7 aspect ratio -->
-	    <append key="input.keymap.data" type="strlist">e00b:displaytoggle</append> <!-- Fn+F8 CRT/LCD -->
-	    <append key="input.keymap.data" type="strlist">e006:brightnessup</append> <!-- Fn+Up arrow Brightness Up -->
-	    <append key="input.keymap.data" type="strlist">e005:brightnessdown</append> <!-- Fn+Down arrow Brightness Down -->
-	    <append key="input.keymap.data" type="strlist">e005:f13</append> <!-- FIXME Fn+Left arrow Auto Brightness -->
-	    <append key="input.keymap.data" type="strlist">e00a:suspend</append> <!-- Fn+F1 hibernate -->
-	    <append key="info.capabilities" type="strlist">input.keymap</append>
-	  </match>
-          <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="D820">
+          <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="D420">
             <append key="input.keymap.data" type="strlist">e007:battery</append> <!-- Fn+F3 battery icon -->
             <append key="input.keymap.data" type="strlist">e00f:switchvideomode</append> <!-- Fn+F7 aspect ratio -->
             <append key="input.keymap.data" type="strlist">e00b:displaytoggle</append> <!-- Fn+F8 CRT/LCD -->
             <append key="input.keymap.data" type="strlist">e006:brightnessup</append> <!-- Fn+Up arrow Brightness Up -->
             <append key="input.keymap.data" type="strlist">e005:brightnessdown</append> <!-- Fn+Down arrow Brightness Down -->
-            <append key="input.keymap.data" type="strlist">e013:f13</append> <!-- FIXME Fn+Left arrow Auto Brightness -->
+            <append key="input.keymap.data" type="strlist">e005:f13</append> <!-- FIXME Fn+Left arrow Auto Brightness -->
             <append key="input.keymap.data" type="strlist">e00a:suspend</append> <!-- Fn+F1 hibernate -->
             <append key="info.capabilities" type="strlist">input.keymap</append>
           </match>
-	</match>
-         <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" prefix="Latitude">
           <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="D620">
             <append key="input.keymap.data" type="strlist">e007:battery</append> <!-- Fn+F3 battery icon -->
             <append key="input.keymap.data" type="strlist">e00f:switchvideomode</append> <!-- Fn+F7 aspect ratio -->
@@ -41,30 +29,53 @@
             <append key="input.keymap.data" type="strlist">e008:radio</append> <!-- Turn On/Off Wireless -->
             <append key="info.capabilities" type="strlist">input.keymap</append>
           </match>
-        </match>
+          <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="D630">
+            <append key="input.keymap.data" type="strlist">e007:battery</append> <!-- Fn+F3 battery icon -->
+            <append key="input.keymap.data" type="strlist">e00f:switchvideomode</append> <!-- Fn+F7 aspect ratio -->
+            <append key="input.keymap.data" type="strlist">e00b:displaytoggle</append> <!-- Fn+F8 CRT/LCD -->
+            <append key="input.keymap.data" type="strlist">e006:brightnessup</append> <!-- Fn+Up arrow Brightness Up -->
+            <append key="input.keymap.data" type="strlist">e005:brightnessdown</append> <!-- Fn+Down arrow Brightness Down -->
+            <append key="input.keymap.data" type="strlist">e013:autobrightness</append> <!-- Fn+Left arrow Auto Brightness -->
+            <append key="input.keymap.data" type="strlist">e00a:suspend</append> <!-- Fn+F1 hibernate -->
+            <append key="input.keymap.data" type="strlist">e008:radio</append> <!-- Turn On/Off Wireless -->
+            <append key="input.keymap.data" type="strlist">e011:prog1</append> <!-- Wifi Catcher (DELL Specific) -->
+            <append key="info.capabilities" type="strlist">input.keymap</append>
+          </match>
+          <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="D820">
+            <append key="input.keymap.data" type="strlist">e007:battery</append> <!-- Fn+F3 battery icon -->
+            <append key="input.keymap.data" type="strlist">e00f:switchvideomode</append> <!-- Fn+F7 aspect ratio -->
+            <append key="input.keymap.data" type="strlist">e00b:displaytoggle</append> <!-- Fn+F8 CRT/LCD -->
+            <append key="input.keymap.data" type="strlist">e006:brightnessup</append> <!-- Fn+Up arrow Brightness Up -->
+            <append key="input.keymap.data" type="strlist">e005:brightnessdown</append> <!-- Fn+Down arrow Brightness Down -->
+            <append key="input.keymap.data" type="strlist">e013:f13</append> <!-- FIXME Fn+Left arrow Auto Brightness -->
+            <append key="input.keymap.data" type="strlist">e00a:suspend</append> <!-- Fn+F1 hibernate -->
+            <append key="info.capabilities" type="strlist">input.keymap</append>
+          </match>
+        </match> <!-- prefix="Latitude" -->
+
         <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" prefix="MXC062"> <!-- Dell XPS M1210 -->
-	  <append key="input.keymap.data" type="strlist">e007:battery</append> <!-- Fn+F3 Battery icon -->
-	  <append key="input.keymap.data" type="strlist">e00b:switchvideomode</append> <!-- Fn+F8 CRT/LCD -->
-	  <append key="input.keymap.data" type="strlist">e006:brightnessup</append> <!-- Fn+Up arrow Brightness Up -->
-	  <append key="input.keymap.data" type="strlist">e005:brightnessdown</append> <!-- Fn+Down arrow Brightness Down -->
-	  <append key="input.keymap.data" type="strlist">e00a:suspend</append> <!-- Fn+F1 Hibernate -->
-	  <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">e012:media</append> <!-- Dell MediaDirect button Opens Dell Media Experience (a sort of media player) -->
-	  <append key="input.keymap.data" type="strlist">e015:prog1</append> <!-- Shutter button Takes a picture if optional camera available -->
-	  <append key="info.capabilities" type="strlist">input.keymap</append>
-	</match>
+          <append key="input.keymap.data" type="strlist">e007:battery</append> <!-- Fn+F3 Battery icon -->
+          <append key="input.keymap.data" type="strlist">e00b:switchvideomode</append> <!-- Fn+F8 CRT/LCD -->
+          <append key="input.keymap.data" type="strlist">e006:brightnessup</append> <!-- Fn+Up arrow Brightness Up -->
+          <append key="input.keymap.data" type="strlist">e005:brightnessdown</append> <!-- Fn+Down arrow Brightness Down -->
+          <append key="input.keymap.data" type="strlist">e00a:suspend</append> <!-- Fn+F1 Hibernate -->
+          <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">e012:media</append> <!-- Dell MediaDirect button Opens Dell Media Experience (a sort of media player) -->
+          <append key="input.keymap.data" type="strlist">e015:prog1</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">e007:battery</append> <!-- Fn+F3 battery icon -->
-	     <append key="input.keymap.data" type="strlist">e006:brightnessup</append> <!-- Fn+Up arrow Brightness Up -->
-	     <append key="input.keymap.data" type="strlist">e005:brightnessdown</append> <!-- Fn+Down arrow Brightness Down -->
-	     <append key="input.keymap.data" type="strlist">e008:wlan</append> <!-- Fn+F2 Toggle WiFi -->
-	     <append key="input.keymap.data" type="strlist">e009:ejectclosedcd</append> <!-- Fn+F10 Eject CD -->
-	     <append key="info.capabilities" type="strlist">input.keymap</append>
-	   </match>
-	</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">e007:battery</append> <!-- Fn+F3 battery icon -->
+            <append key="input.keymap.data" type="strlist">e006:brightnessup</append> <!-- Fn+Up arrow Brightness Up -->
+            <append key="input.keymap.data" type="strlist">e005:brightnessdown</append> <!-- Fn+Down arrow Brightness Down -->
+            <append key="input.keymap.data" type="strlist">e008:wlan</append> <!-- Fn+F2 Toggle WiFi -->
+            <append key="input.keymap.data" type="strlist">e009:ejectclosedcd</append> <!-- Fn+F10 Eject CD -->
+            <append key="info.capabilities" type="strlist">input.keymap</append>
+          </match>
+        </match>
       </match>
     </match>
   </device>


More information about the hal-commit mailing list