leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[media] rc-core: use ir_raw_event_store_with_filter in winbond-cir

Browse Source 
Using ir_raw_event_store_with_filter() saves about 20 lines of code.

Signed-off-by: David Härdeman <david@hardeman.nu>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
David Härdeman 2011-04-28 12:13:27 -03:00 committed by Mauro Carvalho Chehab
parent 08ffff9fa4
commit 488ebc4808
1 changed files with 22 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
drivers/media/rc/winbond-cir.c
View File

@ -330,60 +330,38 @@ wbcir_to_rc6cells(u8 val)
*****************************************************************************/
static void
wbcir_irq_rx(struct wbcir_data *data, struct pnp_dev *device)
wbcir_idle_rx(struct rc_dev *dev, bool idle)
{
u8 irdata[8];
bool disable = true;
unsigned int i;
struct wbcir_data *data = dev->priv;
if (data->rxstate == WBCIR_RXSTATE_INACTIVE) {
if (!idle && data->rxstate == WBCIR_RXSTATE_INACTIVE) {
data->rxstate = WBCIR_RXSTATE_ACTIVE;
led_trigger_event(data->rxtrigger, LED_FULL);
}
if (idle && data->rxstate != WBCIR_RXSTATE_INACTIVE)
/* Tell hardware to go idle by setting RXINACTIVE */
outb(WBCIR_RX_DISABLE, data->sbase + WBCIR_REG_SP3_ASCR);
}
static void
wbcir_irq_rx(struct wbcir_data *data, struct pnp_dev *device)
{
u8 irdata;
DEFINE_IR_RAW_EVENT(rawir);
/* Since RXHDLEV is set, at least 8 bytes are in the FIFO */
insb(data->sbase + WBCIR_REG_SP3_RXDATA, &irdata[0], 8);
for (i = 0; i < 8; i++) {
u8 pulse;
u32 duration;
if (irdata[i] != 0xFF && irdata[i] != 0x00)
disable = false;
while (inb(data->sbase + WBCIR_REG_SP3_LSR) & WBCIR_RX_AVAIL) {
irdata = inb(data->sbase + WBCIR_REG_SP3_RXDATA);
if (data->rxstate == WBCIR_RXSTATE_ERROR)
continue;
pulse = irdata[i] & 0x80 ? false : true;
duration = (irdata[i] & 0x7F) * 10000; /* ns */
if (data->rxev.pulse != pulse) {
if (data->rxev.duration != 0) {
ir_raw_event_store(data->dev, &data->rxev);
data->rxev.duration = 0;
}
data->rxev.pulse = pulse;
}
data->rxev.duration += duration;
rawir.pulse = irdata & 0x80 ? false : true;
rawir.duration = US_TO_NS((irdata & 0x7F) * 10);
ir_raw_event_store_with_filter(data->dev, &rawir);
}
if (disable) {
if (data->rxev.duration != 0 &&
data->rxstate != WBCIR_RXSTATE_ERROR) {
ir_raw_event_store(data->dev, &data->rxev);
data->rxev.duration = 0;
}
/* Set RXINACTIVE */
outb(WBCIR_RX_DISABLE, data->sbase + WBCIR_REG_SP3_ASCR);
/* Drain the FIFO */
while (inb(data->sbase + WBCIR_REG_SP3_LSR) & WBCIR_RX_AVAIL)
inb(data->sbase + WBCIR_REG_SP3_RXDATA);
ir_raw_event_reset(data->dev);
/* Check if we should go idle */
if (data->dev->idle) {
led_trigger_event(data->rxtrigger, LED_OFF);
data->rxstate = WBCIR_RXSTATE_INACTIVE;
}
@ -1088,6 +1066,7 @@ wbcir_probe(struct pnp_dev *device, const struct pnp_device_id *dev_id)
data->dev->input_id.product = WBCIR_ID_FAMILY;
data->dev->input_id.version = WBCIR_ID_CHIP;
data->dev->map_name = RC_MAP_RC6_MCE;
data->dev->s_idle = wbcir_idle_rx;
data->dev->s_tx_mask = wbcir_txmask;
data->dev->s_tx_carrier = wbcir_txcarrier;
data->dev->tx_ir = wbcir_tx;