hal: Branch 'master' - 2 commits
Danny Kukawka
dkukawka at kemper.freedesktop.org
Tue Dec 11 10:57:23 PST 2007
fdi/information/10freedesktop/10-usb-music-players.fdi | 20 +++++++++++++---
fdi/information/10freedesktop/30-keymap-acer.fdi | 21 +++++++++++++++++
2 files changed, 38 insertions(+), 3 deletions(-)
New commits:
commit 7b19ef3d3ac71a5866a651c535d33c712e33db37
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Tue Dec 11 19:56:30 2007 +0100
added Samsung J70 and Digital Live250 to USB music players
Applied adopted patch from SOMOGYI Péter <psomogyi at cern.ch> to add
a Samsung J70 and a Digital Live250 to USB music players.
diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 190a2eb..30be955 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -198,8 +198,8 @@
<append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
<append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
</match>
- <!-- Samsung YP-T7F -->
- <match key="@storage.originating_device:usb.product_id" int="0x503d">
+ <!-- Samsung YP-J70, YP-T7F -->
+ <match key="@storage.originating_device:usb.product_id" int_outof="0x5032;0x503d">
<merge key="portable_audio_player.type" type="string">generic</merge>
<merge key="portable_audio_player.access_method" type="string">storage</merge>
<append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
@@ -207,6 +207,11 @@
<append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
<append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
<append key="portable_audio_player.audio_folders" type="strlist">Music/</append>
+ <!-- Samsung YP-J70 -->
+ <match key="@storage.originating_device:usb.product_id" int_outof="0x5032">
+ <append key="portable_audio_player.audio_folders" type="strlist">RECORDED/</append>
+ <merge key="storage.requires_eject" type="bool">true</merge>
+ </match>
</match>
<!-- Samsung YP-Z5 -->
<match key="@storage.originating_device:usb.product_id" int="0x5041">
@@ -258,7 +263,7 @@
</match>
</match>
- <!-- Jetflash MP3 Player, AKA NAPA LCD-HD, AKA Medion, AKA Tevion -->
+ <!-- Jetflash MP3 Player, AKA NAPA LCD-HD, AKA Medion, AKA Tevion and other -->
<match key="@storage.originating_device:usb.vendor_id" int="0x066f">
<!-- EXATEL i-BEAD100 Player, Medion MD41512 / Tevion 41512 , Transcend (T.Sonic ??? White),
TrekStor i.Beat 115, Transcend (T.Sonic 610), TrekStor i.Beat jump MP3 Player
@@ -293,6 +298,15 @@
<merge key="storage.drive_type" type="string">sd_mmc</merge>
</match>
</match>
+ <!-- Digital Live250 -->
+ <match key="@storage.originating_device:usb.product_id" int="0x80e0">
+ <merge key="portable_audio_player.type" type="string">generic</merge>
+ <merge key="portable_audio_player.access_method" type="string">storage</merge>
+ <append key="portable_audio_player.output_formats" type="strlist">application/ogg</append>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
+ <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
+ </match>
<!-- Jens of Sweeden (JoS) MP-120 -->
<match key="@storage.originating_device:usb.product_id" int="0x82d4">
<merge key="portable_audio_player.type" type="string">generic</merge>
commit 62b49303e2966448e3b9578320cf64e4fa5d4ac1
Author: Carlos Corbacho <carlos at strangeworlds.co.uk>
Date: Tue Dec 11 19:44:07 2007 +0100
add keymap for Acer Extensa 5220
Added keymap for Acer Extensa 5220. Source see:
http://thread.gmane.org/gmane.comp.freedesktop.hal/9516
diff --git a/fdi/information/10freedesktop/30-keymap-acer.fdi b/fdi/information/10freedesktop/30-keymap-acer.fdi
index 98135eb..5c3d5f8 100644
--- a/fdi/information/10freedesktop/30-keymap-acer.fdi
+++ b/fdi/information/10freedesktop/30-keymap-acer.fdi
@@ -131,6 +131,27 @@
<append key="input.keymap.data" type="strlist">e074:prog1</append> <!-- "e" Acer eManager button -->
<append key="info.capabilities" type="strlist">input.keymap</append>
</match>
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="5210;5220;5610;5620">
+ <append key="input.keymap.data" type="strlist">e025:help</append> <!-- Fn+F1 Hotkey help -->
+ <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:euro</append> <!-- Euro symbol -->
+ <append key="input.keymap.data" type="strlist">e034:dollar</append> <!-- Dollar symbol -->
+ <append key="input.keymap.data" type="strlist">e053:bluetooth</append> <!-- Bluetooth (toggle) on-to-off -->
+ <append key="input.keymap.data" type="strlist">e054:bluetooth</append> <!-- Bluetooth (toggle) off-to-on -->
+ <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">e06e:lock</append> <!-- Windows Lock function -->
+ <append key="input.keymap.data" type="strlist">e071:f22</append> <!-- Fn+F7 Touchpad toggle (off-to-on) -->
+ <append key="input.keymap.data" type="strlist">e072:f23</append> <!-- Fn+F7 Touchpad toggle (on-to-off) -->
+ <append key="input.keymap.data" type="strlist">e073:prog2</append> <!-- "P" programmable button -->
+ <append key="input.keymap.data" type="strlist">e074:prog1</append> <!-- "e" Acer eManager button -->
+ <append key="input.keymap.data" type="strlist">e075:presentation</append> <!-- Minimise all Windows -->
+ <append key="input.keymap.data" type="strlist">e078:fn</append> <!-- Fn key -->
+ <append key="input.keymap.data" type="strlist">e079:sync</append> <!-- Launch NTI shadow -->
+ <append key="info.capabilities" type="strlist">input.keymap</append>
+ </match>
</match>
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" prefix="Ferrari">
<!-- Laptops with extra Euro and Dollar keys -->
More information about the hal-commit
mailing list