April 24, 2017 6:02 PM, "Sean Young" <sean@xxxxxxxx> wrote: > On Tue, Apr 18, 2017 at 10:31:04PM +0200, David Härdeman wrote: > >> The new sysfs wakefilter API will expose the difference between the NEC >> protocols to userspace for no good reason and once exposed, it will be much >> more difficult to change the logic. >> >> By only allowing full NEC32 scancodes to be set, any heuristics in the kernel >> can be avoided. > > No heuristics are being removed in this patch or the other patch for nec32, > if anything it gets worse. It avoids having to add heuristics in the future if we move to always use nec32 in the kernel<->userspace API. That, IMHO, is the only sane default. Explicitly differentiating between NEC16/24/32 in the API provides no benefits whatsoever. > This patch depends on the other patch, which needs work. It's a minimal version of the other patch, not dependent on it. It just makes sure that the wakeup logic only supports nec32 before that API becomes official. >> This is the minimalistic version of the full NEC32 patch posted here: >> http://www.spinics.net/lists/linux-media/msg114603.html >> >> Signed-off-by: David Härdeman <david@xxxxxxxxxxx> >> --- >> drivers/media/rc/rc-main.c | 17 ++++------------- >> drivers/media/rc/winbond-cir.c | 32 ++------------------------------ >> 2 files changed, 6 insertions(+), 43 deletions(-) >> >> diff --git a/drivers/media/rc/rc-main.c b/drivers/media/rc/rc-main.c >> index 6ec73357fa47..8a2a2973e718 100644 >> --- a/drivers/media/rc/rc-main.c >> +++ b/drivers/media/rc/rc-main.c >> @@ -742,8 +742,6 @@ static int rc_validate_filter(struct rc_dev *dev, >> [RC_TYPE_SONY15] = 0xff007f, >> [RC_TYPE_SONY20] = 0x1fff7f, >> [RC_TYPE_JVC] = 0xffff, >> - [RC_TYPE_NEC] = 0xffff, >> - [RC_TYPE_NECX] = 0xffffff, >> [RC_TYPE_NEC32] = 0xffffffff, >> [RC_TYPE_SANYO] = 0x1fffff, >> [RC_TYPE_MCIR2_KBD] = 0xffff, >> @@ -759,14 +757,9 @@ static int rc_validate_filter(struct rc_dev *dev, >> enum rc_type protocol = dev->wakeup_protocol; >> >> switch (protocol) { >> + case RC_TYPE_NEC: >> case RC_TYPE_NECX: >> - if ((((s >> 16) ^ ~(s >> 8)) & 0xff) == 0) >> - return -EINVAL; >> - break; >> - case RC_TYPE_NEC32: >> - if ((((s >> 24) ^ ~(s >> 16)) & 0xff) == 0) >> - return -EINVAL; >> - break; >> + return -EINVAL; >> case RC_TYPE_RC6_MCE: >> if ((s & 0xffff0000) != 0x800f0000) >> return -EINVAL; >> @@ -1330,7 +1323,7 @@ static ssize_t store_filter(struct device *device, >> /* >> * This is the list of all variants of all protocols, which is used by >> * the wakeup_protocols sysfs entry. In the protocols sysfs entry some >> - * some protocols are grouped together (e.g. nec = nec + necx + nec32). >> + * some protocols are grouped together. >> * >> * For wakeup we need to know the exact protocol variant so the hardware >> * can be programmed exactly what to expect. >> @@ -1345,9 +1338,7 @@ static const char * const proto_variant_names[] = { >> [RC_TYPE_SONY12] = "sony-12", >> [RC_TYPE_SONY15] = "sony-15", >> [RC_TYPE_SONY20] = "sony-20", >> - [RC_TYPE_NEC] = "nec", >> - [RC_TYPE_NECX] = "nec-x", >> - [RC_TYPE_NEC32] = "nec-32", >> + [RC_TYPE_NEC32] = "nec", >> [RC_TYPE_SANYO] = "sanyo", >> [RC_TYPE_MCIR2_KBD] = "mcir2-kbd", >> [RC_TYPE_MCIR2_MSE] = "mcir2-mse", >> diff --git a/drivers/media/rc/winbond-cir.c b/drivers/media/rc/winbond-cir.c >> index 5a4d4a611197..6ef0e7232356 100644 >> --- a/drivers/media/rc/winbond-cir.c >> +++ b/drivers/media/rc/winbond-cir.c >> @@ -714,34 +714,6 @@ wbcir_shutdown(struct pnp_dev *device) >> proto = IR_PROTOCOL_RC5; >> break; >> >> - case RC_TYPE_NEC: >> - mask[1] = bitrev8(mask_sc); >> - mask[0] = mask[1]; >> - mask[3] = bitrev8(mask_sc >> 8); >> - mask[2] = mask[3]; >> - >> - match[1] = bitrev8(wake_sc); >> - match[0] = ~match[1]; >> - match[3] = bitrev8(wake_sc >> 8); >> - match[2] = ~match[3]; >> - >> - proto = IR_PROTOCOL_NEC; >> - break; >> - >> - case RC_TYPE_NECX: >> - mask[1] = bitrev8(mask_sc); >> - mask[0] = mask[1]; >> - mask[2] = bitrev8(mask_sc >> 8); >> - mask[3] = bitrev8(mask_sc >> 16); >> - >> - match[1] = bitrev8(wake_sc); >> - match[0] = ~match[1]; >> - match[2] = bitrev8(wake_sc >> 8); >> - match[3] = bitrev8(wake_sc >> 16); >> - >> - proto = IR_PROTOCOL_NEC; >> - break; >> - >> case RC_TYPE_NEC32: >> mask[0] = bitrev8(mask_sc); >> mask[1] = bitrev8(mask_sc >> 8); >> @@ -1087,8 +1059,8 @@ wbcir_probe(struct pnp_dev *device, const struct pnp_device_id *dev_id) >> data->dev->max_timeout = 10 * IR_DEFAULT_TIMEOUT; >> data->dev->rx_resolution = US_TO_NS(2); >> data->dev->allowed_protocols = RC_BIT_ALL_IR_DECODER; >> - data->dev->allowed_wakeup_protocols = RC_BIT_NEC | RC_BIT_NECX | >> - RC_BIT_NEC32 | RC_BIT_RC5 | RC_BIT_RC6_0 | >> + data->dev->allowed_wakeup_protocols = >> + RC_BIT_NEC | RC_BIT_RC5 | RC_BIT_RC6_0 | >> RC_BIT_RC6_6A_20 | RC_BIT_RC6_6A_24 | >> RC_BIT_RC6_6A_32 | RC_BIT_RC6_MCE; >> data->dev->wakeup_protocol = RC_TYPE_RC6_MCE;
