diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-04-01 20:35:32 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-05-19 11:56:46 -0400 |
commit | e27e971c69f87bd6c00c4cff973497de365229ef (patch) | |
tree | 0f36f894525dce78ded6c36ecd614c57d57b0cd9 /drivers/media/dvb/dvb-usb/vp7045.c | |
parent | d705d2ab7596b4661a2f13172f4f93ad11bd761f (diff) |
V4L/DVB: rename all *_rc_keys to ir_codes_*_nec_table
Several DVB drivers use a different name convention. As we're moving
the keytables, we need to use the same convention on all places.
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/dvb/dvb-usb/vp7045.c')
-rw-r--r-- | drivers/media/dvb/dvb-usb/vp7045.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/media/dvb/dvb-usb/vp7045.c b/drivers/media/dvb/dvb-usb/vp7045.c index a59faa27912a..036893fa4480 100644 --- a/drivers/media/dvb/dvb-usb/vp7045.c +++ b/drivers/media/dvb/dvb-usb/vp7045.c | |||
@@ -99,7 +99,7 @@ static int vp7045_power_ctrl(struct dvb_usb_device *d, int onoff) | |||
99 | 99 | ||
100 | /* The keymapping struct. Somehow this should be loaded to the driver, but | 100 | /* The keymapping struct. Somehow this should be loaded to the driver, but |
101 | * currently it is hardcoded. */ | 101 | * currently it is hardcoded. */ |
102 | static struct dvb_usb_rc_key vp7045_rc_keys[] = { | 102 | static struct dvb_usb_rc_key ir_codes_vp7045_table[] = { |
103 | { 0x0016, KEY_POWER }, | 103 | { 0x0016, KEY_POWER }, |
104 | { 0x0010, KEY_MUTE }, | 104 | { 0x0010, KEY_MUTE }, |
105 | { 0x0003, KEY_1 }, | 105 | { 0x0003, KEY_1 }, |
@@ -165,10 +165,10 @@ static int vp7045_rc_query(struct dvb_usb_device *d, u32 *event, int *state) | |||
165 | return 0; | 165 | return 0; |
166 | } | 166 | } |
167 | 167 | ||
168 | for (i = 0; i < ARRAY_SIZE(vp7045_rc_keys); i++) | 168 | for (i = 0; i < ARRAY_SIZE(ir_codes_vp7045_table); i++) |
169 | if (rc5_data(&vp7045_rc_keys[i]) == key) { | 169 | if (rc5_data(&ir_codes_vp7045_table[i]) == key) { |
170 | *state = REMOTE_KEY_PRESSED; | 170 | *state = REMOTE_KEY_PRESSED; |
171 | *event = vp7045_rc_keys[i].event; | 171 | *event = ir_codes_vp7045_table[i].event; |
172 | break; | 172 | break; |
173 | } | 173 | } |
174 | return 0; | 174 | return 0; |
@@ -260,8 +260,8 @@ static struct dvb_usb_device_properties vp7045_properties = { | |||
260 | .read_mac_address = vp7045_read_mac_addr, | 260 | .read_mac_address = vp7045_read_mac_addr, |
261 | 261 | ||
262 | .rc_interval = 400, | 262 | .rc_interval = 400, |
263 | .rc_key_map = vp7045_rc_keys, | 263 | .rc_key_map = ir_codes_vp7045_table, |
264 | .rc_key_map_size = ARRAY_SIZE(vp7045_rc_keys), | 264 | .rc_key_map_size = ARRAY_SIZE(ir_codes_vp7045_table), |
265 | .rc_query = vp7045_rc_query, | 265 | .rc_query = vp7045_rc_query, |
266 | 266 | ||
267 | .num_device_descs = 2, | 267 | .num_device_descs = 2, |