aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/usb/dvb-usb
diff options
context:
space:
mode:
authorSean Young <sean@mess.org>2017-08-07 16:20:58 -0400
committerMauro Carvalho Chehab <mchehab@s-opensource.com>2017-08-20 10:02:48 -0400
commit6d741bfed5ed06ed42a16d30f1ed7afdcaf7f092 (patch)
treeba80456506b89d858a91daddde92237b93fabe1c /drivers/media/usb/dvb-usb
parenta9a249a2c997506a64eaee22f1458fda893f62a8 (diff)
media: rc: rename RC_TYPE_* to RC_PROTO_* and RC_BIT_* to RC_PROTO_BIT_*
RC_TYPE is confusing and it's just the protocol. So rename it. Suggested-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Sean Young <sean@mess.org> Acked-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'drivers/media/usb/dvb-usb')
-rw-r--r--drivers/media/usb/dvb-usb/cxusb.c30
-rw-r--r--drivers/media/usb/dvb-usb/dib0700.h2
-rw-r--r--drivers/media/usb/dvb-usb/dib0700_core.c28
-rw-r--r--drivers/media/usb/dvb-usb/dib0700_devices.c152
-rw-r--r--drivers/media/usb/dvb-usb/dtt200u.c12
-rw-r--r--drivers/media/usb/dvb-usb/dvb-usb.h2
-rw-r--r--drivers/media/usb/dvb-usb/dw2102.c21
-rw-r--r--drivers/media/usb/dvb-usb/m920x.c4
-rw-r--r--drivers/media/usb/dvb-usb/pctv452e.c6
-rw-r--r--drivers/media/usb/dvb-usb/technisat-usb2.c2
-rw-r--r--drivers/media/usb/dvb-usb/ttusb2.c4
11 files changed, 132 insertions, 131 deletions
diff --git a/drivers/media/usb/dvb-usb/cxusb.c b/drivers/media/usb/dvb-usb/cxusb.c
index 99a3f3625944..37dea0adc695 100644
--- a/drivers/media/usb/dvb-usb/cxusb.c
+++ b/drivers/media/usb/dvb-usb/cxusb.c
@@ -458,7 +458,7 @@ static int cxusb_rc_query(struct dvb_usb_device *d)
458 cxusb_ctrl_msg(d, CMD_GET_IR_CODE, NULL, 0, ircode, 4); 458 cxusb_ctrl_msg(d, CMD_GET_IR_CODE, NULL, 0, ircode, 4);
459 459
460 if (ircode[2] || ircode[3]) 460 if (ircode[2] || ircode[3])
461 rc_keydown(d->rc_dev, RC_TYPE_NEC, 461 rc_keydown(d->rc_dev, RC_PROTO_NEC,
462 RC_SCANCODE_NEC(~ircode[2] & 0xff, ircode[3]), 0); 462 RC_SCANCODE_NEC(~ircode[2] & 0xff, ircode[3]), 0);
463 return 0; 463 return 0;
464} 464}
@@ -473,7 +473,7 @@ static int cxusb_bluebird2_rc_query(struct dvb_usb_device *d)
473 return 0; 473 return 0;
474 474
475 if (ircode[1] || ircode[2]) 475 if (ircode[1] || ircode[2])
476 rc_keydown(d->rc_dev, RC_TYPE_NEC, 476 rc_keydown(d->rc_dev, RC_PROTO_NEC,
477 RC_SCANCODE_NEC(~ircode[1] & 0xff, ircode[2]), 0); 477 RC_SCANCODE_NEC(~ircode[1] & 0xff, ircode[2]), 0);
478 return 0; 478 return 0;
479} 479}
@@ -486,7 +486,7 @@ static int cxusb_d680_dmb_rc_query(struct dvb_usb_device *d)
486 return 0; 486 return 0;
487 487
488 if (ircode[0] || ircode[1]) 488 if (ircode[0] || ircode[1])
489 rc_keydown(d->rc_dev, RC_TYPE_UNKNOWN, 489 rc_keydown(d->rc_dev, RC_PROTO_UNKNOWN,
490 RC_SCANCODE_RC5(ircode[0], ircode[1]), 0); 490 RC_SCANCODE_RC5(ircode[0], ircode[1]), 0);
491 return 0; 491 return 0;
492} 492}
@@ -1646,7 +1646,7 @@ static struct dvb_usb_device_properties cxusb_bluebird_lgh064f_properties = {
1646 .rc_codes = RC_MAP_DVICO_PORTABLE, 1646 .rc_codes = RC_MAP_DVICO_PORTABLE,
1647 .module_name = KBUILD_MODNAME, 1647 .module_name = KBUILD_MODNAME,
1648 .rc_query = cxusb_rc_query, 1648 .rc_query = cxusb_rc_query,
1649 .allowed_protos = RC_BIT_NEC, 1649 .allowed_protos = RC_PROTO_BIT_NEC,
1650 }, 1650 },
1651 1651
1652 .generic_bulk_ctrl_endpoint = 0x01, 1652 .generic_bulk_ctrl_endpoint = 0x01,
@@ -1703,7 +1703,7 @@ static struct dvb_usb_device_properties cxusb_bluebird_dee1601_properties = {
1703 .rc_codes = RC_MAP_DVICO_MCE, 1703 .rc_codes = RC_MAP_DVICO_MCE,
1704 .module_name = KBUILD_MODNAME, 1704 .module_name = KBUILD_MODNAME,
1705 .rc_query = cxusb_rc_query, 1705 .rc_query = cxusb_rc_query,
1706 .allowed_protos = RC_BIT_NEC, 1706 .allowed_protos = RC_PROTO_BIT_NEC,
1707 }, 1707 },
1708 1708
1709 .generic_bulk_ctrl_endpoint = 0x01, 1709 .generic_bulk_ctrl_endpoint = 0x01,
@@ -1768,7 +1768,7 @@ static struct dvb_usb_device_properties cxusb_bluebird_lgz201_properties = {
1768 .rc_codes = RC_MAP_DVICO_PORTABLE, 1768 .rc_codes = RC_MAP_DVICO_PORTABLE,
1769 .module_name = KBUILD_MODNAME, 1769 .module_name = KBUILD_MODNAME,
1770 .rc_query = cxusb_rc_query, 1770 .rc_query = cxusb_rc_query,
1771 .allowed_protos = RC_BIT_NEC, 1771 .allowed_protos = RC_PROTO_BIT_NEC,
1772 }, 1772 },
1773 1773
1774 .generic_bulk_ctrl_endpoint = 0x01, 1774 .generic_bulk_ctrl_endpoint = 0x01,
@@ -1824,7 +1824,7 @@ static struct dvb_usb_device_properties cxusb_bluebird_dtt7579_properties = {
1824 .rc_codes = RC_MAP_DVICO_PORTABLE, 1824 .rc_codes = RC_MAP_DVICO_PORTABLE,
1825 .module_name = KBUILD_MODNAME, 1825 .module_name = KBUILD_MODNAME,
1826 .rc_query = cxusb_rc_query, 1826 .rc_query = cxusb_rc_query,
1827 .allowed_protos = RC_BIT_NEC, 1827 .allowed_protos = RC_PROTO_BIT_NEC,
1828 }, 1828 },
1829 1829
1830 .generic_bulk_ctrl_endpoint = 0x01, 1830 .generic_bulk_ctrl_endpoint = 0x01,
@@ -1879,7 +1879,7 @@ static struct dvb_usb_device_properties cxusb_bluebird_dualdig4_properties = {
1879 .rc_codes = RC_MAP_DVICO_MCE, 1879 .rc_codes = RC_MAP_DVICO_MCE,
1880 .module_name = KBUILD_MODNAME, 1880 .module_name = KBUILD_MODNAME,
1881 .rc_query = cxusb_bluebird2_rc_query, 1881 .rc_query = cxusb_bluebird2_rc_query,
1882 .allowed_protos = RC_BIT_NEC, 1882 .allowed_protos = RC_PROTO_BIT_NEC,
1883 }, 1883 },
1884 1884
1885 .num_device_descs = 1, 1885 .num_device_descs = 1,
@@ -1933,7 +1933,7 @@ static struct dvb_usb_device_properties cxusb_bluebird_nano2_properties = {
1933 .rc_codes = RC_MAP_DVICO_PORTABLE, 1933 .rc_codes = RC_MAP_DVICO_PORTABLE,
1934 .module_name = KBUILD_MODNAME, 1934 .module_name = KBUILD_MODNAME,
1935 .rc_query = cxusb_bluebird2_rc_query, 1935 .rc_query = cxusb_bluebird2_rc_query,
1936 .allowed_protos = RC_BIT_NEC, 1936 .allowed_protos = RC_PROTO_BIT_NEC,
1937 }, 1937 },
1938 1938
1939 .num_device_descs = 1, 1939 .num_device_descs = 1,
@@ -1989,7 +1989,7 @@ static struct dvb_usb_device_properties cxusb_bluebird_nano2_needsfirmware_prope
1989 .rc_codes = RC_MAP_DVICO_PORTABLE, 1989 .rc_codes = RC_MAP_DVICO_PORTABLE,
1990 .module_name = KBUILD_MODNAME, 1990 .module_name = KBUILD_MODNAME,
1991 .rc_query = cxusb_rc_query, 1991 .rc_query = cxusb_rc_query,
1992 .allowed_protos = RC_BIT_NEC, 1992 .allowed_protos = RC_PROTO_BIT_NEC,
1993 }, 1993 },
1994 1994
1995 .num_device_descs = 1, 1995 .num_device_descs = 1,
@@ -2088,7 +2088,7 @@ struct dvb_usb_device_properties cxusb_bluebird_dualdig4_rev2_properties = {
2088 .rc_codes = RC_MAP_DVICO_MCE, 2088 .rc_codes = RC_MAP_DVICO_MCE,
2089 .module_name = KBUILD_MODNAME, 2089 .module_name = KBUILD_MODNAME,
2090 .rc_query = cxusb_rc_query, 2090 .rc_query = cxusb_rc_query,
2091 .allowed_protos = RC_BIT_NEC, 2091 .allowed_protos = RC_PROTO_BIT_NEC,
2092 }, 2092 },
2093 2093
2094 .num_device_descs = 1, 2094 .num_device_descs = 1,
@@ -2142,7 +2142,7 @@ static struct dvb_usb_device_properties cxusb_d680_dmb_properties = {
2142 .rc_codes = RC_MAP_D680_DMB, 2142 .rc_codes = RC_MAP_D680_DMB,
2143 .module_name = KBUILD_MODNAME, 2143 .module_name = KBUILD_MODNAME,
2144 .rc_query = cxusb_d680_dmb_rc_query, 2144 .rc_query = cxusb_d680_dmb_rc_query,
2145 .allowed_protos = RC_BIT_UNKNOWN, 2145 .allowed_protos = RC_PROTO_BIT_UNKNOWN,
2146 }, 2146 },
2147 2147
2148 .num_device_descs = 1, 2148 .num_device_descs = 1,
@@ -2197,7 +2197,7 @@ static struct dvb_usb_device_properties cxusb_mygica_d689_properties = {
2197 .rc_codes = RC_MAP_D680_DMB, 2197 .rc_codes = RC_MAP_D680_DMB,
2198 .module_name = KBUILD_MODNAME, 2198 .module_name = KBUILD_MODNAME,
2199 .rc_query = cxusb_d680_dmb_rc_query, 2199 .rc_query = cxusb_d680_dmb_rc_query,
2200 .allowed_protos = RC_BIT_UNKNOWN, 2200 .allowed_protos = RC_PROTO_BIT_UNKNOWN,
2201 }, 2201 },
2202 2202
2203 .num_device_descs = 1, 2203 .num_device_descs = 1,
@@ -2251,7 +2251,7 @@ static struct dvb_usb_device_properties cxusb_mygica_t230_properties = {
2251 .rc_codes = RC_MAP_TOTAL_MEDIA_IN_HAND_02, 2251 .rc_codes = RC_MAP_TOTAL_MEDIA_IN_HAND_02,
2252 .module_name = KBUILD_MODNAME, 2252 .module_name = KBUILD_MODNAME,
2253 .rc_query = cxusb_d680_dmb_rc_query, 2253 .rc_query = cxusb_d680_dmb_rc_query,
2254 .allowed_protos = RC_BIT_UNKNOWN, 2254 .allowed_protos = RC_PROTO_BIT_UNKNOWN,
2255 }, 2255 },
2256 2256
2257 .num_device_descs = 1, 2257 .num_device_descs = 1,
@@ -2305,7 +2305,7 @@ static struct dvb_usb_device_properties cxusb_mygica_t230c_properties = {
2305 .rc_codes = RC_MAP_TOTAL_MEDIA_IN_HAND_02, 2305 .rc_codes = RC_MAP_TOTAL_MEDIA_IN_HAND_02,
2306 .module_name = KBUILD_MODNAME, 2306 .module_name = KBUILD_MODNAME,
2307 .rc_query = cxusb_d680_dmb_rc_query, 2307 .rc_query = cxusb_d680_dmb_rc_query,
2308 .allowed_protos = RC_BIT_UNKNOWN, 2308 .allowed_protos = RC_PROTO_BIT_UNKNOWN,
2309 }, 2309 },
2310 2310
2311 .num_device_descs = 1, 2311 .num_device_descs = 1,
diff --git a/drivers/media/usb/dvb-usb/dib0700.h b/drivers/media/usb/dvb-usb/dib0700.h
index 8fd8f5b489d2..f89ab3b5a6c4 100644
--- a/drivers/media/usb/dvb-usb/dib0700.h
+++ b/drivers/media/usb/dvb-usb/dib0700.h
@@ -64,7 +64,7 @@ extern int dib0700_streaming_ctrl(struct dvb_usb_adapter *adap, int onoff);
64extern struct i2c_algorithm dib0700_i2c_algo; 64extern struct i2c_algorithm dib0700_i2c_algo;
65extern int dib0700_identify_state(struct usb_device *udev, struct dvb_usb_device_properties *props, 65extern int dib0700_identify_state(struct usb_device *udev, struct dvb_usb_device_properties *props,
66 struct dvb_usb_device_description **desc, int *cold); 66 struct dvb_usb_device_description **desc, int *cold);
67extern int dib0700_change_protocol(struct rc_dev *dev, u64 *rc_type); 67extern int dib0700_change_protocol(struct rc_dev *dev, u64 *rc_proto);
68extern int dib0700_set_i2c_speed(struct dvb_usb_device *d, u16 scl_kHz); 68extern int dib0700_set_i2c_speed(struct dvb_usb_device *d, u16 scl_kHz);
69 69
70extern int dib0700_device_count; 70extern int dib0700_device_count;
diff --git a/drivers/media/usb/dvb-usb/dib0700_core.c b/drivers/media/usb/dvb-usb/dib0700_core.c
index bea1b4764a66..1ee7ec558293 100644
--- a/drivers/media/usb/dvb-usb/dib0700_core.c
+++ b/drivers/media/usb/dvb-usb/dib0700_core.c
@@ -638,7 +638,7 @@ int dib0700_streaming_ctrl(struct dvb_usb_adapter *adap, int onoff)
638 return ret; 638 return ret;
639} 639}
640 640
641int dib0700_change_protocol(struct rc_dev *rc, u64 *rc_type) 641int dib0700_change_protocol(struct rc_dev *rc, u64 *rc_proto)
642{ 642{
643 struct dvb_usb_device *d = rc->priv; 643 struct dvb_usb_device *d = rc->priv;
644 struct dib0700_state *st = d->priv; 644 struct dib0700_state *st = d->priv;
@@ -654,19 +654,19 @@ int dib0700_change_protocol(struct rc_dev *rc, u64 *rc_type)
654 st->buf[2] = 0; 654 st->buf[2] = 0;
655 655
656 /* Set the IR mode */ 656 /* Set the IR mode */
657 if (*rc_type & RC_BIT_RC5) { 657 if (*rc_proto & RC_PROTO_BIT_RC5) {
658 new_proto = 1; 658 new_proto = 1;
659 *rc_type = RC_BIT_RC5; 659 *rc_proto = RC_PROTO_BIT_RC5;
660 } else if (*rc_type & RC_BIT_NEC) { 660 } else if (*rc_proto & RC_PROTO_BIT_NEC) {
661 new_proto = 0; 661 new_proto = 0;
662 *rc_type = RC_BIT_NEC; 662 *rc_proto = RC_PROTO_BIT_NEC;
663 } else if (*rc_type & RC_BIT_RC6_MCE) { 663 } else if (*rc_proto & RC_PROTO_BIT_RC6_MCE) {
664 if (st->fw_version < 0x10200) { 664 if (st->fw_version < 0x10200) {
665 ret = -EINVAL; 665 ret = -EINVAL;
666 goto out; 666 goto out;
667 } 667 }
668 new_proto = 2; 668 new_proto = 2;
669 *rc_type = RC_BIT_RC6_MCE; 669 *rc_proto = RC_PROTO_BIT_RC6_MCE;
670 } else { 670 } else {
671 ret = -EINVAL; 671 ret = -EINVAL;
672 goto out; 672 goto out;
@@ -680,7 +680,7 @@ int dib0700_change_protocol(struct rc_dev *rc, u64 *rc_type)
680 goto out; 680 goto out;
681 } 681 }
682 682
683 d->props.rc.core.protocol = *rc_type; 683 d->props.rc.core.protocol = *rc_proto;
684 684
685out: 685out:
686 mutex_unlock(&d->usb_mutex); 686 mutex_unlock(&d->usb_mutex);
@@ -712,7 +712,7 @@ static void dib0700_rc_urb_completion(struct urb *purb)
712{ 712{
713 struct dvb_usb_device *d = purb->context; 713 struct dvb_usb_device *d = purb->context;
714 struct dib0700_rc_response *poll_reply; 714 struct dib0700_rc_response *poll_reply;
715 enum rc_type protocol; 715 enum rc_proto protocol;
716 u32 keycode; 716 u32 keycode;
717 u8 toggle; 717 u8 toggle;
718 718
@@ -745,7 +745,7 @@ static void dib0700_rc_urb_completion(struct urb *purb)
745 purb->actual_length); 745 purb->actual_length);
746 746
747 switch (d->props.rc.core.protocol) { 747 switch (d->props.rc.core.protocol) {
748 case RC_BIT_NEC: 748 case RC_PROTO_BIT_NEC:
749 toggle = 0; 749 toggle = 0;
750 750
751 /* NEC protocol sends repeat code as 0 0 0 FF */ 751 /* NEC protocol sends repeat code as 0 0 0 FF */
@@ -764,25 +764,25 @@ static void dib0700_rc_urb_completion(struct urb *purb)
764 poll_reply->nec.not_system << 16 | 764 poll_reply->nec.not_system << 16 |
765 poll_reply->nec.data << 8 | 765 poll_reply->nec.data << 8 |
766 poll_reply->nec.not_data); 766 poll_reply->nec.not_data);
767 protocol = RC_TYPE_NEC32; 767 protocol = RC_PROTO_NEC32;
768 } else if ((poll_reply->nec.system ^ poll_reply->nec.not_system) != 0xff) { 768 } else if ((poll_reply->nec.system ^ poll_reply->nec.not_system) != 0xff) {
769 deb_data("NEC extended protocol\n"); 769 deb_data("NEC extended protocol\n");
770 keycode = RC_SCANCODE_NECX(poll_reply->nec.system << 8 | 770 keycode = RC_SCANCODE_NECX(poll_reply->nec.system << 8 |
771 poll_reply->nec.not_system, 771 poll_reply->nec.not_system,
772 poll_reply->nec.data); 772 poll_reply->nec.data);
773 773
774 protocol = RC_TYPE_NECX; 774 protocol = RC_PROTO_NECX;
775 } else { 775 } else {
776 deb_data("NEC normal protocol\n"); 776 deb_data("NEC normal protocol\n");
777 keycode = RC_SCANCODE_NEC(poll_reply->nec.system, 777 keycode = RC_SCANCODE_NEC(poll_reply->nec.system,
778 poll_reply->nec.data); 778 poll_reply->nec.data);
779 protocol = RC_TYPE_NEC; 779 protocol = RC_PROTO_NEC;
780 } 780 }
781 781
782 break; 782 break;
783 default: 783 default:
784 deb_data("RC5 protocol\n"); 784 deb_data("RC5 protocol\n");
785 protocol = RC_TYPE_RC5; 785 protocol = RC_PROTO_RC5;
786 toggle = poll_reply->report_id; 786 toggle = poll_reply->report_id;
787 keycode = RC_SCANCODE_RC5(poll_reply->rc5.system, poll_reply->rc5.data); 787 keycode = RC_SCANCODE_RC5(poll_reply->rc5.system, poll_reply->rc5.data);
788 788
diff --git a/drivers/media/usb/dvb-usb/dib0700_devices.c b/drivers/media/usb/dvb-usb/dib0700_devices.c
index 6a57fc6d3472..6020170fe99a 100644
--- a/drivers/media/usb/dvb-usb/dib0700_devices.c
+++ b/drivers/media/usb/dvb-usb/dib0700_devices.c
@@ -514,7 +514,7 @@ static int stk7700ph_tuner_attach(struct dvb_usb_adapter *adap)
514 */ 514 */
515static int dib0700_rc_query_old_firmware(struct dvb_usb_device *d) 515static int dib0700_rc_query_old_firmware(struct dvb_usb_device *d)
516{ 516{
517 enum rc_type protocol; 517 enum rc_proto protocol;
518 u32 scancode; 518 u32 scancode;
519 u8 toggle; 519 u8 toggle;
520 int i; 520 int i;
@@ -547,7 +547,7 @@ static int dib0700_rc_query_old_firmware(struct dvb_usb_device *d)
547 dib0700_rc_setup(d, NULL); /* reset ir sensor data to prevent false events */ 547 dib0700_rc_setup(d, NULL); /* reset ir sensor data to prevent false events */
548 548
549 switch (d->props.rc.core.protocol) { 549 switch (d->props.rc.core.protocol) {
550 case RC_BIT_NEC: 550 case RC_PROTO_BIT_NEC:
551 /* NEC protocol sends repeat code as 0 0 0 FF */ 551 /* NEC protocol sends repeat code as 0 0 0 FF */
552 if ((st->buf[3 - 2] == 0x00) && (st->buf[3 - 3] == 0x00) && 552 if ((st->buf[3 - 2] == 0x00) && (st->buf[3 - 3] == 0x00) &&
553 (st->buf[3] == 0xff)) { 553 (st->buf[3] == 0xff)) {
@@ -555,14 +555,14 @@ static int dib0700_rc_query_old_firmware(struct dvb_usb_device *d)
555 return 0; 555 return 0;
556 } 556 }
557 557
558 protocol = RC_TYPE_NEC; 558 protocol = RC_PROTO_NEC;
559 scancode = RC_SCANCODE_NEC(st->buf[3 - 2], st->buf[3 - 3]); 559 scancode = RC_SCANCODE_NEC(st->buf[3 - 2], st->buf[3 - 3]);
560 toggle = 0; 560 toggle = 0;
561 break; 561 break;
562 562
563 default: 563 default:
564 /* RC-5 protocol changes toggle bit on new keypress */ 564 /* RC-5 protocol changes toggle bit on new keypress */
565 protocol = RC_TYPE_RC5; 565 protocol = RC_PROTO_RC5;
566 scancode = RC_SCANCODE_RC5(st->buf[3 - 2], st->buf[3 - 3]); 566 scancode = RC_SCANCODE_RC5(st->buf[3 - 2], st->buf[3 - 3]);
567 toggle = st->buf[3 - 1]; 567 toggle = st->buf[3 - 1];
568 break; 568 break;
@@ -3909,9 +3909,9 @@ struct dvb_usb_device_properties dib0700_devices[] = {
3909 .rc_interval = DEFAULT_RC_INTERVAL, 3909 .rc_interval = DEFAULT_RC_INTERVAL,
3910 .rc_codes = RC_MAP_DIB0700_RC5_TABLE, 3910 .rc_codes = RC_MAP_DIB0700_RC5_TABLE,
3911 .rc_query = dib0700_rc_query_old_firmware, 3911 .rc_query = dib0700_rc_query_old_firmware,
3912 .allowed_protos = RC_BIT_RC5 | 3912 .allowed_protos = RC_PROTO_BIT_RC5 |
3913 RC_BIT_RC6_MCE | 3913 RC_PROTO_BIT_RC6_MCE |
3914 RC_BIT_NEC, 3914 RC_PROTO_BIT_NEC,
3915 .change_protocol = dib0700_change_protocol, 3915 .change_protocol = dib0700_change_protocol,
3916 }, 3916 },
3917 }, { DIB0700_DEFAULT_DEVICE_PROPERTIES, 3917 }, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
@@ -3949,9 +3949,9 @@ struct dvb_usb_device_properties dib0700_devices[] = {
3949 .rc_interval = DEFAULT_RC_INTERVAL, 3949 .rc_interval = DEFAULT_RC_INTERVAL,
3950 .rc_codes = RC_MAP_DIB0700_RC5_TABLE, 3950 .rc_codes = RC_MAP_DIB0700_RC5_TABLE,
3951 .rc_query = dib0700_rc_query_old_firmware, 3951 .rc_query = dib0700_rc_query_old_firmware,
3952 .allowed_protos = RC_BIT_RC5 | 3952 .allowed_protos = RC_PROTO_BIT_RC5 |
3953 RC_BIT_RC6_MCE | 3953 RC_PROTO_BIT_RC6_MCE |
3954 RC_BIT_NEC, 3954 RC_PROTO_BIT_NEC,
3955 .change_protocol = dib0700_change_protocol, 3955 .change_protocol = dib0700_change_protocol,
3956 }, 3956 },
3957 }, { DIB0700_DEFAULT_DEVICE_PROPERTIES, 3957 }, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
@@ -4014,9 +4014,9 @@ struct dvb_usb_device_properties dib0700_devices[] = {
4014 .rc_interval = DEFAULT_RC_INTERVAL, 4014 .rc_interval = DEFAULT_RC_INTERVAL,
4015 .rc_codes = RC_MAP_DIB0700_RC5_TABLE, 4015 .rc_codes = RC_MAP_DIB0700_RC5_TABLE,
4016 .rc_query = dib0700_rc_query_old_firmware, 4016 .rc_query = dib0700_rc_query_old_firmware,
4017 .allowed_protos = RC_BIT_RC5 | 4017 .allowed_protos = RC_PROTO_BIT_RC5 |
4018 RC_BIT_RC6_MCE | 4018 RC_PROTO_BIT_RC6_MCE |
4019 RC_BIT_NEC, 4019 RC_PROTO_BIT_NEC,
4020 .change_protocol = dib0700_change_protocol, 4020 .change_protocol = dib0700_change_protocol,
4021 }, 4021 },
4022 }, { DIB0700_DEFAULT_DEVICE_PROPERTIES, 4022 }, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
@@ -4059,9 +4059,9 @@ struct dvb_usb_device_properties dib0700_devices[] = {
4059 .rc_codes = RC_MAP_DIB0700_RC5_TABLE, 4059 .rc_codes = RC_MAP_DIB0700_RC5_TABLE,
4060 .module_name = "dib0700", 4060 .module_name = "dib0700",
4061 .rc_query = dib0700_rc_query_old_firmware, 4061 .rc_query = dib0700_rc_query_old_firmware,
4062 .allowed_protos = RC_BIT_RC5 | 4062 .allowed_protos = RC_PROTO_BIT_RC5 |
4063 RC_BIT_RC6_MCE | 4063 RC_PROTO_BIT_RC6_MCE |
4064 RC_BIT_NEC, 4064 RC_PROTO_BIT_NEC,
4065 .change_protocol = dib0700_change_protocol, 4065 .change_protocol = dib0700_change_protocol,
4066 }, 4066 },
4067 }, { DIB0700_DEFAULT_DEVICE_PROPERTIES, 4067 }, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
@@ -4140,9 +4140,9 @@ struct dvb_usb_device_properties dib0700_devices[] = {
4140 .rc_codes = RC_MAP_DIB0700_RC5_TABLE, 4140 .rc_codes = RC_MAP_DIB0700_RC5_TABLE,
4141 .module_name = "dib0700", 4141 .module_name = "dib0700",
4142 .rc_query = dib0700_rc_query_old_firmware, 4142 .rc_query = dib0700_rc_query_old_firmware,
4143 .allowed_protos = RC_BIT_RC5 | 4143 .allowed_protos = RC_PROTO_BIT_RC5 |
4144 RC_BIT_RC6_MCE | 4144 RC_PROTO_BIT_RC6_MCE |
4145 RC_BIT_NEC, 4145 RC_PROTO_BIT_NEC,
4146 .change_protocol = dib0700_change_protocol, 4146 .change_protocol = dib0700_change_protocol,
4147 }, 4147 },
4148 }, { DIB0700_DEFAULT_DEVICE_PROPERTIES, 4148 }, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
@@ -4185,9 +4185,9 @@ struct dvb_usb_device_properties dib0700_devices[] = {
4185 .rc_codes = RC_MAP_DIB0700_RC5_TABLE, 4185 .rc_codes = RC_MAP_DIB0700_RC5_TABLE,
4186 .module_name = "dib0700", 4186 .module_name = "dib0700",
4187 .rc_query = dib0700_rc_query_old_firmware, 4187 .rc_query = dib0700_rc_query_old_firmware,
4188 .allowed_protos = RC_BIT_RC5 | 4188 .allowed_protos = RC_PROTO_BIT_RC5 |
4189 RC_BIT_RC6_MCE | 4189 RC_PROTO_BIT_RC6_MCE |
4190 RC_BIT_NEC, 4190 RC_PROTO_BIT_NEC,
4191 .change_protocol = dib0700_change_protocol, 4191 .change_protocol = dib0700_change_protocol,
4192 }, 4192 },
4193 }, { DIB0700_DEFAULT_DEVICE_PROPERTIES, 4193 }, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
@@ -4242,9 +4242,9 @@ struct dvb_usb_device_properties dib0700_devices[] = {
4242 .rc_codes = RC_MAP_DIB0700_RC5_TABLE, 4242 .rc_codes = RC_MAP_DIB0700_RC5_TABLE,
4243 .module_name = "dib0700", 4243 .module_name = "dib0700",
4244 .rc_query = dib0700_rc_query_old_firmware, 4244 .rc_query = dib0700_rc_query_old_firmware,
4245 .allowed_protos = RC_BIT_RC5 | 4245 .allowed_protos = RC_PROTO_BIT_RC5 |
4246 RC_BIT_RC6_MCE | 4246 RC_PROTO_BIT_RC6_MCE |
4247 RC_BIT_NEC, 4247 RC_PROTO_BIT_NEC,
4248 .change_protocol = dib0700_change_protocol, 4248 .change_protocol = dib0700_change_protocol,
4249 }, 4249 },
4250 }, { DIB0700_DEFAULT_DEVICE_PROPERTIES, 4250 }, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
@@ -4308,9 +4308,9 @@ struct dvb_usb_device_properties dib0700_devices[] = {
4308 .rc_codes = RC_MAP_DIB0700_RC5_TABLE, 4308 .rc_codes = RC_MAP_DIB0700_RC5_TABLE,
4309 .module_name = "dib0700", 4309 .module_name = "dib0700",
4310 .rc_query = dib0700_rc_query_old_firmware, 4310 .rc_query = dib0700_rc_query_old_firmware,
4311 .allowed_protos = RC_BIT_RC5 | 4311 .allowed_protos = RC_PROTO_BIT_RC5 |
4312 RC_BIT_RC6_MCE | 4312 RC_PROTO_BIT_RC6_MCE |
4313 RC_BIT_NEC, 4313 RC_PROTO_BIT_NEC,
4314 .change_protocol = dib0700_change_protocol, 4314 .change_protocol = dib0700_change_protocol,
4315 }, 4315 },
4316 }, { DIB0700_DEFAULT_DEVICE_PROPERTIES, 4316 }, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
@@ -4357,9 +4357,9 @@ struct dvb_usb_device_properties dib0700_devices[] = {
4357 .rc_codes = RC_MAP_DIB0700_NEC_TABLE, 4357 .rc_codes = RC_MAP_DIB0700_NEC_TABLE,
4358 .module_name = "dib0700", 4358 .module_name = "dib0700",
4359 .rc_query = dib0700_rc_query_old_firmware, 4359 .rc_query = dib0700_rc_query_old_firmware,
4360 .allowed_protos = RC_BIT_RC5 | 4360 .allowed_protos = RC_PROTO_BIT_RC5 |
4361 RC_BIT_RC6_MCE | 4361 RC_PROTO_BIT_RC6_MCE |
4362 RC_BIT_NEC, 4362 RC_PROTO_BIT_NEC,
4363 .change_protocol = dib0700_change_protocol, 4363 .change_protocol = dib0700_change_protocol,
4364 }, 4364 },
4365 }, { DIB0700_DEFAULT_DEVICE_PROPERTIES, 4365 }, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
@@ -4430,9 +4430,9 @@ struct dvb_usb_device_properties dib0700_devices[] = {
4430 .rc_codes = RC_MAP_DIB0700_RC5_TABLE, 4430 .rc_codes = RC_MAP_DIB0700_RC5_TABLE,
4431 .module_name = "dib0700", 4431 .module_name = "dib0700",
4432 .rc_query = dib0700_rc_query_old_firmware, 4432 .rc_query = dib0700_rc_query_old_firmware,
4433 .allowed_protos = RC_BIT_RC5 | 4433 .allowed_protos = RC_PROTO_BIT_RC5 |
4434 RC_BIT_RC6_MCE | 4434 RC_PROTO_BIT_RC6_MCE |
4435 RC_BIT_NEC, 4435 RC_PROTO_BIT_NEC,
4436 .change_protocol = dib0700_change_protocol, 4436 .change_protocol = dib0700_change_protocol,
4437 }, 4437 },
4438 }, { DIB0700_DEFAULT_DEVICE_PROPERTIES, 4438 }, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
@@ -4466,9 +4466,9 @@ struct dvb_usb_device_properties dib0700_devices[] = {
4466 .rc_codes = RC_MAP_DIB0700_RC5_TABLE, 4466 .rc_codes = RC_MAP_DIB0700_RC5_TABLE,
4467 .module_name = "dib0700", 4467 .module_name = "dib0700",
4468 .rc_query = dib0700_rc_query_old_firmware, 4468 .rc_query = dib0700_rc_query_old_firmware,
4469 .allowed_protos = RC_BIT_RC5 | 4469 .allowed_protos = RC_PROTO_BIT_RC5 |
4470 RC_BIT_RC6_MCE | 4470 RC_PROTO_BIT_RC6_MCE |
4471 RC_BIT_NEC, 4471 RC_PROTO_BIT_NEC,
4472 .change_protocol = dib0700_change_protocol, 4472 .change_protocol = dib0700_change_protocol,
4473 }, 4473 },
4474 }, { DIB0700_DEFAULT_DEVICE_PROPERTIES, 4474 }, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
@@ -4542,9 +4542,9 @@ struct dvb_usb_device_properties dib0700_devices[] = {
4542 .rc_codes = RC_MAP_DIB0700_RC5_TABLE, 4542 .rc_codes = RC_MAP_DIB0700_RC5_TABLE,
4543 .module_name = "dib0700", 4543 .module_name = "dib0700",
4544 .rc_query = dib0700_rc_query_old_firmware, 4544 .rc_query = dib0700_rc_query_old_firmware,
4545 .allowed_protos = RC_BIT_RC5 | 4545 .allowed_protos = RC_PROTO_BIT_RC5 |
4546 RC_BIT_RC6_MCE | 4546 RC_PROTO_BIT_RC6_MCE |
4547 RC_BIT_NEC, 4547 RC_PROTO_BIT_NEC,
4548 .change_protocol = dib0700_change_protocol, 4548 .change_protocol = dib0700_change_protocol,
4549 }, 4549 },
4550 }, { DIB0700_DEFAULT_DEVICE_PROPERTIES, 4550 }, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
@@ -4586,9 +4586,9 @@ struct dvb_usb_device_properties dib0700_devices[] = {
4586 .rc_codes = RC_MAP_DIB0700_NEC_TABLE, 4586 .rc_codes = RC_MAP_DIB0700_NEC_TABLE,
4587 .module_name = "dib0700", 4587 .module_name = "dib0700",
4588 .rc_query = dib0700_rc_query_old_firmware, 4588 .rc_query = dib0700_rc_query_old_firmware,
4589 .allowed_protos = RC_BIT_RC5 | 4589 .allowed_protos = RC_PROTO_BIT_RC5 |
4590 RC_BIT_RC6_MCE | 4590 RC_PROTO_BIT_RC6_MCE |
4591 RC_BIT_NEC, 4591 RC_PROTO_BIT_NEC,
4592 .change_protocol = dib0700_change_protocol, 4592 .change_protocol = dib0700_change_protocol,
4593 }, 4593 },
4594 }, { DIB0700_DEFAULT_DEVICE_PROPERTIES, 4594 }, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
@@ -4635,9 +4635,9 @@ struct dvb_usb_device_properties dib0700_devices[] = {
4635 .rc_codes = RC_MAP_DIB0700_RC5_TABLE, 4635 .rc_codes = RC_MAP_DIB0700_RC5_TABLE,
4636 .module_name = "dib0700", 4636 .module_name = "dib0700",
4637 .rc_query = dib0700_rc_query_old_firmware, 4637 .rc_query = dib0700_rc_query_old_firmware,
4638 .allowed_protos = RC_BIT_RC5 | 4638 .allowed_protos = RC_PROTO_BIT_RC5 |
4639 RC_BIT_RC6_MCE | 4639 RC_PROTO_BIT_RC6_MCE |
4640 RC_BIT_NEC, 4640 RC_PROTO_BIT_NEC,
4641 .change_protocol = dib0700_change_protocol, 4641 .change_protocol = dib0700_change_protocol,
4642 }, 4642 },
4643 }, { DIB0700_DEFAULT_DEVICE_PROPERTIES, 4643 }, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
@@ -4672,9 +4672,9 @@ struct dvb_usb_device_properties dib0700_devices[] = {
4672 .rc_codes = RC_MAP_DIB0700_RC5_TABLE, 4672 .rc_codes = RC_MAP_DIB0700_RC5_TABLE,
4673 .module_name = "dib0700", 4673 .module_name = "dib0700",
4674 .rc_query = dib0700_rc_query_old_firmware, 4674 .rc_query = dib0700_rc_query_old_firmware,
4675 .allowed_protos = RC_BIT_RC5 | 4675 .allowed_protos = RC_PROTO_BIT_RC5 |
4676 RC_BIT_RC6_MCE | 4676 RC_PROTO_BIT_RC6_MCE |
4677 RC_BIT_NEC, 4677 RC_PROTO_BIT_NEC,
4678 .change_protocol = dib0700_change_protocol, 4678 .change_protocol = dib0700_change_protocol,
4679 }, 4679 },
4680 }, { DIB0700_DEFAULT_DEVICE_PROPERTIES, 4680 }, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
@@ -4709,9 +4709,9 @@ struct dvb_usb_device_properties dib0700_devices[] = {
4709 .rc_codes = RC_MAP_DIB0700_RC5_TABLE, 4709 .rc_codes = RC_MAP_DIB0700_RC5_TABLE,
4710 .module_name = "dib0700", 4710 .module_name = "dib0700",
4711 .rc_query = dib0700_rc_query_old_firmware, 4711 .rc_query = dib0700_rc_query_old_firmware,
4712 .allowed_protos = RC_BIT_RC5 | 4712 .allowed_protos = RC_PROTO_BIT_RC5 |
4713 RC_BIT_RC6_MCE | 4713 RC_PROTO_BIT_RC6_MCE |
4714 RC_BIT_NEC, 4714 RC_PROTO_BIT_NEC,
4715 .change_protocol = dib0700_change_protocol, 4715 .change_protocol = dib0700_change_protocol,
4716 }, 4716 },
4717 }, { DIB0700_DEFAULT_DEVICE_PROPERTIES, 4717 }, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
@@ -4746,9 +4746,9 @@ struct dvb_usb_device_properties dib0700_devices[] = {
4746 .rc_codes = RC_MAP_DIB0700_RC5_TABLE, 4746 .rc_codes = RC_MAP_DIB0700_RC5_TABLE,
4747 .module_name = "dib0700", 4747 .module_name = "dib0700",
4748 .rc_query = dib0700_rc_query_old_firmware, 4748 .rc_query = dib0700_rc_query_old_firmware,
4749 .allowed_protos = RC_BIT_RC5 | 4749 .allowed_protos = RC_PROTO_BIT_RC5 |
4750 RC_BIT_RC6_MCE | 4750 RC_PROTO_BIT_RC6_MCE |
4751 RC_BIT_NEC, 4751 RC_PROTO_BIT_NEC,
4752 .change_protocol = dib0700_change_protocol, 4752 .change_protocol = dib0700_change_protocol,
4753 }, 4753 },
4754 }, { DIB0700_DEFAULT_DEVICE_PROPERTIES, 4754 }, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
@@ -4783,9 +4783,9 @@ struct dvb_usb_device_properties dib0700_devices[] = {
4783 .rc_codes = RC_MAP_DIB0700_RC5_TABLE, 4783 .rc_codes = RC_MAP_DIB0700_RC5_TABLE,
4784 .module_name = "dib0700", 4784 .module_name = "dib0700",
4785 .rc_query = dib0700_rc_query_old_firmware, 4785 .rc_query = dib0700_rc_query_old_firmware,
4786 .allowed_protos = RC_BIT_RC5 | 4786 .allowed_protos = RC_PROTO_BIT_RC5 |
4787 RC_BIT_RC6_MCE | 4787 RC_PROTO_BIT_RC6_MCE |
4788 RC_BIT_NEC, 4788 RC_PROTO_BIT_NEC,
4789 .change_protocol = dib0700_change_protocol, 4789 .change_protocol = dib0700_change_protocol,
4790 }, 4790 },
4791 }, { DIB0700_DEFAULT_DEVICE_PROPERTIES, 4791 }, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
@@ -4820,9 +4820,9 @@ struct dvb_usb_device_properties dib0700_devices[] = {
4820 .rc_codes = RC_MAP_DIB0700_RC5_TABLE, 4820 .rc_codes = RC_MAP_DIB0700_RC5_TABLE,
4821 .module_name = "dib0700", 4821 .module_name = "dib0700",
4822 .rc_query = dib0700_rc_query_old_firmware, 4822 .rc_query = dib0700_rc_query_old_firmware,
4823 .allowed_protos = RC_BIT_RC5 | 4823 .allowed_protos = RC_PROTO_BIT_RC5 |
4824 RC_BIT_RC6_MCE | 4824 RC_PROTO_BIT_RC6_MCE |
4825 RC_BIT_NEC, 4825 RC_PROTO_BIT_NEC,
4826 .change_protocol = dib0700_change_protocol, 4826 .change_protocol = dib0700_change_protocol,
4827 }, 4827 },
4828 }, { DIB0700_DEFAULT_DEVICE_PROPERTIES, 4828 }, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
@@ -4871,9 +4871,9 @@ struct dvb_usb_device_properties dib0700_devices[] = {
4871 .rc_codes = RC_MAP_DIB0700_RC5_TABLE, 4871 .rc_codes = RC_MAP_DIB0700_RC5_TABLE,
4872 .module_name = "dib0700", 4872 .module_name = "dib0700",
4873 .rc_query = dib0700_rc_query_old_firmware, 4873 .rc_query = dib0700_rc_query_old_firmware,
4874 .allowed_protos = RC_BIT_RC5 | 4874 .allowed_protos = RC_PROTO_BIT_RC5 |
4875 RC_BIT_RC6_MCE | 4875 RC_PROTO_BIT_RC6_MCE |
4876 RC_BIT_NEC, 4876 RC_PROTO_BIT_NEC,
4877 .change_protocol = dib0700_change_protocol, 4877 .change_protocol = dib0700_change_protocol,
4878 }, 4878 },
4879 }, { DIB0700_DEFAULT_DEVICE_PROPERTIES, 4879 }, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
@@ -4906,9 +4906,9 @@ struct dvb_usb_device_properties dib0700_devices[] = {
4906 .rc_codes = RC_MAP_DIB0700_RC5_TABLE, 4906 .rc_codes = RC_MAP_DIB0700_RC5_TABLE,
4907 .module_name = "dib0700", 4907 .module_name = "dib0700",
4908 .rc_query = dib0700_rc_query_old_firmware, 4908 .rc_query = dib0700_rc_query_old_firmware,
4909 .allowed_protos = RC_BIT_RC5 | 4909 .allowed_protos = RC_PROTO_BIT_RC5 |
4910 RC_BIT_RC6_MCE | 4910 RC_PROTO_BIT_RC6_MCE |
4911 RC_BIT_NEC, 4911 RC_PROTO_BIT_NEC,
4912 .change_protocol = dib0700_change_protocol, 4912 .change_protocol = dib0700_change_protocol,
4913 }, 4913 },
4914 }, { DIB0700_DEFAULT_DEVICE_PROPERTIES, 4914 }, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
@@ -4943,9 +4943,9 @@ struct dvb_usb_device_properties dib0700_devices[] = {
4943 .rc_codes = RC_MAP_DIB0700_RC5_TABLE, 4943 .rc_codes = RC_MAP_DIB0700_RC5_TABLE,
4944 .module_name = "dib0700", 4944 .module_name = "dib0700",
4945 .rc_query = dib0700_rc_query_old_firmware, 4945 .rc_query = dib0700_rc_query_old_firmware,
4946 .allowed_protos = RC_BIT_RC5 | 4946 .allowed_protos = RC_PROTO_BIT_RC5 |
4947 RC_BIT_RC6_MCE | 4947 RC_PROTO_BIT_RC6_MCE |
4948 RC_BIT_NEC, 4948 RC_PROTO_BIT_NEC,
4949 .change_protocol = dib0700_change_protocol, 4949 .change_protocol = dib0700_change_protocol,
4950 }, 4950 },
4951 }, { DIB0700_DEFAULT_DEVICE_PROPERTIES, 4951 }, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
@@ -4981,9 +4981,9 @@ struct dvb_usb_device_properties dib0700_devices[] = {
4981 .rc_codes = RC_MAP_DIB0700_RC5_TABLE, 4981 .rc_codes = RC_MAP_DIB0700_RC5_TABLE,
4982 .module_name = "dib0700", 4982 .module_name = "dib0700",
4983 .rc_query = dib0700_rc_query_old_firmware, 4983 .rc_query = dib0700_rc_query_old_firmware,
4984 .allowed_protos = RC_BIT_RC5 | 4984 .allowed_protos = RC_PROTO_BIT_RC5 |
4985 RC_BIT_RC6_MCE | 4985 RC_PROTO_BIT_RC6_MCE |
4986 RC_BIT_NEC, 4986 RC_PROTO_BIT_NEC,
4987 .change_protocol = dib0700_change_protocol, 4987 .change_protocol = dib0700_change_protocol,
4988 }, 4988 },
4989 }, { DIB0700_DEFAULT_DEVICE_PROPERTIES, 4989 }, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
@@ -5035,9 +5035,9 @@ struct dvb_usb_device_properties dib0700_devices[] = {
5035 .rc_codes = RC_MAP_DIB0700_RC5_TABLE, 5035 .rc_codes = RC_MAP_DIB0700_RC5_TABLE,
5036 .module_name = "dib0700", 5036 .module_name = "dib0700",
5037 .rc_query = dib0700_rc_query_old_firmware, 5037 .rc_query = dib0700_rc_query_old_firmware,
5038 .allowed_protos = RC_BIT_RC5 | 5038 .allowed_protos = RC_PROTO_BIT_RC5 |
5039 RC_BIT_RC6_MCE | 5039 RC_PROTO_BIT_RC6_MCE |
5040 RC_BIT_NEC, 5040 RC_PROTO_BIT_NEC,
5041 .change_protocol = dib0700_change_protocol, 5041 .change_protocol = dib0700_change_protocol,
5042 }, 5042 },
5043 }, 5043 },
diff --git a/drivers/media/usb/dvb-usb/dtt200u.c b/drivers/media/usb/dvb-usb/dtt200u.c
index fcbff7fb0c4e..512370786696 100644
--- a/drivers/media/usb/dvb-usb/dtt200u.c
+++ b/drivers/media/usb/dvb-usb/dtt200u.c
@@ -100,14 +100,14 @@ static int dtt200u_rc_query(struct dvb_usb_device *d)
100 goto ret; 100 goto ret;
101 101
102 if (st->data[0] == 1) { 102 if (st->data[0] == 1) {
103 enum rc_type proto = RC_TYPE_NEC; 103 enum rc_proto proto = RC_PROTO_NEC;
104 104
105 scancode = st->data[1]; 105 scancode = st->data[1];
106 if ((u8) ~st->data[1] != st->data[2]) { 106 if ((u8) ~st->data[1] != st->data[2]) {
107 /* Extended NEC */ 107 /* Extended NEC */
108 scancode = scancode << 8; 108 scancode = scancode << 8;
109 scancode |= st->data[2]; 109 scancode |= st->data[2];
110 proto = RC_TYPE_NECX; 110 proto = RC_PROTO_NECX;
111 } 111 }
112 scancode = scancode << 8; 112 scancode = scancode << 8;
113 scancode |= st->data[3]; 113 scancode |= st->data[3];
@@ -213,7 +213,7 @@ static struct dvb_usb_device_properties dtt200u_properties = {
213 .rc_interval = 300, 213 .rc_interval = 300,
214 .rc_codes = RC_MAP_DTT200U, 214 .rc_codes = RC_MAP_DTT200U,
215 .rc_query = dtt200u_rc_query, 215 .rc_query = dtt200u_rc_query,
216 .allowed_protos = RC_BIT_NEC, 216 .allowed_protos = RC_PROTO_BIT_NEC,
217 }, 217 },
218 218
219 .generic_bulk_ctrl_endpoint = 0x01, 219 .generic_bulk_ctrl_endpoint = 0x01,
@@ -265,7 +265,7 @@ static struct dvb_usb_device_properties wt220u_properties = {
265 .rc_interval = 300, 265 .rc_interval = 300,
266 .rc_codes = RC_MAP_DTT200U, 266 .rc_codes = RC_MAP_DTT200U,
267 .rc_query = dtt200u_rc_query, 267 .rc_query = dtt200u_rc_query,
268 .allowed_protos = RC_BIT_NEC, 268 .allowed_protos = RC_PROTO_BIT_NEC,
269 }, 269 },
270 270
271 .generic_bulk_ctrl_endpoint = 0x01, 271 .generic_bulk_ctrl_endpoint = 0x01,
@@ -317,7 +317,7 @@ static struct dvb_usb_device_properties wt220u_fc_properties = {
317 .rc_interval = 300, 317 .rc_interval = 300,
318 .rc_codes = RC_MAP_DTT200U, 318 .rc_codes = RC_MAP_DTT200U,
319 .rc_query = dtt200u_rc_query, 319 .rc_query = dtt200u_rc_query,
320 .allowed_protos = RC_BIT_NEC, 320 .allowed_protos = RC_PROTO_BIT_NEC,
321 }, 321 },
322 322
323 .generic_bulk_ctrl_endpoint = 0x01, 323 .generic_bulk_ctrl_endpoint = 0x01,
@@ -369,7 +369,7 @@ static struct dvb_usb_device_properties wt220u_zl0353_properties = {
369 .rc_interval = 300, 369 .rc_interval = 300,
370 .rc_codes = RC_MAP_DTT200U, 370 .rc_codes = RC_MAP_DTT200U,
371 .rc_query = dtt200u_rc_query, 371 .rc_query = dtt200u_rc_query,
372 .allowed_protos = RC_BIT_NEC, 372 .allowed_protos = RC_PROTO_BIT_NEC,
373 }, 373 },
374 374
375 .generic_bulk_ctrl_endpoint = 0x01, 375 .generic_bulk_ctrl_endpoint = 0x01,
diff --git a/drivers/media/usb/dvb-usb/dvb-usb.h b/drivers/media/usb/dvb-usb/dvb-usb.h
index 67f898b6f6d0..72468fdffa18 100644
--- a/drivers/media/usb/dvb-usb/dvb-usb.h
+++ b/drivers/media/usb/dvb-usb/dvb-usb.h
@@ -202,7 +202,7 @@ struct dvb_rc {
202 u64 protocol; 202 u64 protocol;
203 u64 allowed_protos; 203 u64 allowed_protos;
204 enum rc_driver_type driver_type; 204 enum rc_driver_type driver_type;
205 int (*change_protocol)(struct rc_dev *dev, u64 *rc_type); 205 int (*change_protocol)(struct rc_dev *dev, u64 *rc_proto);
206 char *module_name; 206 char *module_name;
207 int (*rc_query) (struct dvb_usb_device *d); 207 int (*rc_query) (struct dvb_usb_device *d);
208 int rc_interval; 208 int rc_interval;
diff --git a/drivers/media/usb/dvb-usb/dw2102.c b/drivers/media/usb/dvb-usb/dw2102.c
index 57b187240110..11109b1e641f 100644
--- a/drivers/media/usb/dvb-usb/dw2102.c
+++ b/drivers/media/usb/dvb-usb/dw2102.c
@@ -1671,7 +1671,7 @@ static int dw2102_rc_query(struct dvb_usb_device *d)
1671 if (msg.buf[0] != 0xff) { 1671 if (msg.buf[0] != 0xff) {
1672 deb_rc("%s: rc code: %x, %x\n", 1672 deb_rc("%s: rc code: %x, %x\n",
1673 __func__, key[0], key[1]); 1673 __func__, key[0], key[1]);
1674 rc_keydown(d->rc_dev, RC_TYPE_UNKNOWN, key[0], 0); 1674 rc_keydown(d->rc_dev, RC_PROTO_UNKNOWN, key[0], 0);
1675 } 1675 }
1676 } 1676 }
1677 1677
@@ -1692,7 +1692,8 @@ static int prof_rc_query(struct dvb_usb_device *d)
1692 if (msg.buf[0] != 0xff) { 1692 if (msg.buf[0] != 0xff) {
1693 deb_rc("%s: rc code: %x, %x\n", 1693 deb_rc("%s: rc code: %x, %x\n",
1694 __func__, key[0], key[1]); 1694 __func__, key[0], key[1]);
1695 rc_keydown(d->rc_dev, RC_TYPE_UNKNOWN, key[0]^0xff, 0); 1695 rc_keydown(d->rc_dev, RC_PROTO_UNKNOWN, key[0] ^ 0xff,
1696 0);
1696 } 1697 }
1697 } 1698 }
1698 1699
@@ -1713,7 +1714,7 @@ static int su3000_rc_query(struct dvb_usb_device *d)
1713 if (msg.buf[0] != 0xff) { 1714 if (msg.buf[0] != 0xff) {
1714 deb_rc("%s: rc code: %x, %x\n", 1715 deb_rc("%s: rc code: %x, %x\n",
1715 __func__, key[0], key[1]); 1716 __func__, key[0], key[1]);
1716 rc_keydown(d->rc_dev, RC_TYPE_RC5, 1717 rc_keydown(d->rc_dev, RC_PROTO_RC5,
1717 RC_SCANCODE_RC5(key[1], key[0]), 0); 1718 RC_SCANCODE_RC5(key[1], key[0]), 0);
1718 } 1719 }
1719 } 1720 }
@@ -1912,7 +1913,7 @@ static struct dvb_usb_device_properties dw2102_properties = {
1912 .rc_interval = 150, 1913 .rc_interval = 150,
1913 .rc_codes = RC_MAP_DM1105_NEC, 1914 .rc_codes = RC_MAP_DM1105_NEC,
1914 .module_name = "dw2102", 1915 .module_name = "dw2102",
1915 .allowed_protos = RC_BIT_NEC, 1916 .allowed_protos = RC_PROTO_BIT_NEC,
1916 .rc_query = dw2102_rc_query, 1917 .rc_query = dw2102_rc_query,
1917 }, 1918 },
1918 1919
@@ -1967,7 +1968,7 @@ static struct dvb_usb_device_properties dw2104_properties = {
1967 .rc_interval = 150, 1968 .rc_interval = 150,
1968 .rc_codes = RC_MAP_DM1105_NEC, 1969 .rc_codes = RC_MAP_DM1105_NEC,
1969 .module_name = "dw2102", 1970 .module_name = "dw2102",
1970 .allowed_protos = RC_BIT_NEC, 1971 .allowed_protos = RC_PROTO_BIT_NEC,
1971 .rc_query = dw2102_rc_query, 1972 .rc_query = dw2102_rc_query,
1972 }, 1973 },
1973 1974
@@ -2018,7 +2019,7 @@ static struct dvb_usb_device_properties dw3101_properties = {
2018 .rc_interval = 150, 2019 .rc_interval = 150,
2019 .rc_codes = RC_MAP_DM1105_NEC, 2020 .rc_codes = RC_MAP_DM1105_NEC,
2020 .module_name = "dw2102", 2021 .module_name = "dw2102",
2021 .allowed_protos = RC_BIT_NEC, 2022 .allowed_protos = RC_PROTO_BIT_NEC,
2022 .rc_query = dw2102_rc_query, 2023 .rc_query = dw2102_rc_query,
2023 }, 2024 },
2024 2025
@@ -2067,7 +2068,7 @@ static struct dvb_usb_device_properties s6x0_properties = {
2067 .rc_interval = 150, 2068 .rc_interval = 150,
2068 .rc_codes = RC_MAP_TEVII_NEC, 2069 .rc_codes = RC_MAP_TEVII_NEC,
2069 .module_name = "dw2102", 2070 .module_name = "dw2102",
2070 .allowed_protos = RC_BIT_NEC, 2071 .allowed_protos = RC_PROTO_BIT_NEC,
2071 .rc_query = dw2102_rc_query, 2072 .rc_query = dw2102_rc_query,
2072 }, 2073 },
2073 2074
@@ -2161,7 +2162,7 @@ static struct dvb_usb_device_properties su3000_properties = {
2161 .rc_interval = 150, 2162 .rc_interval = 150,
2162 .rc_codes = RC_MAP_SU3000, 2163 .rc_codes = RC_MAP_SU3000,
2163 .module_name = "dw2102", 2164 .module_name = "dw2102",
2164 .allowed_protos = RC_BIT_RC5, 2165 .allowed_protos = RC_PROTO_BIT_RC5,
2165 .rc_query = su3000_rc_query, 2166 .rc_query = su3000_rc_query,
2166 }, 2167 },
2167 2168
@@ -2230,7 +2231,7 @@ static struct dvb_usb_device_properties t220_properties = {
2230 .rc_interval = 150, 2231 .rc_interval = 150,
2231 .rc_codes = RC_MAP_SU3000, 2232 .rc_codes = RC_MAP_SU3000,
2232 .module_name = "dw2102", 2233 .module_name = "dw2102",
2233 .allowed_protos = RC_BIT_RC5, 2234 .allowed_protos = RC_PROTO_BIT_RC5,
2234 .rc_query = su3000_rc_query, 2235 .rc_query = su3000_rc_query,
2235 }, 2236 },
2236 2237
@@ -2279,7 +2280,7 @@ static struct dvb_usb_device_properties tt_s2_4600_properties = {
2279 .rc_interval = 250, 2280 .rc_interval = 250,
2280 .rc_codes = RC_MAP_TT_1500, 2281 .rc_codes = RC_MAP_TT_1500,
2281 .module_name = "dw2102", 2282 .module_name = "dw2102",
2282 .allowed_protos = RC_BIT_RC5, 2283 .allowed_protos = RC_PROTO_BIT_RC5,
2283 .rc_query = su3000_rc_query, 2284 .rc_query = su3000_rc_query,
2284 }, 2285 },
2285 2286
diff --git a/drivers/media/usb/dvb-usb/m920x.c b/drivers/media/usb/dvb-usb/m920x.c
index 70672e1e5ec7..32081c2ce0da 100644
--- a/drivers/media/usb/dvb-usb/m920x.c
+++ b/drivers/media/usb/dvb-usb/m920x.c
@@ -241,7 +241,7 @@ static int m920x_rc_core_query(struct dvb_usb_device *d)
241 else if (state == REMOTE_KEY_REPEAT) 241 else if (state == REMOTE_KEY_REPEAT)
242 rc_repeat(d->rc_dev); 242 rc_repeat(d->rc_dev);
243 else 243 else
244 rc_keydown(d->rc_dev, RC_TYPE_UNKNOWN, rc_state[1], 0); 244 rc_keydown(d->rc_dev, RC_PROTO_UNKNOWN, rc_state[1], 0);
245 245
246out: 246out:
247 kfree(rc_state); 247 kfree(rc_state);
@@ -1208,7 +1208,7 @@ static struct dvb_usb_device_properties vp7049_properties = {
1208 .rc_interval = 150, 1208 .rc_interval = 150,
1209 .rc_codes = RC_MAP_TWINHAN_VP1027_DVBS, 1209 .rc_codes = RC_MAP_TWINHAN_VP1027_DVBS,
1210 .rc_query = m920x_rc_core_query, 1210 .rc_query = m920x_rc_core_query,
1211 .allowed_protos = RC_BIT_UNKNOWN, 1211 .allowed_protos = RC_PROTO_BIT_UNKNOWN,
1212 }, 1212 },
1213 1213
1214 .size_of_priv = sizeof(struct m920x_state), 1214 .size_of_priv = sizeof(struct m920x_state),
diff --git a/drivers/media/usb/dvb-usb/pctv452e.c b/drivers/media/usb/dvb-usb/pctv452e.c
index d54ebe7e0215..601ade7ca48d 100644
--- a/drivers/media/usb/dvb-usb/pctv452e.c
+++ b/drivers/media/usb/dvb-usb/pctv452e.c
@@ -600,7 +600,7 @@ static int pctv452e_rc_query(struct dvb_usb_device *d)
600 info("%s: cmd=0x%02x sys=0x%02x\n", 600 info("%s: cmd=0x%02x sys=0x%02x\n",
601 __func__, rx[6], rx[7]); 601 __func__, rx[6], rx[7]);
602 602
603 rc_keydown(d->rc_dev, RC_TYPE_RC5, state->last_rc_key, 0); 603 rc_keydown(d->rc_dev, RC_PROTO_RC5, state->last_rc_key, 0);
604 } else if (state->last_rc_key) { 604 } else if (state->last_rc_key) {
605 rc_keyup(d->rc_dev); 605 rc_keyup(d->rc_dev);
606 state->last_rc_key = 0; 606 state->last_rc_key = 0;
@@ -958,7 +958,7 @@ static struct dvb_usb_device_properties pctv452e_properties = {
958 958
959 .rc.core = { 959 .rc.core = {
960 .rc_codes = RC_MAP_DIB0700_RC5_TABLE, 960 .rc_codes = RC_MAP_DIB0700_RC5_TABLE,
961 .allowed_protos = RC_BIT_RC5, 961 .allowed_protos = RC_PROTO_BIT_RC5,
962 .rc_query = pctv452e_rc_query, 962 .rc_query = pctv452e_rc_query,
963 .rc_interval = 100, 963 .rc_interval = 100,
964 }, 964 },
@@ -1011,7 +1011,7 @@ static struct dvb_usb_device_properties tt_connect_s2_3600_properties = {
1011 1011
1012 .rc.core = { 1012 .rc.core = {
1013 .rc_codes = RC_MAP_TT_1500, 1013 .rc_codes = RC_MAP_TT_1500,
1014 .allowed_protos = RC_BIT_RC5, 1014 .allowed_protos = RC_PROTO_BIT_RC5,
1015 .rc_query = pctv452e_rc_query, 1015 .rc_query = pctv452e_rc_query,
1016 .rc_interval = 100, 1016 .rc_interval = 100,
1017 }, 1017 },
diff --git a/drivers/media/usb/dvb-usb/technisat-usb2.c b/drivers/media/usb/dvb-usb/technisat-usb2.c
index 9f7dd1afcb15..18d0f8f5283f 100644
--- a/drivers/media/usb/dvb-usb/technisat-usb2.c
+++ b/drivers/media/usb/dvb-usb/technisat-usb2.c
@@ -749,7 +749,7 @@ static struct dvb_usb_device_properties technisat_usb2_devices = {
749 .rc_codes = RC_MAP_TECHNISAT_USB2, 749 .rc_codes = RC_MAP_TECHNISAT_USB2,
750 .module_name = "technisat-usb2", 750 .module_name = "technisat-usb2",
751 .rc_query = technisat_usb2_rc_query, 751 .rc_query = technisat_usb2_rc_query,
752 .allowed_protos = RC_BIT_ALL_IR_DECODER, 752 .allowed_protos = RC_PROTO_BIT_ALL_IR_DECODER,
753 .driver_type = RC_DRIVER_IR_RAW, 753 .driver_type = RC_DRIVER_IR_RAW,
754 } 754 }
755}; 755};
diff --git a/drivers/media/usb/dvb-usb/ttusb2.c b/drivers/media/usb/dvb-usb/ttusb2.c
index 9e0d6a4166d2..e7020f245f53 100644
--- a/drivers/media/usb/dvb-usb/ttusb2.c
+++ b/drivers/media/usb/dvb-usb/ttusb2.c
@@ -459,7 +459,7 @@ static int tt3650_rc_query(struct dvb_usb_device *d)
459 /* got a "press" event */ 459 /* got a "press" event */
460 st->last_rc_key = RC_SCANCODE_RC5(rx[3], rx[2]); 460 st->last_rc_key = RC_SCANCODE_RC5(rx[3], rx[2]);
461 deb_info("%s: cmd=0x%02x sys=0x%02x\n", __func__, rx[2], rx[3]); 461 deb_info("%s: cmd=0x%02x sys=0x%02x\n", __func__, rx[2], rx[3]);
462 rc_keydown(d->rc_dev, RC_TYPE_RC5, st->last_rc_key, rx[1]); 462 rc_keydown(d->rc_dev, RC_PROTO_RC5, st->last_rc_key, rx[1]);
463 } else if (st->last_rc_key) { 463 } else if (st->last_rc_key) {
464 rc_keyup(d->rc_dev); 464 rc_keyup(d->rc_dev);
465 st->last_rc_key = 0; 465 st->last_rc_key = 0;
@@ -766,7 +766,7 @@ static struct dvb_usb_device_properties ttusb2_properties_ct3650 = {
766 .rc_interval = 150, /* Less than IR_KEYPRESS_TIMEOUT */ 766 .rc_interval = 150, /* Less than IR_KEYPRESS_TIMEOUT */
767 .rc_codes = RC_MAP_TT_1500, 767 .rc_codes = RC_MAP_TT_1500,
768 .rc_query = tt3650_rc_query, 768 .rc_query = tt3650_rc_query,
769 .allowed_protos = RC_BIT_RC5, 769 .allowed_protos = RC_PROTO_BIT_RC5,
770 }, 770 },
771 771
772 .num_adapters = 1, 772 .num_adapters = 1,
generated by cgit v1.2.2 (git 2.25.0) at 2025-09-06 15:14:11 -0400