|
@@ -1017,7 +1017,7 @@ static int imon_ir_change_protocol(struct rc_dev *rc, u64 *rc_type)
|
|
unsigned char ir_proto_packet[] = {
|
|
unsigned char ir_proto_packet[] = {
|
|
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x86 };
|
|
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x86 };
|
|
|
|
|
|
- if (*rc_type && !(*rc_type & rc->allowed_protos))
|
|
|
|
|
|
+ if (*rc_type && !rc_protocols_allowed(rc, *rc_type))
|
|
dev_warn(dev, "Looks like you're trying to use an IR protocol "
|
|
dev_warn(dev, "Looks like you're trying to use an IR protocol "
|
|
"this device does not support\n");
|
|
"this device does not support\n");
|
|
|
|
|
|
@@ -1867,7 +1867,8 @@ static struct rc_dev *imon_init_rdev(struct imon_context *ictx)
|
|
|
|
|
|
rdev->priv = ictx;
|
|
rdev->priv = ictx;
|
|
rdev->driver_type = RC_DRIVER_SCANCODE;
|
|
rdev->driver_type = RC_DRIVER_SCANCODE;
|
|
- rdev->allowed_protos = RC_BIT_OTHER | RC_BIT_RC6_MCE; /* iMON PAD or MCE */
|
|
|
|
|
|
+ /* iMON PAD or MCE */
|
|
|
|
+ rc_set_allowed_protocols(rdev, RC_BIT_OTHER | RC_BIT_RC6_MCE);
|
|
rdev->change_protocol = imon_ir_change_protocol;
|
|
rdev->change_protocol = imon_ir_change_protocol;
|
|
rdev->driver_name = MOD_NAME;
|
|
rdev->driver_name = MOD_NAME;
|
|
|
|
|
|
@@ -1880,7 +1881,7 @@ static struct rc_dev *imon_init_rdev(struct imon_context *ictx)
|
|
|
|
|
|
if (ictx->product == 0xffdc) {
|
|
if (ictx->product == 0xffdc) {
|
|
imon_get_ffdc_type(ictx);
|
|
imon_get_ffdc_type(ictx);
|
|
- rdev->allowed_protos = ictx->rc_type;
|
|
|
|
|
|
+ rc_set_allowed_protocols(rdev, ictx->rc_type);
|
|
}
|
|
}
|
|
|
|
|
|
imon_set_display_type(ictx);
|
|
imon_set_display_type(ictx);
|