hal: Branch 'origin' - 7 commits
Richard Hughes
hughsient at kemper.freedesktop.org
Wed Jun 13 11:48:01 PDT 2007
fdi/information/10freedesktop/10-laptop-panel-hardware.fdi | 7 ++
fdi/information/10freedesktop/10-usb-music-players.fdi | 21 ++++++-
fdi/information/10freedesktop/30-keymap-compaq.fdi | 23 +++++++
fdi/information/10freedesktop/30-keymap-dell.fdi | 28 +++++++++
fdi/information/10freedesktop/30-keymap-lenovo.fdi | 18 +++++-
fdi/information/10freedesktop/30-keymap-misc.fdi | 39 +++++++++++++
fdi/information/10freedesktop/Makefile.am | 5 +
7 files changed, 134 insertions(+), 7 deletions(-)
New commits:
diff-tree 146d8fe54936d3d7b0e405a8c06c94fca321f7ce (from 4fa827c85bcc285272e42a0baa6ca4a36d642fb7)
Author: Jeff Mitchell <kde-dev at emailgoeshere.com>
Date: Tue Jun 12 10:56:34 2007 -0400
Clean up the iPod entry a bit, add a key.
diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index b16304e..c34f135 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -6,12 +6,13 @@
<match key="info.category" string="storage">
<!-- Apple iPod - TODO: use USB ids to determine exact output formats -->
<match key="storage.vendor" contains="Apple">
- <match key="storage.model" contains="iPod">
+ <match key="storage.model" contains="iPod">
<merge key="portable_audio_player.access_method" type="string">storage</merge>
+ <addset key="portable_audio_player.access_method.protocols" type="strlist">ipod</addset>
<merge key="portable_audio_player.type" type="string">ipod</merge>
- <append key="portable_audio_player.output_formats" type="strlist">audio/aac</append>
+ <addset key="portable_audio_player.output_formats" type="strlist">audio/aac</addset>
<merge key="storage.requires_eject" type="bool">true</merge>
- </match>
+ </match>
</match>
<!-- USB Mass Storage devices that are music players -->
diff-tree 4fa827c85bcc285272e42a0baa6ca4a36d642fb7 (from 51ac28987a6492e08acc446f7725c16e72b68560)
Author: Jeff Mitchell <kde-dev at emailgoeshere.com>
Date: Tue Jun 12 10:52:59 2007 -0400
Patch by Steven Walter <stevenrwalter at gmail.com> to add support for LG Fusic Phone.
diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index fb7cfcb..b16304e 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -675,6 +675,20 @@
</match>
+ <!-- LG Fusic Phone -->
+ <match key="@storage.physical_device:usb.vendor_id" int="0x05c6">
+ <match key="@storage.physical_device:usb.product_id" int="0x1000">
+ <addset key="info.capabilities" type="strlist">portable_audio_player</adddset>
+ <merge key="info.category" type="string">portable_audio_player</merge>
+ <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
+ <addset key="portable_audio_player.output_formats" type="strlist">audio/mpeg</addset>
+ <addset key="portable_audio_player.output_formats" type="strlist">audio/aac</adddset>
+ <addset key="portable_audio_player.audio_folders" type="strlist">MUSIC</adddset>
+ <append key="portable_audio_player.playlist_path" type="string">MUSIC/AllMyMusic.m3u</append>
+ <addset key="portable_audio_player.playlist_format" type="strlist">audio/x-mpegurl</addset>
+ </match>
+ </match>
+
<match key="@storage.originating_device:usb.vendor_id" int="0x1006">
<!-- iGP 100 -->
<match key="@storage.originating_device:usb.product_id" int="0x2001">
diff-tree 51ac28987a6492e08acc446f7725c16e72b68560 (from d68caa95593ce25e402d86b6f79b0d226e415989)
Author: Richard Hughes <richard at hughsie.com>
Date: Wed Jun 6 14:24:52 2007 +0100
don't use depreciated keys, and add complete keymap for the x60
Don't use depreciated keys for matching, and add a complete keymap for the x60.
All the blue buttons now work using thinkpad_acpi. Woot!
diff --git a/fdi/information/10freedesktop/30-keymap-lenovo.fdi b/fdi/information/10freedesktop/30-keymap-lenovo.fdi
index 1262a8e..83b13a5 100644
--- a/fdi/information/10freedesktop/30-keymap-lenovo.fdi
+++ b/fdi/information/10freedesktop/30-keymap-lenovo.fdi
@@ -7,7 +7,7 @@
<match key="@input.originating_device:info.linux.driver" string="atkbd">
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" prefix="LENOVO">
- <match key="/org/freedesktop/Hal/devices/computer:smbios.system.version" contains="3000">
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.version" contains="3000">
<append key="input.keymap.data" type="strlist">e016:wlan</append> <!-- Fn+F5 wireless -->
<append key="input.keymap.data" type="strlist">e017:sleep</append> <!-- Fn+F4 suspend -->
<append key="input.keymap.data" type="strlist">e018:suspend</append> <!-- Fn+F12 hibernate -->
@@ -16,12 +16,24 @@
</match>
</match>
+ </device>
+
+ <device>
<!-- These are buttons synthesized in other kernel drivers -->
<match key="input.product" string="ThinkPad Extra Buttons">
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" prefix="LENOVO">
- <append key="input.keymap.data" type="strlist">007f:coffee</append> <!-- thinkvantage -->
- <append key="info.capabilities" type="strlist">input.keymap</append>
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.version" contains="X60">
+ <append key="input.keymap.data" type="strlist">0x01:coffee</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:wifi</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="info.capabilities" type="strlist">input.keymap</append>
+ </match>
</match>
</match>
diff-tree d68caa95593ce25e402d86b6f79b0d226e415989 (from 76e3392e3288276e64a9e93db3884026d11283b7)
Author: Richard Hughes <richard at hughsie.com>
Date: Wed Jun 6 09:24:25 2007 +0100
add Microstar Infinity Keyboard keymap
diff --git a/fdi/information/10freedesktop/30-keymap-misc.fdi b/fdi/information/10freedesktop/30-keymap-misc.fdi
index 1587d39..a8fa30c 100644
--- a/fdi/information/10freedesktop/30-keymap-misc.fdi
+++ b/fdi/information/10freedesktop/30-keymap-misc.fdi
@@ -14,6 +14,24 @@
</match>
</match>
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" prefix="MICRO-STAR">
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="INFINITY">
+ <append key="input.keymap.data" type="strlist">e064:prog1</append> <!-- Fn-F3 Touchpad disable -->
+ <append key="input.keymap.data" type="strlist">e077:brightnessdown</append> <!-- Fn-F4 Brightness down -->
+ <append key="input.keymap.data" type="strlist">e078:brightnessup</append> <!-- Fn-F5 Brightness up -->
+ <append key="input.keymap.data" type="strlist">e02e:volumedown</append> <!-- Fn-F7 Volume down -->
+ <append key="input.keymap.data" type="strlist">e030:volumeup</append> <!-- Fn-F8 Volume up -->
+ <append key="input.keymap.data" type="strlist">e020:mute</append> <!-- Fn-F9 Sound On/Off -->
+ <append key="input.keymap.data" type="strlist">e05f:sleep</append> <!-- Fn-F12 Sleep -->
+ <append key="input.keymap.data" type="strlist">e06c:email</append> <!-- envelope button -->
+ <append key="input.keymap.data" type="strlist">e032:www</append> <!-- e button -->
+ <append key="input.keymap.data" type="strlist">e076:wlan</append> <!-- satellite dish1 -->
+ <append key="input.keymap.data" type="strlist">e062:bluetooth</append> <!-- satellite dish2 -->
+ <append key="input.keymap.data" type="strlist">e079:search</append> <!-- Search -->
+ <append key="info.capabilities" type="strlist">input.keymap</append>
+ </match>
+ </match>
+
</match>
</device>
diff-tree 76e3392e3288276e64a9e93db3884026d11283b7 (from 16c125c02a8257896c7ee21d73fa0aa9077069b4)
Author: Richard Hughes <richard at hughsie.com>
Date: Wed Jun 6 09:18:49 2007 +0100
add Medion FID2060 keymap
diff --git a/fdi/information/10freedesktop/30-keymap-misc.fdi b/fdi/information/10freedesktop/30-keymap-misc.fdi
new file mode 100644
index 0000000..1587d39
--- /dev/null
+++ b/fdi/information/10freedesktop/30-keymap-misc.fdi
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
+
+<deviceinfo version="0.2">
+ <device>
+
+ <!-- These are raw scancodes produced by the atkbd driver -->
+ <match key="@input.originating_device:info.linux.driver" string="atkbd">
+
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" prefix="MEDION">
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="FID2060">
+ <append key="input.keymap.data" type="strlist">6b:channeldown</append> <!-- Thottle Down -->
+ <append key="input.keymap.data" type="strlist">6d:channelup</append> <!-- Thottle Up -->
+ <append key="info.capabilities" type="strlist">input.keymap</append>
+ </match>
+ </match>
+
+ </match>
+
+ </device>
+</deviceinfo>
+
diff --git a/fdi/information/10freedesktop/Makefile.am b/fdi/information/10freedesktop/Makefile.am
index d02d996..eefc158 100644
--- a/fdi/information/10freedesktop/Makefile.am
+++ b/fdi/information/10freedesktop/Makefile.am
@@ -39,6 +39,7 @@ endif
if BUILD_KEYMAPS
dist_fdi_DATA += \
+ 30-keymap-misc.fdi \
30-keymap-compaq.fdi \
30-keymap-lenovo.fdi \
30-keymap-dell.fdi
diff-tree 16c125c02a8257896c7ee21d73fa0aa9077069b4 (from a0eef3bf3bb05731c5edd6b9ea51e216e19cf900)
Author: Richard Hughes <richard at hughsie.com>
Date: Wed Jun 6 09:12:41 2007 +0100
add keymap for Compaq E500 laptop
diff --git a/fdi/information/10freedesktop/30-keymap-compaq.fdi b/fdi/information/10freedesktop/30-keymap-compaq.fdi
new file mode 100644
index 0000000..60b86c7
--- /dev/null
+++ b/fdi/information/10freedesktop/30-keymap-compaq.fdi
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
+
+<deviceinfo version="0.2">
+ <device>
+
+ <!-- These are raw scancodes produced by the atkbd driver -->
+ <match key="@input.originating_device:info.linux.driver" string="atkbd">
+
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" prefix="Compaq">
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="E500">
+ <append key="input.keymap.data" type="strlist">e023:www</append> <!-- I key -->
+ <append key="input.keymap.data" type="strlist">e01f:home</append> <!-- Home key -->
+ <append key="input.keymap.data" type="strlist">e01a:search</append> <!-- Search key -->
+ <append key="input.keymap.data" type="strlist">e01e:email</append> <!-- Email -->
+ <append key="info.capabilities" type="strlist">input.keymap</append>
+ </match>
+ </match>
+
+ </match>
+
+ </device>
+</deviceinfo>
+
diff --git a/fdi/information/10freedesktop/Makefile.am b/fdi/information/10freedesktop/Makefile.am
index 881c40f..d02d996 100644
--- a/fdi/information/10freedesktop/Makefile.am
+++ b/fdi/information/10freedesktop/Makefile.am
@@ -39,6 +39,7 @@ endif
if BUILD_KEYMAPS
dist_fdi_DATA += \
+ 30-keymap-compaq.fdi \
30-keymap-lenovo.fdi \
30-keymap-dell.fdi
endif
diff-tree a0eef3bf3bb05731c5edd6b9ea51e216e19cf900 (from 8e51fc7898707934079be1c74ce6f5e03ceb3dd5)
Author: Bastien Nocera <hadess at hadess.net>
Date: Wed Jun 6 09:03:13 2007 +0100
add Dell D420 keymap support
Add Dell D420 support (untested, because of the matching bugs) - also
add a quirk for a hardware controlled laptop panel.
diff --git a/fdi/information/10freedesktop/10-laptop-panel-hardware.fdi b/fdi/information/10freedesktop/10-laptop-panel-hardware.fdi
index 9bf76c7..476f279 100644
--- a/fdi/information/10freedesktop/10-laptop-panel-hardware.fdi
+++ b/fdi/information/10freedesktop/10-laptop-panel-hardware.fdi
@@ -7,6 +7,13 @@
This is a hardware "feature" seen on some IBM and Lenovo laptops. -->
<device>
<match key="info.category" string="laptop_panel">
+ <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">
+ <merge key="laptop_panel.brightness_in_hardware" type="bool">true</merge>
+ </match>
+ </match>
+ </match>
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" string="IBM">
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.version" contains="ThinkPad">
<merge key="laptop_panel.brightness_in_hardware" type="bool">true</merge>
diff --git a/fdi/information/10freedesktop/30-keymap-dell.fdi b/fdi/information/10freedesktop/30-keymap-dell.fdi
new file mode 100644
index 0000000..5e7386c
--- /dev/null
+++ b/fdi/information/10freedesktop/30-keymap-dell.fdi
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
+
+<deviceinfo version="0.2">
+ <device>
+
+ <!-- These are raw scancodes produced by the atkbd driver -->
+ <match key="@input.originating_device:info.linux.driver" string="atkbd">
+
+ <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>
+ </match>
+
+ </match>
+
+ </device>
+</deviceinfo>
+
diff --git a/fdi/information/10freedesktop/Makefile.am b/fdi/information/10freedesktop/Makefile.am
index cb604dd..881c40f 100644
--- a/fdi/information/10freedesktop/Makefile.am
+++ b/fdi/information/10freedesktop/Makefile.am
@@ -39,7 +39,8 @@ endif
if BUILD_KEYMAPS
dist_fdi_DATA += \
- 30-keymap-lenovo.fdi
+ 30-keymap-lenovo.fdi \
+ 30-keymap-dell.fdi
endif
check:
More information about the hal-commit
mailing list