This adds a complementary ioctl to allow IR RX settings to be
changed.
Userspace is expected to first call RCIOCGIRRX, change the relevant parameters
in struct rc_ir_rx and then call RCIOCSIRRX.
The struct will be updated to reflect what the driver actually set the
parameters to (as all values may not be possible and some might have
to be approximated, e.g. because the hardware only supports some fixed
values) so that userspace knows the end result.
The LIRC driver is also changed to use the new RCIOCGIRRX and RCIOCSIRRX
methods as an alternative to the old functionality. This allows several
operations in struct rc_dev to be deprecated.
Signed-off-by: David Härdeman <david@xxxxxxxxxxx>
---
drivers/media/rc/ir-lirc-codec.c | 53 +++++++++++++++++++++++++++++---------
drivers/media/rc/rc-core-priv.h | 3 ++
drivers/media/rc/rc-main.c | 53 +++++++++++++++++++++++++++++---------
include/media/rc-core.h | 13 ++++++---
4 files changed, 92 insertions(+), 30 deletions(-)
diff --git a/drivers/media/rc/ir-lirc-codec.c b/drivers/media/rc/ir-lirc-codec.c
index 795cbdf..767fd06 100644
--- a/drivers/media/rc/ir-lirc-codec.c
+++ b/drivers/media/rc/ir-lirc-codec.c
@@ -160,6 +160,7 @@ static long ir_lirc_ioctl(struct file *filep, unsigned int cmd,
u32 __user *argp = (u32 __user *)(arg);
int ret = 0;
__u32 val = 0, tmp;
+ struct rc_ir_rx rx;
lirc = lirc_get_pdata(filep);
if (!lirc)
@@ -211,15 +212,23 @@ static long ir_lirc_ioctl(struct file *filep, unsigned int cmd,
/* RX settings */
case LIRC_SET_REC_CARRIER:
- if (!dev->s_rx_carrier_range)
- return -ENOSYS;
-
- if (val <= 0)
+ if (val <= 0 || val < dev->raw->lirc.carrier_low)
return -EINVAL;
- return dev->s_rx_carrier_range(dev,
- dev->raw->lirc.carrier_low,
- val);
+ if (dev->s_rx_carrier_range)
+ return dev->s_rx_carrier_range(dev,
+ dev->raw->lirc.carrier_low,
+ val);
+
+ if (dev->get_ir_rx && dev->set_ir_rx) {
+ rc_init_ir_rx(dev, &rx);
+ dev->get_ir_rx(dev, &rx);
+ rx.freq_min = dev->raw->lirc.carrier_low;
+ rx.freq_max = val;
+ return dev->set_ir_rx(dev, &rx);
+ }
+
+ return -ENOSYS;
case LIRC_SET_REC_CARRIER_RANGE:
if (val <= 0)
@@ -233,16 +242,34 @@ static long ir_lirc_ioctl(struct file *filep, unsigned int cmd,
break;
case LIRC_SET_WIDEBAND_RECEIVER:
- if (!dev->s_learning_mode)
- return -ENOSYS;
+ if (dev->s_learning_mode)
+ return dev->s_learning_mode(dev, !!val);
+
+ if (dev->get_ir_rx && dev->set_ir_rx) {
+ rc_init_ir_rx(dev, &rx);
+ dev->get_ir_rx(dev, &rx);
+ rx.rx_enabled = (!!val) ? rx.rx_learning : ~rx.rx_learning;
+ rx.rx_enabled &= rx.rx_supported;
+ return dev->set_ir_rx(dev, &rx);
+ }
- return dev->s_learning_mode(dev, !!val);
+ return -ENOSYS;
case LIRC_SET_MEASURE_CARRIER_MODE:
- if (!dev->s_carrier_report)
- return -ENOSYS;
+ if (dev->s_carrier_report)
+ return dev->s_carrier_report(dev, !!val);
+
+ if (dev->get_ir_rx && dev->set_ir_rx) {
+ rc_init_ir_rx(dev, &rx);
+ dev->get_ir_rx(dev, &rx);
+ if (!!val)
+ rx.flags |= RC_IR_RX_MEASURE_CARRIER;
+ else
+ rx.flags &= ~RC_IR_RX_MEASURE_CARRIER;
+ return dev->set_ir_rx(dev, &rx);
+ }
- return dev->s_carrier_report(dev, !!val);
+ return -ENOSYS;
/* Generic timeout support */
case LIRC_GET_MIN_TIMEOUT:
diff --git a/drivers/media/rc/rc-core-priv.h b/drivers/media/rc/rc-core-priv.h
index 6a40bc9..8db5bbc 100644
--- a/drivers/media/rc/rc-core-priv.h
+++ b/drivers/media/rc/rc-core-priv.h
@@ -149,6 +149,9 @@ int ir_raw_handler_register(struct ir_raw_handler *ir_raw_handler);
void ir_raw_handler_unregister(struct ir_raw_handler *ir_raw_handler);
void ir_raw_init(void);
+/* Only to be used by rc-core and ir-lirc-codec */
+void rc_init_ir_rx(struct rc_dev *dev, struct rc_ir_rx *rx);
+
/*
* Decoder initialization code
*
diff --git a/drivers/media/rc/rc-main.c b/drivers/media/rc/rc-main.c
index 2d3f421..390673c 100644
--- a/drivers/media/rc/rc-main.c
+++ b/drivers/media/rc/rc-main.c
@@ -1664,6 +1664,31 @@ static int rc_fasync(int fd, struct file *file, int on)
}
/**
+ * rc_init_ir_rx() - initializes a &struct rc_ir_rx to sane defaults
+ * @dev: the &struct rc_dev to take initial settings from
+ * @rx: the &struct rx_ir_rx to fill in with default values
+ *
+ * This function should only to be used by rc-core and ir-lirc-codec.
+ */
+void rc_init_ir_rx(struct rc_dev *dev, struct rc_ir_rx *rx)
+{
+ memset(rx, 0, sizeof(*rx));
+ rx->rx_supported = 0x1;
+ rx->rx_enabled = 0x1;
+ rx->rx_connected = 0x1;
+ rx->protocols_enabled[0] = dev->enabled_protocols;
+ if (dev->driver_type == RC_DRIVER_SCANCODE)
+ rx->protocols_supported[0] = dev->allowed_protos;
+ else
+ rx->protocols_supported[0] = ir_raw_get_allowed_protocols();
+ rx->timeout = dev->timeout;
+ rx->timeout_min = dev->min_timeout;
+ rx->timeout_max = dev->max_timeout;
+ rx->resolution = dev->rx_resolution;
+}
+EXPORT_SYMBOL_GPL(rc_init_ir_rx);
+
+/**
* rc_do_ioctl() - internal implementation of ioctl handling
* @dev: the &struct rc_dev to perform the command on
* @cmd: the ioctl command to perform
@@ -1678,6 +1703,7 @@ static long rc_do_ioctl(struct rc_dev *dev, unsigned int cmd, unsigned long arg)
void __user *p = (void __user *)arg;
unsigned int __user *ip = (unsigned int __user *)p;
struct rc_ir_rx rx;
+ int error;
switch (cmd) {
@@ -1690,20 +1716,21 @@ static long rc_do_ioctl(struct rc_dev *dev, unsigned int cmd, unsigned long arg)
case RCIOCGIRPSIZE:
return put_user(ARRAY_SIZE(rx.protocols_supported), ip);
+ case RCIOCSIRRX:
+ if (!dev->set_ir_rx)
+ return -ENOSYS;
+
+ if (copy_from_user(&rx, p, sizeof(rx)))
+ return -EFAULT;
+
+ error = dev->set_ir_rx(dev, &rx);
+ if (error)
+ return error;
+
+ /* Fall through */
+
case RCIOCGIRRX:
- memset(&rx, 0, sizeof(rx));
- rx.rx_supported = 0x1;
- rx.rx_enabled = 0x1;
- rx.rx_connected = 0x1;
- rx.protocols_enabled[0] = dev->enabled_protocols;
- if (dev->driver_type == RC_DRIVER_SCANCODE)
- rx.protocols_supported[0] = dev->allowed_protos;
- else
- rx.protocols_supported[0] = ir_raw_get_allowed_protocols();
- rx.timeout = dev->timeout;
- rx.timeout_min = dev->min_timeout;
- rx.timeout_max = dev->max_timeout;
- rx.resolution = dev->rx_resolution;
+ rc_init_ir_rx(dev, &rx);
/* See if the driver wishes to override anything */
if (dev->get_ir_rx)
diff --git a/include/media/rc-core.h b/include/media/rc-core.h
index 5669b64..213b642 100644
--- a/include/media/rc-core.h
+++ b/include/media/rc-core.h
@@ -53,8 +53,11 @@ do { \
/* get ir rx parameters */
#define RCIOCGIRRX _IOC(_IOC_READ, RC_IOC_MAGIC, 0x04, sizeof(struct rc_ir_rx))
+/* set ir rx parameters */
+#define RCIOCSIRRX _IOC(_IOC_WRITE, RC_IOC_MAGIC, 0x04, sizeof(struct rc_ir_rx))
+
/**
- * struct rc_ir_rx - used to get all IR RX parameters in one go
+ * struct rc_ir_rx - used to get/set all IR RX parameters in one go
* @flags: device specific flags (only %RC_IR_RX_MEASURE_CARRIER is
* currently defined)
* @rx_supported: bitmask of supported (i.e. possible) receivers
@@ -202,13 +205,14 @@ struct ir_raw_event {
* @s_tx_mask: set transmitter mask (for devices with multiple tx outputs)
* @s_tx_carrier: set transmit carrier frequency
* @s_tx_duty_cycle: set transmit duty cycle (0% - 100%)
- * @s_rx_carrier: inform driver about carrier it is expected to handle
+ * @s_rx_carrier: inform driver about expected carrier (deprecated)
* @tx_ir: transmit IR
* @s_idle: enable/disable hardware idle mode, upon which,
* device doesn't interrupt host until it sees IR pulses
- * @s_learning_mode: enable wide band receiver used for learning
- * @s_carrier_report: enable carrier reports
+ * @s_learning_mode: enable wide band receiver used for learning (deprecated)
+ * @s_carrier_report: enable carrier reports (deprecated)
* @get_ir_rx: allow driver to provide rx settings
+ * @set_ir_rx: allow driver to change rx settings
*/
struct rc_dev {
struct device dev;
@@ -260,6 +264,7 @@ struct rc_dev {
int (*s_learning_mode)(struct rc_dev *dev, int enable);
int (*s_carrier_report) (struct rc_dev *dev, int enable);
void (*get_ir_rx)(struct rc_dev *dev, struct rc_ir_rx *rx);
+ int (*set_ir_rx)(struct rc_dev *dev, struct rc_ir_rx *rx);
};
#define to_rc_dev(d) container_of(d, struct rc_dev, dev)
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
