diff options
Diffstat (limited to 'drivers/media/dvb/dvb-usb/nova-t-usb2.c')
-rw-r--r-- | drivers/media/dvb/dvb-usb/nova-t-usb2.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/media/dvb/dvb-usb/nova-t-usb2.c b/drivers/media/dvb/dvb-usb/nova-t-usb2.c index b41d66ef832..d195a587cc6 100644 --- a/drivers/media/dvb/dvb-usb/nova-t-usb2.c +++ b/drivers/media/dvb/dvb-usb/nova-t-usb2.c | |||
@@ -21,7 +21,7 @@ DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr); | |||
21 | #define deb_ee(args...) dprintk(debug,0x02,args) | 21 | #define deb_ee(args...) dprintk(debug,0x02,args) |
22 | 22 | ||
23 | /* Hauppauge NOVA-T USB2 keys */ | 23 | /* Hauppauge NOVA-T USB2 keys */ |
24 | static struct dvb_usb_rc_key haupp_rc_keys [] = { | 24 | static struct dvb_usb_rc_key ir_codes_haupp_table [] = { |
25 | { 0x1e00, KEY_0 }, | 25 | { 0x1e00, KEY_0 }, |
26 | { 0x1e01, KEY_1 }, | 26 | { 0x1e01, KEY_1 }, |
27 | { 0x1e02, KEY_2 }, | 27 | { 0x1e02, KEY_2 }, |
@@ -91,14 +91,14 @@ static int nova_t_rc_query(struct dvb_usb_device *d, u32 *event, int *state) | |||
91 | 91 | ||
92 | deb_rc("raw key code 0x%02x, 0x%02x, 0x%02x to c: %02x d: %02x toggle: %d\n",key[1],key[2],key[3],custom,data,toggle); | 92 | deb_rc("raw key code 0x%02x, 0x%02x, 0x%02x to c: %02x d: %02x toggle: %d\n",key[1],key[2],key[3],custom,data,toggle); |
93 | 93 | ||
94 | for (i = 0; i < ARRAY_SIZE(haupp_rc_keys); i++) { | 94 | for (i = 0; i < ARRAY_SIZE(ir_codes_haupp_table); i++) { |
95 | if (rc5_data(&haupp_rc_keys[i]) == data && | 95 | if (rc5_data(&ir_codes_haupp_table[i]) == data && |
96 | rc5_custom(&haupp_rc_keys[i]) == custom) { | 96 | rc5_custom(&ir_codes_haupp_table[i]) == custom) { |
97 | 97 | ||
98 | deb_rc("c: %x, d: %x\n", rc5_data(&haupp_rc_keys[i]), | 98 | deb_rc("c: %x, d: %x\n", rc5_data(&ir_codes_haupp_table[i]), |
99 | rc5_custom(&haupp_rc_keys[i])); | 99 | rc5_custom(&ir_codes_haupp_table[i])); |
100 | 100 | ||
101 | *event = haupp_rc_keys[i].event; | 101 | *event = ir_codes_haupp_table[i].event; |
102 | *state = REMOTE_KEY_PRESSED; | 102 | *state = REMOTE_KEY_PRESSED; |
103 | if (st->old_toggle == toggle) { | 103 | if (st->old_toggle == toggle) { |
104 | if (st->last_repeat_count++ < 2) | 104 | if (st->last_repeat_count++ < 2) |
@@ -196,8 +196,8 @@ static struct dvb_usb_device_properties nova_t_properties = { | |||
196 | .read_mac_address = nova_t_read_mac_address, | 196 | .read_mac_address = nova_t_read_mac_address, |
197 | 197 | ||
198 | .rc_interval = 100, | 198 | .rc_interval = 100, |
199 | .rc_key_map = haupp_rc_keys, | 199 | .rc_key_map = ir_codes_haupp_table, |
200 | .rc_key_map_size = ARRAY_SIZE(haupp_rc_keys), | 200 | .rc_key_map_size = ARRAY_SIZE(ir_codes_haupp_table), |
201 | .rc_query = nova_t_rc_query, | 201 | .rc_query = nova_t_rc_query, |
202 | 202 | ||
203 | .i2c_algo = &dibusb_i2c_algo, | 203 | .i2c_algo = &dibusb_i2c_algo, |