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

Commit de8592bd authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

V4L/DVB: ir-core: allow specifying multiple protocols at one open/write 



With this change, it is now possible to do something like:
        su -c 'echo "none +rc-5 +nec" > /sys/class/rc/rc1/protocols'

This prevents the need of multiple opens, one for each protocol change,
and makes userspace application easier.

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 5f124797

drivers/media/IR/ir-sysfs.c

+46 −46
Original line number Diff line number Diff line
@@ -117,14 +117,19 @@ static ssize_t store_protocols(struct device *d, 
	const char *tmp;

	u64 type;

	u64 mask;

	int rc, i;

	int rc, i, count = 0;

	unsigned long flags;



	tmp = skip_spaces(data);

	if (*tmp == '\0') {

		IR_dprintk(1, "Protocol not specified\n");

		return -EINVAL;

	} else if (*tmp == '+') {

	if (ir_dev->props->driver_type == RC_DRIVER_SCANCODE)

		type = ir_dev->rc_tab.ir_type;

	else

		type = ir_dev->raw->enabled_protocols;



	while ((tmp = strsep((char **) &data, " \n")) != NULL) {

		if (!*tmp)

			break;



		if (*tmp == '+') {

			enable = true;

			disable = false;

			tmp++;
@@ -137,10 +142,10 @@ static ssize_t store_protocols(struct device *d, 
			disable = false;

		}





		if (!enable && !disable && !strncasecmp(tmp, PROTO_NONE, sizeof(PROTO_NONE))) {

		mask = 0;

			tmp += sizeof(PROTO_NONE);

			mask = 0;

			count++;

		} else {

			for (i = 0; i < ARRAY_SIZE(proto_names); i++) {

				if (!strncasecmp(tmp, proto_names[i].name, strlen(proto_names[i].name))) {
@@ -150,28 +155,24 @@ static ssize_t store_protocols(struct device *d, 
				}

			}

			if (i == ARRAY_SIZE(proto_names)) {

			IR_dprintk(1, "Unknown protocol\n");

				IR_dprintk(1, "Unknown protocol: '%s'\n", tmp);

				return -EINVAL;

			}

			count++;

		}



	tmp = skip_spaces(tmp);

	if (*tmp != '\0') {

		IR_dprintk(1, "Invalid trailing characters\n");

		return -EINVAL;

	}



	if (ir_dev->props->driver_type == RC_DRIVER_SCANCODE)

		type = ir_dev->rc_tab.ir_type;

	else

		type = ir_dev->raw->enabled_protocols;



		if (enable)

			type |= mask;

		else if (disable)

			type &= ~mask;

		else

			type = mask;

	}



	if (!count) {

		IR_dprintk(1, "Protocol not specified\n");

		return -EINVAL;

	}



	if (ir_dev->props && ir_dev->props->change_protocol) {

		rc = ir_dev->props->change_protocol(ir_dev->props->priv,
@@ -191,7 +192,6 @@ static ssize_t store_protocols(struct device *d, 
		ir_dev->raw->enabled_protocols = type;

	}





	IR_dprintk(1, "Current protocol(s): 0x%llx\n",

		   (long long)type);