diff options
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 f13791ca599..ab0ab3c35e8 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 ir_scancode ir_codes_vp7045_table[] = { | 102 | static struct rc_map_table rc_map_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(ir_codes_vp7045_table); i++) | 168 | for (i = 0; i < ARRAY_SIZE(rc_map_vp7045_table); i++) |
169 | if (rc5_data(&ir_codes_vp7045_table[i]) == key) { | 169 | if (rc5_data(&rc_map_vp7045_table[i]) == key) { |
170 | *state = REMOTE_KEY_PRESSED; | 170 | *state = REMOTE_KEY_PRESSED; |
171 | *event = ir_codes_vp7045_table[i].keycode; | 171 | *event = rc_map_vp7045_table[i].keycode; |
172 | break; | 172 | break; |
173 | } | 173 | } |
174 | return 0; | 174 | return 0; |
@@ -261,8 +261,8 @@ static struct dvb_usb_device_properties vp7045_properties = { | |||
261 | 261 | ||
262 | .rc.legacy = { | 262 | .rc.legacy = { |
263 | .rc_interval = 400, | 263 | .rc_interval = 400, |
264 | .rc_key_map = ir_codes_vp7045_table, | 264 | .rc_map_table = rc_map_vp7045_table, |
265 | .rc_key_map_size = ARRAY_SIZE(ir_codes_vp7045_table), | 265 | .rc_map_size = ARRAY_SIZE(rc_map_vp7045_table), |
266 | .rc_query = vp7045_rc_query, | 266 | .rc_query = vp7045_rc_query, |
267 | }, | 267 | }, |
268 | 268 | ||