diff options
author | Danny Kukawka <danny.kukawka@web.de> | 2010-02-22 16:55:45 +0100 |
---|---|---|
committer | Danny Kukawka <danny.kukawka@web.de> | 2010-02-22 16:55:45 +0100 |
commit | 67662f7e8bd22b13c793555e0e3ab27cda59540e (patch) | |
tree | dfa9f2bc5523cd857934605d3cc3f5270ddfe65e | |
parent | b23c7b4b203436aa89b6e6207023056024b1f741 (diff) | |
parent | e621b51da9f57c820c3f3dadbd0262b112329a9a (diff) |
Merge branch 'master' of ssh://dkukawka@git.freedesktop.org/git/hal-info
-rw-r--r-- | VERSION | 2 | ||||
-rw-r--r-- | fdi/information/10freedesktop/10-laptop-panel-hardware.fdi | 6 | ||||
-rw-r--r-- | fdi/information/10freedesktop/10-usb-music-players.fdi | 168 | ||||
-rw-r--r-- | fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi | 2 | ||||
-rw-r--r-- | fdi/information/10freedesktop/30-keymap-acer.fdi | 4 | ||||
-rw-r--r-- | fdi/information/10freedesktop/30-keymap-misc.fdi | 16 | ||||
-rw-r--r-- | fdi/information/10freedesktop/30-keymap-olpc.fdi | 93 | ||||
-rw-r--r-- | fdi/information/10freedesktop/Makefile.am | 3 |
8 files changed, 231 insertions, 63 deletions
@@ -1 +1 @@ -20090716 +20091130 diff --git a/fdi/information/10freedesktop/10-laptop-panel-hardware.fdi b/fdi/information/10freedesktop/10-laptop-panel-hardware.fdi index ef35a18..58d17b4 100644 --- a/fdi/information/10freedesktop/10-laptop-panel-hardware.fdi +++ b/fdi/information/10freedesktop/10-laptop-panel-hardware.fdi @@ -30,6 +30,12 @@ </match> </match> + <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" prefix_ncase="micro-star"> + <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="U100;U-100"> + <merge key="laptop_panel.brightness_in_hardware" type="bool">true</merge> + </match> + </match> + <match key="linux.sysfs_path" suffix="/backlight/thinkpad_screen"> <merge key="laptop_panel.brightness_in_hardware" type="bool">true</merge> </match> diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi index cc26e83..c19f53e 100644 --- a/fdi/information/10freedesktop/10-usb-music-players.fdi +++ b/fdi/information/10freedesktop/10-usb-music-players.fdi @@ -13,10 +13,15 @@ <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append> <append key="portable_audio_player.output_formats" type="strlist">audio/x-aiff</append> <merge key="storage.requires_eject" type="bool">true</merge> - <!-- iPods with video --> - <match key="@storage.originating_device:usb.product_id" int_outof="0x1261;0x1262"> - <append key="portable_audio_player.output_formats" type="strlist">video/mp4</append> - </match> + </match> + <!-- iPods with video --> + <match key="@storage.originating_device:usb.product_id" int_outof="0x1261;0x1262"> + <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset> + <addset key="portable_audio_player.access_method.protocols" type="strlist">ipod</addset> + <append key="portable_audio_player.output_formats" type="strlist">audio/aac</append> + <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append> + <append key="portable_audio_player.output_formats" type="strlist">audio/x-aiff</append> + <append key="portable_audio_player.output_formats" type="strlist">video/mp4</append> </match> </match> @@ -272,19 +277,25 @@ <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append> <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append> </match> - <!-- Samsung YP-J70, YP-T7F --> - <match key="@storage.originating_device:usb.product_id" int_outof="0x5032;0x503d"> + <!-- Samsung YP-T7F --> + <match key="@storage.originating_device:usb.product_id" int="0x503d"> <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset> <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.output_formats" type="strlist">audio/x-wav</append> <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append> <append key="portable_audio_player.audio_folders" type="strlist">Music/</append> + </match> <!-- Samsung YP-J70 --> - <match key="@storage.originating_device:usb.product_id" int="0x5032"> - <append key="portable_audio_player.audio_folders" type="strlist">RECORDED/</append> - <merge key="storage.requires_eject" type="bool">true</merge> - </match> + <match key="@storage.originating_device:usb.product_id" int="0x5032"> + <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset> + <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.output_formats" type="strlist">audio/x-wav</append> + <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append> + <append key="portable_audio_player.audio_folders" type="strlist">Music/</append> + <append key="portable_audio_player.audio_folders" type="strlist">RECORDED/</append> + <merge key="storage.requires_eject" type="bool">true</merge> </match> <!-- Samsung YP-Z5 --> <match key="@storage.originating_device:usb.product_id" int="0x5041"> @@ -584,8 +595,8 @@ <!-- Cowon --> <match key="@storage.originating_device:usb.vendor_id" int="0xe21"> - <!-- iAUDIO M3, X5, M5, U3 , F2, 7--> - <match key="@storage.originating_device:usb.product_id" int_outof="0x500;0x510;0x520;0x700;0x710;0x730;0x750"> + <!-- iAUDIO M3 --> + <match key="@storage.originating_device:usb.product_id" int_outof="0x500"> <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> @@ -594,45 +605,68 @@ <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</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> - <!-- iAUDIO X5, M5, F2, 7 --> - <match key="@storage.originating_device:usb.product_id" int_outof="0x510;0x520;0x710;0x730;0x750"> - <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.audio_folders" type="strlist">VOICE/</append> - </match> - <!-- iAUDIO U3 --> - <match key="@storage.originating_device:usb.product_id" int="0x700"> - <append key="portable_audio_player.audio_folders" type="strlist">RECORDS/FM/</append> - <append key="portable_audio_player.audio_folders" type="strlist">RECORDS/LINEIN/</append> - <append key="portable_audio_player.audio_folders" type="strlist">RECORDS/VOICE/</append> - </match> </match> - <!-- iAUDIO G3, 5, G2 --> - <match key="@storage.originating_device:usb.product_id" int_outof="0x601;0x602;0x604;0x760"> + <!-- iAUDIO X5, M5, F2, 7 --> + <match key="@storage.originating_device:usb.product_id" int_outof="0x510;0x520;0x710;0x730;0x750"> <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/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.playlist_format" type="strlist">audio/x-mpegurl</append> <append key="portable_audio_player.playlist_path" type="string">PLAYLIST/%File</append> - <!-- iAUDIO G2 --> - <match key="@storage.originating_device:usb.product_id" int="0x760"> - <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.audio_folders" type="strlist">VOICE/</append> - </match> - <!-- iAUDIO U2 --> - <match key="@storage.originating_device:usb.product_id" int="0x600"> - <append key="portable_audio_player.output_formats" type="strlist">application/ogg</append> - <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append> - <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append> - <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append> - <append key="portable_audio_player.audio_folders" type="strlist">MUSIC/</append> - <append key="portable_audio_player.audio_folders" type="strlist">RECORDS/FM/</append> - <append key="portable_audio_player.audio_folders" type="strlist">RECORDS/LINEIN/</append> - <append key="portable_audio_player.audio_folders" type="strlist">RECORDS/VOICE/</append> - </match> + <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.audio_folders" type="strlist">VOICE/</append> + </match> + <!-- iAUDIO U3 --> + <match key="@storage.originating_device:usb.product_id" int="0x700"> + <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/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.playlist_format" type="strlist">audio/x-mpegurl</append> + <append key="portable_audio_player.playlist_path" type="string">PLAYLIST/%File</append> + <append key="portable_audio_player.audio_folders" type="strlist">RECORDS/FM/</append> + <append key="portable_audio_player.audio_folders" type="strlist">RECORDS/LINEIN/</append> + <append key="portable_audio_player.audio_folders" type="strlist">RECORDS/VOICE/</append> + </match> + <!-- iAUDIO G3, 5 --> + <match key="@storage.originating_device:usb.product_id" int_outof="0x601;0x602;0x604"> + <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.input_formats" type="strlist">audio/mpeg</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> + <!-- iAUDIO G2 --> + <match key="@storage.originating_device:usb.product_id" int="0x760"> + <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.input_formats" type="strlist">audio/mpeg</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> + <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.audio_folders" type="strlist">VOICE/</append> + </match> + <!-- iAUDIO U2 --> + <match key="@storage.originating_device:usb.product_id" int="0x600"> + <append key="portable_audio_player.output_formats" type="strlist">application/ogg</append> + <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append> + <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append> + <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append> + <append key="portable_audio_player.audio_folders" type="strlist">MUSIC/</append> + <append key="portable_audio_player.audio_folders" type="strlist">RECORDS/FM/</append> + <append key="portable_audio_player.audio_folders" type="strlist">RECORDS/LINEIN/</append> + <append key="portable_audio_player.audio_folders" type="strlist">RECORDS/VOICE/</append> </match> </match> @@ -669,21 +703,29 @@ <!-- RIM --> <match key="@storage.originating_device:usb.vendor_id" int="0x0fca"> - <!-- Blackberry 8100 (Pearl), 8000 (Curve), 9000 (Bold) --> - <match key="@storage.originating_device:usb.product_id" int_outof="0x4;0x6;0x8004"> + <!-- Blackberry 8100 (Pearl) --> + <match key="@storage.originating_device:usb.product_id" int="0x4"> <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset> <append key="portable_audio_player.input_formats" type="strlist">audio/mp4</append> <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append> - <match key="@storage.originating_device:usb.product_id" int_outof="0x6;0x8004"> - <append key="portable_audio_player.audio_folders" type="strlist">BlackBerry/music/</append> - <append key="portable_audio_player.audio_folders" type="strlist">BlackBerry/videos/</append> - </match> - <match key="@storage.originating_device:usb.product_id" int="0x4"> - <append key="portable_audio_player.audio_folders" type="strlist">blackberry/music/</append> - <append key="portable_audio_player.audio_folders" type="strlist">blackberry/videos/</append> - </match> + <append key="portable_audio_player.audio_folders" type="strlist">blackberry/music/</append> + <append key="portable_audio_player.audio_folders" type="strlist">blackberry/videos/</append> </match> - <match key="@storage.originating_device:usb.product_id" int="0x8004"> + <!-- Blackberry 8000 (Curve) --> + <match key="@storage.originating_device:usb.product_id" int_outof="0x6"> + <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset> + <append key="portable_audio_player.input_formats" type="strlist">audio/mp4</append> + <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append> + <append key="portable_audio_player.audio_folders" type="strlist">BlackBerry/music/</append> + <append key="portable_audio_player.audio_folders" type="strlist">BlackBerry/videos/</append> + </match> + <!-- Blackberry 9000 (Bold) --> + <match key="@storage.originating_device:usb.product_id" int_outof="0x8004"> + <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset> + <append key="portable_audio_player.input_formats" type="strlist">audio/mp4</append> + <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append> + <append key="portable_audio_player.audio_folders" type="strlist">BlackBerry/music/</append> + <append key="portable_audio_player.audio_folders" type="strlist">BlackBerry/videos/</append> <append key="portable_audio_player.audio_folders" type="strlist">home/user/music/</append> <append key="portable_audio_player.audio_folders" type="strlist">home/user/videos/</append> </match> @@ -1012,18 +1054,24 @@ <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append> </match> <!-- T30 UMS firmware v1.7 , S10 UMS firmware v1.05 --> - <match key="@storage.originating_device:usb.product_id" int_outof="0x1019;0x1023"> + <match key="@storage.originating_device:usb.product_id" int_outof="0x1023"> <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset> <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="string">Playlists/%File</append> - <!-- S10 UMS firmware v1.05 folder --> - <match key="@storage.originating_device:usb.product_id" int="0x1023"> - <append key="portable_audio_player.audio_folders" type="strlist">Music/</append> - <append key="portable_audio_player.audio_folders" type="strlist">Recordings/</append> - </match> + </match> + <!-- S10 UMS firmware v1.05 folder --> + <match key="@storage.originating_device:usb.product_id" int="0x1023"> + <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset> + <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="string">Playlists/%File</append> + <append key="portable_audio_player.audio_folders" type="strlist">Music/</append> + <append key="portable_audio_player.audio_folders" type="strlist">Recordings/</append> </match> <!-- iFP 100 UMS, 300 UMS, 500 UMS (supports application/ogg only after firmware upgrade), N10 UMS diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi index 7e876a2..ee4eb3f 100644 --- a/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi +++ b/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi @@ -5,7 +5,7 @@ <match key="system.hardware.product" string="VGN-FS115Z"> <merge key="power_management.quirk.s3_mode" type="bool">true</merge> </match> - <match key="system.hardware.product" contains_outof="VGN-FS730;PCG-FX405;VGN-C2S_G;VGN-B1XP;VGN-FE21B;VGN-B100B"> + <match key="system.hardware.product" contains_outof="VGN-FS730;PCG-FX405;VGN-C2S_G;VGN-B1XP;VGN-FE21B;VGN-B100B;;VGN-B1VP"> <merge key="power_management.quirk.s3_bios" type="bool">true</merge> </match> <match key="system.hardware.product" string_outof="VGN-FS115B;VGN-C140G;VGN-TX3XP_L;VGN-T250P;VGN-AR31S;PCV-RX612;VGN-FS485B;VGN-SZ61XN_C;VGN-TZ37;VGN-TZ170N;VGN-FS920;VGN-C240E;PCG-FX601;VGN-SR11M"> diff --git a/fdi/information/10freedesktop/30-keymap-acer.fdi b/fdi/information/10freedesktop/30-keymap-acer.fdi index a2cf8d8..4511bff 100644 --- a/fdi/information/10freedesktop/30-keymap-acer.fdi +++ b/fdi/information/10freedesktop/30-keymap-acer.fdi @@ -61,6 +61,10 @@ <append key="input.keymap.data" type="strlist">e012:prog2</append> <append key="input.keymap.data" type="strlist">e059:bluetooth</append> <!-- Bluetooth (toggle) on-to-off --> </match> + <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="AO751h;AO531h"> + <remove key="input.keymap.data" type="strlist">e059:brightnessup</remove> + <append key="input.keymap.data" type="strlist">e059:bluetooth</append> <!-- Bluetooth (toggle) on-to-off --> + </match> </match> </match> </device> diff --git a/fdi/information/10freedesktop/30-keymap-misc.fdi b/fdi/information/10freedesktop/30-keymap-misc.fdi index 2b5e45a..44a3323 100644 --- a/fdi/information/10freedesktop/30-keymap-misc.fdi +++ b/fdi/information/10freedesktop/30-keymap-misc.fdi @@ -103,6 +103,22 @@ </match> </match> + <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" prefix="LG"> + <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="X110"> + <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-Left Volume down --> + <append key="input.keymap.data" type="strlist">e02f:search</append> <!-- Fn-F3 Search --> + <append key="input.keymap.data" type="strlist">e030:volumeup</append> <!-- Fn-Right Volume up --> + <append key="input.keymap.data" type="strlist">e031:battery</append> <!-- Fn-F10 Info --> + <append key="input.keymap.data" type="strlist">e033:suspend</append> <!-- Fn-F12 Hibernate --> + <append key="input.keymap.data" type="strlist">e05f:sleep</append> <!-- Fn-F4 Sleep --> + <append key="input.keymap.data" type="strlist">e064:f22</append> <!-- Fn-F5 Touchpad disable --> + <append key="input.keymap.data" type="strlist">e076:wlan</append> <!-- Fn-F6 satellite dish1 --> + <append key="input.keymap.data" type="strlist">e077:brightnessdown</append> <!-- Fn-Down Brightness down --> + <append key="input.keymap.data" type="strlist">e078:brightnessup</append> <!-- Fn-Up Brightness up --> + </match> + </match> + <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" string="MEDIONNB"> <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" prefix="A555"> <append key="input.keymap.data" type="strlist">63:www</append> <!-- N button --> diff --git a/fdi/information/10freedesktop/30-keymap-olpc.fdi b/fdi/information/10freedesktop/30-keymap-olpc.fdi new file mode 100644 index 0000000..3912e66 --- /dev/null +++ b/fdi/information/10freedesktop/30-keymap-olpc.fdi @@ -0,0 +1,93 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- --> + +<deviceinfo version="0.2"> + <device> + + <match key="@input.originating_device:info.linux.driver" string="atkbd"> + <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" string="OLPC"> + <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" string="XO"> + <append key="input.keymap.data" type="strlist">59:fn</append> + <append key="input.keymap.data" type="strlist">e001:fn_esc</append> + + <append key="input.keymap.data" type="strlist">e079:camera</append> + <!-- FN-CAMERA is 'Mic', KEY_SOUND is as close as I see. --> + <append key="input.keymap.data" type="strlist">e078:sound</append> + + <append key="input.keymap.data" type="strlist">e03b:fn_f1</append> + <append key="input.keymap.data" type="strlist">e03c:fn_f2</append> + <append key="input.keymap.data" type="strlist">e03d:fn_f3</append> + <append key="input.keymap.data" type="strlist">e03e:fn_f4</append> + <append key="input.keymap.data" type="strlist">e03f:fn_f5</append> + <append key="input.keymap.data" type="strlist">e040:fn_f6</append> + <append key="input.keymap.data" type="strlist">e041:fn_f7</append> + <append key="input.keymap.data" type="strlist">e042:fn_f8</append> + <append key="input.keymap.data" type="strlist">e043:fn_f9</append> + <append key="input.keymap.data" type="strlist">e044:fn_f10</append> + <append key="input.keymap.data" type="strlist">e057:fn_f11</append> + <append key="input.keymap.data" type="strlist">e058:fn_f12</append> + + <!-- Using KEY_F13-KEY_F21 for the .5 F keys right now. --> + <append key="input.keymap.data" type="strlist">e077:f13</append> + <append key="input.keymap.data" type="strlist">e076:f14</append> + <append key="input.keymap.data" type="strlist">e075:f15</append> + <append key="input.keymap.data" type="strlist">e074:f16</append> + <append key="input.keymap.data" type="strlist">e073:f17</append> + <append key="input.keymap.data" type="strlist">e072:f18</append> + <append key="input.keymap.data" type="strlist">e071:f19</append> + <append key="input.keymap.data" type="strlist">e070:f20</append> + <append key="input.keymap.data" type="strlist">e06f:f21</append> + + <append key="input.keymap.data" type="strlist">e06e:chat</append> + <!-- FIXME: FN-CHAT, just mapping to KEY_CHAT right now --> + <append key="input.keymap.data" type="strlist">e064:chat</append> + + <!-- Frame and Fn-frame , which is listed as 'Win App', try --> + <append key="input.keymap.data" type="strlist">e05d:menu</append> + <append key="input.keymap.data" type="strlist">e05a:prog1</append> + + <!-- The FN of some keys is other keys --> + <append key="input.keymap.data" type="strlist">e053:delete</append> + <append key="input.keymap.data" type="strlist">e052:insert</append> + <append key="input.keymap.data" type="strlist">e049:pageup</append> + <append key="input.keymap.data" type="strlist">e051:pagedown</append> + <append key="input.keymap.data" type="strlist">e047:home</append> + <append key="input.keymap.data" type="strlist">e04f:end</append> + + <!-- FIXME: These should be the language key. Don't ask what they + are doing as KEY_HP. It will make your brain hurt. --> + <append key="input.keymap.data" type="strlist">73:hp</append> + <append key="input.keymap.data" type="strlist">7e:hp</append> + + <!-- L/R grab --> + <append key="input.keymap.data" type="strlist">e05b:leftmeta</append> + <append key="input.keymap.data" type="strlist">e05c:rightmeta</append> + <!-- FIXME: right grab seems to be releasing on a different scancode --> + <append key="input.keymap.data" type="strlist">85:rightmeta</append> + + <!-- Fn-space toggles the backlight. + At least in a dream I had last night. --> + <append key="input.keymap.data" type="strlist">e056:kbdillumtoggle</append> + + <!-- Set the game keys to map to up/down/left/right for now --> + <append key="input.keymap.data" type="strlist">65:kp8</append> + <append key="input.keymap.data" type="strlist">66:kp2</append> + <append key="input.keymap.data" type="strlist">67:kp4</append> + <append key="input.keymap.data" type="strlist">68:kp6</append> + + <!-- set the other game keys to map to pgup/pgdn/home/end --> + <append key="input.keymap.data" type="strlist">e065:kp9</append> + <append key="input.keymap.data" type="strlist">e066:kp3</append> + <append key="input.keymap.data" type="strlist">e067:kp7</append> + <append key="input.keymap.data" type="strlist">e068:kp1</append> + + <append key="input.keymap.data" type="strlist">69:switchvideomode</append> + + <append key="info.capabilities" type="strlist">input.keymap</append> + + </match> + </match> + + </match> + </device> +</deviceinfo> + diff --git a/fdi/information/10freedesktop/Makefile.am b/fdi/information/10freedesktop/Makefile.am index 3332609..e2f428c 100644 --- a/fdi/information/10freedesktop/Makefile.am +++ b/fdi/information/10freedesktop/Makefile.am @@ -86,7 +86,8 @@ dist_fdi_DATA += \ 30-keymap-compaq.fdi \ 30-keymap-lenovo.fdi \ 30-keymap-dell.fdi \ - 30-keymap-acer.fdi + 30-keymap-acer.fdi \ + 30-keymap-olpc.fdi endif check: |