Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 444cc20b3d6141a5fa9a9774a6b710e16af6110d

Authored by Mauro Carvalho Chehab
1 parent aa3f4e446e
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

[media] rc/keymaps: use KEY_CAMERA for snapshots 

On a few places, KEY_MHP were used for snapshots. However, KEY_CAMERA
is used for it on all the other keyboards that have a snapshot/Picture
button.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Jarod Wilson <jarod@redhat.com>

Showing 8 changed files with 9 additions and 8 deletions Side-by-side Diff

drivers/media/dvb/dvb-usb/digitv.c
Diff comments   View file @ 444cc20
... ... @@ -176,7 +176,7 @@
176 176 { 0xaf59, KEY_AUX },
177 177 { 0x5f5a, KEY_DVD },
178 178 { 0x6f5a, KEY_POWER },
179   - { 0x9f5a, KEY_MHP }, /* labelled 'Picture' */
  179 + { 0x9f5a, KEY_CAMERA }, /* labelled 'Picture' */
180 180 { 0xaf5a, KEY_AUDIO },
181 181 { 0x5f65, KEY_INFO },
182 182 { 0x6f65, KEY_F13 }, /* 16:9 */
drivers/media/rc/keymaps/rc-avermedia-m135a.c
Diff comments   View file @ 444cc20
... ... @@ -108,7 +108,7 @@
108 108 { 0x0414, KEY_TEXT },
109 109 { 0x0415, KEY_EPG },
110 110 { 0x041a, KEY_TV2 }, /* PIP */
111   - { 0x041b, KEY_MHP }, /* Snapshot */
  111 + { 0x041b, KEY_CAMERA }, /* Snapshot */
112 112  
113 113 { 0x0417, KEY_RECORD },
114 114 { 0x0416, KEY_PLAYPAUSE },
drivers/media/rc/keymaps/rc-avermedia-m733a-rm-k6.c
Diff comments   View file @ 444cc20
... ... @@ -56,7 +56,7 @@
56 56 { 0x0414, KEY_TEXT },
57 57 { 0x0415, KEY_EPG },
58 58 { 0x041a, KEY_TV2 }, /* PIP */
59   - { 0x041b, KEY_MHP }, /* Snapshot */
  59 + { 0x041b, KEY_CAMERA }, /* Snapshot */
60 60  
61 61 { 0x0417, KEY_RECORD },
62 62 { 0x0416, KEY_PLAYPAUSE },
drivers/media/rc/keymaps/rc-budget-ci-old.c
Diff comments   View file @ 444cc20
... ... @@ -12,7 +12,8 @@
12 12  
13 13 #include <media/rc-map.h>
14 14  
15   -/* From reading the following remotes:
  15 +/*
  16 + * From reading the following remotes:
16 17 * Zenith Universal 7 / TV Mode 807 / VCR Mode 837
17 18 * Hauppauge (from NOVA-CI-s box product)
18 19 * This is a "middle of the road" approach, differences are noted
drivers/media/rc/keymaps/rc-encore-enltv.c
Diff comments   View file @ 444cc20
... ... @@ -24,7 +24,7 @@
24 24 { 0x1e, KEY_TV },
25 25 { 0x00, KEY_VIDEO },
26 26 { 0x01, KEY_AUDIO }, /* music */
27   - { 0x02, KEY_MHP }, /* picture */
  27 + { 0x02, KEY_CAMERA }, /* picture */
28 28  
29 29 { 0x1f, KEY_1 },
30 30 { 0x03, KEY_2 },
drivers/media/rc/keymaps/rc-hauppauge-new.c
Diff comments   View file @ 444cc20
... ... @@ -48,7 +48,7 @@
48 48 "Multimedia Home Platform" -
49 49 no "PICTURES" key in input.h
50 50 */
51   - { 0x1a, KEY_MHP },
  51 + { 0x1a, KEY_CAMERA },
52 52  
53 53 { 0x1b, KEY_EPG }, /* Guide */
54 54 { 0x1c, KEY_TV },
drivers/media/rc/keymaps/rc-nebula.c
Diff comments   View file @ 444cc20
... ... @@ -27,7 +27,7 @@
27 27 { 0x0b, KEY_AUX },
28 28 { 0x0c, KEY_DVD },
29 29 { 0x0d, KEY_POWER },
30   - { 0x0e, KEY_MHP }, /* labelled 'Picture' */
  30 + { 0x0e, KEY_CAMERA }, /* labelled 'Picture' */
31 31 { 0x0f, KEY_AUDIO },
32 32 { 0x10, KEY_INFO },
33 33 { 0x11, KEY_F13 }, /* 16:9 */
drivers/media/rc/keymaps/rc-rc5-hauppauge-new.c
Diff comments   View file @ 444cc20
... ... @@ -51,7 +51,7 @@
51 51 "Multimedia Home Platform" -
52 52 no "PICTURES" key in input.h
53 53 */
54   - { 0x1e1a, KEY_MHP },
  54 + { 0x1e1a, KEY_CAMERA },
55 55  
56 56 { 0x1e1b, KEY_EPG }, /* Guide */
57 57 { 0x1e1c, KEY_TV },