[meego-commits] 14954: Changes to Trunk:Testing/udev

Fri Mar 18 00:05:54 UTC 2011

Hi,
I have made the following changes to udev in project Trunk:Testing. Please review and accept ASAP.

Thank You,
wdouglas

[This message was auto-generated]

---

Request #14954:

  submit:   home:wdouglas:branches:Trunk:Testing/udev(r13)(cleanup) -> Trunk:Testing/udev


Message:
    * Wed Mar 16 2011 William Douglas <william.douglas at linux.intel.com> - 161
- Add tmm keymaps and rules patch

State:   new          2011-03-17T17:05:48 wdouglas
Comment: None



changes files:
--------------

--- udev.changes
+++ udev.changes
@@ -0,0 +1,3 @@
+* Wed Mar 16 2011 William Douglas <william.douglas at linux.intel.com> - 161
+- Add tmm keymaps and rules patch
+

new:
----
  udev-161-keymap-for-mm.patch

spec files:
-----------
--- udev.spec
+++ udev.spec
@@ -28,6 +28,7 @@
 Patch111: udev-145-reconf.patch
 Patch112: udev-pkgconfigdir.patch
 Patch113: udev-162-keymap-for-lenovo-ideapad.patch
+Patch114: udev-161-keymap-for-mm.patch
 
 ExclusiveOS: Linux
 URL: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html
@@ -117,7 +118,7 @@
 %patch111 -p1 -b .ref
 %patch112 -p1 -b .datadir
 %patch113 -p1 -b .ideapad
-
+%patch114 -p1 -b .mm
 
 %build
 libtoolize -f -c
@@ -319,6 +320,7 @@
 %attr(0755,root,root) %{udev_libdir}/rules.d/60-persistent-input.rules
 %attr(0755,root,root) %{udev_libdir}/rules.d/60-filesystem-info.rules
 %attr(0755,root,root) %{udev_libdir}/rules.d/61-mobile-action.rules
+%attr(0755,root,root) %{udev_libdir}/rules.d/65-xorg-keypad.rules
 #%attr(0755,root,root) %{udev_libdir}/rules.d/61-option-modem-modeswitch.rules
 %attr(0755,root,root) %{udev_libdir}/rules.d/70-acl.rules
 %attr(0755,root,root) %{udev_libdir}/rules.d/70-hid2hci.rules

other changes:
--------------

