Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[media] saa7134: NEC scancode fix

This driver codes the two address bytes in reverse order when compared to the
other drivers, so make it consistent (and update the keymap, note that the
result is a prefix change from 0x6b86 -> 0x866b, and the latter is pretty
common among the NECX keymaps. While not conclusive, it's still a strong hint
that the change is correct).

Signed-off-by: David Härdeman <david@hardeman.nu>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>

authored by

David Härdeman and committed by
Mauro Carvalho Chehab
0bc56cbe 120703f9

+35 -35
+1 -1
drivers/media/pci/saa7134/saa7134-input.c
··· 346 346 return 0; 347 347 348 348 *protocol = RC_TYPE_NEC; 349 - *scancode = RC_SCANCODE_NECX(((data[10] << 8) | data[11]), data[9]); 349 + *scancode = RC_SCANCODE_NECX(data[11] << 8 | data[10], data[9]); 350 350 *toggle = 0; 351 351 return 1; 352 352 }
+34 -34
drivers/media/rc/keymaps/rc-behold.c
··· 30 30 /* 0x1c 0x12 * 31 31 * TV/FM POWER * 32 32 * */ 33 - { 0x6b861c, KEY_TUNER }, /* XXX KEY_TV / KEY_RADIO */ 34 - { 0x6b8612, KEY_POWER }, 33 + { 0x866b1c, KEY_TUNER }, /* XXX KEY_TV / KEY_RADIO */ 34 + { 0x866b12, KEY_POWER }, 35 35 36 36 /* 0x01 0x02 0x03 * 37 37 * 1 2 3 * ··· 42 42 * 0x07 0x08 0x09 * 43 43 * 7 8 9 * 44 44 * */ 45 - { 0x6b8601, KEY_1 }, 46 - { 0x6b8602, KEY_2 }, 47 - { 0x6b8603, KEY_3 }, 48 - { 0x6b8604, KEY_4 }, 49 - { 0x6b8605, KEY_5 }, 50 - { 0x6b8606, KEY_6 }, 51 - { 0x6b8607, KEY_7 }, 52 - { 0x6b8608, KEY_8 }, 53 - { 0x6b8609, KEY_9 }, 45 + { 0x866b01, KEY_1 }, 46 + { 0x866b02, KEY_2 }, 47 + { 0x866b03, KEY_3 }, 48 + { 0x866b04, KEY_4 }, 49 + { 0x866b05, KEY_5 }, 50 + { 0x866b06, KEY_6 }, 51 + { 0x866b07, KEY_7 }, 52 + { 0x866b08, KEY_8 }, 53 + { 0x866b09, KEY_9 }, 54 54 55 55 /* 0x0a 0x00 0x17 * 56 56 * RECALL 0 MODE * 57 57 * */ 58 - { 0x6b860a, KEY_AGAIN }, 59 - { 0x6b8600, KEY_0 }, 60 - { 0x6b8617, KEY_MODE }, 58 + { 0x866b0a, KEY_AGAIN }, 59 + { 0x866b00, KEY_0 }, 60 + { 0x866b17, KEY_MODE }, 61 61 62 62 /* 0x14 0x10 * 63 63 * ASPECT FULLSCREEN * 64 64 * */ 65 - { 0x6b8614, KEY_SCREEN }, 66 - { 0x6b8610, KEY_ZOOM }, 65 + { 0x866b14, KEY_SCREEN }, 66 + { 0x866b10, KEY_ZOOM }, 67 67 68 68 /* 0x0b * 69 69 * Up * ··· 74 74 * 0x015 * 75 75 * Down * 76 76 * */ 77 - { 0x6b860b, KEY_CHANNELUP }, 78 - { 0x6b8618, KEY_VOLUMEDOWN }, 79 - { 0x6b8616, KEY_OK }, /* XXX KEY_ENTER */ 80 - { 0x6b860c, KEY_VOLUMEUP }, 81 - { 0x6b8615, KEY_CHANNELDOWN }, 77 + { 0x866b0b, KEY_CHANNELUP }, 78 + { 0x866b18, KEY_VOLUMEDOWN }, 79 + { 0x866b16, KEY_OK }, /* XXX KEY_ENTER */ 80 + { 0x866b0c, KEY_VOLUMEUP }, 81 + { 0x866b15, KEY_CHANNELDOWN }, 82 82 83 83 /* 0x11 0x0d * 84 84 * MUTE INFO * 85 85 * */ 86 - { 0x6b8611, KEY_MUTE }, 87 - { 0x6b860d, KEY_INFO }, 86 + { 0x866b11, KEY_MUTE }, 87 + { 0x866b0d, KEY_INFO }, 88 88 89 89 /* 0x0f 0x1b 0x1a * 90 90 * RECORD PLAY/PAUSE STOP * ··· 93 93 *TELETEXT AUDIO SOURCE * 94 94 * RED YELLOW * 95 95 * */ 96 - { 0x6b860f, KEY_RECORD }, 97 - { 0x6b861b, KEY_PLAYPAUSE }, 98 - { 0x6b861a, KEY_STOP }, 99 - { 0x6b860e, KEY_TEXT }, 100 - { 0x6b861f, KEY_RED }, /*XXX KEY_AUDIO */ 101 - { 0x6b861e, KEY_VIDEO }, 96 + { 0x866b0f, KEY_RECORD }, 97 + { 0x866b1b, KEY_PLAYPAUSE }, 98 + { 0x866b1a, KEY_STOP }, 99 + { 0x866b0e, KEY_TEXT }, 100 + { 0x866b1f, KEY_RED }, /*XXX KEY_AUDIO */ 101 + { 0x866b1e, KEY_VIDEO }, 102 102 103 103 /* 0x1d 0x13 0x19 * 104 104 * SLEEP PREVIEW DVB * 105 105 * GREEN BLUE * 106 106 * */ 107 - { 0x6b861d, KEY_SLEEP }, 108 - { 0x6b8613, KEY_GREEN }, 109 - { 0x6b8619, KEY_BLUE }, /* XXX KEY_SAT */ 107 + { 0x866b1d, KEY_SLEEP }, 108 + { 0x866b13, KEY_GREEN }, 109 + { 0x866b19, KEY_BLUE }, /* XXX KEY_SAT */ 110 110 111 111 /* 0x58 0x5c * 112 112 * FREEZE SNAPSHOT * 113 113 * */ 114 - { 0x6b8658, KEY_SLOW }, 115 - { 0x6b865c, KEY_CAMERA }, 114 + { 0x866b58, KEY_SLOW }, 115 + { 0x866b5c, KEY_CAMERA }, 116 116 117 117 }; 118 118