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

Commit e217fb43 authored by Jarod Wilson's avatar Jarod Wilson Committed by Mauro Carvalho Chehab
Browse files

[media] mceusb: report actual tx frequencies 



Rather than dumping out hex values, lets print the actual calculated
frequency and period the hardware has been configured for. After this

[ 2643.276215] mceusb 3-1:1.0: tx data: 9f 07 (length=2)
[ 2643.276218] mceusb 3-1:1.0: Get carrier mode and freq
[ 2643.277206] mceusb 3-1:1.0: rx data: 9f 06 01 42 (length=4)
[ 2643.277209] mceusb 3-1:1.0: Got carrier of 37037 Hz (period 27us)

Matches up perfectly with the table in Microsoft's docs.

Of course, I've noticed on one of my devices that the MS-recommended
default value of 1 for carrier pre-scaler and 66 for carrier period was
butchered, and instead of converting 66 to hex (0x42 like above), they
put in 0x66, so the hardware reports a default carrier of 24390Hz.
Fortunately, I guess, this particular device is rx-only, but I wouldn't
put it past other hw to screw up here too.

Signed-off-by: default avatarJarod Wilson <jarod@redhat.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent b71969be

drivers/media/rc/mceusb.c

+11 −5
Original line number Diff line number Diff line
@@ -516,6 +516,7 @@ static void mceusb_dev_printdata(struct mceusb_dev *ir, char *buf, 
	u8 cmd, subcmd, data1, data2, data3, data4, data5;

	struct device *dev = ir->dev;

	int i, start, skip = 0;

	u32 carrier, period;



	if (!debug)

		return;
@@ -613,9 +614,14 @@ static void mceusb_dev_printdata(struct mceusb_dev *ir, char *buf, 
			dev_info(dev, "Resp to 9f 05 of 0x%02x 0x%02x\n",

				 data1, data2);

			break;

		case MCE_CMD_SETIRCFS:

			dev_info(dev, "%s carrier mode and freq of "

				 "0x%02x 0x%02x\n", inout, data1, data2);

		case MCE_RSP_EQIRCFS:

			period = DIV_ROUND_CLOSEST(

					(1 << data1 * 2) * (data2 + 1), 10);

			if (!period)

				break;

			carrier = (1000 * 1000) / period;

			dev_info(dev, "%s carrier of %u Hz (period %uus)\n",

				 inout, carrier, period);

			break;

		case MCE_CMD_GETIRCFS:

			dev_info(dev, "Get carrier mode and freq\n");
@@ -626,9 +632,9 @@ static void mceusb_dev_printdata(struct mceusb_dev *ir, char *buf, 
			break;

		case MCE_RSP_EQIRTIMEOUT:

			/* value is in units of 50us, so x*50/1000 ms */

			period = ((data1 << 8) | data2) * MCE_TIME_UNIT / 1000;

			dev_info(dev, "%s receive timeout of %d ms\n",

				 inout,

				 ((data1 << 8) | data2) * MCE_TIME_UNIT / 1000);

				 inout, period);

			break;

		case MCE_CMD_GETIRTIMEOUT:

			dev_info(dev, "Get receive timeout\n");