++++++ udev-161-keymap-for-mm.patch (new)
--- udev-161-keymap-for-mm.patch
+++ udev-161-keymap-for-mm.patch
+From e4b22fb0026e9fbbdf8906a90db7002e57f3476e Mon Sep 17 00:00:00 2001
+From: William Douglas <william.douglas at linux.intel.com>
+Date: Fri, 11 Mar 2011 14:17:00 -0800
+Subject: [PATCH] add tmm and mrst-cdk keymaps and rules
+
+---
+ Makefile.am                        |    3 ++
+ extras/keymap/65-xorg-keypad.rules |    4 ++
+ extras/keymap/95-keymap.rules      |    3 ++
+ extras/keymap/keymaps/mrst-cdk     |   66 ++++++++++++++++++++++++++++++++++++
+ extras/keymap/keymaps/tmm          |   66 ++++++++++++++++++++++++++++++++++++
+ 5 files changed, 142 insertions(+), 0 deletions(-)
+ create mode 100644 extras/keymap/65-xorg-keypad.rules
+ create mode 100644 extras/keymap/keymaps/mrst-cdk
+ create mode 100644 extras/keymap/keymaps/tmm
+
+diff --git a/Makefile.am b/Makefile.am
+index c16b259..e7eb960 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -499,6 +499,7 @@ nodist_extras_keymap_keymap_SOURCES = \
+ BUILT_SOURCES += $(nodist_extras_keymap_keymap_SOURCES)
+ 
+ EXTRA_DIST += extras/keymap/check-keymaps.sh
++dist_udevrules_DATA += extras/keymap/65-xorg-keypad.rules
+ dist_udevrules_DATA += extras/keymap/95-keymap.rules
+ dist_udevrules_DATA += extras/keymap/95-keyboard-force-release.rules
+ libexec_PROGRAMS += extras/keymap/keymap
+@@ -548,11 +549,13 @@ dist_udevkeymap_DATA = \
+ 	extras/keymap/keymaps/medion-fid2060 \
+ 	extras/keymap/keymaps/medionnb-a555 \
+ 	extras/keymap/keymaps/micro-star \
++	extras/keymap/keymaps/tmm \
+ 	extras/keymap/keymaps/module-asus-w3j \
+ 	extras/keymap/keymaps/module-ibm \
+ 	extras/keymap/keymaps/module-lenovo \
+ 	extras/keymap/keymaps/module-sony \
+ 	extras/keymap/keymaps/module-sony-old \
++	extras/keymap/keymaps/mrst-cdk \
+ 	extras/keymap/keymaps/olpc-xo \
+ 	extras/keymap/keymaps/oqo-model2 \
+ 	extras/keymap/keymaps/samsung-other \
+diff --git a/extras/keymap/65-xorg-keypad.rules b/extras/keymap/65-xorg-keypad.rules
+new file mode 100644
+index 0000000..3167489
+--- /dev/null
++++ b/extras/keymap/65-xorg-keypad.rules
+@@ -0,0 +1,4 @@
++ENV{DMI_VENDOR}="$attr{[dmi/id]sys_vendor}"
++
++KERNEL=="event*", ENV{DMI_VENDOR}=="Acer", ATTR{[dmi/id]product_name}=="MM", ATTR{[dmi/id]board_name}=="MM", ENV{ID_INPUT_KEY}=="1", ENV{XKBLAYOUT}="tmm"
++
+diff --git a/extras/keymap/95-keymap.rules b/extras/keymap/95-keymap.rules
+index 13b5571..9b018bb 100644
+--- a/extras/keymap/95-keymap.rules
++++ b/extras/keymap/95-keymap.rules
+@@ -48,6 +48,9 @@ ENV{DMI_VENDOR}=="Sony*", KERNELS=="input*", ATTRS{name}=="Sony Vaio Keys", RUN+
+ # Older Vaios have some different keys
+ ENV{DMI_VENDOR}=="Sony*", ATTR{[dmi/id]product_name}=="*PCG-C1*|*PCG-K25*|*PCG-F1*|*PCG-F2*|*PCG-F3*|*PCG-F4*|*PCG-F5*|*PCG-F6*|*PCG-FX*|*PCG-FRV*|*PCG-GR*|*PCG-TR*|*PCG-NV*|*PCG-Z*|*VGN-S360*|*VGN-SZ2HP_B*", ATTRS{name}=="Sony Vaio Keys", RUN+="keymap $name module-sony-old"
+ 
++ENV{DMI_VENDOR}=="Intel Corporation", ATTR{[dmi/id]product_name}=="Moorestown", ATTR{[dmi/id]board_name}=="CDK", RUN+="keymap $name mrst-cdk"
++ENV{DMI_VENDOR}=="INSYDE", ATTR{[dmi/id]product_name}=="Moorestown", ATTR{[dmi/id]board_name}=="MM", RUN+="keymap $name tmm"
++
+ #
+ # The following rules belong to standard i8042 AT keyboard with high key codes.
+ #
+diff --git a/extras/keymap/keymaps/mrst-cdk b/extras/keymap/keymaps/mrst-cdk
+new file mode 100644
+index 0000000..b2accce
+--- /dev/null
++++ b/extras/keymap/keymaps/mrst-cdk
+@@ -0,0 +1,66 @@
++# moorestown CDK scancodes to keycodes.  Due to keymap braindamage,
++# numbers are not KEY_x strings, but actual keycodes.
++0x000 f
++0x001 d
++0x002 e
++0x003 grave
++0x004 c
++0x005 r
++0x006 5
++0x007 v
++0x008 numlock
++0x009 leftctrl
++0x00a z
++0x00b w
++0x00c 3
++0x00d x
++0x00e s
++0x00f 4
++0x010 equal
++0x011 n
++0x012 h
++0x013 u
++0x014 8
++0x015 m
++0x016 j
++0x017 9
++0x018 7
++0x019 6
++0x01a apostrophe
++0x01b g
++0x01c t
++0x01d space
++0x01e b
++0x01f y
++0x020 unknown
++0x021 11
++0x022 left
++0x023 semicolon
++0x024 p
++0x025 down
++0x026 up
++0x027 backspace
++0x028 l
++0x029 k
++0x02a i
++0x02b slash
++0x02c comma
++0x02d o
++0x02e 10
++0x02f dot
++0x030 q
++0x031 tab
++0x032 esc
++0x033 leftshift
++0x034 capslock
++0x035 2
++0x036 fn
++0x037 a
++0x038 leftshift
++0x039 rightshift
++0x03a enter
++0x03b reserved
++0x03c right
++0x03d reserved
++0x03e reserved
++0x03f reserved
+diff --git a/extras/keymap/keymaps/tmm b/extras/keymap/keymaps/tmm
+new file mode 100644
+index 0000000..36c2cf7
+--- /dev/null
++++ b/extras/keymap/keymaps/tmm
+@@ -0,0 +1,66 @@
++# tmm scancodes to keycodes.  Due to keymap braindamage,
++# numbers are not KEY_x strings, but actual keycodes.
++0x000 2
++0x001 9
++0x002 t
++0x003 s
++0x004 l
++0x005 n
++0x006 unknown
++0x007 unknown
++0x008 3
++0x009 10
++0x00a y
++0x00b d
++0x00c backspace
++0x00d m
++0x00e unknown
++0x00f unknown
++0x010 4
++0x011 11
++0x012 u
++0x013 f
++0x014 z
++0x015 f23
++0x016 unknown
++0x017 unknown
++0x018 5
++0x019 q
++0x01a i
++0x01b g
++0x01c x
++0x01d f24
++0x01e unknown
++0x01f unknown 
++0x020 6
++0x021 w 
++0x022 o
++0x023 h
++0x024 c
++0x025 comma
++0x026 unknown
++0x027 unknown
++0x028 7
++0x029 e
++0x02a p
++0x02b j
++0x02c v
++0x02d dot
++0x02e unknown
++0x02f unknown
++0x030 8
++0x031 r
++0x032 a
++0x033 k
(15 more lines skipped)


