media: rc-core: rename ir_raw_event_reset to ir_raw_event_overflow
authorSean Young <sean@mess.org>
Sat, 15 Jan 2022 10:12:35 +0000 (11:12 +0100)
committerMauro Carvalho Chehab <mchehab@kernel.org>
Fri, 28 Jan 2022 18:32:50 +0000 (19:32 +0100)
The driver report a reset event when the hardware reports and overflow.
There is no reason to have a generic "reset" event.

Signed-off-by: Sean Young <sean@mess.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
25 files changed:
drivers/media/pci/cx23885/cx23885-input.c
drivers/media/rc/fintek-cir.c
drivers/media/rc/igorplugusb.c
drivers/media/rc/iguanair.c
drivers/media/rc/ir-hix5hd2.c
drivers/media/rc/ir-imon-decoder.c
drivers/media/rc/ir-jvc-decoder.c
drivers/media/rc/ir-mce_kbd-decoder.c
drivers/media/rc/ir-nec-decoder.c
drivers/media/rc/ir-rc5-decoder.c
drivers/media/rc/ir-rc6-decoder.c
drivers/media/rc/ir-rcmm-decoder.c
drivers/media/rc/ir-sanyo-decoder.c
drivers/media/rc/ir-sharp-decoder.c
drivers/media/rc/ir-sony-decoder.c
drivers/media/rc/ir-xmp-decoder.c
drivers/media/rc/ite-cir.c
drivers/media/rc/lirc_dev.c
drivers/media/rc/nuvoton-cir.c
drivers/media/rc/rc-core-priv.h
drivers/media/rc/rc-ir-raw.c
drivers/media/rc/st_rc.c
drivers/media/rc/sunxi-cir.c
drivers/media/rc/winbond-cir.c
include/media/rc-core.h

index 19c34e5..d2e84c6 100644 (file)
@@ -55,7 +55,7 @@ static void cx23885_input_process_measurements(struct cx23885_dev *dev,
        } while (num != 0);
 
        if (overrun)
-               ir_raw_event_reset(kernel_ir->rc);
+               ir_raw_event_overflow(kernel_ir->rc);
        else if (handle)
                ir_raw_event_handle(kernel_ir->rc);
 }
index b0d5805..3fb0968 100644 (file)
@@ -287,7 +287,7 @@ static void fintek_process_rx_ir_data(struct fintek_dev *fintek)
                        if (fintek->rem)
                                fintek->parser_state = PARSE_IRDATA;
                        else
-                               ir_raw_event_reset(fintek->rdev);
+                               ir_raw_event_overflow(fintek->rdev);
                        break;
                case SUBCMD:
                        fintek->rem = fintek_cmdsize(fintek->cmd, sample);
