hal: Branch 'master'

[Danny Kukawka]

 fdi/information/10freedesktop/30-keymap-acer.fdi |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
diff-tree 6046509a09d196e0c7a3e2815fc9c73d6258c6c2 (from 8d8ef711a54e2664c7d086c43b3cc3ea9b28edd5)
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Tue Sep 11 21:14:17 2007 +0200

    fixed keymap entry for a Acer C300 Tablet PC
    
    Fixed the keymap entry for the Acer C300 Tablet PC:
    - as pointed out by Andrew Lutomirski <andy at luto.us>: the scancode of
      the 'rotate screen' key is 0x67
    - fixed entry for the lock key on the display: IMO it's the key to lock
      the tablet device and the tablet keys and not a lockscreen key, since
      there is no such key currently in the kernel: mapped to f23

diff --git a/fdi/information/10freedesktop/30-keymap-acer.fdi b/fdi/information/10freedesktop/30-keymap-acer.fdi
index bcce56d..b33b187 100644
--- a/fdi/information/10freedesktop/30-keymap-acer.fdi
+++ b/fdi/information/10freedesktop/30-keymap-acer.fdi
@@ -66,11 +66,11 @@
         <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" prefix="TravelMate">
           <!-- TravelMate C300 -->
           <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="C300">
-            <append key="input.keymap.data" type="strlist">0x68:f22</append> <!-- FIXME: rotate screen --> 
+            <append key="input.keymap.data" type="strlist">0x67:f22</append> <!-- FIXME: rotate screen --> 
             <append key="input.keymap.data" type="strlist">0x68:up</append> 
             <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:screenlock</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>
           <!-- TravelMate 3000 -->