diff options
Diffstat (limited to 'drivers/media/dvb/dvb-usb/digitv.c')
-rw-r--r-- | drivers/media/dvb/dvb-usb/digitv.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/media/dvb/dvb-usb/digitv.c b/drivers/media/dvb/dvb-usb/digitv.c index 13d006bb19db..f2dbce7edb3b 100644 --- a/drivers/media/dvb/dvb-usb/digitv.c +++ b/drivers/media/dvb/dvb-usb/digitv.c | |||
@@ -161,7 +161,7 @@ static int digitv_tuner_attach(struct dvb_usb_adapter *adap) | |||
161 | return 0; | 161 | return 0; |
162 | } | 162 | } |
163 | 163 | ||
164 | static struct ir_scancode ir_codes_digitv_table[] = { | 164 | static struct rc_map_table rc_map_digitv_table[] = { |
165 | { 0x5f55, KEY_0 }, | 165 | { 0x5f55, KEY_0 }, |
166 | { 0x6f55, KEY_1 }, | 166 | { 0x6f55, KEY_1 }, |
167 | { 0x9f55, KEY_2 }, | 167 | { 0x9f55, KEY_2 }, |
@@ -237,10 +237,10 @@ static int digitv_rc_query(struct dvb_usb_device *d, u32 *event, int *state) | |||
237 | /* if something is inside the buffer, simulate key press */ | 237 | /* if something is inside the buffer, simulate key press */ |
238 | if (key[1] != 0) | 238 | if (key[1] != 0) |
239 | { | 239 | { |
240 | for (i = 0; i < d->props.rc.legacy.rc_key_map_size; i++) { | 240 | for (i = 0; i < d->props.rc.legacy.rc_map_size; i++) { |
241 | if (rc5_custom(&d->props.rc.legacy.rc_key_map[i]) == key[1] && | 241 | if (rc5_custom(&d->props.rc.legacy.rc_map_table[i]) == key[1] && |
242 | rc5_data(&d->props.rc.legacy.rc_key_map[i]) == key[2]) { | 242 | rc5_data(&d->props.rc.legacy.rc_map_table[i]) == key[2]) { |
243 | *event = d->props.rc.legacy.rc_key_map[i].keycode; | 243 | *event = d->props.rc.legacy.rc_map_table[i].keycode; |
244 | *state = REMOTE_KEY_PRESSED; | 244 | *state = REMOTE_KEY_PRESSED; |
245 | return 0; | 245 | return 0; |
246 | } | 246 | } |
@@ -312,8 +312,8 @@ static struct dvb_usb_device_properties digitv_properties = { | |||
312 | 312 | ||
313 | .rc.legacy = { | 313 | .rc.legacy = { |
314 | .rc_interval = 1000, | 314 | .rc_interval = 1000, |
315 | .rc_key_map = ir_codes_digitv_table, | 315 | .rc_map_table = rc_map_digitv_table, |
316 | .rc_key_map_size = ARRAY_SIZE(ir_codes_digitv_table), | 316 | .rc_map_size = ARRAY_SIZE(rc_map_digitv_table), |
317 | .rc_query = digitv_rc_query, | 317 | .rc_query = digitv_rc_query, |
318 | }, | 318 | }, |
319 | 319 | ||