index 3e9988e..b40dbf5 100644 (file)
@@ -67,7 +67,7 @@ static void igorplugusb_irdata(struct igorplugusb *ir, unsigned len)
                if (overflow > 0) {
                        dev_warn(ir->dev, "receive overflow, at least %u lost",
                                                                overflow);
-                       ir_raw_event_reset(ir->rc);
+                       ir_raw_event_overflow(ir->rc);
                }
 
                do {
index f8d080e..c9cb827 100644 (file)
@@ -109,7 +109,7 @@ static void process_ir_data(struct iguanair *ir, unsigned len)
                        break;
                case CMD_RX_OVERFLOW:
                        dev_warn(ir->dev, "receive overflow\n");
-                       ir_raw_event_reset(ir->rc);
+                       ir_raw_event_overflow(ir->rc);
                        break;
                default:
                        dev_warn(ir->dev, "control code %02x received\n",
index e0be647..4ff954b 100644 (file)
@@ -194,7 +194,7 @@ static irqreturn_t hix5hd2_ir_rx_interrupt(int irq, void *data)
                 * IR_INTS availably since logic would not clear
                 * fifo when overflow, drv do the job
                 */
-               ir_raw_event_reset(priv->rdev);
+               ir_raw_event_overflow(priv->rdev);
                symb_num = readl_relaxed(priv->base + IR_DATAH);
                for (i = 0; i < symb_num; i++)
                        readl_relaxed(priv->base + IR_DATAL);
index 41dbbef..dc68f64 100644 (file)
@@ -95,7 +95,7 @@ static int ir_imon_decode(struct rc_dev *dev, struct ir_raw_event ev)
        struct imon_dec *data = &dev->raw->imon;
 
        if (!is_timing_event(ev)) {
-               if (ev.reset)
+               if (ev.overflow)
                        data->state = STATE_INACTIVE;
                return 0;
        }
index 470f2e1..8b10954 100644 (file)
@@ -40,7 +40,7 @@ static int ir_jvc_decode(struct rc_dev *dev, struct ir_raw_event ev)
        struct jvc_dec *data = &dev->raw->jvc;
 
        if (!is_timing_event(ev)) {
-               if (ev.reset)
+               if (ev.overflow)
                        data->state = STATE_INACTIVE;
                return 0;
        }
index 1524dc0..66e8feb 100644 (file)
@@ -221,7 +221,7 @@ static int ir_mce_kbd_decode(struct rc_dev *dev, struct ir_raw_event ev)
        struct lirc_scancode lsc = {};
 
        if (!is_timing_event(ev)) {
-               if (ev.reset)
+               if (ev.overflow)
                        data->state = STATE_INACTIVE;
                return 0;
        }
index b4c3e4b..37b9943 100644 (file)
@@ -44,7 +44,7 @@ static int ir_nec_decode(struct rc_dev *dev, struct ir_raw_event ev)
        u8 address, not_address, command, not_command;
 
        if (!is_timing_event(ev)) {
-               if (ev.reset)
+               if (ev.overflow)
                        data->state = STATE_INACTIVE;
                return 0;
        }
index d58b622..82d7f6a 100644 (file)
@@ -45,7 +45,7 @@ static int ir_rc5_decode(struct rc_dev *dev, struct ir_raw_event ev)
        enum rc_proto protocol;
 
        if (!is_timing_event(ev)) {
-               if (ev.reset)
+               if (ev.overflow)
                        data->state = STATE_INACTIVE;
                return 0;
        }
index 0657ad5..3b2c8ba 100644 (file)
@@ -85,7 +85,7 @@ static int ir_rc6_decode(struct rc_dev *dev, struct ir_raw_event ev)
        enum rc_proto protocol;
 
        if (!is_timing_event(ev)) {
-               if (ev.reset)
+               if (ev.overflow)
                        data->state = STATE_INACTIVE;
                return 0;
        }
index fd9ec69..a8a3443 100644 (file)
@@ -69,7 +69,7 @@ static int ir_rcmm_decode(struct rc_dev *dev, struct ir_raw_event ev)
                return 0;
 
        if (!is_timing_event(ev)) {
-               if (ev.reset)
+               if (ev.overflow)
                        data->state = STATE_INACTIVE;
                return 0;
        }
index bfc181b..2bc98c3 100644 (file)
@@ -51,8 +51,8 @@ static int ir_sanyo_decode(struct rc_dev *dev, struct ir_raw_event ev)
        u8 command, not_command;
 
        if (!is_timing_event(ev)) {
-               if (ev.reset) {
-                       dev_dbg(&dev->dev, "SANYO event reset received. reset to state 0\n");
+               if (ev.overflow) {
+                       dev_dbg(&dev->dev, "SANYO event overflow received. reset to state 0\n");
                        data->state = STATE_INACTIVE;
                }
                return 0;
index d09c38c..3d8488c 100644 (file)
@@ -41,7 +41,7 @@ static int ir_sharp_decode(struct rc_dev *dev, struct ir_raw_event ev)
        u32 msg, echo, address, command, scancode;
 
        if (!is_timing_event(ev)) {
-               if (ev.reset)
+               if (ev.overflow)
                        data->state = STATE_INACTIVE;
                return 0;
        }
index d760d52..bb25867 100644 (file)
@@ -39,7 +39,7 @@ static int ir_sony_decode(struct rc_dev *dev, struct ir_raw_event ev)
        u8 device, subdevice, function;
 
        if (!is_timing_event(ev)) {
-               if (ev.reset)
+               if (ev.overflow)
                        data->state = STATE_INACTIVE;
                return 0;
        }
index ff94f48..dc36b68 100644 (file)
@@ -37,7 +37,7 @@ static int ir_xmp_decode(struct rc_dev *dev, struct ir_raw_event ev)
        struct xmp_dec *data = &dev->raw->xmp;
 
        if (!is_timing_event(ev)) {
-               if (ev.reset)
+               if (ev.overflow)
                        data->state = STATE_INACTIVE;
                return 0;
        }
index 4f77d4e..fcfadd7 100644 (file)
@@ -238,7 +238,7 @@ static irqreturn_t ite_cir_isr(int irq, void *data)
        /* Check for RX overflow */
        if (iflags & ITE_IRQ_RX_FIFO_OVERRUN) {
                dev_warn(&dev->rdev->dev, "receive overflow\n");
-               ir_raw_event_reset(dev->rdev);
+               ir_raw_event_overflow(dev->rdev);
        }
 
        /* check for the receive interrupt */
index a080291..fa4671f 100644 (file)
@@ -41,17 +41,17 @@ void lirc_raw_event(struct rc_dev *dev, struct ir_raw_event ev)
        struct lirc_fh *fh;
        int sample;
 
-       /* Packet start */
-       if (ev.reset) {
+       /* Receiver overflow, data missing */
+       if (ev.overflow) {
                /*
                 * Userspace expects a long space event before the start of
                 * the signal to use as a sync.  This may be done with repeat
-                * packets and normal samples.  But if a reset has been sent
+                * packets and normal samples.  But if an overflow has been sent
                 * then we assume that a long time has passed, so we send a
                 * space with the maximum time value.
                 */
                sample = LIRC_SPACE(LIRC_VALUE_MASK);
-               dev_dbg(&dev->dev, "delivering reset sync space to lirc_dev\n");
+               dev_dbg(&dev->dev, "delivering overflow space to lirc_dev\n");
 
        /* Carrier reports */
        } else if (ev.carrier_report) {
index 8a37f08..2214d41 100644 (file)
@@ -742,7 +742,7 @@ static void nvt_handle_rx_fifo_overrun(struct nvt_dev *nvt)
 
        nvt->pkts = 0;
        nvt_clear_cir_fifo(nvt);
-       ir_raw_event_reset(nvt->rdev);
+       ir_raw_event_overflow(nvt->rdev);
 }
 
 /* copy data from hardware rx fifo into driver buffer */
index 62f032d..ef1e95e 100644 (file)
@@ -190,7 +190,7 @@ static inline void decrease_duration(struct ir_raw_event *ev, unsigned 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;
+       return !ev.carrier_report && !ev.overflow;
 }
 
 #define TO_STR(is_pulse)               ((is_pulse) ? "pulse" : "space")
index c65bba4..16e33d7 100644 (file)
@@ -35,8 +35,6 @@ static int ir_raw_event_thread(void *data)
                                    !is_transition(&ev, &raw->prev_ev))
                                        dev_warn_once(&dev->dev, "two consecutive events of type %s",
                                                      TO_STR(ev.pulse));
-                               if (raw->prev_ev.reset && ev.pulse == 0)
-                                       dev_warn_once(&dev->dev, "timing event after reset should be pulse");
                        }
                        list_for_each_entry(handler, &ir_raw_handler_list, list)
                                if (dev->enabled_protocols &
index 4e419db..19e987a 100644 (file)
@@ -111,7 +111,7 @@ static irqreturn_t st_rc_rx_interrupt(int irq, void *data)
                int_status = readl(dev->rx_base + IRB_RX_INT_STATUS);
                if (unlikely(int_status & IRB_RX_OVERRUN_INT)) {
                        /* discard the entire collection in case of errors!  */
-                       ir_raw_event_reset(dev->rdev);
+                       ir_raw_event_overflow(dev->rdev);
                        dev_info(dev->dev, "IR RX overrun\n");
                        writel(IRB_RX_OVERRUN_INT,
                                        dev->rx_base + IRB_RX_INT_CLEAR);
index 391a591..b631a81 100644 (file)
@@ -126,7 +126,7 @@ static irqreturn_t sunxi_ir_irq(int irqno, void *dev_id)
        }
 
        if (status & REG_RXSTA_ROI) {
-               ir_raw_event_reset(ir->rc);
+               ir_raw_event_overflow(ir->rc);
        } else if (status & REG_RXSTA_RPE) {
                ir_raw_event_set_idle(ir->rc, true);
                ir_raw_event_handle(ir->rc);
index 94efb03..25884a7 100644 (file)
@@ -470,7 +470,7 @@ wbcir_irq_handler(int irqno, void *cookie)
                /* RX overflow? (read clears bit) */
                if (inb(data->sbase + WBCIR_REG_SP3_LSR) & WBCIR_RX_OVERRUN) {
                        data->rxstate = WBCIR_RXSTATE_ERROR;
-                       ir_raw_event_reset(data->dev);
+                       ir_raw_event_overflow(data->dev);
                }
 
                /* TX underflow? */
index 33b3f7f..8033495 100644 (file)
@@ -298,7 +298,7 @@ struct ir_raw_event {
        u8                      duty_cycle;
 
        unsigned                pulse:1;
-       unsigned                reset:1;
+       unsigned                overflow:1;
        unsigned                timeout:1;
        unsigned                carrier_report:1;
 };
@@ -321,9 +321,9 @@ int ir_raw_encode_scancode(enum rc_proto protocol, u32 scancode,
                           struct ir_raw_event *events, unsigned int max);
 int ir_raw_encode_carrier(enum rc_proto protocol);
 
-static inline void ir_raw_event_reset(struct rc_dev *dev)
+static inline void ir_raw_event_overflow(struct rc_dev *dev)
 {
-       ir_raw_event_store(dev, &((struct ir_raw_event) { .reset = true }));
+       ir_raw_event_store(dev, &((struct ir_raw_event) { .overflow = true }));
        dev->idle = true;
        ir_raw_event_handle(dev);
 }