[systemd-commits] keymaps/logitech-usb Makefile.am src/udev

[Martin Pitt]

 Makefile.am                     |    1 +
 keymaps/logitech-usb            |    6 ++++++
 src/udev/keymap/95-keymap.rules |    1 +
 3 files changed, 8 insertions(+)

New commits:
commit 98627dced719f047e9e47af1f855d9c032e548f9
Author: Martin Pitt <martinpitt at gnome.org>
Date:   Fri May 24 08:35:47 2013 +0200

    keymap: Add Logitech USB (iTouch)
    
    https://launchpad.net/bugs/1152377

diff --git a/Makefile.am b/Makefile.am
index b278143..e63563f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2505,6 +2505,7 @@ dist_udevkeymap_DATA = \
 	keymaps/lenovo-thinkpad_x6_tablet \
 	keymaps/lenovo-thinkpad_x200_tablet \
 	keymaps/lg-x110 \
+	keymaps/logitech-usb \
 	keymaps/logitech-wave \
 	keymaps/logitech-wave-cordless \
 	keymaps/logitech-wave-pro-cordless \
diff --git a/keymaps/logitech-usb b/keymaps/logitech-usb
new file mode 100644
index 0000000..728f0e0
--- /dev/null
+++ b/keymaps/logitech-usb
@@ -0,0 +1,6 @@
+0x90001 shop	# Shopping
+0x90002 config	# iTouch
+0x90003 finance	# Finance
+0x90004 prog1	# My Sites
+0x90005 prog2	# Community
+0xC0183 media	# Media
diff --git a/src/udev/keymap/95-keymap.rules b/src/udev/keymap/95-keymap.rules
index df1bffe..994950c 100644
--- a/src/udev/keymap/95-keymap.rules
+++ b/src/udev/keymap/95-keymap.rules
@@ -23,6 +23,7 @@ LABEL="keyboard_usbcheck"
 ENV{ID_VENDOR}=="Genius", ENV{ID_MODEL_ID}=="0708", ENV{ID_USB_INTERFACE_NUM}=="01", RUN+="keymap $name genius-slimstar-320"
 ENV{ID_VENDOR}=="Logitech*", ATTRS{name}=="Logitech USB Multimedia Keyboard", RUN+="keymap $name logitech-wave"
 ENV{ID_VENDOR}=="Logitech*", ATTRS{name}=="Logitech USB Receiver", RUN+="keymap $name logitech-wave-cordless"
+ENV{ID_VENDOR}=="Logitech*", ATTRS{name}=="* Logitech USB Keyboard*", RUN+="keymap $name logitech-usb"
 # Logitech Cordless Wave Pro looks slightly weird; some hotkeys are coming through the mouse interface
 ENV{ID_VENDOR_ID}=="046d", ENV{ID_MODEL_ID}=="c52[9b]", ATTRS{name}=="Logitech USB Receiver", RUN+="keymap $name logitech-wave-pro-cordless"