[media] IR: extend ir_raw_event and do refactoring

Add new event types for timeout & carrier report
Move timeout handling from ir_raw_event_store_with_filter to
ir-lirc-codec, where it is really needed.
Now lirc bridge ensures proper gap handling.
Extend lirc bridge for carrier & timeout reports

Note: all new ir_raw_event variables now should be initialized
like that: DEFINE_IR_RAW_EVENT(ev);

To clean an existing event, use init_ir_raw_event(&ev);

Signed-off-by: Maxim Levitsky <maximlevitsky@gmail.com>
Acked-by: Jarod Wilson <jarod@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

13 files changed, 147 insertions, 87 deletions

diff --git a/drivers/media/IR/ene_ir.c b/drivers/media/IR/ene_ir.c
index f5beea04906a..0795872ff5de 100644
--- a/drivers/media/IR/ene_ir.c
+++ b/drivers/media/IR/ene_ir.c
@@ -697,7 +697,7 @@ static irqreturn_t ene_isr(int irq, void *data)
         unsigned long flags;
         irqreturn_t retval = IRQ_NONE;
         struct ene_device *dev = (struct ene_device *)data;
-        struct ir_raw_event ev;
+        DEFINE_IR_RAW_EVENT(ev);
 
         spin_lock_irqsave(&dev->hw_lock, flags);
 
@@ -898,7 +898,7 @@ static int ene_set_learning_mode(void *data, int enable)
 }
 
 /* outside interface: enable or disable idle mode */
-static void ene_rx_set_idle(void *data, int idle)
+static void ene_rx_set_idle(void *data, bool idle)
 {
         struct ene_device *dev = (struct ene_device *)data;
 
diff --git a/drivers/media/IR/ir-core-priv.h b/drivers/media/IR/ir-core-priv.h
index 6830580ae4db..81c936bd793f 100644
--- a/drivers/media/IR/ir-core-priv.h
+++ b/drivers/media/IR/ir-core-priv.h
@@ -88,6 +88,12 @@ struct ir_raw_event_ctrl {
                 struct ir_input_dev *ir_dev;
                 struct lirc_driver *drv;
                 int carrier_low;
+
+                ktime_t gap_start;
+                u64 gap_duration;
+                bool gap;
+                bool send_timeout_reports;
+
         } lirc;
 };
 
@@ -115,9 +121,14 @@ static inline void decrease_duration(struct ir_raw_event *ev, unsigned duration)
                 ev->duration -= duration;
 }
 
+/* Returns true if event is normal pulse/space event */
+static inline bool is_timing_event(struct ir_raw_event ev)
+{
+        return !ev.carrier_report && !ev.reset;
+}
+
 #define TO_US(duration)                 DIV_ROUND_CLOSEST((duration), 1000)
 #define TO_STR(is_pulse)                ((is_pulse) ? "pulse" : "space")
