SOURCES (LINUX_2_6_20): kernel-small_fixes.patch - fixed ir keymap...

[charles]

Author: charles                      Date: Sat Feb 17 23:32:31 2007 GMT
Module: SOURCES                       Tag: LINUX_2_6_20
---- Log message:
- fixed ir keymaps for pixelview

---- Files affected:
SOURCES:
   kernel-small_fixes.patch (1.1.2.1 -> 1.1.2.1.4.1) 

---- Diffs:

================================================================
Index: SOURCES/kernel-small_fixes.patch
diff -u SOURCES/kernel-small_fixes.patch:1.1.2.1 SOURCES/kernel-small_fixes.patch:1.1.2.1.4.1
--- SOURCES/kernel-small_fixes.patch:1.1.2.1	Mon Aug  7 13:29:56 2006
+++ SOURCES/kernel-small_fixes.patch	Sun Feb 18 00:32:26 2007
@@ -37,3 +37,67 @@
  /* Enforce in-order execution of data I/O.
   * No distinction between read/write on PPC; use eieio for all three.
   */
+--- linux-2.6.20/drivers/media/common/ir-keymaps.c.orig	2007-02-04 19:44:54.000000000 +0100
++++ linux-2.6.20/drivers/media/common/ir-keymaps.c	2007-02-17 22:22:39.327414970 +0100
+@@ -151,10 +151,6 @@
+ 
+ IR_KEYTAB_TYPE ir_codes_pixelview[IR_KEYTAB_SIZE] = {
+ 
+-	[ 0x1e ] = KEY_POWER,       // power
+-	[ 0x07 ] = KEY_MEDIA,       // source
+-	[ 0x1c ] = KEY_SEARCH,      // scan
+-
+ /* FIXME: duplicate keycodes?
+  *
+  * These four keys seem to share the same GPIO as CH+, CH-, <<< and >>>
+@@ -175,14 +171,10 @@
+  */
+ 
+ 	[ 0x03 ] = KEY_TUNER,       // TV/FM
++	[ 0x07 ] = KEY_SEARCH,      // scan
++	[ 0x1c ] = KEY_ZOOM,        // zoom
+ 
+-	[ 0x00 ] = KEY_RECORD,
+-	[ 0x08 ] = KEY_STOP,
+-	[ 0x11 ] = KEY_PLAY,
+-
+-	[ 0x1a ] = KEY_PLAYPAUSE,   // freeze
+-	[ 0x19 ] = KEY_ZOOM,        // zoom
+-	[ 0x0f ] = KEY_TEXT,        // min
++	[ 0x1e ] = KEY_POWER,       // power
+ 
+ 	[ 0x01 ] = KEY_1,
+ 	[ 0x0b ] = KEY_2,
+@@ -195,20 +187,22 @@
+ 	[ 0x12 ] = KEY_9,
+ 	[ 0x02 ] = KEY_0,
+ 	[ 0x10 ] = KEY_LAST,        // +100
+-	[ 0x13 ] = KEY_LIST,        // recall
++	[ 0x13 ] = KEY_LIST,        // loop
+ 
+-	[ 0x1f ] = KEY_CHANNELUP,   // chn down
+-	[ 0x17 ] = KEY_CHANNELDOWN, // chn up
+-	[ 0x16 ] = KEY_VOLUMEUP,    // vol down
+-	[ 0x14 ] = KEY_VOLUMEDOWN,  // vol up
++	[ 0x1f ] = KEY_VOLUMEUP,    // vol down
++	[ 0x17 ] = KEY_VOLUMEDOWN,  // vol up
++	[ 0x16 ] = KEY_CHANNELUP,   // chn down
++	[ 0x14 ] = KEY_CHANNELDOWN, // chn up
+ 
+-	[ 0x04 ] = KEY_KPMINUS,     // <<<
++	[ 0x00 ] = KEY_MEDIA,       // source
++	[ 0x18 ] = KEY_MUTE,        // mute/unmute
++
++	[ 0x04 ] = KEY_KPMINUS,     // -
+ 	[ 0x0e ] = KEY_SETUP,       // function
+-	[ 0x0c ] = KEY_KPPLUS,      // >>>
++	[ 0x0c ] = KEY_KPPLUS,      // +
+ 
+-	[ 0x0d ] = KEY_GOTO,        // mts
+-	[ 0x1d ] = KEY_REFRESH,     // reset
+-	[ 0x18 ] = KEY_MUTE         // mute/unmute
++	[ 0x0d ] = KEY_REFRESH,     // reset
++	[ 0x0f ] = KEY_PLAYPAUSE    // freeze
+ };
+ 
+ EXPORT_SYMBOL_GPL(ir_codes_pixelview);
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/kernel-small_fixes.patch?r1=1.1.2.1&r2=1.1.2.1.4.1&f=u