lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[media] nuvoton-cir: simplify raw IR sample handling

Browse Source 
The nuvoton-cir driver was storing up consecutive pulse-pulse and
space-space samples internally, for no good reason, since
ir_raw_event_store_with_filter() already merges back to back like
samples types for us. This should also fix a regression introduced late
in 3.0 that related to a timeout change, which actually becomes correct
when coupled with this change. Tested with RC6 and RC5 on my own
nuvoton-cir hardware atop vanilla 3.0.0, after verifying quirky
behavior in 3.0 due to the timeout change.

Reported-by: Stephan Raue <sraue@openelec.tv>
CC: Stephan Raue <sraue@openelec.tv>
CC: stable@vger.kernel.org
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Jarod Wilson
2011-08-08 17:20:40 -03:00
committed by Mauro Carvalho Chehab
parent c8814df3a5
commit de4ed0c111
2 changed files with 8 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
drivers/media/rc/nuvoton-cir.c
View File

@@ -618,7 +618,6 @@ static void nvt_dump_rx_buf(struct nvt_dev *nvt)
static void nvt_process_rx_ir_data(struct nvt_dev *nvt) static void nvt_process_rx_ir_data(struct nvt_dev *nvt)
{ {
DEFINE_IR_RAW_EVENT(rawir); DEFINE_IR_RAW_EVENT(rawir);
unsigned int count;
u32 carrier; u32 carrier;
u8 sample; u8 sample;
int i; int i;
@@ -631,65 +630,38 @@ static void nvt_process_rx_ir_data(struct nvt_dev *nvt)
if (nvt->carrier_detect_enabled) if (nvt->carrier_detect_enabled)
carrier = nvt_rx_carrier_detect(nvt); carrier = nvt_rx_carrier_detect(nvt);
count = nvt->pkts; nvt_dbg_verbose("Processing buffer of len %d", nvt->pkts);
nvt_dbg_verbose("Processing buffer of len %d", count);
init_ir_raw_event(&rawir); init_ir_raw_event(&rawir);
for (i = 0; i < count; i++) { for (i = 0; i < nvt->pkts; i++) {
nvt->pkts--;
sample = nvt->buf[i]; sample = nvt->buf[i];
rawir.pulse = ((sample & BUF_PULSE_BIT) != 0); rawir.pulse = ((sample & BUF_PULSE_BIT) != 0);
rawir.duration = US_TO_NS((sample & BUF_LEN_MASK) rawir.duration = US_TO_NS((sample & BUF_LEN_MASK)
* SAMPLE_PERIOD); * SAMPLE_PERIOD);
if ((sample & BUF_LEN_MASK) == BUF_LEN_MASK) { nvt_dbg("Storing %s with duration %d",
if (nvt->rawir.pulse == rawir.pulse) rawir.pulse ? "pulse" : "space", rawir.duration);
nvt->rawir.duration += rawir.duration;
else {
nvt->rawir.duration = rawir.duration;
nvt->rawir.pulse = rawir.pulse;
}
continue;
}
rawir.duration += nvt->rawir.duration; ir_raw_event_store_with_filter(nvt->rdev, &rawir);
init_ir_raw_event(&nvt->rawir);
nvt->rawir.duration = 0;
nvt->rawir.pulse = rawir.pulse;
if (sample == BUF_PULSE_BIT)
rawir.pulse = false;
if (rawir.duration) {
nvt_dbg("Storing %s with duration %d",
rawir.pulse ? "pulse" : "space",
rawir.duration);
ir_raw_event_store_with_filter(nvt->rdev, &rawir);
}
/* /*
* BUF_PULSE_BIT indicates end of IR data, BUF_REPEAT_BYTE * BUF_PULSE_BIT indicates end of IR data, BUF_REPEAT_BYTE
* indicates end of IR signal, but new data incoming. In both * indicates end of IR signal, but new data incoming. In both
* cases, it means we're ready to call ir_raw_event_handle * cases, it means we're ready to call ir_raw_event_handle
*/ */
if ((sample == BUF_PULSE_BIT) && nvt->pkts) { if ((sample == BUF_PULSE_BIT) && (i + 1 < nvt->pkts)) {
nvt_dbg("Calling ir_raw_event_handle (signal end)\n"); nvt_dbg("Calling ir_raw_event_handle (signal end)\n");
ir_raw_event_handle(nvt->rdev); ir_raw_event_handle(nvt->rdev);
} }
} }
nvt->pkts = 0;
nvt_dbg("Calling ir_raw_event_handle (buffer empty)\n"); nvt_dbg("Calling ir_raw_event_handle (buffer empty)\n");
ir_raw_event_handle(nvt->rdev); ir_raw_event_handle(nvt->rdev);
if (nvt->pkts) {
nvt_dbg("Odd, pkts should be 0 now... (its %u)", nvt->pkts);
nvt->pkts = 0;
}
nvt_dbg_verbose("%s done", __func__); nvt_dbg_verbose("%s done", __func__);
} }
@@ -1048,7 +1020,6 @@ 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->nvt_lock);
spin_lock_init(&nvt->tx.lock); spin_lock_init(&nvt->tx.lock);
init_ir_raw_event(&nvt->rawir);
ret = -EBUSY; ret = -EBUSY;
/* now claim resources */ /* now claim resources */

1
drivers/media/rc/nuvoton-cir.h
View File

@@ -67,7 +67,6 @@ static int debug;
struct nvt_dev { struct nvt_dev {
struct pnp_dev *pdev; struct pnp_dev *pdev;
struct rc_dev *rdev; struct rc_dev *rdev;
struct ir_raw_event rawir;
spinlock_t nvt_lock; spinlock_t nvt_lock;