-#define IS_RESET(ev)                    (ev.duration == 0)
 /*
  * Routines from ir-sysfs.c - Meant to be called only internally inside
  * ir-core
diff --git a/drivers/media/IR/ir-jvc-decoder.c b/drivers/media/IR/ir-jvc-decoder.c
index 77a89c4de014..63dca6e5458b 100644
--- a/drivers/media/IR/ir-jvc-decoder.c
+++ b/drivers/media/IR/ir-jvc-decoder.c
@@ -50,8 +50,9 @@ static int ir_jvc_decode(struct input_dev *input_dev, struct ir_raw_event ev)
         if (!(ir_dev->raw->enabled_protocols & IR_TYPE_JVC))
                 return 0;
 
-        if (IS_RESET(ev)) {
-                data->state = STATE_INACTIVE;
+        if (!is_timing_event(ev)) {
+                if (ev.reset)
+                        data->state = STATE_INACTIVE;
                 return 0;
         }
 
diff --git a/drivers/media/IR/ir-lirc-codec.c b/drivers/media/IR/ir-lirc-codec.c
index 20ac9a4ce522..1d9c6b0fd0ea 100644
--- a/drivers/media/IR/ir-lirc-codec.c
+++ b/drivers/media/IR/ir-lirc-codec.c
@@ -32,6 +32,7 @@
 static int ir_lirc_decode(struct input_dev *input_dev, struct ir_raw_event ev)
 {
         struct ir_input_dev *ir_dev = input_get_drvdata(input_dev);
+        struct lirc_codec *lirc = &ir_dev->raw->lirc;
         int sample;
 
         if (!(ir_dev->raw->enabled_protocols & IR_TYPE_LIRC))
@@ -40,21 +41,57 @@ static int ir_lirc_decode(struct input_dev *input_dev, struct ir_raw_event ev)
         if (!ir_dev->raw->lirc.drv || !ir_dev->raw->lirc.drv->rbuf)
                 return -EINVAL;
 
-        if (IS_RESET(ev))
+        /* Packet start */
+        if (ev.reset)
                 return 0;
 
-        IR_dprintk(2, "LIRC data transfer started (%uus %s)\n",
-                   TO_US(ev.duration), TO_STR(ev.pulse));
+        /* Carrier reports */
+        if (ev.carrier_report) {
+                sample = LIRC_FREQUENCY(ev.carrier);
+
+        /* Packet end */
+        } else if (ev.timeout) {
+
+                if (lirc->gap)
+                        return 0;
+
+                lirc->gap_start = ktime_get();
+                lirc->gap = true;
+                lirc->gap_duration = ev.duration;
+
+                if (!lirc->send_timeout_reports)
+                        return 0;
+
+                sample = LIRC_TIMEOUT(ev.duration / 1000);
 
-        sample = ev.duration / 1000;
-        if (ev.pulse)
-                sample |= PULSE_BIT;
+        /* Normal sample */
+        } else {
+
+                if (lirc->gap) {
+                        int gap_sample;
+
+                        lirc->gap_duration += ktime_to_ns(ktime_sub(ktime_get(),
+                                lirc->gap_start));
+
+                        /* Convert to ms and cap by LIRC_VALUE_MASK */
+                        do_div(lirc->gap_duration, 1000);
+                        lirc->gap_duration = min(lirc->gap_duration,
+                                                        (u64)LIRC_VALUE_MASK);
+
+                        gap_sample = LIRC_SPACE(lirc->gap_duration);
+                        lirc_buffer_write(ir_dev->raw->lirc.drv->rbuf,
+                                                (unsigned char *) &gap_sample);
+                        lirc->gap = false;
+                }
+
+                sample = ev.pulse ? LIRC_PULSE(ev.duration / 1000) :
+                                        LIRC_SPACE(ev.duration / 1000);
+        }
 
         lirc_buffer_write(ir_dev->raw->lirc.drv->rbuf,
                           (unsigned char *) &sample);
         wake_up(&ir_dev->raw->lirc.drv->rbuf->wait_poll);
 
-
         return 0;
 }
 
