summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Pitt <martinpitt@gnome.org>2013-06-02 11:25:06 -0400
committerAnthony G. Basile <blueness@gentoo.org>2013-06-02 11:25:06 -0400
commitebbcb55a2d488668cf779fab6cb1100e9a3f2298 (patch)
tree347784b71cf50bfa32504adac9170504efc598e3
parentc4b8f8a920cf254ebaf5c4442462ab5192d2c48a (diff)
keymap: Add Logitech USB (iTouch)
https://launchpad.net/bugs/1152377 Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
-rw-r--r--keymaps/Makefile.am1
-rw-r--r--keymaps/logitech-usb6
-rw-r--r--rules/95-keymap.rules1
3 files changed, 8 insertions, 0 deletions
diff --git a/keymaps/Makefile.am b/keymaps/Makefile.am
index 918c99fdbd..afac244830 100644
--- a/keymaps/Makefile.am
+++ b/keymaps/Makefile.am
@@ -38,6 +38,7 @@ KEYMAPS = \
lenovo-thinkpad_x6_tablet \
lenovo-thinkpad_x200_tablet \
lg-x110 \
+ logitech-usb \
logitech-wave \
logitech-wave-cordless \
logitech-wave-pro-cordless \
diff --git a/keymaps/logitech-usb b/keymaps/logitech-usb
new file mode 100644
index 0000000000..728f0e02b2
--- /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/rules/95-keymap.rules b/rules/95-keymap.rules
index 30a77c888b..a196a33d7b 100644
--- a/rules/95-keymap.rules
+++ b/rules/95-keymap.rules
@@ -27,6 +27,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"