diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-01-24 10:18:47 -0500 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-03-22 18:24:14 -0400 |
| commit | 15195d3a83b59f0ca3bed52cbe5524042ce13fd6 (patch) | |
| tree | 0915c3f1d4e0dfacaf196c60e5e297e0388a3be7 /include/media | |
| parent | 0548757419c974d8c0851c13279b2c89a12b2978 (diff) | |
[media] rc/keymaps: Rename Hauppauge table as rc-hauppauge
There are two "hauppauge-new" keymaps, one with protocol
unknown, and the other with the protocol marked accordingly.
However, both tables are miss-named.
Also, the old rc-hauppauge-new is broken, as it mixes
three different controllers as if they were just one.
This patch solves half of the problem by renaming the
correct keycode table as just rc-hauppauge. This table
contains the codes for the four different types of
remote controllers found on Hauppauge cards, properly
mapped with their different addresses.
create mode 100644 drivers/media/rc/keymaps/rc-hauppauge.c
delete mode 100644 drivers/media/rc/keymaps/rc-rc5-hauppauge-new.c
[Jarod: fix up RC_MAP_HAUPPAUGE defines]
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Diffstat (limited to 'include/media')
| -rw-r--r-- | include/media/rc-map.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/media/rc-map.h b/include/media/rc-map.h index d843afc7c9e6..9184751f19c0 100644 --- a/include/media/rc-map.h +++ b/include/media/rc-map.h | |||
| @@ -94,7 +94,7 @@ void rc_map_init(void); | |||
| 94 | #define RC_MAP_GADMEI_RM008Z "rc-gadmei-rm008z" | 94 | #define RC_MAP_GADMEI_RM008Z "rc-gadmei-rm008z" |
| 95 | #define RC_MAP_GENIUS_TVGO_A11MCE "rc-genius-tvgo-a11mce" | 95 | #define RC_MAP_GENIUS_TVGO_A11MCE "rc-genius-tvgo-a11mce" |
| 96 | #define RC_MAP_GOTVIEW7135 "rc-gotview7135" | 96 | #define RC_MAP_GOTVIEW7135 "rc-gotview7135" |
| 97 | #define RC_MAP_HAUPPAUGE_NEW "rc-hauppauge-new" | 97 | #define RC_MAP_HAUPPAUGE_NEW "rc-hauppauge" |
| 98 | #define RC_MAP_IMON_MCE "rc-imon-mce" | 98 | #define RC_MAP_IMON_MCE "rc-imon-mce" |
| 99 | #define RC_MAP_IMON_PAD "rc-imon-pad" | 99 | #define RC_MAP_IMON_PAD "rc-imon-pad" |
| 100 | #define RC_MAP_IODATA_BCTV7E "rc-iodata-bctv7e" | 100 | #define RC_MAP_IODATA_BCTV7E "rc-iodata-bctv7e" |
| @@ -125,7 +125,7 @@ void rc_map_init(void); | |||
| 125 | #define RC_MAP_PROTEUS_2309 "rc-proteus-2309" | 125 | #define RC_MAP_PROTEUS_2309 "rc-proteus-2309" |
| 126 | #define RC_MAP_PURPLETV "rc-purpletv" | 126 | #define RC_MAP_PURPLETV "rc-purpletv" |
| 127 | #define RC_MAP_PV951 "rc-pv951" | 127 | #define RC_MAP_PV951 "rc-pv951" |
| 128 | #define RC_MAP_RC5_HAUPPAUGE_NEW "rc-rc5-hauppauge-new" | 128 | #define RC_MAP_HAUPPAUGE "rc-hauppauge" |
| 129 | #define RC_MAP_RC5_TV "rc-rc5-tv" | 129 | #define RC_MAP_RC5_TV "rc-rc5-tv" |
| 130 | #define RC_MAP_RC6_MCE "rc-rc6-mce" | 130 | #define RC_MAP_RC6_MCE "rc-rc6-mce" |
| 131 | #define RC_MAP_REAL_AUDIO_220_32_KEYS "rc-real-audio-220-32-keys" | 131 | #define RC_MAP_REAL_AUDIO_220_32_KEYS "rc-real-audio-220-32-keys" |