hal: Branch 'master'

[Danny Kukawka]

 fdi/information/10freedesktop/30-keymap-hp.fdi |    9 +++++++++
 1 file changed, 9 insertions(+)

New commits:
commit a5ec7bcde0c182a0e6144723778bfbbb86c245dc
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Tue Nov 20 14:28:37 2007 +0100

    added keymap for HP Pavilion dv6500
    
    Applied slightly adopted patch from Ugo Viti <ugo.viti at initzero.it>
    from HAL ML to add a keymap for a HP Pavilion dv6500.

diff --git a/fdi/information/10freedesktop/30-keymap-hp.fdi b/fdi/information/10freedesktop/30-keymap-hp.fdi
index da2bf0a..93747d1 100644
--- a/fdi/information/10freedesktop/30-keymap-hp.fdi
+++ b/fdi/information/10freedesktop/30-keymap-hp.fdi
@@ -14,6 +14,15 @@
           <append key="input.keymap.data" type="strlist">e058:f22</append>	<!-- touchpad off -->
           <append key="info.capabilities" type="strlist">input.keymap</append>
         </match>
+        <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="dv6500">
+          <append key="input.keymap.data" type="strlist">e008:f20</append>	<!-- FIXME: quick play -->
+          <append key="input.keymap.data" type="strlist">e00a:screenlock</append> <!-- FnF6 (lock) -->
+          <append key="input.keymap.data" type="strlist">e00e:f21</append>	<!-- FIXME: dvd -->
+          <append key="input.keymap.data" type="strlist">e031:help</append>	<!-- FnF1 (help) -->
+          <append key="input.keymap.data" type="strlist">e058:f22</append>	<!-- FIXME: touchpad off -->
+          <append key="input.keymap.data" type="strlist">e059:f22</append>	<!-- FIXME: touchpad on -->
+          <append key="info.capabilities" type="strlist">input.keymap</append>
+        </match>
         <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="nc2400">
           <append key="input.keymap.data" type="strlist">e001:fn_esc</append>	<!-- FnEsc -->
           <append key="input.keymap.data" type="strlist">e008:tv</append>	<!-- SVideo/Presentation -->