diff options
6 files changed, 44 insertions, 15 deletions
diff --git a/fdi/information/10freedesktop/10-modem.fdi b/fdi/information/10freedesktop/10-modem.fdi index c32e360..1f3ac50 100644 --- a/fdi/information/10freedesktop/10-modem.fdi +++ b/fdi/information/10freedesktop/10-modem.fdi @@ -531,7 +531,7 @@ <remove key="info.capabilities" type="strlist">net.80203</remove> </match> </match> - <match key="info.parent" contains_outof="bdb_1904"> + <match key="info.parent" contains="bdb_1904"> <match key="info.parent" suffix="_if6"> <remove key="info.capabilities" type="strlist">net.80203</remove> </match> diff --git a/fdi/information/10freedesktop/10-recall-battery-lenovo.fdi b/fdi/information/10freedesktop/10-recall-battery-lenovo.fdi index 6b57561..207511c 100644 --- a/fdi/information/10freedesktop/10-recall-battery-lenovo.fdi +++ b/fdi/information/10freedesktop/10-recall-battery-lenovo.fdi @@ -10,18 +10,24 @@ * GNOME Power Manager no longer reads these values. --> - <match key="battery.vendor" string="SANYO"> + <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" string="LENOVO"> - <match key="battery.model" string="92P1131"> - <merge key="info.is_recalled" type="bool">true</merge> + <match key="battery.vendor" string="SANYO"> + <match key="battery.model" string="92P1131"> + <merge key="info.is_recalled" type="bool">true</merge> + <merge key="info.recall.website_url" type="string">http://www.lenovo.com/batteryprogram</merge> + <merge key="info.recall.vendor" type="string">LENOVO</merge> + </match> </match> - <!-- only matching on specific model and vendor SANYO --> - <match key="info.is_recalled" bool="true"> + <!-- battery.vendor unknown --> + <!-- ThinkPad battery has low capacity or shows an “Irreparable damage” or “Battery cannot be charged” error + message – ThinkPad T60/T61/R60/R61/X60/X61. Note: This issue is not a safety recall and does not pose a safety hazard. --> + <match key="battery.model" string_outof="42T4546;42T4566;92P1141;42T4550;42T4567;42T4568;92P1169;92P1173;93P5028;93P5030"> + <merge key="info.is_recalled" type="bool">true</merge> + <merge key="info.recall.website_url" type="string">http://download.lenovo.com/lenovo/content/batt/082009/LandingPage.html</merge> <merge key="info.recall.vendor" type="string">LENOVO</merge> - <merge key="info.recall.website_url" type="string">http://www.lenovo.com/batteryprogram</merge> </match> - </match> </device> diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi index dd0d88e..c19f53e 100644 --- a/fdi/information/10freedesktop/10-usb-music-players.fdi +++ b/fdi/information/10freedesktop/10-usb-music-players.fdi @@ -38,6 +38,14 @@ </match> </match> + <!-- ALi Corporation --> + <match key="@storage.originating_device:usb.vendor_id" int="0x0402"> + <!-- ALi MP3 Player --> + <match key="@storage.originating_device:usb.product_id" int="0x5667"> + <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset> + </match> + </match> + <!-- Creative --> <match key="@storage.originating_device:usb.vendor_id" int="0x41e"> <!-- MuVo V100 --> @@ -229,7 +237,7 @@ <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_format" type="strlist">audio/x-mpegurl</append> <append key="portable_audio_player.playlist_path" type="string">PLAYLISTS/%File</append> </match> </match> @@ -327,7 +335,7 @@ <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">RECORD</append> - <append key="portable_audio_player.playlist_formats" 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_path" type="string">PLAYLISTS/%File</append> </match> <!-- Samsung YP-S5 --> @@ -430,7 +438,7 @@ <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> <append key="portable_audio_player.audio_folders" type="strlist">/</append> - <append key="portable_audio_player.playlist_formats" 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_path" type="string">PLAYLIST/%File</append> <match key="storage.lun" int="1"> <merge key="storage.drive_type" type="string">sd_mmc</merge> @@ -770,9 +778,10 @@ <!-- K800i mobile phone --> <!-- media files go in mp3/$ARTIST/$ALBUM/$TRACKNAME --> - <match key="@storage.originating_device:usb.product_id" int="0xd039"> + <match key="@storage.originating_device:usb.product_id" int_outof="0xd039;0xe039"> <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset> <append key="portable_audio_player.output_formats" type="strlist">audio/3gpp</append> + <append key="portable_audio_player.output_formats" type="strlist">audio/aac</append> <append key="portable_audio_player.output_formats" type="strlist">audio/mp4</append> <append key="portable_audio_player.output_formats" type="strlist">audio/aac</append> <append key="portable_audio_player.output_formats" type="strlist">audio/vnd.rn-realaudio</append> @@ -782,6 +791,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> + <append key="portable_audio_player.audio_folders" type="strlist">Music/</append> </match> <!-- W950i mobile phone --> @@ -1144,7 +1154,7 @@ <append key="portable_audio_player.audio_folders" type="strlist">music/</append> <append key="portable_audio_player.audio_folders" type="strlist">video/</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_format" type="strlist">audio/x-mpegurl</append> <append key="portable_audio_player.playlist_path" type="string">playlists/%File</append> </match> </match> diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi index 91ad85c..561b413 100644 --- a/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi +++ b/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi @@ -161,6 +161,13 @@ </match> </match> + <!-- Aspire One 751 --> + <match key="system.hardware.product" string="AO751h"> + <merge key="power_management.quirk.dpms_on" type="bool">true</merge> + <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge> + <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> + </match> + <!-- Aspire One 110 --> <match key="system.hardware.product" prefix_outof="AOA110;AOA150"> <merge key="power_management.quirk.none" type="bool">true</merge> diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi index 4a3016c..37a4a99 100644 --- a/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi +++ b/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi @@ -133,6 +133,12 @@ </match> </match> </match> + <match key="system.hardware.product" contains="Compaq nx6315"> + <match key="system.hardware.version" prefix="68MOU"> + <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 key="system.hardware.product" contains="nx 7010"> <merge key="power_management.quirk.s3_bios" type="bool">true</merge> <match key="system.hardware.product" contains="DU394T#"> @@ -145,7 +151,7 @@ <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge> </match> </match> - <match key="system.hardware.product" contains_outof="HP Compaq dc5800 Small Form Factor;HP d330 uT; nw9440;nw8440"> + <match key="system.hardware.product" contains_outof="HP Compaq dc5800 Small Form Factor;HP d330 uT; nw9440;nw8440;HP xw4550 Workstation;HP xw6600 Workstation;HP xw8600 Workstation;HP xw9400 Workstation"> <merge key="power_management.quirk.none" type="bool">true</merge> </match> diff --git a/fdi/information/10freedesktop/30-keymap-misc.fdi b/fdi/information/10freedesktop/30-keymap-misc.fdi index 39d71ed..44a3323 100644 --- a/fdi/information/10freedesktop/30-keymap-misc.fdi +++ b/fdi/information/10freedesktop/30-keymap-misc.fdi @@ -150,7 +150,7 @@ </match> <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" prefix_ncase="samsung"> - <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="NC10;SP55S;SQ45S70S;SX60P;SX30S;SX22S;R59P/R60P/R61P;Q210;Q310;X05;P560;R560"> + <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="NC10;NC20;SP55S;SQ45S70S;SX60P;SX30S;SX22S;R59P/R60P/R61P;Q210;Q310;X05;P560;R560"> <append key="input.keymap.data" type="strlist">e002:switchvideomode</append> <!-- Fn+F4 CRT/LCD (high keycode: "displaytoggle") --> <append key="input.keymap.data" type="strlist">e003:battery</append> <!-- Fn+F2 battery icon --> <append key="input.keymap.data" type="strlist">e004:prog1</append> <!-- Fn+F5 backlight on/off --> |