hal-info: Branch 'master' - 8 commits
Danny Kukawka
dkukawka at kemper.freedesktop.org
Wed Aug 10 01:50:02 PDT 2011
fdi/information/10freedesktop/10-modem.fdi | 17 ++++++++++++
fdi/information/10freedesktop/10-usb-music-players.fdi | 8 ++++-
fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi | 1
fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi | 5 +++
fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi | 2 -
fdi/information/10freedesktop/30-keymap-hp.fdi | 9 ++++--
6 files changed, 38 insertions(+), 4 deletions(-)
New commits:
commit 03c30f528636452cdc3fc6cf985010b0a2c9306e
Author: Dirk Fieldhouse <fieldhouse at gmx.net>
Date: Wed Aug 10 10:41:10 2011 +0200
fix suspend quirks for Toshiba Tecra T8xx/T9xx
Fixed suspend quirks for Toshiba Tecra T8xx/T9xx Laptops.
fd.o#34236
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi
index 2c3113b..216636f 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi
@@ -49,7 +49,7 @@
</match>
<!-- Tecra Laptops -->
- <match key="system.hardware.product" prefix="TECRA">
+ <match key="system.hardware.product" prefix_outof="TECRA;T8;T9">
<match key="system.hardware.product" contains_outof="8100;8200; M9">
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
commit 01ebce6843d6e1ebdb62618cfaa76de44beb9da4
Author: Gary Ching-Pang Lin <chingpang at gmail.com>
Date: Thu Jan 27 15:59:37 2011 +0800
add the new keymap for some HP machines
Signed-off-by: Danny Kukawka <danny.kukawka at web.de>
diff --git a/fdi/information/10freedesktop/30-keymap-hp.fdi b/fdi/information/10freedesktop/30-keymap-hp.fdi
index b28a93a..863d6eb 100644
--- a/fdi/information/10freedesktop/30-keymap-hp.fdi
+++ b/fdi/information/10freedesktop/30-keymap-hp.fdi
@@ -89,6 +89,11 @@
</match>
</match>
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="Presario CQ43;Presario CQ57;HP 635">
+ <!-- HP Compaq Presario CQ43, Presario CQ57, HP 635 -->
+ <append key="input.keymap.data" type="strlist">e066:switchvideomode</append> <!-- FnF4 (video switch) -->
+ </match>
+
</match>
</match>
</match>
commit 64eca43cff84f833014d10e0660c1d3ac237bf85
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Thu Mar 31 07:48:41 2011 +0200
add keymapping for HP EliteBook 2760p
Added keymapping for HP EliteBook 2760p (TabletPC).
diff --git a/fdi/information/10freedesktop/30-keymap-hp.fdi b/fdi/information/10freedesktop/30-keymap-hp.fdi
index 825e2c8..b28a93a 100644
--- a/fdi/information/10freedesktop/30-keymap-hp.fdi
+++ b/fdi/information/10freedesktop/30-keymap-hp.fdi
@@ -63,7 +63,7 @@
<append key="input.keymap.data" type="strlist">e059:help</append> <!-- I key (high keycode: "info") -->
</match>
- <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="2510p;2530p">
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="2510p;2530p;2760p">
<!-- The 2510p seems to be unique in having a touchpad disable button despite being an enterprise model -->
<remove key="input.keymap.data" type="strlist">e059:help</remove>
<append key="input.keymap.data" type="strlist">e058:f22</append> <!-- touchpad off -->
commit a20b5bebd632b9c49eb2d25ea5615b29c94749a3
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Fri Sep 10 15:47:08 2010 +0200
fixed keymap detection for HP Pavillion dv6315ea
Fixed keymap detection for HP Pavillion dv6315ea due to new
BIOS version/update.
fd.o#19936
diff --git a/fdi/information/10freedesktop/30-keymap-hp.fdi b/fdi/information/10freedesktop/30-keymap-hp.fdi
index 88a4690..825e2c8 100644
--- a/fdi/information/10freedesktop/30-keymap-hp.fdi
+++ b/fdi/information/10freedesktop/30-keymap-hp.fdi
@@ -82,7 +82,7 @@
<match key="/org/freedesktop/Hal/devices/computer:system.board.vendor" string="Quanta">
<!-- HP Pavillion dv6315ea with empty system.hardware.* keys fd.o#19936 -->
<match key="/org/freedesktop/Hal/devices/computer:system.board.product" string="30B7">
- <match key="/org/freedesktop/Hal/devices/computer:system.board.version" string="65.2B">
+ <match key="/org/freedesktop/Hal/devices/computer:system.board.version" string_outof="65.2B;65.28">
<remove key="input.keymap.data" type="strlist">e008:presentation</remove>
<append key="input.keymap.data" type="strlist">e008:media</append> <!-- FIXME: quick play -->
</match>
commit 943e6a314caac4c8e8a0ccfc21c9de7060a19baa
Author: cyli <cyli at alum.mit.edu>
Date: Thu Sep 9 14:04:48 2010 +0200
add Kindle 2 as usb music player
Added Kindle 2 as usb music player.
lp#407875
diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 8b326f5..26bfce2 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -1091,11 +1091,17 @@
<!-- Amazon -->
<match key="@storage.originating_device:usb.vendor_id" int="0x1949">
- <!-- Amazon Kindle -->
+ <!-- Amazon Kindle 1 -->
<match key="@storage.originating_device:usb.product_id" int="0x0001">
<addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
<append key="portable_audio_player.audio_folders" type="strlist">music/</append>
</match>
+ <!-- Amazon Kindle 2 -->
+ <match key="@storage.originating_device:usb.product_id" int="0x2">
+ <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
+ <append key="portable_audio_player.audio_folders" type="strlist">music/</append>
+ <merge key="storage.requires_eject" type="bool">true</merge>
+ </match>
</match>
<!-- Insignia -->
commit 6902fe33b85f37194a1790baa38f1c1f31e314f7
Author: Hendy Irawan <gauldong at gmail.com>
Date: Thu Sep 9 13:57:25 2010 +0200
added HAIER CE100 CDMA Modem (vendor ID 0x201e, product ID 0x2009)
Added HAIER CE100 CDMA Modem (vendor ID 0x201e, product ID 0x2009)
as modem. lp#490002
diff --git a/fdi/information/10freedesktop/10-modem.fdi b/fdi/information/10freedesktop/10-modem.fdi
index bc9cfdd..b60def1 100644
--- a/fdi/information/10freedesktop/10-modem.fdi
+++ b/fdi/information/10freedesktop/10-modem.fdi
@@ -392,6 +392,23 @@
</match>
</match>
+ <!-- HAIER CE100 -->
+ <match key="@info.parent:usb.vendor_id" int="0x201e">
+ <match key="@info.parent:usb.product_id" int_outof="0x2009">
+ <match key="@info.parent:usb.interface.number" int="0">
+ <append key="modem.command_sets" type="strlist">IS-707-A</append>
+ <append key="info.capabilities" type="strlist">modem</append>
+ </match>
+ </match>
+
+ <!-- Qualcomm 3G modem -->
+ <match key="@info.parent:usb.product_id" int="0x9212">
+ <!-- There's only one port bound to by the driver, so no need to specify the specific port. -->
+ <append key="modem.command_sets" type="strlist">GSM-07.07</append>
+ <append key="modem.command_sets" type="strlist">GSM-07.05</append>
+ </match>
+ </match>
+
<match key="@info.parent:usb.vendor_id" int="0x22b8">
<!-- BUSlink UM-864GW USB GPRS Modem (Model SCWi275u), Motorola G24 USB GPRS Modem -->
<match key="@info.parent:usb.product_id" int_outof="0x3802;0x4902">
commit 96233b213eae9f54a01266022dbb6bf6a30da996
Author: Andika Triwidada <andika at gmail.com>
Date: Thu Sep 9 13:51:19 2010 +0200
added suspend quirks for 'Intel powered Classmate PC'
Added suspend quirks for 'Intel powered Classmate PC'.
lp#370778
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
index 4f08a94..44d3350 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
@@ -41,6 +41,11 @@
</match>
</device>
<device>
+ <match key="system.hardware.product" prefix="Intel powered Classmate PC">
+ <merge key="power_management.quirk.dpms_on" type="bool">true</merge>
+ </match>
+ </device>
+ <device>
<match key="system.hardware.vendor" string="JVC">
<match key="system.hardware.product" string="J2N ">
<merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
commit 704b6e796a4ada939a949b055d2cca704d1941bf
Author: Rob Foehl <rwf at loonybin.net>
Date: Thu Sep 9 13:46:05 2010 +0200
fix suspend quirk for Dell Latitude C600
Fixed suspend quirk for Dell Latitude C600. Use dpms_suspend.
lp#370617
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
index 033759a..c24512a 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
@@ -10,6 +10,7 @@
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
</match>
<match key="system.hardware.product" contains="C600">
+ <merge key="power_management.quirk.dpms_suspend" type="bool">true</merge>
<merge key="power_management.quirk.radeon_off" type="bool">true</merge>
</match>
<match key="system.hardware.product" contains="C800">
More information about the hal-commit
mailing list