Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6
* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (442 commits) [media] videobuf2-dma-contig: make cookie() return a pointer to dma_addr_t [media] sh_mobile_ceu_camera: Do not call vb2's mem_ops directly [media] V4L: soc-camera: explicitly require V4L2_BUF_TYPE_VIDEO_CAPTURE [media] v4l: soc-camera: Store negotiated buffer settings [media] rc: interim support for 32-bit NEC-ish scancodes [media] mceusb: topseed 0x0011 needs gen3 init for tx to work [media] lirc_zilog: error out if buffer read bytes != chunk size [media] lirc: silence some compile warnings [media] hdpvr: use same polling interval as other OS [media] ir-kbd-i2c: pass device code w/key in hauppauge case [media] rc/keymaps: Remove the obsolete rc-rc5-tv keymap [media] remove the old RC_MAP_HAUPPAUGE_NEW RC map [media] rc/keymaps: Rename Hauppauge table as rc-hauppauge [media] rc-rc5-hauppauge-new: Fix Hauppauge Grey mapping [media] rc-rc5-hauppauge-new: Add support for the old Black RC [media] rc-rc5-hauppauge-new: Add the old control to the table [media] rc-winfast: Fix the keycode tables [media] a800: Fix a few wrong IR key assignments [media] opera1: Use multimedia keys instead of an app-specific mapping [media] dw2102: Use multimedia keys instead of an app-specific mapping ... Fix up trivial conflicts (remove/modify and some real conflicts) in: arch/arm/mach-omap2/devices.c drivers/staging/Kconfig drivers/staging/Makefile drivers/staging/dabusb/dabusb.c drivers/staging/dabusb/dabusb.h drivers/staging/easycap/easycap_ioctl.c drivers/staging/usbvideo/usbvideo.c drivers/staging/usbvideo/vicam.c
This commit is contained in:
Linus Torvalds
@@ -32,18 +32,6 @@ config LIRC_IMON
|
||||
|
||||
Current generation iMON devices use the input layer imon driver.
|
||||
|
||||
config LIRC_IT87
|
||||
tristate "ITE IT87XX CIR Port Receiver"
|
||||
depends on LIRC && PNP
|
||||
help
|
||||
Driver for the ITE IT87xx IR Receiver
|
||||
|
||||
config LIRC_ITE8709
|
||||
tristate "ITE8709 CIR Port Receiver"
|
||||
depends on LIRC && PNP
|
||||
help
|
||||
Driver for the ITE8709 IR Receiver
|
||||
|
||||
config LIRC_PARALLEL
|
||||
tristate "Homebrew Parallel Port Receiver"
|
||||
depends on LIRC && PARPORT
|
||||
|
||||
@@ -6,8 +6,6 @@
|
||||
obj-$(CONFIG_LIRC_BT829) += lirc_bt829.o
|
||||
obj-$(CONFIG_LIRC_IGORPLUGUSB) += lirc_igorplugusb.o
|
||||
obj-$(CONFIG_LIRC_IMON) += lirc_imon.o
|
||||
obj-$(CONFIG_LIRC_IT87) += lirc_it87.o
|
||||
obj-$(CONFIG_LIRC_ITE8709) += lirc_ite8709.o
|
||||
obj-$(CONFIG_LIRC_PARALLEL) += lirc_parallel.o
|
||||
obj-$(CONFIG_LIRC_SASEM) += lirc_sasem.o
|
||||
obj-$(CONFIG_LIRC_SERIAL) += lirc_serial.o
|
||||
|
||||
@@ -1,34 +1,33 @@
|
||||
1. Both ir-kbd-i2c and lirc_zilog provide support for RX events.
|
||||
The 'tx_only' lirc_zilog module parameter will allow ir-kbd-i2c
|
||||
and lirc_zilog to coexist in the kernel, if the user requires such a set-up.
|
||||
However the IR unit will not work well without coordination between the
|
||||
two modules. A shared mutex, for transceiver access locking, needs to be
|
||||
supplied by bridge drivers, in struct IR_i2_init_data, to both ir-kbd-i2c
|
||||
and lirc_zilog, before they will coexist usefully. This should be fixed
|
||||
before moving out of staging.
|
||||
1. Both ir-kbd-i2c and lirc_zilog provide support for RX events for
|
||||
the chips supported by lirc_zilog. Before moving lirc_zilog out of staging:
|
||||
|
||||
2. References and locking need careful examination. For cx18 and ivtv PCI
|
||||
cards, which are not easily "hot unplugged", the imperfect state of reference
|
||||
counting and locking is acceptable if not correct. For USB connected units
|
||||
like HD PVR, PVR USB2, HVR-1900, and HVR1950, the likelyhood of an Ooops on
|
||||
unplug is probably great. Proper reference counting and locking needs to be
|
||||
implemented before this module is moved out of staging.
|
||||
a. ir-kbd-i2c needs a module parameter added to allow the user to tell
|
||||
ir-kbd-i2c to ignore Z8 IR units.
|
||||
|
||||
3. The binding between hdpvr and lirc_zilog is currently disabled,
|
||||
due to an OOPS reported a few years ago when both the hdpvr and cx18
|
||||
drivers were loaded in his system. More details can be seen at:
|
||||
http://www.mail-archive.com/linux-media@vger.kernel.org/msg09163.html
|
||||
More tests need to be done, in order to fix the reported issue.
|
||||
b. lirc_zilog should provide Rx key presses to the rc core like ir-kbd-i2c
|
||||
does.
|
||||
|
||||
4. In addition to providing a shared mutex for transceiver access
|
||||
locking, bridge drivers, if able, should provide a chip reset() callback
|
||||
|
||||
2. lirc_zilog module ref-counting need examination. It has not been
|
||||
verified that cdev and lirc_dev will take the proper module references on
|
||||
lirc_zilog to prevent removal of lirc_zilog when the /dev/lircN device node
|
||||
is open.
|
||||
|
||||
(The good news is ref-counting of lirc_zilog internal structures appears to be
|
||||
complete. Testing has shown the cx18 module can be unloaded out from under
|
||||
irw + lircd + lirc_dev, with the /dev/lirc0 device node open, with no adverse
|
||||
effects. The cx18 module could then be reloaded and irw properly began
|
||||
receiving button presses again and ir_send worked without error.)
|
||||
|
||||
|
||||
3. Bridge drivers, if able, should provide a chip reset() callback
|
||||
to lirc_zilog via struct IR_i2c_init_data. cx18 and ivtv already have routines
|
||||
to perform Z8 chip resets via GPIO manipulations. This will allow lirc_zilog
|
||||
to perform Z8 chip resets via GPIO manipulations. This would allow lirc_zilog
|
||||
to bring the chip back to normal when it hangs, in the same places the
|
||||
original lirc_pvr150 driver code does. This is not strictly needed, so it
|
||||
is not required to move lirc_zilog out of staging.
|
||||
|
||||
5. Both lirc_zilog and ir-kbd-i2c support the Zilog Z8 for IR, as programmed
|
||||
Note: Both lirc_zilog and ir-kbd-i2c support the Zilog Z8 for IR, as programmed
|
||||
and installed on Hauppauge products. When working on either module, developers
|
||||
must consider at least the following bridge drivers which mention an IR Rx unit
|
||||
at address 0x71 (indicative of a Z8):
|
||||
|
||||
@@ -379,7 +379,7 @@ static ssize_t vfd_write(struct file *file, const char *buf,
|
||||
struct imon_context *context;
|
||||
const unsigned char vfd_packet6[] = {
|
||||
0x01, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF };
|
||||
int *data_buf;
|
||||
int *data_buf = NULL;
|
||||
|
||||
context = file->private_data;
|
||||
if (!context) {
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,116 +0,0 @@
|
||||
/* lirc_it87.h */
|
||||
/* SECTION: Definitions */
|
||||
|
||||
/********************************* ITE IT87xx ************************/
|
||||
|
||||
/* based on the following documentation from ITE:
|
||||
a) IT8712F Preliminary CIR Programming Guide V0.1
|
||||
b) IT8705F Simple LPC I/O Preliminary Specification V0.3
|
||||
c) IT8712F EC-LPC I/O Preliminary Specification V0.5
|
||||
*/
|
||||
|
||||
/* IT8712/05 Ports: */
|
||||
#define IT87_ADRPORT 0x2e
|
||||
#define IT87_DATAPORT 0x2f
|
||||
#define IT87_INIT {0x87, 0x01, 0x55, 0x55}
|
||||
|
||||
/* alternate Ports: */
|
||||
/*
|
||||
#define IT87_ADRPORT 0x4e
|
||||
#define IT87_DATAPORT 0x4f
|
||||
#define IT87_INIT {0x87, 0x01, 0x55, 0xaa}
|
||||
*/
|
||||
|
||||
/* IT8712/05 Registers */
|
||||
#define IT87_CFGCTRL 0x2
|
||||
#define IT87_LDN 0x7
|
||||
#define IT87_CHIP_ID1 0x20
|
||||
#define IT87_CHIP_ID2 0x21
|
||||
#define IT87_CFG_VERSION 0x22
|
||||
#define IT87_SWSUSPEND 0x23
|
||||
|
||||
#define IT8712_CIR_LDN 0xa
|
||||
#define IT8705_CIR_LDN 0x7
|
||||
|
||||
/* CIR Configuration Registers: */
|
||||
#define IT87_CIR_ACT 0x30
|
||||
#define IT87_CIR_BASE_MSB 0x60
|
||||
#define IT87_CIR_BASE_LSB 0x61
|
||||
#define IT87_CIR_IRQ 0x70
|
||||
#define IT87_CIR_CONFIG 0xf0
|
||||
|
||||
/* List of IT87_CIR registers: offset to BaseAddr */
|
||||
#define IT87_CIR_DR 0
|
||||
#define IT87_CIR_IER 1
|
||||
#define IT87_CIR_RCR 2
|
||||
#define IT87_CIR_TCR1 3
|
||||
#define IT87_CIR_TCR2 4
|
||||
#define IT87_CIR_TSR 5
|
||||
#define IT87_CIR_RSR 6
|
||||
#define IT87_CIR_BDLR 5
|
||||
#define IT87_CIR_BDHR 6
|
||||
#define IT87_CIR_IIR 7
|
||||
|
||||
/* Bit Definition */
|
||||
/* IER: */
|
||||
#define IT87_CIR_IER_TM_EN 0x80
|
||||
#define IT87_CIR_IER_RESEVED 0x40
|
||||
#define IT87_CIR_IER_RESET 0x20
|
||||
#define IT87_CIR_IER_BR 0x10
|
||||
#define IT87_CIR_IER_IEC 0x8
|
||||
#define IT87_CIR_IER_RFOIE 0x4
|
||||
#define IT87_CIR_IER_RDAIE 0x2
|
||||
#define IT87_CIR_IER_TLDLIE 0x1
|
||||
|
||||
/* RCR: */
|
||||
#define IT87_CIR_RCR_RDWOS 0x80
|
||||
#define IT87_CIR_RCR_HCFS 0x40
|
||||
#define IT87_CIR_RCR_RXEN 0x20
|
||||
#define IT87_CIR_RCR_RXEND 0x10
|
||||
#define IT87_CIR_RCR_RXACT 0x8
|
||||
#define IT87_CIR_RCR_RXDCR 0x7
|
||||
|
||||
/* TCR1: */
|
||||
#define IT87_CIR_TCR1_FIFOCLR 0x80
|
||||
#define IT87_CIR_TCR1_ILE 0x40
|
||||
#define IT87_CIR_TCR1_FIFOTL 0x30
|
||||
#define IT87_CIR_TCR1_TXRLE 0x8
|
||||
#define IT87_CIR_TCR1_TXENDF 0x4
|
||||
#define IT87_CIR_TCR1_TXMPM 0x3
|
||||
|
||||
/* TCR2: */
|
||||
#define IT87_CIR_TCR2_CFQ 0xf8
|
||||
#define IT87_CIR_TCR2_TXMPW 0x7
|
||||
|
||||
/* TSR: */
|
||||
#define IT87_CIR_TSR_RESERVED 0xc0
|
||||
#define IT87_CIR_TSR_TXFBC 0x3f
|
||||
|
||||
/* RSR: */
|
||||
#define IT87_CIR_RSR_RXFTO 0x80
|
||||
#define IT87_CIR_RSR_RESERVED 0x40
|
||||
#define IT87_CIR_RSR_RXFBC 0x3f
|
||||
|
||||
/* IIR: */
|
||||
#define IT87_CIR_IIR_RESERVED 0xf8
|
||||
#define IT87_CIR_IIR_IID 0x6
|
||||
#define IT87_CIR_IIR_IIP 0x1
|
||||
|
||||
/* TM: */
|
||||
#define IT87_CIR_TM_IL_SEL 0x80
|
||||
#define IT87_CIR_TM_RESERVED 0x40
|
||||
#define IT87_CIR_TM_TM_REG 0x3f
|
||||
|
||||
#define IT87_CIR_FIFO_SIZE 32
|
||||
|
||||
/* Baudratedivisor for IT87: power of 2: only 1,2,4 or 8) */
|
||||
#define IT87_CIR_BAUDRATE_DIVISOR 0x1
|
||||
#define IT87_CIR_DEFAULT_IOBASE 0x310
|
||||
#define IT87_CIR_DEFAULT_IRQ 0x7
|
||||
#define IT87_CIR_SPACE 0x00
|
||||
#define IT87_CIR_PULSE 0xff
|
||||
#define IT87_CIR_FREQ_MIN 27
|
||||
#define IT87_CIR_FREQ_MAX 58
|
||||
#define TIME_CONST (IT87_CIR_BAUDRATE_DIVISOR * 8000000ul / 115200ul)
|
||||
|
||||
/********************************* ITE IT87xx ************************/
|
||||
@@ -1,542 +0,0 @@
|
||||
/*
|
||||
* LIRC driver for ITE8709 CIR port
|
||||
*
|
||||
* Copyright (C) 2008 Grégory Lardière <spmf2004-lirc@yahoo.fr>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License as
|
||||
* published by the Free Software Foundation; either version 2 of the
|
||||
* License, or (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful, but
|
||||
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
|
||||
* USA
|
||||
*/
|
||||
|
||||
#include <linux/module.h>
|
||||
#include <linux/interrupt.h>
|
||||
#include <linux/sched.h>
|
||||
#include <linux/delay.h>
|
||||
#include <linux/pnp.h>
|
||||
#include <linux/io.h>
|
||||
|
||||
#include <media/lirc.h>
|
||||
#include <media/lirc_dev.h>
|
||||
|
||||
#define LIRC_DRIVER_NAME "lirc_ite8709"
|
||||
|
||||
#define BUF_CHUNK_SIZE sizeof(int)
|
||||
#define BUF_SIZE (128*BUF_CHUNK_SIZE)
|
||||
|
||||
/*
|
||||
* The ITE8709 device seems to be the combination of IT8512 superIO chip and
|
||||
* a specific firmware running on the IT8512's embedded micro-controller.
|
||||
* In addition of the embedded micro-controller, the IT8512 chip contains a
|
||||
* CIR module and several other modules. A few modules are directly accessible
|
||||
* by the host CPU, but most of them are only accessible by the
|
||||
* micro-controller. The CIR module is only accessible by the micro-controller.
|
||||
* The battery-backed SRAM module is accessible by the host CPU and the
|
||||
* micro-controller. So one of the MC's firmware role is to act as a bridge
|
||||
* between the host CPU and the CIR module. The firmware implements a kind of
|
||||
* communication protocol using the SRAM module as a shared memory. The IT8512
|
||||
* specification is publicly available on ITE's web site, but the communication
|
||||
* protocol is not, so it was reverse-engineered.
|
||||
*/
|
||||
|
||||
/* ITE8709 Registers addresses and values (reverse-engineered) */
|
||||
#define ITE8709_MODE 0x1a
|
||||
#define ITE8709_REG_ADR 0x1b
|
||||
#define ITE8709_REG_VAL 0x1c
|
||||
#define ITE8709_IIR 0x1e /* Interrupt identification register */
|
||||
#define ITE8709_RFSR 0x1f /* Receiver FIFO status register */
|
||||
#define ITE8709_FIFO_START 0x20
|
||||
|
||||
#define ITE8709_MODE_READY 0X00
|
||||
#define ITE8709_MODE_WRITE 0X01
|
||||
#define ITE8709_MODE_READ 0X02
|
||||
#define ITE8709_IIR_RDAI 0x02 /* Receiver data available interrupt */
|
||||
#define ITE8709_IIR_RFOI 0x04 /* Receiver FIFO overrun interrupt */
|
||||
#define ITE8709_RFSR_MASK 0x3f /* FIFO byte count mask */
|
||||
|
||||
/*
|
||||
* IT8512 CIR-module registers addresses and values
|
||||
* (from IT8512 E/F specification v0.4.1)
|
||||
*/
|
||||
#define IT8512_REG_MSTCR 0x01 /* Master control register */
|
||||
#define IT8512_REG_IER 0x02 /* Interrupt enable register */
|
||||
#define IT8512_REG_CFR 0x04 /* Carrier frequency register */
|
||||
#define IT8512_REG_RCR 0x05 /* Receive control register */
|
||||
#define IT8512_REG_BDLR 0x08 /* Baud rate divisor low byte register */
|
||||
#define IT8512_REG_BDHR 0x09 /* Baud rate divisor high byte register */
|
||||
|
||||
#define IT8512_MSTCR_RESET 0x01 /* Reset registers to default value */
|
||||
#define IT8512_MSTCR_FIFOCLR 0x02 /* Clear FIFO */
|
||||
#define IT8512_MSTCR_FIFOTL_7 0x04 /* FIFO threshold level : 7 */
|
||||
#define IT8512_MSTCR_FIFOTL_25 0x0c /* FIFO threshold level : 25 */
|
||||
#define IT8512_IER_RDAIE 0x02 /* Enable data interrupt request */
|
||||
#define IT8512_IER_RFOIE 0x04 /* Enable FIFO overrun interrupt req */
|
||||
#define IT8512_IER_IEC 0x80 /* Enable interrupt request */
|
||||
#define IT8512_CFR_CF_36KHZ 0x09 /* Carrier freq : low speed, 36kHz */
|
||||
#define IT8512_RCR_RXDCR_1 0x01 /* Demodulation carrier range : 1 */
|
||||
#define IT8512_RCR_RXACT 0x08 /* Receiver active */
|
||||
#define IT8512_RCR_RXEN 0x80 /* Receiver enable */
|
||||
#define IT8512_BDR_6 6 /* Baud rate divisor : 6 */
|
||||
|
||||
/* Actual values used by this driver */
|
||||
#define CFG_FIFOTL IT8512_MSTCR_FIFOTL_25
|
||||
#define CFG_CR_FREQ IT8512_CFR_CF_36KHZ
|
||||
#define CFG_DCR IT8512_RCR_RXDCR_1
|
||||
#define CFG_BDR IT8512_BDR_6
|
||||
#define CFG_TIMEOUT 100000 /* Rearm interrupt when a space is > 100 ms */
|
||||
|
||||
static int debug;
|
||||
|
||||
struct ite8709_device {
|
||||
int use_count;
|
||||
int io;
|
||||
int irq;
|
||||
spinlock_t hardware_lock;
|
||||
__u64 acc_pulse;
|
||||
__u64 acc_space;
|
||||
char lastbit;
|
||||
struct timeval last_tv;
|
||||
struct lirc_driver driver;
|
||||
struct tasklet_struct tasklet;
|
||||
char force_rearm;
|
||||
char rearmed;
|
||||
char device_busy;
|
||||
};
|
||||
|
||||
#define dprintk(fmt, args...) \
|
||||
do { \
|
||||
if (debug) \
|
||||
printk(KERN_DEBUG LIRC_DRIVER_NAME ": " \
|
||||
fmt, ## args); \
|
||||
} while (0)
|
||||
|
||||
|
||||
static unsigned char ite8709_read(struct ite8709_device *dev,
|
||||
unsigned char port)
|
||||
{
|
||||
outb(port, dev->io);
|
||||
return inb(dev->io+1);
|
||||
}
|
||||
|
||||
static void ite8709_write(struct ite8709_device *dev, unsigned char port,
|
||||
unsigned char data)
|
||||
{
|
||||
outb(port, dev->io);
|
||||
outb(data, dev->io+1);
|
||||
}
|
||||
|
||||
static void ite8709_wait_device(struct ite8709_device *dev)
|
||||
{
|
||||
int i = 0;
|
||||
/*
|
||||
* loop until device tells it's ready to continue
|
||||
* iterations count is usually ~750 but can sometimes achieve 13000
|
||||
*/
|
||||
for (i = 0; i < 15000; i++) {
|
||||
udelay(2);
|
||||
if (ite8709_read(dev, ITE8709_MODE) == ITE8709_MODE_READY)
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
static void ite8709_write_register(struct ite8709_device *dev,
|
||||
unsigned char reg_adr, unsigned char reg_value)
|
||||
{
|
||||
ite8709_wait_device(dev);
|
||||
|
||||
ite8709_write(dev, ITE8709_REG_VAL, reg_value);
|
||||
ite8709_write(dev, ITE8709_REG_ADR, reg_adr);
|
||||
ite8709_write(dev, ITE8709_MODE, ITE8709_MODE_WRITE);
|
||||
}
|
||||
|
||||
static void ite8709_init_hardware(struct ite8709_device *dev)
|
||||
{
|
||||
spin_lock_irq(&dev->hardware_lock);
|
||||
dev->device_busy = 1;
|
||||
spin_unlock_irq(&dev->hardware_lock);
|
||||
|
||||
ite8709_write_register(dev, IT8512_REG_BDHR, (CFG_BDR >> 8) & 0xff);
|
||||
ite8709_write_register(dev, IT8512_REG_BDLR, CFG_BDR & 0xff);
|
||||
ite8709_write_register(dev, IT8512_REG_CFR, CFG_CR_FREQ);
|
||||
ite8709_write_register(dev, IT8512_REG_IER,
|
||||
IT8512_IER_IEC | IT8512_IER_RFOIE | IT8512_IER_RDAIE);
|
||||
ite8709_write_register(dev, IT8512_REG_RCR, CFG_DCR);
|
||||
ite8709_write_register(dev, IT8512_REG_MSTCR,
|
||||
CFG_FIFOTL | IT8512_MSTCR_FIFOCLR);
|
||||
ite8709_write_register(dev, IT8512_REG_RCR,
|
||||
IT8512_RCR_RXEN | IT8512_RCR_RXACT | CFG_DCR);
|
||||
|
||||
spin_lock_irq(&dev->hardware_lock);
|
||||
dev->device_busy = 0;
|
||||
spin_unlock_irq(&dev->hardware_lock);
|
||||
|
||||
tasklet_enable(&dev->tasklet);
|
||||
}
|
||||
|
||||
static void ite8709_drop_hardware(struct ite8709_device *dev)
|
||||
{
|
||||
tasklet_disable(&dev->tasklet);
|
||||
|
||||
spin_lock_irq(&dev->hardware_lock);
|
||||
dev->device_busy = 1;
|
||||
spin_unlock_irq(&dev->hardware_lock);
|
||||
|
||||
ite8709_write_register(dev, IT8512_REG_RCR, 0);
|
||||
ite8709_write_register(dev, IT8512_REG_MSTCR,
|
||||
IT8512_MSTCR_RESET | IT8512_MSTCR_FIFOCLR);
|
||||
|
||||
spin_lock_irq(&dev->hardware_lock);
|
||||
dev->device_busy = 0;
|
||||
spin_unlock_irq(&dev->hardware_lock);
|
||||
}
|
||||
|
||||
static int ite8709_set_use_inc(void *data)
|
||||
{
|
||||
struct ite8709_device *dev;
|
||||
dev = data;
|
||||
if (dev->use_count == 0)
|
||||
ite8709_init_hardware(dev);
|
||||
dev->use_count++;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void ite8709_set_use_dec(void *data)
|
||||
{
|
||||
struct ite8709_device *dev;
|
||||
dev = data;
|
||||
dev->use_count--;
|
||||
if (dev->use_count == 0)
|
||||
ite8709_drop_hardware(dev);
|
||||
}
|
||||
|
||||
static void ite8709_add_read_queue(struct ite8709_device *dev, int flag,
|
||||
__u64 val)
|
||||
{
|
||||
int value;
|
||||
|
||||
dprintk("add a %llu usec %s\n", val, flag ? "pulse" : "space");
|
||||
|
||||
value = (val > PULSE_MASK) ? PULSE_MASK : val;
|
||||
if (flag)
|
||||
value |= PULSE_BIT;
|
||||
|
||||
if (!lirc_buffer_full(dev->driver.rbuf)) {
|
||||
lirc_buffer_write(dev->driver.rbuf, (void *) &value);
|
||||
wake_up(&dev->driver.rbuf->wait_poll);
|
||||
}
|
||||
}
|
||||
|
||||
static irqreturn_t ite8709_interrupt(int irq, void *dev_id)
|
||||
{
|
||||
unsigned char data;
|
||||
int iir, rfsr, i;
|
||||
int fifo = 0;
|
||||
char bit;
|
||||
struct timeval curr_tv;
|
||||
|
||||
/* Bit duration in microseconds */
|
||||
const unsigned long bit_duration = 1000000ul / (115200 / CFG_BDR);
|
||||
|
||||
struct ite8709_device *dev;
|
||||
dev = dev_id;
|
||||
|
||||
/*
|
||||
* If device is busy, we simply discard data because we are in one of
|
||||
* these two cases : shutting down or rearming the device, so this
|
||||
* doesn't really matter and this avoids waiting too long in IRQ ctx
|
||||
*/
|
||||
spin_lock(&dev->hardware_lock);
|
||||
if (dev->device_busy) {
|
||||
spin_unlock(&dev->hardware_lock);
|
||||
return IRQ_RETVAL(IRQ_HANDLED);
|
||||
}
|
||||
|
||||
iir = ite8709_read(dev, ITE8709_IIR);
|
||||
|
||||
switch (iir) {
|
||||
case ITE8709_IIR_RFOI:
|
||||
dprintk("fifo overrun, scheduling forced rearm just in case\n");
|
||||
dev->force_rearm = 1;
|
||||
tasklet_schedule(&dev->tasklet);
|
||||
spin_unlock(&dev->hardware_lock);
|
||||
return IRQ_RETVAL(IRQ_HANDLED);
|
||||
|
||||
case ITE8709_IIR_RDAI:
|
||||
rfsr = ite8709_read(dev, ITE8709_RFSR);
|
||||
fifo = rfsr & ITE8709_RFSR_MASK;
|
||||
if (fifo > 32)
|
||||
fifo = 32;
|
||||
dprintk("iir: 0x%x rfsr: 0x%x fifo: %d\n", iir, rfsr, fifo);
|
||||
|
||||
if (dev->rearmed) {
|
||||
do_gettimeofday(&curr_tv);
|
||||
dev->acc_space += 1000000ull
|
||||
* (curr_tv.tv_sec - dev->last_tv.tv_sec)
|
||||
+ (curr_tv.tv_usec - dev->last_tv.tv_usec);
|
||||
dev->rearmed = 0;
|
||||
}
|
||||
for (i = 0; i < fifo; i++) {
|
||||
data = ite8709_read(dev, i+ITE8709_FIFO_START);
|
||||
data = ~data;
|
||||
/* Loop through */
|
||||
for (bit = 0; bit < 8; ++bit) {
|
||||
if ((data >> bit) & 1) {
|
||||
dev->acc_pulse += bit_duration;
|
||||
if (dev->lastbit == 0) {
|
||||
ite8709_add_read_queue(dev, 0,
|
||||
dev->acc_space);
|
||||
dev->acc_space = 0;
|
||||
}
|
||||
} else {
|
||||
dev->acc_space += bit_duration;
|
||||
if (dev->lastbit == 1) {
|
||||
ite8709_add_read_queue(dev, 1,
|
||||
dev->acc_pulse);
|
||||
dev->acc_pulse = 0;
|
||||
}
|
||||
}
|
||||
dev->lastbit = (data >> bit) & 1;
|
||||
}
|
||||
}
|
||||
ite8709_write(dev, ITE8709_RFSR, 0);
|
||||
|
||||
if (dev->acc_space > CFG_TIMEOUT) {
|
||||
dprintk("scheduling rearm IRQ\n");
|
||||
do_gettimeofday(&dev->last_tv);
|
||||
dev->force_rearm = 0;
|
||||
tasklet_schedule(&dev->tasklet);
|
||||
}
|
||||
|
||||
spin_unlock(&dev->hardware_lock);
|
||||
return IRQ_RETVAL(IRQ_HANDLED);
|
||||
|
||||
default:
|
||||
/* not our irq */
|
||||
dprintk("unknown IRQ (shouldn't happen) !!\n");
|
||||
spin_unlock(&dev->hardware_lock);
|
||||
return IRQ_RETVAL(IRQ_NONE);
|
||||
}
|
||||
}
|
||||
|
||||
static void ite8709_rearm_irq(unsigned long data)
|
||||
{
|
||||
struct ite8709_device *dev;
|
||||
unsigned long flags;
|
||||
dev = (struct ite8709_device *) data;
|
||||
|
||||
spin_lock_irqsave(&dev->hardware_lock, flags);
|
||||
dev->device_busy = 1;
|
||||
spin_unlock_irqrestore(&dev->hardware_lock, flags);
|
||||
|
||||
if (dev->force_rearm || dev->acc_space > CFG_TIMEOUT) {
|
||||
dprintk("rearming IRQ\n");
|
||||
ite8709_write_register(dev, IT8512_REG_RCR,
|
||||
IT8512_RCR_RXACT | CFG_DCR);
|
||||
ite8709_write_register(dev, IT8512_REG_MSTCR,
|
||||
CFG_FIFOTL | IT8512_MSTCR_FIFOCLR);
|
||||
ite8709_write_register(dev, IT8512_REG_RCR,
|
||||
IT8512_RCR_RXEN | IT8512_RCR_RXACT | CFG_DCR);
|
||||
if (!dev->force_rearm)
|
||||
dev->rearmed = 1;
|
||||
dev->force_rearm = 0;
|
||||
}
|
||||
|
||||
spin_lock_irqsave(&dev->hardware_lock, flags);
|
||||
dev->device_busy = 0;
|
||||
spin_unlock_irqrestore(&dev->hardware_lock, flags);
|
||||
}
|
||||
|
||||
static int ite8709_cleanup(struct ite8709_device *dev, int stage, int errno,
|
||||
char *msg)
|
||||
{
|
||||
if (msg != NULL)
|
||||
printk(KERN_ERR LIRC_DRIVER_NAME ": %s\n", msg);
|
||||
|
||||
switch (stage) {
|
||||
case 6:
|
||||
if (dev->use_count > 0)
|
||||
ite8709_drop_hardware(dev);
|
||||
case 5:
|
||||
free_irq(dev->irq, dev);
|
||||
case 4:
|
||||
release_region(dev->io, 2);
|
||||
case 3:
|
||||
lirc_unregister_driver(dev->driver.minor);
|
||||
case 2:
|
||||
lirc_buffer_free(dev->driver.rbuf);
|
||||
kfree(dev->driver.rbuf);
|
||||
case 1:
|
||||
kfree(dev);
|
||||
case 0:
|
||||
;
|
||||
}
|
||||
|
||||
return errno;
|
||||
}
|
||||
|
||||
static int __devinit ite8709_pnp_probe(struct pnp_dev *dev,
|
||||
const struct pnp_device_id *dev_id)
|
||||
{
|
||||
struct lirc_driver *driver;
|
||||
struct ite8709_device *ite8709_dev;
|
||||
int ret;
|
||||
|
||||
/* Check resources validity */
|
||||
if (!pnp_irq_valid(dev, 0))
|
||||
return ite8709_cleanup(NULL, 0, -ENODEV, "invalid IRQ");
|
||||
if (!pnp_port_valid(dev, 2))
|
||||
return ite8709_cleanup(NULL, 0, -ENODEV, "invalid IO port");
|
||||
|
||||
/* Allocate memory for device struct */
|
||||
ite8709_dev = kzalloc(sizeof(struct ite8709_device), GFP_KERNEL);
|
||||
if (ite8709_dev == NULL)
|
||||
return ite8709_cleanup(NULL, 0, -ENOMEM, "kzalloc failed");
|
||||
pnp_set_drvdata(dev, ite8709_dev);
|
||||
|
||||
/* Initialize device struct */
|
||||
ite8709_dev->use_count = 0;
|
||||
ite8709_dev->irq = pnp_irq(dev, 0);
|
||||
ite8709_dev->io = pnp_port_start(dev, 2);
|
||||
ite8709_dev->hardware_lock =
|
||||
__SPIN_LOCK_UNLOCKED(ite8709_dev->hardware_lock);
|
||||
ite8709_dev->acc_pulse = 0;
|
||||
ite8709_dev->acc_space = 0;
|
||||
ite8709_dev->lastbit = 0;
|
||||
do_gettimeofday(&ite8709_dev->last_tv);
|
||||
tasklet_init(&ite8709_dev->tasklet, ite8709_rearm_irq,
|
||||
(long) ite8709_dev);
|
||||
ite8709_dev->force_rearm = 0;
|
||||
ite8709_dev->rearmed = 0;
|
||||
ite8709_dev->device_busy = 0;
|
||||
|
||||
/* Initialize driver struct */
|
||||
driver = &ite8709_dev->driver;
|
||||
strcpy(driver->name, LIRC_DRIVER_NAME);
|
||||
driver->minor = -1;
|
||||
driver->code_length = sizeof(int) * 8;
|
||||
driver->sample_rate = 0;
|
||||
driver->features = LIRC_CAN_REC_MODE2;
|
||||
driver->data = ite8709_dev;
|
||||
driver->add_to_buf = NULL;
|
||||
driver->set_use_inc = ite8709_set_use_inc;
|
||||
driver->set_use_dec = ite8709_set_use_dec;
|
||||
driver->dev = &dev->dev;
|
||||
driver->owner = THIS_MODULE;
|
||||
|
||||
/* Initialize LIRC buffer */
|
||||
driver->rbuf = kmalloc(sizeof(struct lirc_buffer), GFP_KERNEL);
|
||||
if (!driver->rbuf)
|
||||
return ite8709_cleanup(ite8709_dev, 1, -ENOMEM,
|
||||
"can't allocate lirc_buffer");
|
||||
if (lirc_buffer_init(driver->rbuf, BUF_CHUNK_SIZE, BUF_SIZE))
|
||||
return ite8709_cleanup(ite8709_dev, 1, -ENOMEM,
|
||||
"lirc_buffer_init() failed");
|
||||
|
||||
/* Register LIRC driver */
|
||||
ret = lirc_register_driver(driver);
|
||||
if (ret < 0)
|
||||
return ite8709_cleanup(ite8709_dev, 2, ret,
|
||||
"lirc_register_driver() failed");
|
||||
|
||||
/* Reserve I/O port access */
|
||||
if (!request_region(ite8709_dev->io, 2, LIRC_DRIVER_NAME))
|
||||
return ite8709_cleanup(ite8709_dev, 3, -EBUSY,
|
||||
"i/o port already in use");
|
||||
|
||||
/* Reserve IRQ line */
|
||||
ret = request_irq(ite8709_dev->irq, ite8709_interrupt, 0,
|
||||
LIRC_DRIVER_NAME, ite8709_dev);
|
||||
if (ret < 0)
|
||||
return ite8709_cleanup(ite8709_dev, 4, ret,
|
||||
"IRQ already in use");
|
||||
|
||||
/* Initialize hardware */
|
||||
ite8709_drop_hardware(ite8709_dev); /* Shutdown hw until first use */
|
||||
|
||||
printk(KERN_INFO LIRC_DRIVER_NAME ": device found : irq=%d io=0x%x\n",
|
||||
ite8709_dev->irq, ite8709_dev->io);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void __devexit ite8709_pnp_remove(struct pnp_dev *dev)
|
||||
{
|
||||
struct ite8709_device *ite8709_dev;
|
||||
ite8709_dev = pnp_get_drvdata(dev);
|
||||
|
||||
ite8709_cleanup(ite8709_dev, 6, 0, NULL);
|
||||
|
||||
printk(KERN_INFO LIRC_DRIVER_NAME ": device removed\n");
|
||||
}
|
||||
|
||||
#ifdef CONFIG_PM
|
||||
static int ite8709_pnp_suspend(struct pnp_dev *dev, pm_message_t state)
|
||||
{
|
||||
struct ite8709_device *ite8709_dev;
|
||||
ite8709_dev = pnp_get_drvdata(dev);
|
||||
|
||||
if (ite8709_dev->use_count > 0)
|
||||
ite8709_drop_hardware(ite8709_dev);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int ite8709_pnp_resume(struct pnp_dev *dev)
|
||||
{
|
||||
struct ite8709_device *ite8709_dev;
|
||||
ite8709_dev = pnp_get_drvdata(dev);
|
||||
|
||||
if (ite8709_dev->use_count > 0)
|
||||
ite8709_init_hardware(ite8709_dev);
|
||||
|
||||
return 0;
|
||||
}
|
||||
#else
|
||||
#define ite8709_pnp_suspend NULL
|
||||
#define ite8709_pnp_resume NULL
|
||||
#endif
|
||||
|
||||
static const struct pnp_device_id pnp_dev_table[] = {
|
||||
{"ITE8709", 0},
|
||||
{}
|
||||
};
|
||||
|
||||
MODULE_DEVICE_TABLE(pnp, pnp_dev_table);
|
||||
|
||||
static struct pnp_driver ite8709_pnp_driver = {
|
||||
.name = LIRC_DRIVER_NAME,
|
||||
.probe = ite8709_pnp_probe,
|
||||
.remove = __devexit_p(ite8709_pnp_remove),
|
||||
.suspend = ite8709_pnp_suspend,
|
||||
.resume = ite8709_pnp_resume,
|
||||
.id_table = pnp_dev_table,
|
||||
};
|
||||
|
||||
static int __init ite8709_init_module(void)
|
||||
{
|
||||
return pnp_register_driver(&ite8709_pnp_driver);
|
||||
}
|
||||
module_init(ite8709_init_module);
|
||||
|
||||
static void __exit ite8709_cleanup_module(void)
|
||||
{
|
||||
pnp_unregister_driver(&ite8709_pnp_driver);
|
||||
}
|
||||
module_exit(ite8709_cleanup_module);
|
||||
|
||||
MODULE_DESCRIPTION("LIRC driver for ITE8709 CIR port");
|
||||
MODULE_AUTHOR("Grégory Lardière");
|
||||
MODULE_LICENSE("GPL");
|
||||
|
||||
module_param(debug, bool, S_IRUGO | S_IWUSR);
|
||||
MODULE_PARM_DESC(debug, "Enable debugging messages");
|
||||
@@ -364,7 +364,7 @@ static ssize_t vfd_write(struct file *file, const char *buf,
|
||||
int i;
|
||||
int retval = 0;
|
||||
struct sasem_context *context;
|
||||
int *data_buf;
|
||||
int *data_buf = NULL;
|
||||
|
||||
context = (struct sasem_context *) file->private_data;
|
||||
if (!context) {
|
||||
|
||||
+511
-313
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user