Merge tag 'media/v5.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
Pull media updates from Mauro Carvalho Chehab: - remove sensor drivers that got converted from soc_camera - remaining soc_camera drivers got moved to staging - some documentation cleanups and improvements - the imx staging driver now supports imx7 - the ov9640, mt9m001 and mt9m111 got converted from soc_camera - the vim2m driver now does what a m2m convert driver expects to do - epoll() fixes on media subsystems - several drivers fixes, typos, cleanups and improvements * tag 'media/v5.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (346 commits) media: dvb/earth-pt1: fix wrong initialization for demod blocks media: vim2m: Address some coding style issues media: vim2m: don't use BUG() media: vim2m: speedup passthrough copy media: vim2m: add an horizontal scaler media: vim2m: don't accept YUYV anymore as output format media: vim2m: add vertical linear scaler media: vim2m: better handle cap/out buffers with different sizes media: vim2m: use different framesizes for bayer formats media: vim2m: add support for VIDIOC_ENUM_FRAMESIZES media: vim2m: ensure that width is multiple of two media: vim2m: improve debug messages media: vim2m: add bayer capture formats media: a few more typos at staging, pci, platform, radio and usb media: Documentation: fix several typos media: staging: fix several typos media: include: fix several typos media: common: fix several typos media: v4l2-core: fix several typos media: usb: fix several typos ...
This commit is contained in:
@@ -53,6 +53,10 @@ static const struct {
|
||||
{ RC_PROTO_RC6_6A_32, "rc-6-6a-32", 0xffffffff, "rc-6" },
|
||||
{ RC_PROTO_RC6_MCE, "rc-6-mce", 0x00007fff, "rc-6" },
|
||||
{ RC_PROTO_SHARP, "sharp", 0x1fff, "sharp" },
|
||||
{ RC_PROTO_IMON, "imon", 0x7fffffff, "imon" },
|
||||
{ RC_PROTO_RCMM12, "rcmm-12", 0x00000fff, "rcmm" },
|
||||
{ RC_PROTO_RCMM24, "rcmm-24", 0x00ffffff, "rcmm" },
|
||||
{ RC_PROTO_RCMM32, "rcmm-32", 0xffffffff, "rcmm" },
|
||||
};
|
||||
|
||||
int lirc_open(const char *rc)
|
||||
@@ -141,6 +145,11 @@ int main(int argc, char **argv)
|
||||
(((scancode >> 8) ^ ~scancode) & 0xff) == 0)
|
||||
continue;
|
||||
|
||||
if (rc_proto == RC_PROTO_RCMM32 &&
|
||||
(scancode & 0x000c0000) != 0x000c0000 &&
|
||||
scancode & 0x00008000)
|
||||
continue;
|
||||
|
||||
struct lirc_scancode lsc = {
|
||||
.rc_proto = rc_proto,
|
||||
.scancode = scancode
|
||||
|
Reference in New Issue
Block a user