@@ -102,7 +139,7 @@ static long ir_lirc_ioctl(struct file *filep, unsigned int cmd,
         struct ir_input_dev *ir_dev;
         int ret = 0;
         void *drv_data;
-        __u32 val = 0;
+        __u32 val = 0, tmp;
 
         lirc = lirc_get_pdata(filep);
         if (!lirc)
@@ -130,22 +167,20 @@ static long ir_lirc_ioctl(struct file *filep, unsigned int cmd,
         case LIRC_SET_SEND_MODE:
                 if (val != (LIRC_MODE_PULSE & LIRC_CAN_SEND_MASK))
                         return -EINVAL;
-                break;
+                return 0;
 
         /* TX settings */
         case LIRC_SET_TRANSMITTER_MASK:
-                if (ir_dev->props->s_tx_mask)
-                        ret = ir_dev->props->s_tx_mask(drv_data, val);
-                else
+                if (!ir_dev->props->s_tx_mask)
                         return -EINVAL;
-                break;
+
+                return ir_dev->props->s_tx_mask(drv_data, val);
 
         case LIRC_SET_SEND_CARRIER:
-                if (ir_dev->props->s_tx_carrier)
-                        ir_dev->props->s_tx_carrier(drv_data, val);
-                else
+                if (!ir_dev->props->s_tx_carrier)
                         return -EINVAL;
-                break;
+
+                return ir_dev->props->s_tx_carrier(drv_data, val);
 
         case LIRC_SET_SEND_DUTY_CYCLE:
                 if (!ir_dev->props->s_tx_duty_cycle)
@@ -154,39 +189,42 @@ static long ir_lirc_ioctl(struct file *filep, unsigned int cmd,
                 if (val <= 0 || val >= 100)
                         return -EINVAL;
 
-                ir_dev->props->s_tx_duty_cycle(ir_dev->props->priv, val);
-                break;
+                return ir_dev->props->s_tx_duty_cycle(drv_data, val);
 
         /* RX settings */
         case LIRC_SET_REC_CARRIER:
-                if (ir_dev->props->s_rx_carrier_range)
-                        ret = ir_dev->props->s_rx_carrier_range(
-                                ir_dev->props->priv,
-                                ir_dev->raw->lirc.carrier_low, val);
-                else
+                if (!ir_dev->props->s_rx_carrier_range)
                         return -ENOSYS;
 
-                if (!ret)
-                        ir_dev->raw->lirc.carrier_low = 0;
-                break;
+                if (val <= 0)
+                        return -EINVAL;
+
+                return ir_dev->props->s_rx_carrier_range(drv_data,
+                        ir_dev->raw->lirc.carrier_low, val);
 
         case LIRC_SET_REC_CARRIER_RANGE:
-                if (val >= 0)
-                        ir_dev->raw->lirc.carrier_low = val;
-                break;
+                if (val <= 0)
+                        return -EINVAL;
 
+                ir_dev->raw->lirc.carrier_low = val;
+                return 0;
 
         case LIRC_GET_REC_RESOLUTION:
                 val = ir_dev->props->rx_resolution;
                 break;
 
         case LIRC_SET_WIDEBAND_RECEIVER:
-                if (ir_dev->props->s_learning_mode)
-                        return ir_dev->props->s_learning_mode(
-                                ir_dev->props->priv, !!val);
-                else
+                if (!ir_dev->props->s_learning_mode)
                         return -ENOSYS;
 
+                return ir_dev->props->s_learning_mode(drv_data, !!val);
+
+        case LIRC_SET_MEASURE_CARRIER_MODE:
+                if (!ir_dev->props->s_carrier_report)
+                        return -ENOSYS;
+
+                return ir_dev->props->s_carrier_report(drv_data, !!val);
+
         /* Generic timeout support */
         case LIRC_GET_MIN_TIMEOUT:
                 if (!ir_dev->props->max_timeout)
@@ -201,10 +239,20 @@ static long ir_lirc_ioctl(struct file *filep, unsigned int cmd,
                 break;
 
         case LIRC_SET_REC_TIMEOUT:
-                if (val < ir_dev->props->min_timeout ||
-                    val > ir_dev->props->max_timeout)
-                        return -EINVAL;
-                ir_dev->props->timeout = val * 1000;
+                if (!ir_dev->props->max_timeout)
+                        return -ENOSYS;
+
+                tmp = val * 1000;
+
+                if (tmp < ir_dev->props->min_timeout ||
+                        tmp > ir_dev->props->max_timeout)
+                                return -EINVAL;
+
+                ir_dev->props->timeout = tmp;
+                break;
+
+        case LIRC_SET_REC_TIMEOUT_REPORTS:
+                lirc->send_timeout_reports = !!val;
                 break;
 
         default:
@@ -280,6 +328,10 @@ static int ir_lirc_register(struct input_dev *input_dev)
         if (ir_dev->props->s_learning_mode)
                 features |= LIRC_CAN_USE_WIDEBAND_RECEIVER;
 
+        if (ir_dev->props->s_carrier_report)
+                features |= LIRC_CAN_MEASURE_CARRIER;
+
+
         if (ir_dev->props->max_timeout)
                 features |= LIRC_CAN_SET_REC_TIMEOUT;
 
diff --git a/drivers/media/IR/ir-nec-decoder.c b/drivers/media/IR/ir-nec-decoder.c
index d597421d6547..70993f79c8a2 100644
--- a/drivers/media/IR/ir-nec-decoder.c
+++ b/drivers/media/IR/ir-nec-decoder.c
@@ -54,8 +54,9 @@ static int ir_nec_decode(struct input_dev *input_dev, struct ir_raw_event ev)
         if (!(ir_dev->raw->enabled_protocols & IR_TYPE_NEC))
                 return 0;
 
-        if (IS_RESET(ev)) {
-                data->state = STATE_INACTIVE;
+        if (!is_timing_event(ev)) {
+                if (ev.reset)
+                        data->state = STATE_INACTIVE;
                 return 0;
         }
 
diff --git a/drivers/media/IR/ir-raw-event.c b/drivers/media/IR/ir-raw-event.c
index 119b567feeab..0d59ef7d1014 100644
--- a/drivers/media/IR/ir-raw-event.c
+++ b/drivers/media/IR/ir-raw-event.c
@@ -174,7 +174,7 @@ int ir_raw_event_store_with_filter(struct input_dev *input_dev,
         if (ir->idle && !ev->pulse)
                 return 0;
         else if (ir->idle)
-                ir_raw_event_set_idle(input_dev, 0);
+                ir_raw_event_set_idle(input_dev, false);
 
         if (!raw->this_ev.duration) {
                 raw->this_ev = *ev;
@@ -187,48 +187,35 @@ int ir_raw_event_store_with_filter(struct input_dev *input_dev,
 
         /* Enter idle mode if nessesary */
         if (!ev->pulse && ir->props->timeout &&
-                raw->this_ev.duration >= ir->props->timeout)
-                ir_raw_event_set_idle(input_dev, 1);
+                raw->this_ev.duration >= ir->props->timeout) {
+                ir_raw_event_set_idle(input_dev, true);
+        }
         return 0;
 }
 EXPORT_SYMBOL_GPL(ir_raw_event_store_with_filter);
 
-void ir_raw_event_set_idle(struct input_dev *input_dev, int idle)
+/**
+ * ir_raw_event_set_idle() - hint the ir core if device is receiving
+ * IR data or not
+ * @input_dev: the struct input_dev device descriptor
+ * @idle: the hint value
+ */
+void ir_raw_event_set_idle(struct input_dev *input_dev, bool idle)
 {
         struct ir_input_dev *ir = input_get_drvdata(input_dev);
         struct ir_raw_event_ctrl *raw = ir->raw;
-        ktime_t now;
-        u64 delta;
 
-        if (!ir->props)
+        if (!ir->props || !ir->raw)
                 return;
 
-        if (!ir->raw)
-                goto out;
+        IR_dprintk(2, "%s idle mode\n", idle ? "enter" : "leave");
 
         if (idle) {
-                IR_dprintk(2, "enter idle mode\n");
-                raw->last_event = ktime_get();
-        } else {
-                IR_dprintk(2, "exit idle mode\n");
-
-                now = ktime_get();
-                delta = ktime_to_ns(ktime_sub(now, ir->raw->last_event));
-
-                WARN_ON(raw->this_ev.pulse);
-
-                raw->this_ev.duration =
-                        min(raw->this_ev.duration + delta,
-                                                (u64)IR_MAX_DURATION);
-
+                raw->this_ev.timeout = true;
                 ir_raw_event_store(input_dev, &raw->this_ev);
-
-                if (raw->this_ev.duration == IR_MAX_DURATION)
-                        ir_raw_event_reset(input_dev);
-
-                raw->this_ev.duration = 0;
+                init_ir_raw_event(&raw->this_ev);
         }
-out:
+
         if (ir->props->s_idle)
                 ir->props->s_idle(ir->props->priv, idle);
         ir->idle = idle;
diff --git a/drivers/media/IR/ir-rc5-decoder.c b/drivers/media/IR/ir-rc5-decoder.c
index df4770d978ad..572ed4ca8c68 100644
--- a/drivers/media/IR/ir-rc5-decoder.c
+++ b/drivers/media/IR/ir-rc5-decoder.c
@@ -55,8 +55,9 @@ static int ir_rc5_decode(struct input_dev *input_dev, struct ir_raw_event ev)
         if (!(ir_dev->raw->enabled_protocols & IR_TYPE_RC5))
                 return 0;
 
-        if (IS_RESET(ev)) {
-                data->state = STATE_INACTIVE;
+        if (!is_timing_event(ev)) {
+                if (ev.reset)
+                        data->state = STATE_INACTIVE;
                 return 0;
         }
 
diff --git a/drivers/media/IR/ir-rc5-sz-decoder.c b/drivers/media/IR/ir-rc5-sz-decoder.c
index 68f11d6acd5b..7c413501a3f7 100644
--- a/drivers/media/IR/ir-rc5-sz-decoder.c
+++ b/drivers/media/IR/ir-rc5-sz-decoder.c
@@ -51,8 +51,9 @@ static int ir_rc5_sz_decode(struct input_dev *input_dev, struct ir_raw_event ev)
         if (!(ir_dev->raw->enabled_protocols & IR_TYPE_RC5_SZ))
                 return 0;
 
-        if (IS_RESET(ev)) {
-                data->state = STATE_INACTIVE;
+        if (!is_timing_event(ev)) {
+                if (ev.reset)
+                        data->state = STATE_INACTIVE;
                 return 0;
         }
 
diff --git a/drivers/media/IR/ir-rc6-decoder.c b/drivers/media/IR/ir-rc6-decoder.c
index f1624b8279bc..d25da91f44ff 100644
--- a/drivers/media/IR/ir-rc6-decoder.c
+++ b/drivers/media/IR/ir-rc6-decoder.c
@@ -85,8 +85,9 @@ static int ir_rc6_decode(struct input_dev *input_dev, struct ir_raw_event ev)
         if (!(ir_dev->raw->enabled_protocols & IR_TYPE_RC6))
                 return 0;
 
-        if (IS_RESET(ev)) {
-                data->state = STATE_INACTIVE;
+        if (!is_timing_event(ev)) {
+                if (ev.reset)
+                        data->state = STATE_INACTIVE;
                 return 0;
         }
 
diff --git a/drivers/media/IR/ir-sony-decoder.c b/drivers/media/IR/ir-sony-decoder.c
index b9074f07c7a0..2d15730822bc 100644
--- a/drivers/media/IR/ir-sony-decoder.c
+++ b/drivers/media/IR/ir-sony-decoder.c
@@ -48,8 +48,9 @@ static int ir_sony_decode(struct input_dev *input_dev, struct ir_raw_event ev)
         if (!(ir_dev->raw->enabled_protocols & IR_TYPE_SONY))
                 return 0;
 
-        if (IS_RESET(ev)) {
-                data->state = STATE_INACTIVE;
+        if (!is_timing_event(ev)) {
+                if (ev.reset)
+                        data->state = STATE_INACTIVE;
                 return 0;
         }
 
diff --git a/drivers/media/IR/mceusb.c b/drivers/media/IR/mceusb.c
index bc620e10ef77..6825da5771f6 100644
--- a/drivers/media/IR/mceusb.c
+++ b/drivers/media/IR/mceusb.c
@@ -660,7 +660,7 @@ static int mceusb_set_tx_carrier(void *priv, u32 carrier)
 
 static void mceusb_process_ir_data(struct mceusb_dev *ir, int buf_len)
 {
-        struct ir_raw_event rawir = { .pulse = false, .duration = 0 };
+        DEFINE_IR_RAW_EVENT(rawir);
         int i, start_index = 0;
         u8 hdr = MCE_CONTROL_HEADER;
 
@@ -997,6 +997,7 @@ static int __devinit mceusb_dev_probe(struct usb_interface *intf,
         ir->len_in = maxp;
         ir->flags.microsoft_gen1 = is_microsoft_gen1;
         ir->flags.tx_mask_inverted = tx_mask_inverted;
+        init_ir_raw_event(&ir->rawir);
 
         /* Saving usb interface data for use by the transmitter routine */
         ir->usb_ep_in = ep_in;
diff --git a/drivers/media/IR/nuvoton-cir.c b/drivers/media/IR/nuvoton-cir.c
index 2f0f78078b57..301be53aee85 100644
--- a/drivers/media/IR/nuvoton-cir.c
+++ b/drivers/media/IR/nuvoton-cir.c
@@ -586,7 +586,7 @@ static void nvt_dump_rx_buf(struct nvt_dev *nvt)
  */
 static void nvt_process_rx_ir_data(struct nvt_dev *nvt)
 {
-        struct ir_raw_event rawir = { .pulse = false, .duration = 0 };
+        DEFINE_IR_RAW_EVENT(rawir);
         unsigned int count;
         u32 carrier;
         u8 sample;
@@ -622,6 +622,8 @@ static void nvt_process_rx_ir_data(struct nvt_dev *nvt)
                 }
 
                 rawir.duration += nvt->rawir.duration;
+
+                init_ir_raw_event(&nvt->rawir);
                 nvt->rawir.duration = 0;
                 nvt->rawir.pulse = rawir.pulse;
 
@@ -1016,6 +1018,7 @@ static int nvt_probe(struct pnp_dev *pdev, const struct pnp_device_id *dev_id)
 
         spin_lock_init(&nvt->nvt_lock);
         spin_lock_init(&nvt->tx.lock);
+        init_ir_raw_event(&nvt->rawir);
 
         ret = -EBUSY;
         /* now claim resources */
diff --git a/drivers/media/IR/streamzap.c b/drivers/media/IR/streamzap.c
index 86a4f68feea4..548381c35bfd 100644
--- a/drivers/media/IR/streamzap.c
+++ b/drivers/media/IR/streamzap.c
@@ -146,7 +146,7 @@ static void sz_push(struct streamzap_ir *sz, struct ir_raw_event rawir)
 static void sz_push_full_pulse(struct streamzap_ir *sz,
                                unsigned char value)
 {
-        struct ir_raw_event rawir;
+        DEFINE_IR_RAW_EVENT(rawir);
 
         if (sz->idle) {
                 long deltv;
@@ -193,7 +193,7 @@ static void sz_push_half_pulse(struct streamzap_ir *sz,
 static void sz_push_full_space(struct streamzap_ir *sz,
                                unsigned char value)
 {
-        struct ir_raw_event rawir;
+        DEFINE_IR_RAW_EVENT(rawir);
 
         rawir.pulse = false;
         rawir.duration = ((int) value) * SZ_RESOLUTION;
@@ -270,7 +270,7 @@ static void streamzap_callback(struct urb *urb)
                         break;
                 case FullSpace:
                         if (sz->buf_in[i] == SZ_TIMEOUT) {
-                                struct ir_raw_event rawir;
+                                DEFINE_IR_RAW_EVENT(rawir);
 
                                 rawir.pulse = false;
                                 rawir.duration = timeout;