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

Commit 9d2f1d3c authored by David Härdeman's avatar David Härdeman Committed by Mauro Carvalho Chehab
Browse files

[media] rc-core: rename dev->scanmask to dev->scancode_mask 



We already have dev->scancode_filter and dev->scancode_wakeup_filter
so rename dev->scanmask to dev->scancode_mask for consistency.

Signed-off-by: default avatarDavid Härdeman <david@hardeman.nu>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent c5540fbb

drivers/media/pci/cx88/cx88-input.c

+1 −1
Original line number Diff line number Diff line
@@ -478,7 +478,7 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci) 
	dev->priv = core;

	dev->open = cx88_ir_open;

	dev->close = cx88_ir_close;

	dev->scanmask = hardware_mask;

	dev->scancode_mask = hardware_mask;



	if (ir->sampling) {

		dev->driver_type = RC_DRIVER_IR_RAW;

drivers/media/pci/ttpci/budget-ci.c

+1 −1
Original line number Diff line number Diff line
@@ -234,7 +234,7 @@ static int msp430_ir_init(struct budget_ci *budget_ci) 
		break;

	}

	if (!budget_ci->ir.full_rc5)

		dev->scanmask = 0xff;

		dev->scancode_mask = 0xff;



	error = rc_register_device(dev);

	if (error) {

drivers/media/rc/rc-main.c

+2 −2
Original line number Diff line number Diff line
@@ -285,8 +285,8 @@ static unsigned int ir_establish_scancode(struct rc_dev *dev, 
	 * IR tables from other remotes. So, we support specifying a mask to

	 * indicate the valid bits of the scancodes.

	 */

	if (dev->scanmask)

		scancode &= dev->scanmask;

	if (dev->scancode_mask)

		scancode &= dev->scancode_mask;



	/* First check if we already have a mapping for this ir command */

	for (i = 0; i < rc_map->len; i++) {

drivers/media/usb/cx231xx/cx231xx-input.c

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ int cx231xx_ir_init(struct cx231xx *dev) 
	dev->init_data.get_key = get_key_isdbt;

	dev->init_data.ir_codes = cx231xx_boards[dev->model].rc_map_name;

	/* The i2c micro-controller only outputs the cmd part of NEC protocol */

	dev->init_data.rc_dev->scanmask = 0xff;

	dev->init_data.rc_dev->scancode_mask = 0xff;

	dev->init_data.rc_dev->driver_name = "cx231xx";

	dev->init_data.type = RC_BIT_NEC;

	info.addr = 0x30;

drivers/media/usb/tm6000/tm6000-input.c

+1 −1
Original line number Diff line number Diff line
@@ -443,7 +443,7 @@ int tm6000_ir_init(struct tm6000_core *dev) 
	/* input setup */

	rc->allowed_protocols = RC_BIT_RC5 | RC_BIT_NEC;

	/* Neded, in order to support NEC remotes with 24 or 32 bits */

	rc->scanmask = 0xffff;

	rc->scancode_mask = 0xffff;

	rc->priv = ir;

	rc->change_protocol = tm6000_ir_change_protocol;

	if (dev->int_in.endp) {