[linux-dvb] Patch 27 / 50: code cleanup for irkeymaps

Uwe Bugla uwe.bugla at gmx.de
Fri Jun 23 17:19:37 CEST 2006


#Applies against: 2.6.17
#Signed-off-by: Uwe Bugla <uwe.bugla at gmx.de>
#Changes: wipe out uncommented material
--- a/drivers/media/common/ir-keymaps.c	2006-05-27 14:03:00
+++ b/drivers/media/common/ir-keymaps.c	2006-05-29 15:13:00
@@ -123,28 +123,7 @@
 	[ 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 >>>
- * The GPIO values are
- * 6397fb for both "Scan <" and "CH -",
- * 639ffb for "Scan >" and "CH+",
- * 6384fb for "Tune <" and "<<<",
- * 638cfb for "Tune >" and ">>>", regardless of the mask.
- *
- *	[ 0x17 ] = KEY_BACK,        // fm scan <<
- *	[ 0x1f ] = KEY_FORWARD,     // fm scan >>
- *
- *	[ 0x04 ] = KEY_LEFT,        // fm tuning <
- *	[ 0x0c ] = KEY_RIGHT,       // fm tuning >
- *
- * For now, these four keys are disabled. Pressing them will generate
- * the CH+/CH-/<<</>>> events
- */
-
 	[ 0x03 ] = KEY_TUNER,       // TV/FM
-
 	[ 0x00 ] = KEY_RECORD,
 	[ 0x08 ] = KEY_STOP,
 	[ 0x11 ] = KEY_PLAY,
@@ -951,93 +930,40 @@
    The "ascii-art picture" below (in comments, first row
    is the keycode in hex, and subsequent row(s) shows
    the button labels (several variants when appropriate)
-   helps to descide which keycodes to assign to the buttons.
+   helps to decide which keycodes to assign to the buttons.
  */
 IR_KEYTAB_TYPE ir_codes_manli[IR_KEYTAB_SIZE] = {
-
-	/*  0x1c            0x12  *
-	 * FUNCTION         POWER *
-	 *   FM              (|)  *
-	 *                        */
 	[ 0x1c ] = KEY_RADIO,	/*XXX*/
 	[ 0x12 ] = KEY_POWER,
-
-	/*  0x01    0x02    0x03  *
-	 *   1       2       3    *
-	 *                        *
-	 *  0x04    0x05    0x06  *
-	 *   4       5       6    *
-	 *                        *
-	 *  0x07    0x08    0x09  *
-	 *   7       8       9    *
-	 *                        */
 	[ 0x01 ] = KEY_1,
 	[ 0x02 ] = KEY_2,
 	[ 0x03 ] = KEY_3,
 	[ 0x04 ] = KEY_4,
 	[ 0x05 ] = KEY_5,
 	[ 0x06 ] = KEY_6,
 	[ 0x07 ] = KEY_7,
 	[ 0x08 ] = KEY_8,
 	[ 0x09 ] = KEY_9,
-
-	/*  0x0a    0x00    0x17  *
-	 * RECALL    0      +100  *
-	 *                  PLUS  *
-	 *                        */
 	[ 0x0a ] = KEY_AGAIN,	/*XXX KEY_REWIND? */
 	[ 0x00 ] = KEY_0,
 	[ 0x17 ] = KEY_DIGITS,	/*XXX*/
-
-	/*  0x14            0x10  *
-	 *  MENU            INFO  *
-	 *  OSD                   */
 	[ 0x14 ] = KEY_MENU,
 	[ 0x10 ] = KEY_INFO,
-
-	/*          0x0b          *
-	 *           Up           *
-	 *                        *
-	 *  0x18    0x16    0x0c  *
-	 *  Left     Ok     Right *
-	 *                        *
-	 *         0x015          *
-	 *         Down           *
-	 *                        */
 	[ 0x0b ] = KEY_UP,	/*XXX KEY_SCROLLUP? */
 	[ 0x18 ] = KEY_LEFT,	/*XXX KEY_BACK? */
 	[ 0x16 ] = KEY_OK,	/*XXX KEY_SELECT? KEY_ENTER? */
 	[ 0x0c ] = KEY_RIGHT,	/*XXX KEY_FORWARD? */
 	[ 0x15 ] = KEY_DOWN,	/*XXX KEY_SCROLLDOWN? */
-
-	/*  0x11            0x0d  *
-	 *  TV/AV           MODE  *
-	 *  SOURCE         STEREO *
-	 *                        */
 	[ 0x11 ] = KEY_TV,	/*XXX*/
 	[ 0x0d ] = KEY_MODE,	/*XXX there's no KEY_STEREO */
-
-	/*  0x0f    0x1b    0x1a  *
-	 *  AUDIO   Vol+    Chan+ *
-	 *        TIMESHIFT???    *
-	 *                        *
-	 *  0x0e    0x1f    0x1e  *
-	 *  SLEEP   Vol-    Chan- *
-	 *                        */
 	[ 0x0f ] = KEY_AUDIO,
 	[ 0x1b ] = KEY_VOLUMEUP,
 	[ 0x1a ] = KEY_CHANNELUP,
 	[ 0x0e ] = KEY_SLEEP,	/*XXX maybe KEY_PAUSE */
 	[ 0x1f ] = KEY_VOLUMEDOWN,
 	[ 0x1e ] = KEY_CHANNELDOWN,
-
-	/*         0x13     0x19  *
-	 *         MUTE   SNAPSHOT*
-	 *                        */
 	[ 0x13 ] = KEY_MUTE,
 	[ 0x19 ] = KEY_RECORD,	/*XXX*/
-
-	// 0x1d unused ?
 };
 
 EXPORT_SYMBOL_GPL(ir_codes_manli);

-- 


Der GMX SmartSurfer hilft bis zu 70% Ihrer Onlinekosten zu sparen!
Ideal für Modem und ISDN: http://www.gmx.net/de/go/smartsurfer



More information about the linux-dvb mailing list