diff options
Diffstat (limited to 'drivers/media/dvb/dvb-usb/opera1.c')
-rw-r--r-- | drivers/media/dvb/dvb-usb/opera1.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/media/dvb/dvb-usb/opera1.c b/drivers/media/dvb/dvb-usb/opera1.c index f896337b4535..1f1b7d6980a5 100644 --- a/drivers/media/dvb/dvb-usb/opera1.c +++ b/drivers/media/dvb/dvb-usb/opera1.c | |||
@@ -35,7 +35,7 @@ | |||
35 | struct opera1_state { | 35 | struct opera1_state { |
36 | u32 last_key_pressed; | 36 | u32 last_key_pressed; |
37 | }; | 37 | }; |
38 | struct ir_codes_opera_table { | 38 | struct rc_map_opera_table { |
39 | u32 keycode; | 39 | u32 keycode; |
40 | u32 event; | 40 | u32 event; |
41 | }; | 41 | }; |
@@ -331,7 +331,7 @@ static int opera1_pid_filter_control(struct dvb_usb_adapter *adap, int onoff) | |||
331 | return 0; | 331 | return 0; |
332 | } | 332 | } |
333 | 333 | ||
334 | static struct ir_scancode ir_codes_opera1_table[] = { | 334 | static struct rc_map_table rc_map_opera1_table[] = { |
335 | {0x5fa0, KEY_1}, | 335 | {0x5fa0, KEY_1}, |
336 | {0x51af, KEY_2}, | 336 | {0x51af, KEY_2}, |
337 | {0x5da2, KEY_3}, | 337 | {0x5da2, KEY_3}, |
@@ -404,12 +404,12 @@ static int opera1_rc_query(struct dvb_usb_device *dev, u32 * event, int *state) | |||
404 | 404 | ||
405 | send_key = (send_key & 0xffff) | 0x0100; | 405 | send_key = (send_key & 0xffff) | 0x0100; |
406 | 406 | ||
407 | for (i = 0; i < ARRAY_SIZE(ir_codes_opera1_table); i++) { | 407 | for (i = 0; i < ARRAY_SIZE(rc_map_opera1_table); i++) { |
408 | if (rc5_scan(&ir_codes_opera1_table[i]) == (send_key & 0xffff)) { | 408 | if (rc5_scan(&rc_map_opera1_table[i]) == (send_key & 0xffff)) { |
409 | *state = REMOTE_KEY_PRESSED; | 409 | *state = REMOTE_KEY_PRESSED; |
410 | *event = ir_codes_opera1_table[i].keycode; | 410 | *event = rc_map_opera1_table[i].keycode; |
411 | opst->last_key_pressed = | 411 | opst->last_key_pressed = |
412 | ir_codes_opera1_table[i].keycode; | 412 | rc_map_opera1_table[i].keycode; |
413 | break; | 413 | break; |
414 | } | 414 | } |
415 | opst->last_key_pressed = 0; | 415 | opst->last_key_pressed = 0; |
@@ -497,8 +497,8 @@ static struct dvb_usb_device_properties opera1_properties = { | |||
497 | .i2c_algo = &opera1_i2c_algo, | 497 | .i2c_algo = &opera1_i2c_algo, |
498 | 498 | ||
499 | .rc.legacy = { | 499 | .rc.legacy = { |
500 | .rc_key_map = ir_codes_opera1_table, | 500 | .rc_map_table = rc_map_opera1_table, |
501 | .rc_key_map_size = ARRAY_SIZE(ir_codes_opera1_table), | 501 | .rc_map_size = ARRAY_SIZE(rc_map_opera1_table), |
502 | .rc_interval = 200, | 502 | .rc_interval = 200, |
503 | .rc_query = opera1_rc_query, | 503 | .rc_query = opera1_rc_query, |
504 | }, | 504 | }, |