hal: Branch 'origin' - 22 commits
Richard Hughes
hughsient at kemper.freedesktop.org
Tue Aug 21 10:05:23 PDT 2007
fdi/information/10freedesktop/10-usb-music-players.fdi | 90 +++++++++-
fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi | 5
fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi | 4
fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi | 6
fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi | 4
fdi/information/10freedesktop/30-keymap-acer.fdi | 68 +++++++
fdi/information/10freedesktop/30-keymap-compaq.fdi | 2
fdi/information/10freedesktop/30-keymap-dell.fdi | 86 ++++-----
fdi/information/10freedesktop/30-keymap-hp.fdi | 50 +++++
fdi/information/10freedesktop/30-keymap-misc.fdi | 26 +-
fdi/information/10freedesktop/30-keymap-module-sony-laptop.fdi | 3
tools/keymap-check.sh | 4
12 files changed, 283 insertions(+), 65 deletions(-)
New commits:
diff-tree b844a4df4072d01917c54371e4001fe0af12157e (from fca27b96eb970f9519b1cacb7a55c157dff4feac)
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Tue Aug 21 15:38:25 2007 +0200
fix keymap-check.sh to cleanup temporary files on exit
Fixed keymap-check.sh to cleanup temporary /tmp/quirk-keymap-list.txt
file before finish the check.
diff --git a/tools/keymap-check.sh b/tools/keymap-check.sh
index 7254fbd..5cb8faf 100755
--- a/tools/keymap-check.sh
+++ b/tools/keymap-check.sh
@@ -66,5 +66,9 @@ if [ ! -z "`echo $result | grep FAILED`"
retval=1
fi
+if [ -e /tmp/quirk-keymap-list.txt ]; then
+ rm -rf /tmp/quirk-keymap-list.txt
+fi
+
exit $retval
diff-tree fca27b96eb970f9519b1cacb7a55c157dff4feac (from 3d6b1649f772310dba7e67a60bbf0b061524cecf)
Author: Emil Soleyman <emil at soleyman.com>
Date: Sun Aug 19 18:01:27 2007 +0100
add video quirk for Z61t
I have found a video quirk when suspending and resuming my Lenovo Z61t.
I am attaching a patch that will update hal-info.
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
index 92377d7..f33dc74 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
@@ -39,6 +39,10 @@
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
+ <match key="system.hardware.version" string="ThinkPad Z61t">
+ <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
+ <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
+ </match>
<!-- T61 -->
<match key="system.hardware.version" string="766314G">
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
diff-tree 3d6b1649f772310dba7e67a60bbf0b061524cecf (from 042b780cb92d8121db0e33749f046be1623cef7a)
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Thu Aug 16 15:11:54 2007 +0200
add more keymaps for Acer and Hewlett-Packard laptops
Added new keymaps for the following laptops:
- HP: nc6230, nc6400, nw8440, nx6125, nx6325, nx7400
- Acer: TM C300, TM 3000, TM 4650
diff --git a/fdi/information/10freedesktop/30-keymap-acer.fdi b/fdi/information/10freedesktop/30-keymap-acer.fdi
index 62ceea4..b09ec82 100644
--- a/fdi/information/10freedesktop/30-keymap-acer.fdi
+++ b/fdi/information/10freedesktop/30-keymap-acer.fdi
@@ -223,6 +223,39 @@
</match>
</match>
<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">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:lockscreen</append>
+ <append key="info.capabilities" type="strlist">input.keymap</append>
+ </match>
+ <!-- TravelMate 3000 -->
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="3000">
+ <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">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 -->
+ <append key="input.keymap.data" type="strlist">e058:bluetooth</append> <!-- Bluetooth (toggle) off-to-on -->
+ <append key="input.keymap.data" type="strlist">e06e:brightnessup</append> <!-- Fn+Right Brightness Up -->
+ <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="info.capabilities" type="strlist">input.keymap</append>
+ </match>
+ <!-- TravelMate 4650 -->
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="4650">
+ <append key="input.keymap.data" type="strlist">e059:brightnessup</append> <!-- Fn+Right Brightness Up -->
+ <append key="input.keymap.data" type="strlist">e033:prog2</append> <!-- "P" programmable button -->
+ <append key="input.keymap.data" type="strlist">e034:prog1</append> <!-- "e" Acer eManager button -->
+ <append key="info.capabilities" type="strlist">input.keymap</append>
+ </match>
<!-- TravelMate 5110, TravelMate 5610 and TravelMate 5620 are identical -->
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="5110">
<append key="input.keymap.data" type="strlist">e025:help</append> <!-- Fn+F1 Hotkey help -->
diff --git a/fdi/information/10freedesktop/30-keymap-hp.fdi b/fdi/information/10freedesktop/30-keymap-hp.fdi
index 3ca2de8..e0ad344 100644
--- a/fdi/information/10freedesktop/30-keymap-hp.fdi
+++ b/fdi/information/10freedesktop/30-keymap-hp.fdi
@@ -21,12 +21,60 @@
<append key="input.keymap.data" type="strlist">e059:www</append> <!-- I key -->
<append key="info.capabilities" type="strlist">input.keymap</append>
</match>
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="nc6230">
+ <append key="input.keymap.data" type="strlist">e001:fn_esc</append> <!-- FnEsc -->
+ <append key="input.keymap.data" type="strlist">e008:tv</append> <!-- SVideo -->
+ <append key="input.keymap.data" type="strlist">e009:battery</append> <!-- FnF8 (battery) -->
+ <append key="input.keymap.data" type="strlist">e00a:screenlock</append> <!-- FnF6 Lock -->
+ <append key="input.keymap.data" type="strlist">e033:f22</append> <!-- FIXME: Auto brightness -->
+ <append key="input.keymap.data" type="strlist">e059:www</append> <!-- I key -->
+ <append key="info.capabilities" type="strlist">input.keymap</append>
+ </match>
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="nc6320">
<append key="input.keymap.data" type="strlist">e008:tv</append> <!-- SVideo -->
<append key="input.keymap.data" type="strlist">e009:battery</append> <!-- FnF8 (battery) -->
<append key="input.keymap.data" type="strlist">e059:www</append> <!-- I key -->
<append key="info.capabilities" type="strlist">input.keymap</append>
</match>
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="nc6400">
+ <append key="input.keymap.data" type="strlist">e001:fn_esc</append> <!-- FnEsc -->
+ <append key="input.keymap.data" type="strlist">e008:tv</append> <!-- SVideo -->
+ <append key="input.keymap.data" type="strlist">e009:battery</append> <!-- FnF8 (battery) -->
+ <append key="input.keymap.data" type="strlist">e059:www</append> <!-- I key -->
+ <append key="info.capabilities" type="strlist">input.keymap</append>
+ </match>
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="nw8440">
+ <append key="input.keymap.data" type="strlist">e001:fn_esc</append> <!-- FnEsc -->
+ <append key="input.keymap.data" type="strlist">e008:tv</append> <!-- SVideo -->
+ <append key="input.keymap.data" type="strlist">e009:battery</append> <!-- FnF8 (battery) -->
+ <append key="input.keymap.data" type="strlist">e00a:screenlock</append> <!-- FnF6 Lock -->
+ <append key="input.keymap.data" type="strlist">e033:f22</append> <!-- FIXME: Auto brightness -->
+ <append key="input.keymap.data" type="strlist">e059:www</append> <!-- I key -->
+ <append key="info.capabilities" type="strlist">input.keymap</append>
+ </match>
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="nx6125">
+ <append key="input.keymap.data" type="strlist">e001:fn_esc</append> <!-- FnEsc -->
+ <append key="input.keymap.data" type="strlist">e008:tv</append> <!-- SVideo -->
+ <append key="input.keymap.data" type="strlist">e009:battery</append> <!-- FnF8 (battery) -->
+ <append key="input.keymap.data" type="strlist">e059:www</append> <!-- I key -->
+ <append key="info.capabilities" type="strlist">input.keymap</append>
+ </match>
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="nx6325">
+ <append key="input.keymap.data" type="strlist">e001:fn_esc</append> <!-- FnEsc -->
+ <append key="input.keymap.data" type="strlist">e008:tv</append> <!-- SVideo -->
+ <append key="input.keymap.data" type="strlist">e009:battery</append> <!-- FnF8 (battery) -->
+ <append key="input.keymap.data" type="strlist">e00a:screenlock</append> <!-- FnF6 Lock -->
+ <append key="input.keymap.data" type="strlist">e033:f22</append> <!-- FIXME: Auto brightness -->
+ <append key="input.keymap.data" type="strlist">e059:www</append> <!-- I key -->
+ <append key="info.capabilities" type="strlist">input.keymap</append>
+ </match>
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="nx7400">
+ <append key="input.keymap.data" type="strlist">e001:fn_esc</append> <!-- FnEsc -->
+ <append key="input.keymap.data" type="strlist">e009:battery</append> <!-- FnF8 (battery) -->
+ <append key="input.keymap.data" type="strlist">e00a:screenlock</append> <!-- FnF6 Lock -->
+ <append key="input.keymap.data" type="strlist">e033:f22</append> <!-- FIXME: Auto brightness -->
+ <append key="info.capabilities" type="strlist">input.keymap</append>
+ </match>
</match>
</match>
</device>
diff-tree 042b780cb92d8121db0e33749f046be1623cef7a (from d580bfcb45793a85e18cc2ed9b3383221e8c3d28)
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Wed Aug 15 13:27:10 2007 +0200
removed not needed match from 30-keymap-module-sony-laptop.fdi
Removed not needed match from 30-keymap-module-sony-laptop.fdi.
diff --git a/fdi/information/10freedesktop/30-keymap-module-sony-laptop.fdi b/fdi/information/10freedesktop/30-keymap-module-sony-laptop.fdi
index 1608eb1..9dfa58e 100644
--- a/fdi/information/10freedesktop/30-keymap-module-sony-laptop.fdi
+++ b/fdi/information/10freedesktop/30-keymap-module-sony-laptop.fdi
@@ -16,8 +16,7 @@
<append key="input.keymap.data" type="strlist">0x10:suspend</append> <!-- Fn+F12 hibernate -->
<append key="info.capabilities" type="strlist">input.keymap</append>
</match>
- </match>
- <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" prefix="Sony">
+
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" string="VGN-FS790B">
<append key="input.keymap.data" type="strlist">0x06:mute</append> <!-- Fn+F2 mute -->
<append key="input.keymap.data" type="strlist">0x07:volumedown</append> <!-- Fn+F3 mixer down -->
diff-tree d580bfcb45793a85e18cc2ed9b3383221e8c3d28 (from aaac8e3628e44eb0dbfabd7bf07a5bffd8dd940f)
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Wed Aug 15 13:23:15 2007 +0200
sort keymap entries for machines listed in 30-keymap-misc.fdi
Sort the keymap entries for machines listed in 30-keymap-misc.fdi
to find easier duplicates.
diff --git a/fdi/information/10freedesktop/30-keymap-misc.fdi b/fdi/information/10freedesktop/30-keymap-misc.fdi
index 0e2afbe..9a8fc81 100644
--- a/fdi/information/10freedesktop/30-keymap-misc.fdi
+++ b/fdi/information/10freedesktop/30-keymap-misc.fdi
@@ -16,17 +16,17 @@
<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:f22</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">e020:mute</append> <!-- Fn-F9 Sound On/Off -->
<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">e032:www</append> <!-- e button -->
<append key="input.keymap.data" type="strlist">e05f:sleep</append> <!-- Fn-F12 Sleep -->
+ <append key="input.keymap.data" type="strlist">e062:bluetooth</append> <!-- satellite dish2 -->
+ <append key="input.keymap.data" type="strlist">e064:f22</append> <!-- Fn-F3 Touchpad disable -->
<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">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">e079:search</append> <!-- Search -->
<append key="info.capabilities" type="strlist">input.keymap</append>
</match>
@@ -34,28 +34,28 @@
<match key="/org/freedesktop/Hal/devices/computer:system.chassis.manufacturer" prefix="MICRO-STAR">
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.version" string="0131">
- <append key="input.keymap.data" type="strlist">e078:brightnessup</append> <!-- Fn-F4 Brightness up -->
- <append key="input.keymap.data" type="strlist">e077:brightnessdown</append> <!-- Fn-F5 Brightness down -->
+ <append key="input.keymap.data" type="strlist">e020:mute</append> <!-- Fn-F9 Sound On/Off -->
<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">e032:www</append> <!-- www button -->
<append key="input.keymap.data" type="strlist">e05f:sleep</append> <!-- Fn-F12 Sleep -->
+ <append key="input.keymap.data" type="strlist">e062:bluetooth</append> <!-- satellite dish: bluetooth -->
<append key="input.keymap.data" type="strlist">e06c:email</append> <!-- envelope button -->
- <append key="input.keymap.data" type="strlist">e032:www</append> <!-- www button -->
<append key="input.keymap.data" type="strlist">e076:wlan</append> <!-- satellite dish: wlan -->
- <append key="input.keymap.data" type="strlist">e062:bluetooth</append> <!-- satellite dish: bluetooth -->
- <append key="input.keymap.data" type="strlist">e079:search</append> <!-- search button -->
<append key="input.keymap.data" type="strlist">e071:unknown</append> <!-- plug -->
<append key="input.keymap.data" type="strlist">e072:unknown</append> <!-- unplug -->
+ <append key="input.keymap.data" type="strlist">e077:brightnessdown</append> <!-- Fn-F5 Brightness down -->
+ <append key="input.keymap.data" type="strlist">e078:brightnessup</append> <!-- Fn-F4 Brightness up -->
+ <append key="input.keymap.data" type="strlist">e079:search</append> <!-- search button -->
<append key="info.capabilities" type="strlist">input.keymap</append>
</match>
</match>
<match key="/org/freedesktop/Hal/devices/computer:system.vendor" string="MEDIONNB">
<match key="/org/freedesktop/Hal/devices/computer:system.product" prefix="A555">
- <append key="input.keymap.data" type="strlist">67:email</append> <!-- envelope button -->
<append key="input.keymap.data" type="strlist">63:www</append> <!-- N button -->
<append key="input.keymap.data" type="strlist">66:prog1</append> <!-- link 1 button -->
+ <append key="input.keymap.data" type="strlist">67:email</append> <!-- envelope button -->
<append key="input.keymap.data" type="strlist">69:prog2</append> <!-- link 2 button -->
<append key="info.capabilities" type="strlist">input.keymap</append>
</match>
diff-tree aaac8e3628e44eb0dbfabd7bf07a5bffd8dd940f (from e1a30ab4d8c5808611b1d0efe29d9272d1c1fcf5)
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Wed Aug 15 13:13:18 2007 +0200
sort keymap entries for Compaq/HP machines
Sort the keymap entries for Compaq/HP machines to find easier duplicates.
diff --git a/fdi/information/10freedesktop/30-keymap-compaq.fdi b/fdi/information/10freedesktop/30-keymap-compaq.fdi
index c6d51dd..012e192 100644
--- a/fdi/information/10freedesktop/30-keymap-compaq.fdi
+++ b/fdi/information/10freedesktop/30-keymap-compaq.fdi
@@ -9,9 +9,9 @@
<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:homepage</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="input.keymap.data" type="strlist">e01f:homepage</append> <!-- Home key -->
<append key="info.capabilities" type="strlist">input.keymap</append>
</match>
</match>
diff --git a/fdi/information/10freedesktop/30-keymap-hp.fdi b/fdi/information/10freedesktop/30-keymap-hp.fdi
index 730e4c4..3ca2de8 100644
--- a/fdi/information/10freedesktop/30-keymap-hp.fdi
+++ b/fdi/information/10freedesktop/30-keymap-hp.fdi
@@ -16,15 +16,15 @@
<append key="info.capabilities" type="strlist">input.keymap</append>
</match>
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="nc6120">
- <append key="input.keymap.data" type="strlist">e059:www</append> <!-- I key -->
- <append key="input.keymap.data" type="strlist">e009:battery</append> <!-- FnF8 (battery) -->
<append key="input.keymap.data" type="strlist">e008:tv</append> <!-- SVideo -->
+ <append key="input.keymap.data" type="strlist">e009:battery</append> <!-- FnF8 (battery) -->
+ <append key="input.keymap.data" type="strlist">e059:www</append> <!-- I key -->
<append key="info.capabilities" type="strlist">input.keymap</append>
</match>
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="nc6320">
- <append key="input.keymap.data" type="strlist">e059:www</append> <!-- I key -->
- <append key="input.keymap.data" type="strlist">e009:battery</append> <!-- FnF8 (battery) -->
<append key="input.keymap.data" type="strlist">e008:tv</append> <!-- SVideo -->
+ <append key="input.keymap.data" type="strlist">e009:battery</append> <!-- FnF8 (battery) -->
+ <append key="input.keymap.data" type="strlist">e059:www</append> <!-- I key -->
<append key="info.capabilities" type="strlist">input.keymap</append>
</match>
</match>
diff-tree e1a30ab4d8c5808611b1d0efe29d9272d1c1fcf5 (from 99aaae3e58698f75ebbcb88c8d27e6bf45b579c7)
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Wed Aug 15 13:08:14 2007 +0200
sort keymap entries for ACER machines
Sort the keymap entries for ACER machines to find easier duplicates.
diff --git a/fdi/information/10freedesktop/30-keymap-dell.fdi b/fdi/information/10freedesktop/30-keymap-dell.fdi
index da5e2b3..f3bc047 100644
--- a/fdi/information/10freedesktop/30-keymap-dell.fdi
+++ b/fdi/information/10freedesktop/30-keymap-dell.fdi
@@ -9,56 +9,56 @@
<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:f23</append> <!-- FIXME Fn+Left arrow Auto Brightness -->
+ <append key="input.keymap.data" type="strlist">e006:brightnessup</append> <!-- Fn+Up arrow Brightness Up -->
+ <append key="input.keymap.data" type="strlist">e007:battery</append> <!-- Fn+F3 battery icon -->
<append key="input.keymap.data" type="strlist">e00a:suspend</append> <!-- Fn+F1 hibernate -->
+ <append key="input.keymap.data" type="strlist">e00b:displaytoggle</append> <!-- Fn+F8 CRT/LCD -->
+ <append key="input.keymap.data" type="strlist">e00f:switchvideomode</append> <!-- Fn+F7 aspect ratio -->
<append key="info.capabilities" type="strlist">input.keymap</append>
</match>
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="D610">
- <append key="input.keymap.data" type="strlist">e007:battery</append> <!-- Fn+F3 battery icon -->
- <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">e00a:suspend</append> <!-- Fn+F1 hibernate -->
+ <append key="input.keymap.data" type="strlist">e006:brightnessup</append> <!-- Fn+Up arrow Brightness Up -->
+ <append key="input.keymap.data" type="strlist">e007:battery</append> <!-- Fn+F3 battery icon -->
<append key="input.keymap.data" type="strlist">e008:wlan</append> <!-- Fn+F2 Turn On/Off Wireless -->
<append key="input.keymap.data" type="strlist">e009:ejectclosecd</append> <!-- Fn+F10 Eject CD -->
+ <append key="input.keymap.data" type="strlist">e00a:suspend</append> <!-- Fn+F1 hibernate -->
+ <append key="input.keymap.data" type="strlist">e00b:displaytoggle</append> <!-- Fn+F8 CRT/LCD -->
<append key="info.capabilities" type="strlist">input.keymap</append>
</match>
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="D620">
+ <append key="input.keymap.data" type="strlist">e005:brightnessdown</append> <!-- Fn+Down arrow Brightness Down -->
+ <append key="input.keymap.data" type="strlist">e006:brightnessup</append> <!-- Fn+Up arrow Brightness Up -->
<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">e008:wlan</append> <!-- Turn On/Off Wireless -->
+ <append key="input.keymap.data" type="strlist">e00a:suspend</append> <!-- Fn+F1 hibernate -->
<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">e00f:switchvideomode</append> <!-- Fn+F7 aspect ratio -->
<append key="input.keymap.data" type="strlist">e013:f23</append> <!-- Fn+Left arrow Auto Brightness -->
- <append key="input.keymap.data" type="strlist">e00a:suspend</append> <!-- Fn+F1 hibernate -->
- <append key="input.keymap.data" type="strlist">e008:wlan</append> <!-- Turn On/Off Wireless -->
<append key="info.capabilities" type="strlist">input.keymap</append>
</match>
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="D630">
- <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">e013:f23</append> <!-- Fn+Left arrow Auto Brightness -->
- <append key="input.keymap.data" type="strlist">e00a:suspend</append> <!-- Fn+F1 hibernate -->
+ <append key="input.keymap.data" type="strlist">e006:brightnessup</append> <!-- Fn+Up arrow Brightness Up -->
+ <append key="input.keymap.data" type="strlist">e007:battery</append> <!-- Fn+F3 battery icon -->
<append key="input.keymap.data" type="strlist">e008:wlan</append> <!-- Turn On/Off Wireless -->
+ <append key="input.keymap.data" type="strlist">e00a:suspend</append> <!-- Fn+F1 hibernate -->
+ <append key="input.keymap.data" type="strlist">e00b:displaytoggle</append> <!-- Fn+F8 CRT/LCD -->
+ <append key="input.keymap.data" type="strlist">e00f:switchvideomode</append> <!-- Fn+F7 aspect ratio -->
<append key="input.keymap.data" type="strlist">e011:prog1</append> <!-- Wifi Catcher (DELL Specific) -->
+ <append key="input.keymap.data" type="strlist">e013:f23</append> <!-- Fn+Left arrow Auto Brightness -->
<append key="info.capabilities" type="strlist">input.keymap</append>
</match>
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="D820">
+ <append key="input.keymap.data" type="strlist">e005:brightnessdown</append> <!-- Fn+Down arrow Brightness Down -->
+ <append key="input.keymap.data" type="strlist">e006:brightnessup</append> <!-- Fn+Up arrow Brightness Up -->
<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">e00a:suspend</append> <!-- Fn+F1 hibernate -->
<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">e00f:switchvideomode</append> <!-- Fn+F7 aspect ratio -->
<append key="input.keymap.data" type="strlist">e013:f23</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> <!-- prefix="Latitude" -->
@@ -77,25 +77,25 @@
</match>
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" prefix="MXC061"> <!-- Dell Inspiron 640m -->
- <append key="input.keymap.data" type="strlist">e00a:suspend</append> <!-- Fn+F1 hibernate -->
- <append key="input.keymap.data" type="strlist">e008:wlan</append> <!-- Fn+F2 Toggle WiFi -->
+ <append key="input.keymap.data" type="strlist">e005:brightnessdown</append> <!-- Fn+Down arrow Brightness Down -->
+ <append key="input.keymap.data" type="strlist">e006:brightnessup</append> <!-- Fn+Up arrow Brightness Up -->
<append key="input.keymap.data" type="strlist">e007:battery</append> <!-- Fn+F3 battery icon -->
- <append key="input.keymap.data" type="strlist">e00b:switchvideomode</append> <!-- Fn+F8 CRT/LCD -->
+ <append key="input.keymap.data" type="strlist">e008:wlan</append> <!-- Fn+F2 Toggle WiFi -->
<append key="input.keymap.data" type="strlist">e009:ejectclosecd</append> <!-- Fn+F10 Eject CD -->
- <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">e00a:suspend</append> <!-- Fn+F1 hibernate -->
+ <append key="input.keymap.data" type="strlist">e00b:switchvideomode</append> <!-- Fn+F8 CRT/LCD -->
<append key="input.keymap.data" type="strlist">e012:media</append> <!-- MediaDirect button (house icon) -->
<append key="info.capabilities" type="strlist">input.keymap</append>
</match>
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" prefix="MXC062"> <!-- Dell XPS M1210 -->
- <append key="input.keymap.data" type="strlist">e007:battery</append> <!-- Fn+F3 Battery icon -->
- <append key="input.keymap.data" type="strlist">e00b:switchvideomode</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">e00a:suspend</append> <!-- Fn+F1 Hibernate -->
+ <append key="input.keymap.data" type="strlist">e006:brightnessup</append> <!-- Fn+Up arrow Brightness Up -->
+ <append key="input.keymap.data" type="strlist">e007:battery</append> <!-- Fn+F3 Battery icon -->
<append key="input.keymap.data" type="strlist">e008:wlan</append> <!-- Wirelesss switch -->
<append key="input.keymap.data" type="strlist">e008:bluetooth</append> <!-- FIXME Bluetooth switch (same as wireless) -->
+ <append key="input.keymap.data" type="strlist">e00a:suspend</append> <!-- Fn+F1 Hibernate -->
+ <append key="input.keymap.data" type="strlist">e00b:switchvideomode</append> <!-- Fn+F8 CRT/LCD -->
<append key="input.keymap.data" type="strlist">e012:media</append> <!-- Dell MediaDirect button Opens Dell Media Experience (a sort of media player) -->
<append key="input.keymap.data" type="strlist">e015:camera</append> <!-- Shutter button Takes a picture if optional camera available -->
<append key="info.capabilities" type="strlist">input.keymap</append>
@@ -103,24 +103,24 @@
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" prefix="Inspiron">
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="8500">
- <append key="input.keymap.data" type="strlist">e007:battery</append> <!-- Fn+F3 battery icon -->
- <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">e006:brightnessup</append> <!-- Fn+Up arrow Brightness Up -->
+ <append key="input.keymap.data" type="strlist">e007:battery</append> <!-- Fn+F3 battery icon -->
<append key="input.keymap.data" type="strlist">e008:wlan</append> <!-- Fn+F2 Toggle WiFi -->
<append key="input.keymap.data" type="strlist">e009:ejectclosecd</append> <!-- Fn+F10 Eject CD -->
<append key="info.capabilities" type="strlist">input.keymap</append>
</match>
</match>
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" prefix="MM061"> <!-- Inspiron E1505/6400 -->
- <append key="input.keymap.data" type="strlist">e005:brightnessdown</append> <!-- Fn+Down arrow Brightness Down -->
- <append key="input.keymap.data" type="strlist">e006:brightnessup</append> <!-- Fn+Up arrow Brightness Up -->
- <append key="input.keymap.data" type="strlist">e007:battery</append> <!-- Fn+F3 battery icon -->
- <append key="input.keymap.data" type="strlist">e008:bluetooth</append> <!-- Fn+F2 bluetooth -->
- <append key="input.keymap.data" type="strlist">e009:ejectclosecd</append> <!-- Fn+F10 Eject CD -->
- <append key="input.keymap.data" type="strlist">e00a:suspend</append> <!-- Fn+F1 Hibernate -->
- <append key="input.keymap.data" type="strlist">e00b:switchvideomode</append> <!-- Fn+F8 CRT/LCD -->
- <append key="input.keymap.data" type="strlist">e012:media</append> <!-- MediaDirect button (house icon) -->
- <append key="info.capabilities" type="strlist">input.keymap</append>
+ <append key="input.keymap.data" type="strlist">e005:brightnessdown</append> <!-- Fn+Down arrow Brightness Down -->
+ <append key="input.keymap.data" type="strlist">e006:brightnessup</append> <!-- Fn+Up arrow Brightness Up -->
+ <append key="input.keymap.data" type="strlist">e007:battery</append> <!-- Fn+F3 battery icon -->
+ <append key="input.keymap.data" type="strlist">e008:bluetooth</append> <!-- Fn+F2 bluetooth -->
+ <append key="input.keymap.data" type="strlist">e009:ejectclosecd</append> <!-- Fn+F10 Eject CD -->
+ <append key="input.keymap.data" type="strlist">e00a:suspend</append> <!-- Fn+F1 Hibernate -->
+ <append key="input.keymap.data" type="strlist">e00b:switchvideomode</append> <!-- Fn+F8 CRT/LCD -->
+ <append key="input.keymap.data" type="strlist">e012:media</append> <!-- MediaDirect button (house icon) -->
+ <append key="info.capabilities" type="strlist">input.keymap</append>
</match>
</match>
</match>
diff-tree 99aaae3e58698f75ebbcb88c8d27e6bf45b579c7 (from 1e35ae7ec96ee063b9868c59a85b956710fdb32c)
Author: osma ahvenlampi <oa at iki.fi>
Date: Tue Aug 14 12:52:35 2007 +0100
add keymap for Acer TravelMate 6292
New computer, new hal-info patch :)
No quirks needed, though I find VBE POST doesn't hurt and might even
be helpful, but this makes the special keys work:
diff --git a/fdi/information/10freedesktop/30-keymap-acer.fdi b/fdi/information/10freedesktop/30-keymap-acer.fdi
index 9e48f75..62ceea4 100644
--- a/fdi/information/10freedesktop/30-keymap-acer.fdi
+++ b/fdi/information/10freedesktop/30-keymap-acer.fdi
@@ -280,6 +280,22 @@
<append key="input.keymap.data" type="strlist">e074:prog1</append> <!-- "e" Acer eManager button -->
<append key="info.capabilities" type="strlist">input.keymap</append>
</match>
+ <!-- TravelMate 6292 -->
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="6292">
+ <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">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">e059: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">e071:f22</append> <!-- Fn+F7 Touchpad toggle (off-to-on) -->
+ <append key="input.keymap.data" type="strlist">e072:f22</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="info.capabilities" type="strlist">input.keymap</append>
+ </match>
</match>
</match>
</match>
diff-tree 1e35ae7ec96ee063b9868c59a85b956710fdb32c (from 0fa94ede0b504850a616466b17c5cefba050cbe4)
Author: Pekka Pietikainen <pp at ee.oulu.fi>
Date: Mon Aug 13 09:03:06 2007 +0100
add suspend quirk for X31 (2672CBG) backlight quirk
Well, the attached patch makes the backlight on my X31 really go off when
suspending (it doesn't, and the battery runs out in a few hours).
There's something funny about the current quirk though, mine is
matched by a entry that is commented as X40,
<match key=system.hardware.product prefix=2672>
system.chassis.manufacturer = 'IBM' (string)
system.chassis.type = 'Notebook' (string)
system.firmware.release_date = '09/22/2005' (string)
system.firmware.vendor = 'IBM' (string)
system.firmware.version = '1QET97WW (3.02 )' (string)
system.formfactor = 'laptop' (string)
system.hardware.primary_video.product = 19545 (0x4c59) (int)
system.hardware.primary_video.vendor = 4098 (0x1002) (int)
system.hardware.product = '2672CBG' (string)
system.hardware.serial = '99CDPCY' (string)
system.hardware.uuid = 'DCA94A01-4757-11CB-B939-E5EBFBD084DE' (string)
system.hardware.vendor = 'IBM' (string)
system.hardware.version = 'ThinkPad X31' (string)
system.kernel.machine = 'i686' (string)
system.kernel.name = 'Linux' (string)
system.kernel.version = '2.6.23-0.71.rc2.fc8' (string)
system.product = '2672CBG ThinkPad X31' (string)
In fact, dpms_suspend is the only quirk I need, radeon_off/s3_bios&mode
seem to do neither help nor hinder (maybe make suspend/resume slower)...
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
index 8b7b7c9..4f0710d 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
@@ -18,6 +18,7 @@
</match>
<!-- X40 -->
<match key="system.hardware.product" prefix="2672">
+ <merge key="power_management.quirk.dpms_suspend" type="bool">true</merge>
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
<merge key="power_management.quirk.radeon_off" type="bool">true</merge>
diff-tree 0fa94ede0b504850a616466b17c5cefba050cbe4 (from 3e00518ed2f0d48d106a32200507a2a7ce4985df)
Author: Aurelien Bompard <aurelien at bompard.org>
Date: Mon Aug 13 08:59:14 2007 +0100
add suspend quirk for hp 6320
Hi all,
This patch fixes suspend on my HP 6320. It should be pretty straightforward,
it's a simple copy of the 6120 entry.
FYI, on this laptop I'm running Fedora 7 with hal-info 20070725, kernel
2.6.22.1 and the intel video driver.
With the patch, it works like a charm :)
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
index 065f768..5d44520 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
@@ -66,6 +66,10 @@
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
<merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
</match>
+ <match key="system.hardware.product" contains="nc6320">
+ <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
+ <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
+ </match>
</match>
</device>
</deviceinfo>
diff-tree 3e00518ed2f0d48d106a32200507a2a7ce4985df (from 7dde0e41a0ad0a10170dbe4549561d61580f2353)
Author: Frederic Crozat <fcrozat at mandriva.com>
Date: Fri Aug 10 19:28:02 2007 +0200
remove vbestate_restore quirk for Dell M65
Remove vbestate_restore quirk, it might break suspend for this laptop
(it is known to work with only vbe-post)
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
index d47052b..1c0aa4b 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
@@ -6,7 +6,6 @@
<match key="system.hardware.product" contains="M65">
<merge key="power_management.quirk.dpms_on" type="bool">true</merge>
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
- <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
</match>
<match key="system.hardware.product" prefix="Latitude">
diff-tree 7dde0e41a0ad0a10170dbe4549561d61580f2353 (from cdd641dc9133cdc43ca351cde1b15775cedd4905)
Author: Angel Marin <anmar at anmar.eu.org>
Date: Fri Aug 10 19:24:20 2007 +0200
quirk for Dell XPS M1210
Since the last set of fedora updates, the attached quirk is needed to
make a dell xps m1210 (with the integrated intel graphics card) suspend
reliably.
On iwl land, it now suspends and resumes without unloading the module
since fedora's 2.6.22.1-41 kernel. Though with the iwl patch included in
that kernel removing module does no longer works, so to the general
advise (on hal quirk site) to put iwl3945 in SUSPEND_MODULES, a note
should be added to try suspending without it first on recent kernels.
Otherwise adding the module will just put the system in a mostly useless
state when trying to suspend.
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
index bfe018f..d47052b 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
@@ -86,6 +86,10 @@
<merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
</match>
+ <!-- Dell XPS M1210 -->
+ <match key="system.hardware.product" prefix="MXC062">
+ <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
+ </match>
</match>
</device>
</deviceinfo>
diff-tree cdd641dc9133cdc43ca351cde1b15775cedd4905 (from 381d55fe8238efed31459bc21d8623215f81cc97)
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Fri Aug 10 17:58:28 2007 +0200
add support for M-Cody M20 USB mp3 player
Applied adopted patch from Doug Goldstein <cardoe at gentoo.org> to
add support for a M-Cody M20 USB mp3 player.
diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 4b5f75b..28a17bb 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -844,8 +844,19 @@
</match>
</match>
- <!-- Maxfield -->
+ <!-- Maxfield, M-Cody -->
<match key="@storage.originating_device:usb.vendor_id" int="0x1890">
+ <!-- M-Cody M20 -->
+ <match key="@storage.originating_device:usb.product_id" int="0x0001">
+ <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>
+ <append key="portable_audio_player.output_formats" type="strlist">application/ogg</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>
+ <append key="portable_audio_player.audio_folders" type="strlist">voice/</append>
+ <append key="portable_audio_player.audio_folders" type="strlist">fm/</append>
+ </match>
<!-- Maxfield MAX-SIN TOUCH -->
<match key="@storage.originating_device:usb.product_id" int="0x0110">
<merge key="portable_audio_player.type" type="string">generic</merge>
diff-tree 381d55fe8238efed31459bc21d8623215f81cc97 (from 0011a3c481acd835432fc08244e7889b4dec299a)
Author: Theo van Klaveren <t.vanklaveren at student.utwente.nl>
Date: Fri Aug 10 17:51:57 2007 +0200
Keymap for Acer Aspire 3620
> Just saw the committed keymap for the Acer Aspire 3610. I can
> confirm that that keymap is identical to the keymap for the
> Aspire 3620.
> Something like the attached patch should do it, I think.
diff --git a/fdi/information/10freedesktop/30-keymap-acer.fdi b/fdi/information/10freedesktop/30-keymap-acer.fdi
index dc66181..9e48f75 100644
--- a/fdi/information/10freedesktop/30-keymap-acer.fdi
+++ b/fdi/information/10freedesktop/30-keymap-acer.fdi
@@ -112,6 +112,7 @@
<append key="input.keymap.data" type="strlist">e074:prog1</append> <!-- "e" Acer eManager button -->
<append key="info.capabilities" type="strlist">input.keymap</append>
</match>
+ <!-- Aspire 3610 and Aspire 3620 are identical -->
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="3610">
<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 -->
@@ -129,6 +130,24 @@
<append key="input.keymap.data" type="strlist">e074:prog1</append> <!-- "e" Acer eManager button -->
<append key="info.capabilities" type="strlist">input.keymap</append>
</match>
+ <!-- Aspire 3610 and Aspire 3620 are identical -->
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="3620">
+ <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: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">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 -->
+ <append key="input.keymap.data" type="strlist">e058:bluetooth</append> <!-- Bluetooth (toggle) off-to-on -->
+ <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:f22</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="info.capabilities" type="strlist">input.keymap</append>
+ </match>
<!-- Aspire 3020 and Aspire 5020 are identical -->
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="5020">
<append key="input.keymap.data" type="strlist">e025:help</append> <!-- Fn+F1 Hotkey help -->
diff-tree 0011a3c481acd835432fc08244e7889b4dec299a (from c0430118b551ff22e90825192561b44bf8f804f6)
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Mon Aug 6 17:40:47 2007 +0200
add support for Thomson PDP9512FM entry from fd.o #10901
Applied slightly adopted patch from Lukáš Lalinský <lalinsky at gmail.com>
(from fd.o #10901) to add support for Thomson PDP9512FM USB mp3 player.
diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 40ab86c..4b5f75b 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -422,6 +422,14 @@
<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>
+ <!-- Thomson PDP9512FM -->
+ <match key="@storage.originating_device:usb.product_id" int="0x76b">
+ <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>
+ <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>
</match>
<!-- SanDisk -->
diff-tree c0430118b551ff22e90825192561b44bf8f804f6 (from f5b9163235e8539ba0645eff4a31a5d6534cd8bc)
Author: Ilya Konstantinov <freedesktop-bugzilla at future.shiny.co.il>
Date: Mon Aug 6 15:15:34 2007 +0200
add support for MPMan USB mp3 player
Applied patch from fd.o #11170:
> Another variant of the good old MPMan which I've recently acquired
> with PID 0x1101. Same abilities as the PID 0x1100 one.
> Also updated the PID 0x1100 one with the proper folder_depth (tested
> - 1 folder depth is supported, 2 folder depths are not).
diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 73d3ec8..40ab86c 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -780,18 +780,26 @@
</match>
</match>
- <!-- Foston, MPMan -->
+ <!-- Foston, MPMan, Actions Semiconductor -->
<match key="@storage.originating_device:usb.vendor_id" int="0x10d6">
<!-- Foston 128/256MB / MPMan MP-Ki 128 Player -->
<match key="@storage.originating_device:usb.product_id" int="0x1100">
<merge key="portable_audio_player.type" type="string">generic</merge>
<merge key="portable_audio_player.access_method" type="string">storage</merge>
- <merge key="portable_audio_player.folder_depth" type="int">0</merge>
+ <merge key="portable_audio_player.folder_depth" type="int">1</merge>
+ <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>
+ <!-- A similar 2GB MP3 Player -->
+ <match key="@storage.originating_device:usb.product_id" int="0x1101">
+ <merge key="portable_audio_player.type" type="string">generic</merge>
+ <merge key="portable_audio_player.access_method" type="string">storage</merge>
+ <merge key="portable_audio_player.folder_depth" type="int">1</merge>
<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>
-
</match>
<!-- Jens of Sweden -->
diff-tree f5b9163235e8539ba0645eff4a31a5d6534cd8bc (from 004d59ead4d2cc0217ff4c48ffae382d5fb95011)
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Mon Aug 6 15:09:53 2007 +0200
added support for Sony Ericsson K610i as mp3 player
Added adopted patch from Olivier Berger <oberger at ouvaton.org> (fd.o #11221)
to support Sony Ericsson K610i as USB mp3 player.
diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index e93f1d5..73d3ec8 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -673,6 +673,13 @@
<append key="portable_audio_player.audio_folders" type="strlist">MSSEMC/Media files/audio/</append>
</match>
+ <!-- K610i mobile phone -->
+ <match key="@storage.originating_device:usb.product_id" int="0xe046">
+ <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.input_formats" type="strlist">audio/x-wav</append>
+ </match>
+
<!-- W800 Walkman Phone -->
<!-- media files go in mp3/$ARTIST/$ALBUM/$TRACKNAME -->
<match key="@storage.originating_device:usb.product_id" int="0xd028">
diff-tree 004d59ead4d2cc0217ff4c48ffae382d5fb95011 (from f743c790e816c5613cc4ddfe711bca92296faa84)
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Mon Aug 6 14:09:29 2007 +0200
add support for Zen Nano Plus from fd.o #11756
Added slightly adopted patch from fd.o #11756 send/reported by
Claudio Saavedra <csaavedra at alumnos.utalca.cl> to add support for
Zen Nano Plus.
diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 9efb2e8..e93f1d5 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -98,6 +98,14 @@
<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>
+ <!-- Zen Nano Plus-->
+ <match key="@storage.originating_device:usb.product_id" int="0x4139">
+ <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>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
+ <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
+ </match>
<!-- Zen Stone -->
<match key="@storage.originating_device:usb.product_id" int="0x4154">
<merge key="portable_audio_player.type" type="string">generic</merge>
diff-tree f743c790e816c5613cc4ddfe711bca92296faa84 (from ca0aee4be0475c3aba542d4c48217cc87545342b)
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Mon Aug 6 13:49:45 2007 +0200
added support for TrekStor Vibez mp3 player from fd.o #11736
Added adopted patch from Sharmarke Aden <aden.list at gmail.com> from fd.o #11736
to add support for TrekStor Vibez mp3 player.
diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 2ab23a2..9efb2e8 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -371,6 +371,18 @@
<append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
<append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
</match>
+ <!-- TrekStor vibez -->
+ <match key="@storage.originating_device:usb.product_id" int="0x842a">
+ <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.output_formats" type="strlist">audio/flac</append>
+ <append key="portable_audio_player.playlist_format" type="strlist">audio/x-scpls</append>
+ <append key="portable_audio_player.playlist_format" type="strlist">audio/x-mpegurl</append>
+ <append key="portable_audio_player.playlist_format" type="strlist">application/vnd.ms-wpl</append>
+ </match>
</match>
<!-- RCA -->
diff-tree ca0aee4be0475c3aba542d4c48217cc87545342b (from bc910e84c24a999f844d10303642f73468483b57)
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Mon Aug 6 13:39:21 2007 +0200
added Meizu Mini Player M6 audio player from fd.o #11735
Added adopted patch from Michael Budde <mbudde at gmail.com> from fd.o #11735
to add Meizu Mini Player M6 audio player.
diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 298b1f2..2ab23a2 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -180,6 +180,24 @@
</match>
</match>
+ <!-- Meizu -->
+ <match key="@storage.originating_device:usb.vendor_id" int="0x492">
+ <!-- Mini Player M6 -->
+ <match key="@storage.originating_device:usb.product_id" int="0x140">
+ <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/flac</append>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
+ <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
+ <append key="portable_audio_player.audio_folders" type="strlist">MUSIC/</append>
+ <append key="portable_audio_player.audio_folders" type="strlist">RECORD/</append>
+ <append key="portable_audio_player.playlist_formats" type="strlist">audio/x-mpegurl</append>
+ <append key="portable_audio_player.playlist_path" type="string">PLAYLISTS/%File</append>
+ </match>
+ </match>
+
<!--Panasonic -->
<match key="@storage.originating_deviceusb.vendor_id" int="0x4da">
<!--Panasonic SV-MP31V-->
diff-tree bc910e84c24a999f844d10303642f73468483b57 (from fc0cb07cb3a754fe3603301c5bfe22be6187b186)
Author: Jonathan Matthew <jonathan at kaolin.wh9.net>
Date: Mon Aug 6 13:30:06 2007 +0200
added support for iRiver T30 UMS firmware v1.7
From fd.o #11698:
> Version 1.7 (or perhaps earlier) of the firmware for the iRiver T30
> (USB mass storage version) changes the device ID from 0x1018 to 0x1019.
> It also adds a new playlist format that I'm working on adding support
> for, audio/x-iriver-pla.
diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 862e62d..298b1f2 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -845,6 +845,16 @@
<append key="portable_audio_player.output_formats" type="strlist">application/ogg</append>
<append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
</match>
+ <!-- T30 UMS firmware v1.7 -->
+ <match key="@storage.originating_device:usb.product_id" int="0x1019">
+ <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>
+ <append key="portable_audio_player.output_formats" type="strlist">application/ogg</append>
+ <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
+ <append key="portable_audio_player.playlist_format" type="strlist">audio/x-iriver-pla</append>
+ <append key="portable_audio_player.playlist_path" type="strlist">Playlists/%File</append>
+ </match>
<!-- T10 UMS -->
<match key="@storage.originating_device:usb.product_id" int="0x1020">
<merge key="portable_audio_player.type" type="string">generic</merge>
diff-tree fc0cb07cb3a754fe3603301c5bfe22be6187b186 (from 3044be7d86fcee550a385cef8a7df4cfc169c349)
Author: David Wilkins <dwilkins at conecuh.com>
Date: Sat Aug 4 09:21:41 2007 +0100
add quirk for z60t
This patch adds the z60t to the quirks file
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
index 05fe19a..8b7b7c9 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
@@ -70,6 +70,11 @@
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
+ <!-- Z60t -->
+ <match key="system.hardware.product" prefix="2513">
+ <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
+ <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
+ </match>
</match>
</device>
</deviceinfo>
More information about the hal-commit
mailing list