Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f5ef1e8c authored by David Härdeman's avatar David Härdeman Committed by Sasha Levin
Browse files

[media] rc-core: fix dib0700 scancode generation for RC5 



[ Upstream commit 4d298b8539ed59f1d69d3aa6e41a2c4908137612 ]

commit af3a4a9b ("[media] dib0700: NEC scancode cleanup") cleaned
up the NEC scancode logic but overlooked the RC5 case.

This patch brings the RC5 case in line with the NEC code and makes
the struct self-documenting.

Signed-off-by: default avatarDavid Härdeman <david@hardeman.nu>
Reported-by: default avatarDavid Cimbůrek <david.cimburek@gmail.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
Signed-off-by: default avatarSasha Levin <sasha.levin@oracle.com>
parent 0d420959

drivers/media/usb/dvb-usb/dib0700_core.c

+40 −30
Original line number Diff line number Diff line
@@ -658,10 +658,20 @@ out: 
struct dib0700_rc_response {

	u8 report_id;

	u8 data_state;

	union {

		struct {

			u8 system;

			u8 not_system;

			u8 data;

			u8 not_data;

		} nec;

		struct {

			u8 not_used;

			u8 system;

			u8 data;

			u8 not_data;

		} rc5;

	};

};

#define RC_MSG_SIZE_V1_20 6
@@ -697,8 +707,8 @@ static void dib0700_rc_urb_completion(struct urb *purb) 


	deb_data("IR ID = %02X state = %02X System = %02X %02X Cmd = %02X %02X (len %d)\n",

		 poll_reply->report_id, poll_reply->data_state,

		 poll_reply->system, poll_reply->not_system,

		 poll_reply->data, poll_reply->not_data,

		 poll_reply->nec.system, poll_reply->nec.not_system,

		 poll_reply->nec.data, poll_reply->nec.not_data,

		 purb->actual_length);



	switch (d->props.rc.core.protocol) {
@@ -707,30 +717,30 @@ static void dib0700_rc_urb_completion(struct urb *purb) 
		toggle = 0;



		/* NEC protocol sends repeat code as 0 0 0 FF */

		if (poll_reply->system     == 0x00 &&

		    poll_reply->not_system == 0x00 &&

		    poll_reply->data       == 0x00 &&

		    poll_reply->not_data   == 0xff) {

		if (poll_reply->nec.system     == 0x00 &&

		    poll_reply->nec.not_system == 0x00 &&

		    poll_reply->nec.data       == 0x00 &&

		    poll_reply->nec.not_data   == 0xff) {

			poll_reply->data_state = 2;

			break;

		}



		if ((poll_reply->data ^ poll_reply->not_data) != 0xff) {

		if ((poll_reply->nec.data ^ poll_reply->nec.not_data) != 0xff) {

			deb_data("NEC32 protocol\n");

			keycode = RC_SCANCODE_NEC32(poll_reply->system     << 24 |

						     poll_reply->not_system << 16 |

						     poll_reply->data       << 8  |

						     poll_reply->not_data);

		} else if ((poll_reply->system ^ poll_reply->not_system) != 0xff) {

			keycode = RC_SCANCODE_NEC32(poll_reply->nec.system     << 24 |

						     poll_reply->nec.not_system << 16 |

						     poll_reply->nec.data       << 8  |

						     poll_reply->nec.not_data);

		} else if ((poll_reply->nec.system ^ poll_reply->nec.not_system) != 0xff) {

			deb_data("NEC extended protocol\n");

			keycode = RC_SCANCODE_NECX(poll_reply->system << 8 |

						    poll_reply->not_system,

						    poll_reply->data);

			keycode = RC_SCANCODE_NECX(poll_reply->nec.system << 8 |

						    poll_reply->nec.not_system,

						    poll_reply->nec.data);



		} else {

			deb_data("NEC normal protocol\n");

			keycode = RC_SCANCODE_NEC(poll_reply->system,

						   poll_reply->data);

			keycode = RC_SCANCODE_NEC(poll_reply->nec.system,

						   poll_reply->nec.data);

		}



		break;
@@ -738,19 +748,19 @@ static void dib0700_rc_urb_completion(struct urb *purb) 
		deb_data("RC5 protocol\n");

		protocol = RC_TYPE_RC5;

		toggle = poll_reply->report_id;

		keycode = RC_SCANCODE_RC5(poll_reply->system, poll_reply->data);



		break;

	}

		keycode = RC_SCANCODE_RC5(poll_reply->rc5.system, poll_reply->rc5.data);



	if ((poll_reply->data + poll_reply->not_data) != 0xff) {

		if ((poll_reply->rc5.data ^ poll_reply->rc5.not_data) != 0xff) {

			/* Key failed integrity check */

			err("key failed integrity check: %02x %02x %02x %02x",

		    poll_reply->system,  poll_reply->not_system,

		    poll_reply->data, poll_reply->not_data);

			    poll_reply->rc5.not_used, poll_reply->rc5.system,

			    poll_reply->rc5.data, poll_reply->rc5.not_data);

			goto resubmit;

		}



		break;

	}



	rc_keydown(d->rc_dev, protocol, keycode, toggle);



resubmit: