AR-1 - Adding support category for distributions AR-4 - Remove Allwinner legacy AR-5 - Drop Udoo family and move Udoo board into newly created imx6 family AR-9 - Rename sunxi-next to sunxi-legacy AR-10 - Rename sunxi-dev to sunxi-current AR-11 - Adding Radxa Rockpi S support AR-13 - Rename rockchip64-default to rockchip64-legacy AR-14 - Add rockchip64-current as mainline source AR-15 - Drop Rockchip 4.19.y NEXT, current become 5.3.y AR-16 - Rename RK3399 default to legacy AR-17 - Rename Odroid XU4 next and default to legacy 4.14.y, add DEV 5.4.y AR-18 - Add Odroid N2 current mainline AR-19 - Move Odroid C1 to meson family AR-20 - Rename mvebu64-default to mvebu64-legacy AR-21 - Rename mvebu-default to mvebu-legacy AR-22 - Rename mvebu-next to mvebu-current AR-23 - Drop meson64 default and next, current becomes former DEV 5.3.y AR-24 - Drop cubox family and move Cubox/Hummingboard boards under imx6 AR-26 - Adjust motd AR-27 - Enabling distribution release status AR-28 - Added new GCC compilers AR-29 - Implementing Ubuntu Eoan AR-30 - Add desktop packages per board or family AR-31 - Remove (Ubuntu/Debian) distribution name from image filename AR-32 - Move arch configs from configuration.sh to separate arm64 and armhf config files AR-33 - Revision numbers for beta builds changed to day_in_the_year AR-34 - Patches support linked patches AR-35 - Break meson64 family into gxbb and gxl AR-36 - Add Nanopineo2 Black AR-38 - Upgrade option from old branches to new one via armbian-config AR-41 - Show full timezone info AR-43 - Merge Odroid N2 to meson64 AR-44 - Enable FORCE_BOOTSCRIPT_UPDATE for all builds
337 lines
11 KiB
Diff
337 lines
11 KiB
Diff
--- a/drivers/media/usb/dvb-usb/dib0700_devices.c 2019-10-09 03:04:06.615412788 +0200
|
|
+++ b/drivers/media/usb/dvb-usb/dib0700_devices.c 2019-10-09 03:05:04.005761125 +0200
|
|
@@ -519,7 +519,7 @@
|
|
static int dib0700_rc_query_old_firmware(struct dvb_usb_device *d)
|
|
{
|
|
u8 key[4];
|
|
- enum rc_type protocol;
|
|
+ enum rc_proto protocol;
|
|
u32 scancode;
|
|
u8 toggle;
|
|
int i;
|
|
@@ -548,7 +548,7 @@
|
|
dib0700_rc_setup(d, NULL); /* reset ir sensor data to prevent false events */
|
|
|
|
switch (d->props.rc.core.protocol) {
|
|
- case RC_BIT_NEC:
|
|
+ case RC_PROTO_BIT_NEC:
|
|
/* NEC protocol sends repeat code as 0 0 0 FF */
|
|
if ((key[3-2] == 0x00) && (key[3-3] == 0x00) &&
|
|
(key[3] == 0xff)) {
|
|
@@ -556,14 +556,14 @@
|
|
return 0;
|
|
}
|
|
|
|
- protocol = RC_TYPE_NEC;
|
|
+ protocol = RC_PROTO_NEC;
|
|
scancode = RC_SCANCODE_NEC(key[3-2], key[3-3]);
|
|
toggle = 0;
|
|
break;
|
|
|
|
default:
|
|
/* RC-5 protocol changes toggle bit on new keypress */
|
|
- protocol = RC_TYPE_RC5;
|
|
+ protocol = RC_PROTO_RC5;
|
|
scancode = RC_SCANCODE_RC5(key[3-2], key[3-3]);
|
|
toggle = key[3-1];
|
|
break;
|
|
@@ -3887,9 +3887,9 @@
|
|
.rc_interval = DEFAULT_RC_INTERVAL,
|
|
.rc_codes = RC_MAP_DIB0700_RC5_TABLE,
|
|
.rc_query = dib0700_rc_query_old_firmware,
|
|
- .allowed_protos = RC_BIT_RC5 |
|
|
- RC_BIT_RC6_MCE |
|
|
- RC_BIT_NEC,
|
|
+ .allowed_protos = RC_PROTO_BIT_RC5 |
|
|
+ RC_PROTO_BIT_RC6_MCE |
|
|
+ RC_PROTO_BIT_NEC,
|
|
.change_protocol = dib0700_change_protocol,
|
|
},
|
|
}, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
|
|
@@ -3927,9 +3927,9 @@
|
|
.rc_interval = DEFAULT_RC_INTERVAL,
|
|
.rc_codes = RC_MAP_DIB0700_RC5_TABLE,
|
|
.rc_query = dib0700_rc_query_old_firmware,
|
|
- .allowed_protos = RC_BIT_RC5 |
|
|
- RC_BIT_RC6_MCE |
|
|
- RC_BIT_NEC,
|
|
+ .allowed_protos = RC_PROTO_BIT_RC5 |
|
|
+ RC_PROTO_BIT_RC6_MCE |
|
|
+ RC_PROTO_BIT_NEC,
|
|
.change_protocol = dib0700_change_protocol,
|
|
},
|
|
}, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
|
|
@@ -3992,9 +3992,9 @@
|
|
.rc_interval = DEFAULT_RC_INTERVAL,
|
|
.rc_codes = RC_MAP_DIB0700_RC5_TABLE,
|
|
.rc_query = dib0700_rc_query_old_firmware,
|
|
- .allowed_protos = RC_BIT_RC5 |
|
|
- RC_BIT_RC6_MCE |
|
|
- RC_BIT_NEC,
|
|
+ .allowed_protos = RC_PROTO_BIT_RC5 |
|
|
+ RC_PROTO_BIT_RC6_MCE |
|
|
+ RC_PROTO_BIT_NEC,
|
|
.change_protocol = dib0700_change_protocol,
|
|
},
|
|
}, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
|
|
@@ -4037,9 +4037,9 @@
|
|
.rc_codes = RC_MAP_DIB0700_RC5_TABLE,
|
|
.module_name = "dib0700",
|
|
.rc_query = dib0700_rc_query_old_firmware,
|
|
- .allowed_protos = RC_BIT_RC5 |
|
|
- RC_BIT_RC6_MCE |
|
|
- RC_BIT_NEC,
|
|
+ .allowed_protos = RC_PROTO_BIT_RC5 |
|
|
+ RC_PROTO_BIT_RC6_MCE |
|
|
+ RC_PROTO_BIT_NEC,
|
|
.change_protocol = dib0700_change_protocol,
|
|
},
|
|
}, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
|
|
@@ -4118,9 +4118,9 @@
|
|
.rc_codes = RC_MAP_DIB0700_RC5_TABLE,
|
|
.module_name = "dib0700",
|
|
.rc_query = dib0700_rc_query_old_firmware,
|
|
- .allowed_protos = RC_BIT_RC5 |
|
|
- RC_BIT_RC6_MCE |
|
|
- RC_BIT_NEC,
|
|
+ .allowed_protos = RC_PROTO_BIT_RC5 |
|
|
+ RC_PROTO_BIT_RC6_MCE |
|
|
+ RC_PROTO_BIT_NEC,
|
|
.change_protocol = dib0700_change_protocol,
|
|
},
|
|
}, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
|
|
@@ -4163,9 +4163,9 @@
|
|
.rc_codes = RC_MAP_DIB0700_RC5_TABLE,
|
|
.module_name = "dib0700",
|
|
.rc_query = dib0700_rc_query_old_firmware,
|
|
- .allowed_protos = RC_BIT_RC5 |
|
|
- RC_BIT_RC6_MCE |
|
|
- RC_BIT_NEC,
|
|
+ .allowed_protos = RC_PROTO_BIT_RC5 |
|
|
+ RC_PROTO_BIT_RC6_MCE |
|
|
+ RC_PROTO_BIT_NEC,
|
|
.change_protocol = dib0700_change_protocol,
|
|
},
|
|
}, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
|
|
@@ -4220,9 +4220,9 @@
|
|
.rc_codes = RC_MAP_DIB0700_RC5_TABLE,
|
|
.module_name = "dib0700",
|
|
.rc_query = dib0700_rc_query_old_firmware,
|
|
- .allowed_protos = RC_BIT_RC5 |
|
|
- RC_BIT_RC6_MCE |
|
|
- RC_BIT_NEC,
|
|
+ .allowed_protos = RC_PROTO_BIT_RC5 |
|
|
+ RC_PROTO_BIT_RC6_MCE |
|
|
+ RC_PROTO_BIT_NEC,
|
|
.change_protocol = dib0700_change_protocol,
|
|
},
|
|
}, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
|
|
@@ -4286,9 +4286,9 @@
|
|
.rc_codes = RC_MAP_DIB0700_RC5_TABLE,
|
|
.module_name = "dib0700",
|
|
.rc_query = dib0700_rc_query_old_firmware,
|
|
- .allowed_protos = RC_BIT_RC5 |
|
|
- RC_BIT_RC6_MCE |
|
|
- RC_BIT_NEC,
|
|
+ .allowed_protos = RC_PROTO_BIT_RC5 |
|
|
+ RC_PROTO_BIT_RC6_MCE |
|
|
+ RC_PROTO_BIT_NEC,
|
|
.change_protocol = dib0700_change_protocol,
|
|
},
|
|
}, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
|
|
@@ -4335,9 +4335,9 @@
|
|
.rc_codes = RC_MAP_DIB0700_NEC_TABLE,
|
|
.module_name = "dib0700",
|
|
.rc_query = dib0700_rc_query_old_firmware,
|
|
- .allowed_protos = RC_BIT_RC5 |
|
|
- RC_BIT_RC6_MCE |
|
|
- RC_BIT_NEC,
|
|
+ .allowed_protos = RC_PROTO_BIT_RC5 |
|
|
+ RC_PROTO_BIT_RC6_MCE |
|
|
+ RC_PROTO_BIT_NEC,
|
|
.change_protocol = dib0700_change_protocol,
|
|
},
|
|
}, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
|
|
@@ -4404,9 +4404,9 @@
|
|
.rc_codes = RC_MAP_DIB0700_RC5_TABLE,
|
|
.module_name = "dib0700",
|
|
.rc_query = dib0700_rc_query_old_firmware,
|
|
- .allowed_protos = RC_BIT_RC5 |
|
|
- RC_BIT_RC6_MCE |
|
|
- RC_BIT_NEC,
|
|
+ .allowed_protos = RC_PROTO_BIT_RC5 |
|
|
+ RC_PROTO_BIT_RC6_MCE |
|
|
+ RC_PROTO_BIT_NEC,
|
|
.change_protocol = dib0700_change_protocol,
|
|
},
|
|
}, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
|
|
@@ -4440,9 +4440,9 @@
|
|
.rc_codes = RC_MAP_DIB0700_RC5_TABLE,
|
|
.module_name = "dib0700",
|
|
.rc_query = dib0700_rc_query_old_firmware,
|
|
- .allowed_protos = RC_BIT_RC5 |
|
|
- RC_BIT_RC6_MCE |
|
|
- RC_BIT_NEC,
|
|
+ .allowed_protos = RC_PROTO_BIT_RC5 |
|
|
+ RC_PROTO_BIT_RC6_MCE |
|
|
+ RC_PROTO_BIT_NEC,
|
|
.change_protocol = dib0700_change_protocol,
|
|
},
|
|
}, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
|
|
@@ -4516,9 +4516,9 @@
|
|
.rc_codes = RC_MAP_DIB0700_RC5_TABLE,
|
|
.module_name = "dib0700",
|
|
.rc_query = dib0700_rc_query_old_firmware,
|
|
- .allowed_protos = RC_BIT_RC5 |
|
|
- RC_BIT_RC6_MCE |
|
|
- RC_BIT_NEC,
|
|
+ .allowed_protos = RC_PROTO_BIT_RC5 |
|
|
+ RC_PROTO_BIT_RC6_MCE |
|
|
+ RC_PROTO_BIT_NEC,
|
|
.change_protocol = dib0700_change_protocol,
|
|
},
|
|
}, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
|
|
@@ -4560,9 +4560,9 @@
|
|
.rc_codes = RC_MAP_DIB0700_NEC_TABLE,
|
|
.module_name = "dib0700",
|
|
.rc_query = dib0700_rc_query_old_firmware,
|
|
- .allowed_protos = RC_BIT_RC5 |
|
|
- RC_BIT_RC6_MCE |
|
|
- RC_BIT_NEC,
|
|
+ .allowed_protos = RC_PROTO_BIT_RC5 |
|
|
+ RC_PROTO_BIT_RC6_MCE |
|
|
+ RC_PROTO_BIT_NEC,
|
|
.change_protocol = dib0700_change_protocol,
|
|
},
|
|
}, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
|
|
@@ -4609,9 +4609,9 @@
|
|
.rc_codes = RC_MAP_DIB0700_RC5_TABLE,
|
|
.module_name = "dib0700",
|
|
.rc_query = dib0700_rc_query_old_firmware,
|
|
- .allowed_protos = RC_BIT_RC5 |
|
|
- RC_BIT_RC6_MCE |
|
|
- RC_BIT_NEC,
|
|
+ .allowed_protos = RC_PROTO_BIT_RC5 |
|
|
+ RC_PROTO_BIT_RC6_MCE |
|
|
+ RC_PROTO_BIT_NEC,
|
|
.change_protocol = dib0700_change_protocol,
|
|
},
|
|
}, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
|
|
@@ -4646,9 +4646,9 @@
|
|
.rc_codes = RC_MAP_DIB0700_RC5_TABLE,
|
|
.module_name = "dib0700",
|
|
.rc_query = dib0700_rc_query_old_firmware,
|
|
- .allowed_protos = RC_BIT_RC5 |
|
|
- RC_BIT_RC6_MCE |
|
|
- RC_BIT_NEC,
|
|
+ .allowed_protos = RC_PROTO_BIT_RC5 |
|
|
+ RC_PROTO_BIT_RC6_MCE |
|
|
+ RC_PROTO_BIT_NEC,
|
|
.change_protocol = dib0700_change_protocol,
|
|
},
|
|
}, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
|
|
@@ -4683,9 +4683,9 @@
|
|
.rc_codes = RC_MAP_DIB0700_RC5_TABLE,
|
|
.module_name = "dib0700",
|
|
.rc_query = dib0700_rc_query_old_firmware,
|
|
- .allowed_protos = RC_BIT_RC5 |
|
|
- RC_BIT_RC6_MCE |
|
|
- RC_BIT_NEC,
|
|
+ .allowed_protos = RC_PROTO_BIT_RC5 |
|
|
+ RC_PROTO_BIT_RC6_MCE |
|
|
+ RC_PROTO_BIT_NEC,
|
|
.change_protocol = dib0700_change_protocol,
|
|
},
|
|
}, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
|
|
@@ -4720,9 +4720,9 @@
|
|
.rc_codes = RC_MAP_DIB0700_RC5_TABLE,
|
|
.module_name = "dib0700",
|
|
.rc_query = dib0700_rc_query_old_firmware,
|
|
- .allowed_protos = RC_BIT_RC5 |
|
|
- RC_BIT_RC6_MCE |
|
|
- RC_BIT_NEC,
|
|
+ .allowed_protos = RC_PROTO_BIT_RC5 |
|
|
+ RC_PROTO_BIT_RC6_MCE |
|
|
+ RC_PROTO_BIT_NEC,
|
|
.change_protocol = dib0700_change_protocol,
|
|
},
|
|
}, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
|
|
@@ -4757,9 +4757,9 @@
|
|
.rc_codes = RC_MAP_DIB0700_RC5_TABLE,
|
|
.module_name = "dib0700",
|
|
.rc_query = dib0700_rc_query_old_firmware,
|
|
- .allowed_protos = RC_BIT_RC5 |
|
|
- RC_BIT_RC6_MCE |
|
|
- RC_BIT_NEC,
|
|
+ .allowed_protos = RC_PROTO_BIT_RC5 |
|
|
+ RC_PROTO_BIT_RC6_MCE |
|
|
+ RC_PROTO_BIT_NEC,
|
|
.change_protocol = dib0700_change_protocol,
|
|
},
|
|
}, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
|
|
@@ -4794,9 +4794,9 @@
|
|
.rc_codes = RC_MAP_DIB0700_RC5_TABLE,
|
|
.module_name = "dib0700",
|
|
.rc_query = dib0700_rc_query_old_firmware,
|
|
- .allowed_protos = RC_BIT_RC5 |
|
|
- RC_BIT_RC6_MCE |
|
|
- RC_BIT_NEC,
|
|
+ .allowed_protos = RC_PROTO_BIT_RC5 |
|
|
+ RC_PROTO_BIT_RC6_MCE |
|
|
+ RC_PROTO_BIT_NEC,
|
|
.change_protocol = dib0700_change_protocol,
|
|
},
|
|
}, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
|
|
@@ -4845,9 +4845,9 @@
|
|
.rc_codes = RC_MAP_DIB0700_RC5_TABLE,
|
|
.module_name = "dib0700",
|
|
.rc_query = dib0700_rc_query_old_firmware,
|
|
- .allowed_protos = RC_BIT_RC5 |
|
|
- RC_BIT_RC6_MCE |
|
|
- RC_BIT_NEC,
|
|
+ .allowed_protos = RC_PROTO_BIT_RC5 |
|
|
+ RC_PROTO_BIT_RC6_MCE |
|
|
+ RC_PROTO_BIT_NEC,
|
|
.change_protocol = dib0700_change_protocol,
|
|
},
|
|
}, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
|
|
@@ -4880,9 +4880,9 @@
|
|
.rc_codes = RC_MAP_DIB0700_RC5_TABLE,
|
|
.module_name = "dib0700",
|
|
.rc_query = dib0700_rc_query_old_firmware,
|
|
- .allowed_protos = RC_BIT_RC5 |
|
|
- RC_BIT_RC6_MCE |
|
|
- RC_BIT_NEC,
|
|
+ .allowed_protos = RC_PROTO_BIT_RC5 |
|
|
+ RC_PROTO_BIT_RC6_MCE |
|
|
+ RC_PROTO_BIT_NEC,
|
|
.change_protocol = dib0700_change_protocol,
|
|
},
|
|
}, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
|
|
@@ -4917,9 +4917,9 @@
|
|
.rc_codes = RC_MAP_DIB0700_RC5_TABLE,
|
|
.module_name = "dib0700",
|
|
.rc_query = dib0700_rc_query_old_firmware,
|
|
- .allowed_protos = RC_BIT_RC5 |
|
|
- RC_BIT_RC6_MCE |
|
|
- RC_BIT_NEC,
|
|
+ .allowed_protos = RC_PROTO_BIT_RC5 |
|
|
+ RC_PROTO_BIT_RC6_MCE |
|
|
+ RC_PROTO_BIT_NEC,
|
|
.change_protocol = dib0700_change_protocol,
|
|
},
|
|
}, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
|
|
@@ -4955,9 +4955,9 @@
|
|
.rc_codes = RC_MAP_DIB0700_RC5_TABLE,
|
|
.module_name = "dib0700",
|
|
.rc_query = dib0700_rc_query_old_firmware,
|
|
- .allowed_protos = RC_BIT_RC5 |
|
|
- RC_BIT_RC6_MCE |
|
|
- RC_BIT_NEC,
|
|
+ .allowed_protos = RC_PROTO_BIT_RC5 |
|
|
+ RC_PROTO_BIT_RC6_MCE |
|
|
+ RC_PROTO_BIT_NEC,
|
|
.change_protocol = dib0700_change_protocol,
|
|
},
|
|
},
|