hal: Branch 'master'

Danny Kukawka dkukawka at kemper.freedesktop.org
Mon Nov 12 11:17:21 PST 2007


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

New commits:
commit 6b41960a556d9164b429f575e6e685800558278b
Author: Carlos Corbacho <carlos at strangeworlds.co.uk>
Date:   Mon Nov 12 20:17:14 2007 +0100

    keymap-acer: Convert Euro and Dollar keys to proper keycodes
    
    As of Linux kernel commit f7852be649d7c005f2ab8820e85d7eb94f589ebc,
    Linux now has proper keycodes for the extra Euro and Dollar keys.
    
    Convert all Acer keymaps with these extra keys to use the new
    keycodes.

diff --git a/fdi/information/10freedesktop/30-keymap-acer.fdi b/fdi/information/10freedesktop/30-keymap-acer.fdi
index 6e8dde6..4069c5e 100644
--- a/fdi/information/10freedesktop/30-keymap-acer.fdi
+++ b/fdi/information/10freedesktop/30-keymap-acer.fdi
@@ -30,8 +30,8 @@
             <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:f14</append> <!-- FIXME Euro symbol -->
-            <append key="input.keymap.data" type="strlist">e034:f15</append> <!-- FIXME Dollar symbol -->
+            <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 -->
@@ -48,8 +48,8 @@
             <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:f14</append> <!-- FIXME Euro symbol -->
-            <append key="input.keymap.data" type="strlist">e034:f15</append> <!-- FIXME Dollar symbol -->
+            <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 -->
@@ -67,8 +67,8 @@
             <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:f14</append> <!-- FIXME Euro symbol -->
-            <append key="input.keymap.data" type="strlist">e034:f15</append> <!-- FIXME Dollar symbol -->
+            <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 -->
@@ -88,8 +88,8 @@
             <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:f14</append> <!-- FIXME Euro symbol -->
-            <append key="input.keymap.data" type="strlist">e034:f15</append> <!-- FIXME Dollar symbol -->
+            <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 -->
@@ -108,8 +108,8 @@
             <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:f14</append> <!-- FIXME Euro symbol -->
-            <append key="input.keymap.data" type="strlist">e034:f15</append> <!-- FIXME Dollar symbol -->
+            <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 -->
@@ -154,8 +154,8 @@
             <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:f14</append> <!-- FIXME Euro symbol -->
-            <append key="input.keymap.data" type="strlist">e034:f15</append> <!-- FIXME Dollar symbol -->
+            <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 -->
@@ -180,8 +180,8 @@
             <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:f14</append> <!-- FIXME Euro symbol -->
-            <append key="input.keymap.data" type="strlist">e034:f15</append> <!-- FIXME Dollar symbol -->
+            <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 -->


More information about the hal-commit mailing list