hal-info: Branch 'master'
Danny Kukawka
dkukawka at kemper.freedesktop.org
Mon Aug 25 11:00:43 PDT 2008
fdi/information/10freedesktop/10-cd-dvd-burner.fdi | 4 -
fdi/information/10freedesktop/10-dell-rfkill-switch-wlan.fdi | 2
fdi/information/10freedesktop/10-ipw-rfkill-switch.fdi | 2
fdi/information/10freedesktop/10-laptop-panel-hardware.fdi | 2
fdi/information/10freedesktop/10-modem.fdi | 12 +--
fdi/information/10freedesktop/10-sony-bluetooth-switch.fdi | 2
fdi/information/10freedesktop/10-usb-card-readers.fdi | 20 +++---
fdi/information/10freedesktop/10-usb-music-players.fdi | 32 +++++-----
fdi/information/10freedesktop/10-usb-pda.fdi | 4 -
fdi/information/10freedesktop/10-usbcsr-mice.fdi | 4 -
fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi | 6 -
fdi/information/10freedesktop/20-video-quirk-pm-apple.fdi | 2
fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi | 2
fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi | 14 ++--
fdi/information/10freedesktop/20-video-quirk-pm-fujitsu.fdi | 8 +-
fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi | 10 +--
fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi | 8 +-
fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi | 10 +--
fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi | 2
fdi/information/10freedesktop/20-video-quirk-pm-samsung.fdi | 2
fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi | 4 -
fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi | 20 +++---
fdi/information/10freedesktop/21-video-quirk-nvidia.fdi | 2
fdi/information/10freedesktop/30-keymap-acer.fdi | 10 +--
fdi/information/10freedesktop/30-keymap-hp.fdi | 2
fdi/information/10freedesktop/30-keymap-misc.fdi | 12 +--
fdi/information/10freedesktop/30-keymap-module-sony-laptop.fdi | 2
fdi/information/10freedesktop/99-video-quirk-default.fdi | 2
fdi/preprobe/10osvendor/10-ide-drives.fdi | 4 -
29 files changed, 103 insertions(+), 103 deletions(-)
New commits:
commit 5e26a07574f75f721bf76bcf52a9ea4f5adfe108
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Mon Aug 25 19:59:58 2008 +0200
removed needless whitespaces at the end of lines
Removed needless whitespaces at the end of lines.
diff --git a/fdi/information/10freedesktop/10-cd-dvd-burner.fdi b/fdi/information/10freedesktop/10-cd-dvd-burner.fdi
index 0cb920f..3cee7fa 100644
--- a/fdi/information/10freedesktop/10-cd-dvd-burner.fdi
+++ b/fdi/information/10freedesktop/10-cd-dvd-burner.fdi
@@ -4,7 +4,7 @@
<device>
- <!-- Handle broken CD/DVD burner which reports from capabilities.
+ <!-- Handle broken CD/DVD burner which reports from capabilities.
Taken from nautilus-cd-burner-2.12. (fd.o Bug #3036) -->
<match key="storage.model" string="IOMEGA - CDRW9602EXT-B">
<merge key="storage.cdrom.cdr" type="bool">true</merge>
@@ -18,7 +18,7 @@
<merge key="storage.cdrom.dvdr" type="bool">false</merge>
<merge key="storage.cdrom.dvdram" type="bool">false</merge>
</match>
-
+
<!-- Handle TEAC CD-R55S, taken from :
http://lists.freedesktop.org/archives/hal/2005-November/003925.html -->
<match key="storage.vendor" string="TEAC">
diff --git a/fdi/information/10freedesktop/10-dell-rfkill-switch-wlan.fdi b/fdi/information/10freedesktop/10-dell-rfkill-switch-wlan.fdi
index 4c545c5..26acf09 100644
--- a/fdi/information/10freedesktop/10-dell-rfkill-switch-wlan.fdi
+++ b/fdi/information/10freedesktop/10-dell-rfkill-switch-wlan.fdi
@@ -5,7 +5,7 @@
<device>
<match key="info.subsystem" string="platform">
<match key="platform.id" string="dcdbas">
- <match key="/org/freedesktop/Hal/devices/computer:system.kernel.name" string="Linux">
+ <match key="/org/freedesktop/Hal/devices/computer:system.kernel.name" string="Linux">
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" prefix="Dell ">
<match key="/org/freedesktop/Hal/devices/computer:system.formfactor" string="laptop">
<spawn udi="/org/freedesktop/Hal/devices/dell_wlan_switch"/>
diff --git a/fdi/information/10freedesktop/10-ipw-rfkill-switch.fdi b/fdi/information/10freedesktop/10-ipw-rfkill-switch.fdi
index 11e0814..847fd17 100644
--- a/fdi/information/10freedesktop/10-ipw-rfkill-switch.fdi
+++ b/fdi/information/10freedesktop/10-ipw-rfkill-switch.fdi
@@ -12,7 +12,7 @@
</match>
</match>
</device>
-
+
<device>
<match key="info.udi" string="/org/freedesktop/Hal/devices/ipw_wlan_switch">
<append key="info.capabilities" type="strlist">killswitch</append>
diff --git a/fdi/information/10freedesktop/10-laptop-panel-hardware.fdi b/fdi/information/10freedesktop/10-laptop-panel-hardware.fdi
index 9dbf8f2..cb9ceff 100644
--- a/fdi/information/10freedesktop/10-laptop-panel-hardware.fdi
+++ b/fdi/information/10freedesktop/10-laptop-panel-hardware.fdi
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
+<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
<deviceinfo version="0.2">
<!-- Some laptops have software controllable backlights and will provide
notifications on keypresses, but will also change the brightness
diff --git a/fdi/information/10freedesktop/10-modem.fdi b/fdi/information/10freedesktop/10-modem.fdi
index e6ce065..a8cdc12 100644
--- a/fdi/information/10freedesktop/10-modem.fdi
+++ b/fdi/information/10freedesktop/10-modem.fdi
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?> <!-- -*- xml -*- -->
+<?xml version="1.0" encoding="UTF-8"?> <!-- -*- xml -*- -->
<deviceinfo version="0.2">
<device>
@@ -31,10 +31,10 @@
<!-- Option -->
<match key="@info.parent:usb.vendor_id" int="0x0af0">
- <!-- Colt,Ricola,Ricola Light,Ricola Quad,Ricola Quad Light,Ricola Ndis,Ricola Ndis Light;Ricola Ndis Quad,Ricola Ndis Quad Light,
- Cobra,Cobra Bus,Viper,Viper Bus,Gt Max Ready,Gt Max,Fuji Modem Light,Fuji Modem Gt,Fuji Modem Ex,Fuji Network Light,Fuji Network Gt,
- Fuji Network Ex,Koi Modem,Koi Network,Scorpion Modem,Scorpion Network,Etna Modem,Etna Network,Etna Modem Lite;Etna Modem Gt,
- Etna Modem Ex,Etna Network Lite,Etna Network Gt,Etna Network Ex,Etna Koi Modem,Etna Koi Network -->
+ <!-- Colt,Ricola,Ricola Light,Ricola Quad,Ricola Quad Light,Ricola Ndis,Ricola Ndis Light;Ricola Ndis Quad,Ricola Ndis Quad Light,
+ Cobra,Cobra Bus,Viper,Viper Bus,Gt Max Ready,Gt Max,Fuji Modem Light,Fuji Modem Gt,Fuji Modem Ex,Fuji Network Light,Fuji Network Gt,
+ Fuji Network Ex,Koi Modem,Koi Network,Scorpion Modem,Scorpion Network,Etna Modem,Etna Network,Etna Modem Lite;Etna Modem Gt,
+ Etna Modem Ex,Etna Network Lite,Etna Network Gt,Etna Network Ex,Etna Koi Modem,Etna Koi Network -->
<match key="@info.parent:usb.product_id" int_outof="0x5000;0x6000;0x6100;0x6200;0x6300;0x6050;0x6150;0x6250;0x6350;0x6500;0x6501;0x6600;0x6601;0x6701;0x6711;0x6721;0x6741;0x6761;0x6731;0x6751;0x6771;0x6800;0x6811;0x6901;0x6911;0x7001;0x7011;0x7021;0x7041;0x7061;0x7031;0x7051;0x7071;0x7100;0x7111">
<match key="@info.parent:usb.interface.number" int="0">
<append key="info.capabilities" type="strlist">modem</append>
@@ -214,7 +214,7 @@
<!-- Dell Wireless -->
<match key="@info.parent:usb.vendor_id" int="0x413c">
- <!-- 5700 Mobile Broadband CDMA/EVDO Mini-Card == Novatel Expedite EV620 CDMA/EV-DO,
+ <!-- 5700 Mobile Broadband CDMA/EVDO Mini-Card == Novatel Expedite EV620 CDMA/EV-DO,
5700 Mobile Broadband CDMA/EVDO ExpressCard == Novatel Merlin XV620 CDMA/EV-DO,
5700 Mobile Broadband CDMA/EVDO Mini-Card == Novatel Expedite E720 CDMA/EV-DO,
5720 Mobile Broadband CDMA/EVDO Mini-Card == Novatel Expedite E725 CDMA/EV-DO,
diff --git a/fdi/information/10freedesktop/10-sony-bluetooth-switch.fdi b/fdi/information/10freedesktop/10-sony-bluetooth-switch.fdi
index 6f489f5..d833040 100644
--- a/fdi/information/10freedesktop/10-sony-bluetooth-switch.fdi
+++ b/fdi/information/10freedesktop/10-sony-bluetooth-switch.fdi
@@ -3,7 +3,7 @@
<deviceinfo version="0.2">
<device>
- <match key="system.kernel.name" string="Linux">
+ <match key="system.kernel.name" string="Linux">
<match key="system.hardware.vendor" string="Sony Corporation">
<match key="system.formfactor" string="laptop">
<match key="system.product" contains="VGN-S1XP">
diff --git a/fdi/information/10freedesktop/10-usb-card-readers.fdi b/fdi/information/10freedesktop/10-usb-card-readers.fdi
index 06fac99..1530573 100644
--- a/fdi/information/10freedesktop/10-usb-card-readers.fdi
+++ b/fdi/information/10freedesktop/10-usb-card-readers.fdi
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?> <!-- -*- xml -*- -->
+<?xml version="1.0" encoding="UTF-8"?> <!-- -*- xml -*- -->
<deviceinfo version="0.2">
<device>
@@ -21,33 +21,33 @@
<match key="storage.bus" string="usb">
<match key="storage.model" contains="HS-CF">
<merge key="storage.drive_type" type="string">compact_flash</merge>
- </match>
+ </match>
<match key="storage.model" contains="HS-MS">
<merge key="storage.drive_type" type="string">memory_stick</merge>
- </match>
+ </match>
<match key="storage.model" contains="HS-SM">
<merge key="storage.drive_type" type="string">smart_media</merge>
- </match>
+ </match>
<match key="storage.model" contains="HS-xD">
<merge key="storage.drive_type" type="string">smart_media</merge>
- </match>
+ </match>
<match key="storage.model" contains="HS-SD">
<merge key="storage.drive_type" type="string">sd_mmc</merge>
- </match>
+ </match>
<!-- Another common theme -->
<match key="storage.model" contains="USB CF Reader">
<merge key="storage.drive_type" type="string">compact_flash</merge>
- </match>
+ </match>
<match key="storage.model" contains="USB MS Reader">
<merge key="storage.drive_type" type="string">memory_stick</merge>
- </match>
+ </match>
<match key="storage.model" contains="USB SM Reader">
<merge key="storage.drive_type" type="string">smart_media</merge>
- </match>
+ </match>
<match key="storage.model" contains="USB SD Reader">
<merge key="storage.drive_type" type="string">sd_mmc</merge>
- </match>
+ </match>
<!-- Yet another common theme -->
<match key="storage.model" contains="Reader-CF">
diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index d944573..1122e6b 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -17,7 +17,7 @@
</match>
<!-- USB Mass Storage devices that are music players -->
-
+
<match key="@storage.originating_device:info.subsystem" string="usb">
<!-- Transcend -->
<match key="@storage.originating_device:usb.vendor_id" int="0x402">
@@ -146,7 +146,7 @@
</match>
</match>
- <!-- Philips -->
+ <!-- Philips -->
<match key="@storage.originating_device:usb.vendor_id" int="0x471">
<!-- Philips GoGear SA1330 -->
<match key="@storage.originating_device:usb.product_id" int="0x165">
@@ -234,7 +234,7 @@
<append key="portable_audio_player.playlist_format" type="strlist">audio/x-mpegurl</append>
<append key="portable_audio_player.playlist_format" type="strlist">audio/x-scpls</append>
<append key="portable_audio_player.playlist_path" type="strlist">Playlists/</append>
- </match>
+ </match>
<!-- Samsung YP-T9 -->
<match key="@storage.originating_device:usb.product_id" int="0x5055">
<addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
@@ -301,7 +301,7 @@
<!-- 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),
+ <!-- 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
-->
<match key="@storage.originating_device:usb.product_id" int_outof="0x8000;0x8008;0x8206;0x821f;0x829c;0x82e0;0x835d">
@@ -346,15 +346,15 @@
<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>
- <!-- TrekStor vibez -->
+ <!-- TrekStor vibez -->
<match key="@storage.originating_device:usb.product_id" int="0x842a">
<addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
<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.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">audio/x-mpegurl</append>
<append key="portable_audio_player.playlist_format" type="strlist">application/vnd.ms-wpl</append>
</match>
</match>
@@ -380,7 +380,7 @@
<match key="@storage.originating_device:usb.product_id" int="0x778">
<addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
<append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
- </match>
+ </match>
</match>
<!-- SanDisk -->
@@ -441,7 +441,7 @@
</match>
</match>
</match>
-
+
<!-- Danger Research -->
<match key="@storage.originating_device:usb.vendor_id" int="0x0da0">
<!-- Hiptop/Sidekick 3 -->
@@ -601,7 +601,7 @@
<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-amr</append>
- </match>
+ </match>
<!-- W950i mobile phone -->
<match key="@storage.originating_device:usb.product_id" int="0xd037">
@@ -668,7 +668,7 @@
<append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
</match>
</match>
-
+
<!-- Mobile Media Tech. -->
<match key="@storage.originating_device:usb.vendor_id" int="0x1011">
<!-- No-name device, sold as "Lavod" -->
@@ -687,7 +687,7 @@
<append key="portable_audio_player.audio_folders" type="strlist">MP3/</append>
</match>
</match>
-
+
<!-- Foston, MPMan, Actions Semiconductor -->
<match key="@storage.originating_device:usb.vendor_id" int="0x10d6">
<!-- Foston 128/256MB / MPMan MP-Ki 128 Player, A similar 2GB MP3 Player -->
@@ -834,7 +834,7 @@
</match>
</match>
- </match>
+ </match>
<!-- USB devices that are music players but uses a user-space library -->
<!-- NOTE: they need to get removed or ported to the new keys -->
@@ -894,7 +894,7 @@
</match>
</match>
-
+
<!-- Set common keys for detected audio player if you have special cases add the player below this match -->
<match key="portable_audio_player.access_method.protocols" exists="true">
<match key="portable_audio_player.access_method.protocols" contains="storage">
@@ -910,7 +910,7 @@
<append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
</match>
- <!-- handle special devices -->
+ <!-- handle special devices -->
<match key="info.category" string="storage">
<!-- Sony PSP (PlayStation Portable) -->
@@ -930,6 +930,6 @@
</match>
</match>
</match>
-
+
</device>
</deviceinfo>
diff --git a/fdi/information/10freedesktop/10-usb-pda.fdi b/fdi/information/10freedesktop/10-usb-pda.fdi
index c51caf7..1e9861e 100644
--- a/fdi/information/10freedesktop/10-usb-pda.fdi
+++ b/fdi/information/10freedesktop/10-usb-pda.fdi
@@ -171,7 +171,7 @@
<merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
</match>
</match>
-
+
<!-- Alphasmart -->
<match key="usb_device.vendor_id" int="0x081e">
<!-- Alphasmart Dana -->
@@ -185,5 +185,5 @@
</match>
</device>
-
+
</deviceinfo>
diff --git a/fdi/information/10freedesktop/10-usbcsr-mice.fdi b/fdi/information/10freedesktop/10-usbcsr-mice.fdi
index 43650be..e066018 100644
--- a/fdi/information/10freedesktop/10-usbcsr-mice.fdi
+++ b/fdi/information/10freedesktop/10-usbcsr-mice.fdi
@@ -16,7 +16,7 @@
</match>
<!-- Receiver for Cordless Click! -->
- <match key="usb_device.product_id" int="0xc510">
+ <match key="usb_device.product_id" int="0xc510">
<merge key="info.product" type="string">Cordless Click Mouse</merge>
<merge key="battery.type" type="string">mouse</merge>
<!-- proprietary properties defining the behavior -->
@@ -26,7 +26,7 @@
</match>
<!-- Receiver for Cordless Keyboard + Mouse combo -->
- <match key="usb_device.product_id" int_outof="0xc512;0xc505">
+ <match key="usb_device.product_id" int_outof="0xc512;0xc505">
<merge key="info.product" type="string">Cordless Keyboard+Mouse Receiver</merge>
<merge key="battery.type" type="string">keyboard</merge>
<!-- proprietary properties defining the behavior -->
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi
index 8b07882..013654c 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
+<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
<deviceinfo version="0.2">
<device>
<match key="system.hardware.vendor" prefix="Acer">
@@ -28,8 +28,8 @@
<merge key="power_management.quirk.none" type="bool">true</merge>
</match>
- <!-- these need the full name to prevent mixes with other machines
- NOTE: HAL removes whitespaces at the end of the sysfs and dmidecode output,
+ <!-- these need the full name to prevent mixes with other machines
+ NOTE: HAL removes whitespaces at the end of the sysfs and dmidecode output,
we need to do exact string matches.
-->
<match key="system.hardware.product" string_outof="TravelMate 240;TravelMate 250;TravelMate 650">
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-apple.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-apple.fdi
index 2a49ece..23823e3 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-apple.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-apple.fdi
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
+<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
<deviceinfo version="0.2">
<device>
<match key="system.hardware.vendor" prefix="Apple">
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi
index 8c3bc23..beb7c5f 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
+<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
<deviceinfo version="0.2">
<device>
<match key="system.hardware.vendor" prefix="ASUS">
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
index f08c919..3ba657c 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
+<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
<deviceinfo version="0.2">
<device>
<match key="system.hardware.vendor" prefix="Dell">
@@ -32,16 +32,16 @@
<merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
<match key="system.hardware.product" contains_outof="D600;D610">
- <merge key="power_management.quirk.vbe_post" 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>
<merge key="power_management.quirk.no_fb" type="bool">true</merge>
</match>
<match key="system.hardware.product" contains_outof="D630">
<match key="system.firmware.version" compare_lt="A12">
- <merge key="power_management.quirk.vbe_post" 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>
<merge key="power_management.quirk.no_fb" type="bool">true</merge>
- </match>
+ </match>
<match key="system.firmware.version" compare_ge="A12">
<merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
</match>
@@ -124,18 +124,18 @@
<merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
</match>
</match>
-
+
<!-- Dell Inspiron 640m, XPS M1210 -->
<match key="system.hardware.product" contains_outof="MXC061;MXC062">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
</match>
- <!-- Dell XPS M1330, OptiPlex GX520 (desktop with intel)
+ <!-- Dell XPS M1330, OptiPlex GX520 (desktop with intel)
MM061 = Inspiron E1505 or/and 6400 -->
<match key="system.hardware.product" contains_outof="XPS M1330;OptiPlex GX520;MM061">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
<merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
</match>
-
+
<!-- these need no quirks : DXP051, Inspiron: 1300, E1702/E1705, 630m; M1710 (only resumes with vesafb) -->
<match key="system.hardware.product" contains_outof="DXP051;ME051;MP061;MXC051;MXG061;XPS M1530;OptiPlex GX260">
<merge key="power_management.quirk.none" type="bool">true</merge>
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-fujitsu.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-fujitsu.fdi
index e318b26..1881839 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-fujitsu.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-fujitsu.fdi
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
+<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
<deviceinfo version="0.2">
<device>
<match key="system.hardware.vendor" prefix="FUJITSU">
-
+
<match key="system.hardware.product" contains_ncase="amilo">
<match key="system.hardware.product" contains_outof="A1667G Serie;Pa 1510;Li 1718;M1425">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
@@ -22,7 +22,7 @@
<match key="system.hardware.version" contains_outof="-1 ;0.01">
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
<merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
- <!-- This machine need a special new quirk: power_management.quirk.pci_save
+ <!-- This machine need a special new quirk: power_management.quirk.pci_save
<match key="system.firmware.version" prefix="R01-S0N">
<merge key="power_management.quirk.pci_save" type="bool">true</merge>
</match>
@@ -96,7 +96,7 @@
<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.product" string="P6VAP-AP">
<merge key="power_management.quirk.none" type="bool">true</merge>
</match>
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
index ed0dac0..21fcb53 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
+<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
<deviceinfo version="0.2">
<device>
@@ -50,7 +50,7 @@
<merge key="power_management.quirk.none" type="bool">true</merge>
</match>
</match>
-
+
<match key="system.hardware.product" prefix="N620c ">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
@@ -123,7 +123,7 @@
</match>
<match key="system.firmware.version" contains_not="F.08">
<merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
- </match>
+ </match>
</match>
</match>
<match key="system.hardware.product" contains="nx6310">
@@ -144,7 +144,7 @@
<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
<match key="system.firmware.version" contains_not="68YGU">
<merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
- </match>
+ </match>
</match>
<match key="system.hardware.product" contains="Pavilion ">
@@ -189,7 +189,7 @@
<merge key="power_management.quirk.none" type="bool">true</merge>
</match>
</match>
-
+
<match key="system.hardware.product" contains_outof="8710p;dv2000;dv2500;tx1000;dv5000 (EZ535UA#;HP d530 SFF">
<merge key="power_management.quirk.none" type="bool">true</merge>
</match>
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
index 13980be..f8d96f3 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
+<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
<deviceinfo version="0.2">
<device>
<match key="system.hardware.vendor" string="IBM">
@@ -18,11 +18,11 @@
<!-- 600e -->
<match key="system.hardware.product" prefix="2645">
- <match key="system.firmware.version" string="INET17WW">
+ <match key="system.firmware.version" string="INET17WW">
<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.firmware.version" contains_not="INET17WW">
+ <match key="system.firmware.version" contains_not="INET17WW">
<merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
</match>
</match>
@@ -108,7 +108,7 @@
<merge key="power_management.quirk.none" type="bool">true</merge>
</match>
</match>
-
+
</match>
</device>
</deviceinfo>
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
index 5ecbabc..4ff0e14 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
+<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
<deviceinfo version="0.2">
<device>
<match key="system.hardware.vendor" string="LENOVO">
@@ -17,10 +17,10 @@
<match key="system.hardware.version" prefix_ncase="ThinkPad R60">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
<!-- R60e 32bit works with S3_MODE, 64bit needs VBE_MODE -->
- <match key="system.hardware.product" prefix="0657">
- <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
+ <match key="system.hardware.product" prefix="0657">
+ <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
</match>
- <match key="system.hardware.product" contains_not="0657">
+ <match key="system.hardware.product" contains_not="0657">
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
</match>
@@ -41,7 +41,7 @@
<match key="system.hardware.product" prefix="7663">
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
- <!-- T61 (8895), intel card 32bit works with S3_MODE, but 64bit needs VBE_MODE
+ <!-- T61 (8895), intel card 32bit works with S3_MODE, but 64bit needs VBE_MODE
T61p (6460), does not work with the NVidia driver-->
<match key="system.hardware.product" prefix_outof="6457;6460;6465">
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
index 487bedd..96bde1a 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
+<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
<deviceinfo version="0.2">
<device>
<match key="system.hardware.vendor" string="AIRIS">
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-samsung.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-samsung.fdi
index 8585303..cbe361b 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-samsung.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-samsung.fdi
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
+<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
<deviceinfo version="0.2">
<device>
<match key="system.hardware.vendor" prefix_ncase="Samsung">
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi
index d13f5cc..fc4c571 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
+<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
<deviceinfo version="0.2">
<device>
<match key="system.hardware.vendor" string="Sony Corporation">
@@ -45,7 +45,7 @@
<!-- machines which need no quirks -->
<!-- Note:
- - VGN-FE31M: only from X, S3_MODE hangs the machine, all other leave the screen blank
+ - VGN-FE31M: only from X, S3_MODE hangs the machine, all other leave the screen blank
- VGN-SZ5XN_C: machine has two gfx cards, works only well with the intel, not with the nvidia -->
<match key="system.hardware.product" string_outof="VGN-TX3HP;VGN-B55G(I);VGN-FE31M;VGN-FS215B;VGN-FS660_W;VGN-SZ5XN_C;VGN-TZ21XN_B;PCG-FR215E;VGN-SZ340P;VGN-FE11M;VGN-TZ91HS;PCG-Z505HSK(UC);VGN-FZ39VN">
<merge key="power_management.quirk.none" type="bool">true</merge>
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi
index e8b01b8..5feb4e3 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
+<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
<deviceinfo version="0.2">
<device>
<match key="system.hardware.vendor" string="TOSHIBA">
@@ -43,8 +43,8 @@
<!-- these need no quirks-->
<match key="system.hardware.product" contains_outof="A80;Pro4600">
<merge key="power_management.quirk.none" type="bool">true</merge>
- </match>
- </match>
+ </match>
+ </match>
<!-- Tecra Laptops -->
<match key="system.hardware.product" prefix="TECRA">
@@ -57,8 +57,8 @@
<!-- these need no quirks-->
<match key="system.hardware.product" contains_outof=" A8; A9; S3; S1">
<merge key="power_management.quirk.none" type="bool">true</merge>
- </match>
- </match>
+ </match>
+ </match>
<!-- Portege Laptops -->
<match key="system.hardware.product" prefix="PORTEGE">
@@ -76,7 +76,7 @@
<!-- these need no quirks-->
<match key="system.hardware.product" contains="R100">
<merge key="power_management.quirk.none" type="bool">true</merge>
- </match>
+ </match>
</match>
<!-- EQUIUM -->
@@ -85,7 +85,7 @@
<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
</match>
- </match>
+ </match>
<!-- Toshiba Portege 3490CT -->
<match key="system.hardware.product" string="P3490">
@@ -116,12 +116,12 @@
<!-- these need no quirks-->
<match key="system.hardware.product" contains="Libretto L5/TNK">
<merge key="power_management.quirk.none" type="bool">true</merge>
- </match>
+ </match>
<match key="system.hardware.product" string="SP4600">
<match key="system.hardware.version" string="Version 1.0">
<merge key="power_management.quirk.none" type="bool">true</merge>
- </match>
- </match>
+ </match>
+ </match>
</match>
</device>
diff --git a/fdi/information/10freedesktop/21-video-quirk-nvidia.fdi b/fdi/information/10freedesktop/21-video-quirk-nvidia.fdi
index 3b7956b..5f563e8 100644
--- a/fdi/information/10freedesktop/21-video-quirk-nvidia.fdi
+++ b/fdi/information/10freedesktop/21-video-quirk-nvidia.fdi
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
+<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
<!-- According to nvidia, the only currently supported way to resume g80
class hardware is to re-run a cached copy of the video BIOS. No other
quirks will be effective -->
diff --git a/fdi/information/10freedesktop/30-keymap-acer.fdi b/fdi/information/10freedesktop/30-keymap-acer.fdi
index e544363..1551932 100644
--- a/fdi/information/10freedesktop/30-keymap-acer.fdi
+++ b/fdi/information/10freedesktop/30-keymap-acer.fdi
@@ -33,16 +33,16 @@
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" prefix="Extensa">
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="5210;5220;5610;5620;5720">
<remove key="input.keymap.data" type="strlist">e06e:brightnessup</remove>
- <append key="input.keymap.data" type="strlist">e06e:lock</append> <!-- Windows Lock function -->
+ <append key="input.keymap.data" type="strlist">e06e:lock</append> <!-- Windows Lock function -->
</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">0x67: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">0x67: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:f23</append> <!-- FIXME: lock tablet device/buttons-->
</match>
</match>
diff --git a/fdi/information/10freedesktop/30-keymap-hp.fdi b/fdi/information/10freedesktop/30-keymap-hp.fdi
index fc714bd..8f71267 100644
--- a/fdi/information/10freedesktop/30-keymap-hp.fdi
+++ b/fdi/information/10freedesktop/30-keymap-hp.fdi
@@ -16,7 +16,7 @@
<append key="input.keymap.data" type="strlist">e033:f21</append> <!-- FIXME: Auto brightness -->
<append key="input.keymap.data" type="strlist">e057:wlan</append> <!-- Wlan -->
<append key="info.capabilities" type="strlist">input.keymap</append>
- <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_ncase="Pavilion">
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_ncase="Pavilion">
<!-- Home and entertainment machines -->
<append key="input.keymap.data" type="strlist">e008:player</append> <!-- FIXME: quick play -->
<append key="input.keymap.data" type="strlist">e058:f22</append> <!-- touchpad off -->
diff --git a/fdi/information/10freedesktop/30-keymap-misc.fdi b/fdi/information/10freedesktop/30-keymap-misc.fdi
index 0fc397a..35b2bbf 100644
--- a/fdi/information/10freedesktop/30-keymap-misc.fdi
+++ b/fdi/information/10freedesktop/30-keymap-misc.fdi
@@ -48,7 +48,7 @@
<append key="info.capabilities" type="strlist">input.keymap</append>
</match>
</match>
-
+
<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">e020:mute</append> <!-- Fn-F9 Sound On/Off -->
@@ -85,7 +85,7 @@
<append key="info.capabilities" type="strlist">input.keymap</append>
</match>
</match>
-
+
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" string="MAXDATA">
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" prefix="Pro 7000">
<append key="input.keymap.data" type="strlist">97:prog2</append> <!-- "P2" programmable button -->
@@ -119,8 +119,8 @@
<append key="info.capabilities" type="strlist">input.keymap</append>
</match>
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="SX20S">
- <append key="input.keymap.data" type="strlist">0074:mute</append>
- <append key="input.keymap.data" type="strlist">0075:mute</append>
+ <append key="input.keymap.data" type="strlist">0074:mute</append>
+ <append key="input.keymap.data" type="strlist">0075:mute</append>
<append key="input.keymap.data" type="strlist">0077:f21</append> <!-- FIXME: Touchpad on -->
<append key="input.keymap.data" type="strlist">0079:f21</append> <!-- FIXME: Touchpad off -->
</match>
@@ -128,8 +128,8 @@
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" string="TOSHIBA">
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" string="SATELLITE A100">
- <append key="input.keymap.data" type="strlist">e024:stop</append>
- <append key="input.keymap.data" type="strlist">e032:www</append>
+ <append key="input.keymap.data" type="strlist">e024:stop</append>
+ <append key="input.keymap.data" type="strlist">e032:www</append>
<append key="info.capabilities" type="strlist">input.keymap</append>
</match>
</match>
diff --git a/fdi/information/10freedesktop/30-keymap-module-sony-laptop.fdi b/fdi/information/10freedesktop/30-keymap-module-sony-laptop.fdi
index 6979629..5a5df76 100644
--- a/fdi/information/10freedesktop/30-keymap-module-sony-laptop.fdi
+++ b/fdi/information/10freedesktop/30-keymap-module-sony-laptop.fdi
@@ -10,7 +10,7 @@
<!-- Older Vaios have a different keymap -->
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="PCG-C1;PCG-K25;PCG-F1;PCG-F2;PCG-F3;PCG-F4;PCG-F5;PCG-F6;PCG-FX;PCG-FRV;PCG-GR;PCG-TR;PCG-NV;PCG-Z">
<append key="input.keymap.data" type="strlist">0x06:battery</append>
- <append key="input.keymap.data" type="strlist">0x07:mute</append>
+ <append key="input.keymap.data" type="strlist">0x07:mute</append>
</match>
<!-- now the generic mapping -->
diff --git a/fdi/information/10freedesktop/99-video-quirk-default.fdi b/fdi/information/10freedesktop/99-video-quirk-default.fdi
index f0e5c93..bc24aa4 100644
--- a/fdi/information/10freedesktop/99-video-quirk-default.fdi
+++ b/fdi/information/10freedesktop/99-video-quirk-default.fdi
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
+<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
<deviceinfo version="0.2">
<!-- The aim of this file is to handle systems without any default video
quirks. The vast majority of hardware will not function without either
diff --git a/fdi/preprobe/10osvendor/10-ide-drives.fdi b/fdi/preprobe/10osvendor/10-ide-drives.fdi
index 26844b8..71ecf32 100644
--- a/fdi/preprobe/10osvendor/10-ide-drives.fdi
+++ b/fdi/preprobe/10osvendor/10-ide-drives.fdi
@@ -3,7 +3,7 @@
<deviceinfo version="0.2">
<device>
- <!-- Handle weird Dell Laptops that slow down the system if the optical
+ <!-- Handle weird Dell Laptops that slow down the system if the optical
drive is polled (RH Bug #138148) -->
<match key="storage.bus" string="ide">
<match key="storage.model" string="HL-DT-STCD-RW/DVD-ROM GCC-4240N">
@@ -101,6 +101,6 @@
</match>
</match>
-
+
</device>
</deviceinfo>
More information about the hal-commit
mailing list