[PATCH] removes useless 30-keymap-module-thinkpad-acpi.fdi

=?utf-8?q?S=C3=A9bastien=20Mazy?= melyadon at gmail.com
Thu Jan 15 04:11:25 PST 2009


Hello,

This patch removes the file 30-keymap-module-thinkpad-acpi.fdi from
hal-info because:
 - the linux kernel module thinkpad_acpi already sends relevant keycodes
 - it remapped KEY_WLAN to KEY_RADIO, which is unwanted

Attached is also a fdi file, not to be commited, to remap keycodes > 255
until Xorg is fixed to support them.

---
 .../30-keymap-module-thinkpad-acpi.fdi             |   49 --------------------
 1 files changed, 0 insertions(+), 49 deletions(-)
 delete mode 100644 fdi/information/10freedesktop/30-keymap-module-thinkpad-acpi.fdi

diff --git a/fdi/information/10freedesktop/30-keymap-module-thinkpad-acpi.fdi b/fdi/information/10freedesktop/30-keymap-module-thinkpad-acpi.fdi
deleted file mode 100644
index bdc4fe9..0000000
--- a/fdi/information/10freedesktop/30-keymap-module-thinkpad-acpi.fdi
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
-
-<deviceinfo version="0.2">
-  <device>
-    <!-- These are buttons synthesized in the thinkpad-acpi kernel module -->
-    <match key="input.product" string="ThinkPad Extra Buttons">
-      <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" prefix="IBM">
-        <append key="input.keymap.data" type="strlist">0x01:battery</append> <!-- Fn+F2 battery -->
-        <append key="input.keymap.data" type="strlist">0x02:screenlock</append> <!-- Fn+F3 lock -->
-        <append key="input.keymap.data" type="strlist">0x03:sleep</append> <!-- Fn+F4 suspend -->
-        <append key="input.keymap.data" type="strlist">0x04:radio</append> <!-- Fn+F5 switch radio -->
-        <append key="input.keymap.data" type="strlist">0x06:switchvideomode</append> <!-- Fn+F7 switch video output device -->
-        <append key="input.keymap.data" type="strlist">0x07:zoom</append> <!-- Fn+F8 screen expand -->
-        <append key="input.keymap.data" type="strlist">0x08:f24</append> <!-- Fn+F9 undock -->
-        <append key="input.keymap.data" type="strlist">0x0b:suspend</append> <!-- Fn+F12 hibernate -->
-        <append key="input.keymap.data" type="strlist">0x0f:brightnessup</append> <!-- Fn+Home -->
-        <append key="input.keymap.data" type="strlist">0x10:brightnessdown</append> <!-- Fn+End -->
-        <append key="input.keymap.data" type="strlist">0x11:kbdillumtoggle</append> <!-- Fn+PgUp - ThinkLight -->
-        <append key="input.keymap.data" type="strlist">0x13:zoom</append> <!-- Fn+Space -->
-        <append key="input.keymap.data" type="strlist">0x14:volumeup</append> <!-- Volume Up button -->
-	<append key="input.keymap.data" type="strlist">0x15:volumedown</append> <!-- Volume Down button -->
-        <append key="input.keymap.data" type="strlist">0x16:mute</append> <!-- Mute button -->
-        <append key="input.keymap.data" type="strlist">0x17:vendor</append> <!-- ThinkPad/ThinkVantage button -->
-        <append key="info.capabilities" type="strlist">input.keymap</append>
-      </match>
-      <!-- Lenovo systems have a similar but different layout to IBM systems -->
-      <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" prefix="LENOVO">
-        <append key="input.keymap.data" type="strlist">0x01:screenlock</append> <!-- Fn+F2 lock -->
-        <append key="input.keymap.data" type="strlist">0x02:battery</append> <!-- Fn+F3 battery -->
-        <append key="input.keymap.data" type="strlist">0x03:sleep</append> <!-- Fn+F4 suspend -->
-        <append key="input.keymap.data" type="strlist">0x04:radio</append> <!-- Fn+F5 wifi -->
-        <append key="input.keymap.data" type="strlist">0x06:switchvideomode</append> <!-- Fn+F7 switch video output device -->
-        <append key="input.keymap.data" type="strlist">0x07:f22</append> <!-- Fn+F8 touchpadtoggle -->
-        <append key="input.keymap.data" type="strlist">0x08:f24</append> <!-- Fn+F9 undock -->
-        <append key="input.keymap.data" type="strlist">0x0b:suspend</append> <!-- Fn+F12 hibernate -->
-        <append key="input.keymap.data" type="strlist">0x0f:brightnessup</append> <!-- Fn+Home -->
-        <append key="input.keymap.data" type="strlist">0x10:brightnessdown</append> <!-- Fn+End -->
-        <append key="input.keymap.data" type="strlist">0x11:kbdillumtoggle</append> <!-- Fn+PgUp - ThinkLight -->
-        <append key="input.keymap.data" type="strlist">0x13:zoom</append> <!-- Fn+Space -->
-        <append key="input.keymap.data" type="strlist">0x14:volumeup</append> <!-- Volume Up button -->
-	<append key="input.keymap.data" type="strlist">0x15:volumedown</append> <!-- Volume Down button -->
-        <append key="input.keymap.data" type="strlist">0x16:mute</append> <!-- Mute button -->
-        <append key="input.keymap.data" type="strlist">0x17:vendor</append> <!-- ThinkPad/ThinkVantage button -->
-        <append key="info.capabilities" type="strlist">input.keymap</append>
-      </match>
-    </match>
-  </device>
-</deviceinfo>
-
-- 
1.6.1


-- 
Sébastien Mazy
-------------- next part --------------
<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->

<deviceinfo version="0.2">
  <device>
    <!-- These are buttons synthesized in the thinkpad-acpi kernel module -->
    <match key="input.product" string="ThinkPad Extra Buttons">
        <append key="input.keymap.data" type="strlist">0x13:f</append> <!-- Fn+Space -->
        <append key="input.keymap.data" type="strlist">0x17:computer</append> <!-- ThinkPad/ThinkVantage button -->
        <append key="info.capabilities" type="strlist">input.keymap</append>
    </match>
  </device>
</deviceinfo>



More information about the hal mailing list