Commit 3f00d3e8 authored by Linus Torvalds's avatar Linus Torvalds
parents 407cf84f a637a114
...@@ -958,7 +958,7 @@ config SOC_PNX8550 ...@@ -958,7 +958,7 @@ config SOC_PNX8550
bool bool
select DMA_NONCOHERENT select DMA_NONCOHERENT
select HW_HAS_PCI select HW_HAS_PCI
select SYS_HAS_CPU_R4X00 select SYS_HAS_CPU_MIPS32_R1
select SYS_SUPPORTS_32BIT_KERNEL select SYS_SUPPORTS_32BIT_KERNEL
config SWAP_IO_SPACE config SWAP_IO_SPACE
......
mkboot
elf2ecoff
zImage
zImage.tmp
...@@ -129,7 +129,7 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5 ...@@ -129,7 +129,7 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5
# #
# CPU selection # CPU selection
# #
# CONFIG_CPU_MIPS32_R1 is not set CONFIG_CPU_MIPS32_R1=y
# CONFIG_CPU_MIPS32_R2 is not set # CONFIG_CPU_MIPS32_R2 is not set
# CONFIG_CPU_MIPS64_R1 is not set # CONFIG_CPU_MIPS64_R1 is not set
# CONFIG_CPU_MIPS64_R2 is not set # CONFIG_CPU_MIPS64_R2 is not set
...@@ -137,7 +137,7 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5 ...@@ -137,7 +137,7 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5
# CONFIG_CPU_TX39XX is not set # CONFIG_CPU_TX39XX is not set
# CONFIG_CPU_VR41XX is not set # CONFIG_CPU_VR41XX is not set
# CONFIG_CPU_R4300 is not set # CONFIG_CPU_R4300 is not set
CONFIG_CPU_R4X00=y # CONFIG_CPU_R4X00 is not set
# CONFIG_CPU_TX49XX is not set # CONFIG_CPU_TX49XX is not set
# CONFIG_CPU_R5000 is not set # CONFIG_CPU_R5000 is not set
# CONFIG_CPU_R5432 is not set # CONFIG_CPU_R5432 is not set
...@@ -148,10 +148,11 @@ CONFIG_CPU_R4X00=y ...@@ -148,10 +148,11 @@ CONFIG_CPU_R4X00=y
# CONFIG_CPU_RM7000 is not set # CONFIG_CPU_RM7000 is not set
# CONFIG_CPU_RM9000 is not set # CONFIG_CPU_RM9000 is not set
# CONFIG_CPU_SB1 is not set # CONFIG_CPU_SB1 is not set
CONFIG_SYS_HAS_CPU_R4X00=y CONFIG_SYS_HAS_CPU_MIPS32_R1=y
CONFIG_CPU_MIPS32=y
CONFIG_CPU_MIPSR1=y
CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y
# #
# Kernel type # Kernel type
...@@ -162,11 +163,11 @@ CONFIG_PAGE_SIZE_4KB=y ...@@ -162,11 +163,11 @@ CONFIG_PAGE_SIZE_4KB=y
# CONFIG_PAGE_SIZE_8KB is not set # CONFIG_PAGE_SIZE_8KB is not set
# CONFIG_PAGE_SIZE_16KB is not set # CONFIG_PAGE_SIZE_16KB is not set
# CONFIG_PAGE_SIZE_64KB is not set # CONFIG_PAGE_SIZE_64KB is not set
CONFIG_CPU_HAS_PREFETCH=y
# CONFIG_MIPS_MT is not set # CONFIG_MIPS_MT is not set
# CONFIG_64BIT_PHYS_ADDR is not set # CONFIG_64BIT_PHYS_ADDR is not set
# CONFIG_CPU_ADVANCED is not set # CONFIG_CPU_ADVANCED is not set
CONFIG_CPU_HAS_LLSC=y CONFIG_CPU_HAS_LLSC=y
CONFIG_CPU_HAS_LLDSCD=y
CONFIG_CPU_HAS_SYNC=y CONFIG_CPU_HAS_SYNC=y
CONFIG_GENERIC_HARDIRQS=y CONFIG_GENERIC_HARDIRQS=y
CONFIG_GENERIC_IRQ_PROBE=y CONFIG_GENERIC_IRQ_PROBE=y
......
...@@ -128,7 +128,7 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5 ...@@ -128,7 +128,7 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5
# #
# CPU selection # CPU selection
# #
# CONFIG_CPU_MIPS32_R1 is not set CONFIG_CPU_MIPS32_R1=y
# CONFIG_CPU_MIPS32_R2 is not set # CONFIG_CPU_MIPS32_R2 is not set
# CONFIG_CPU_MIPS64_R1 is not set # CONFIG_CPU_MIPS64_R1 is not set
# CONFIG_CPU_MIPS64_R2 is not set # CONFIG_CPU_MIPS64_R2 is not set
...@@ -136,7 +136,7 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5 ...@@ -136,7 +136,7 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5
# CONFIG_CPU_TX39XX is not set # CONFIG_CPU_TX39XX is not set
# CONFIG_CPU_VR41XX is not set # CONFIG_CPU_VR41XX is not set
# CONFIG_CPU_R4300 is not set # CONFIG_CPU_R4300 is not set
CONFIG_CPU_R4X00=y # CONFIG_CPU_R4X00 is not set
# CONFIG_CPU_TX49XX is not set # CONFIG_CPU_TX49XX is not set
# CONFIG_CPU_R5000 is not set # CONFIG_CPU_R5000 is not set
# CONFIG_CPU_R5432 is not set # CONFIG_CPU_R5432 is not set
...@@ -147,10 +147,11 @@ CONFIG_CPU_R4X00=y ...@@ -147,10 +147,11 @@ CONFIG_CPU_R4X00=y
# CONFIG_CPU_RM7000 is not set # CONFIG_CPU_RM7000 is not set
# CONFIG_CPU_RM9000 is not set # CONFIG_CPU_RM9000 is not set
# CONFIG_CPU_SB1 is not set # CONFIG_CPU_SB1 is not set
CONFIG_SYS_HAS_CPU_R4X00=y CONFIG_SYS_HAS_CPU_MIPS32_R1=y
CONFIG_CPU_MIPS32=y
CONFIG_CPU_MIPSR1=y
CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y
# #
# Kernel type # Kernel type
...@@ -161,6 +162,7 @@ CONFIG_PAGE_SIZE_4KB=y ...@@ -161,6 +162,7 @@ CONFIG_PAGE_SIZE_4KB=y
# CONFIG_PAGE_SIZE_8KB is not set # CONFIG_PAGE_SIZE_8KB is not set
# CONFIG_PAGE_SIZE_16KB is not set # CONFIG_PAGE_SIZE_16KB is not set
# CONFIG_PAGE_SIZE_64KB is not set # CONFIG_PAGE_SIZE_64KB is not set
CONFIG_CPU_HAS_PREFETCH=y
# CONFIG_MIPS_MT is not set # CONFIG_MIPS_MT is not set
# CONFIG_64BIT_PHYS_ADDR is not set # CONFIG_64BIT_PHYS_ADDR is not set
CONFIG_CPU_ADVANCED=y CONFIG_CPU_ADVANCED=y
......
...@@ -41,7 +41,9 @@ rtc_ds1386_get_time(void) ...@@ -41,7 +41,9 @@ rtc_ds1386_get_time(void)
u8 byte; u8 byte;
u8 temp; u8 temp;
unsigned int year, month, day, hour, minute, second; unsigned int year, month, day, hour, minute, second;
unsigned long flags;
spin_lock_irqsave(&rtc_lock, flags);
/* let us freeze external registers */ /* let us freeze external registers */
byte = READ_RTC(0xB); byte = READ_RTC(0xB);
byte &= 0x3f; byte &= 0x3f;
...@@ -60,6 +62,7 @@ rtc_ds1386_get_time(void) ...@@ -60,6 +62,7 @@ rtc_ds1386_get_time(void)
/* enable time transfer */ /* enable time transfer */
byte |= 0x80; byte |= 0x80;
WRITE_RTC(0xB, byte); WRITE_RTC(0xB, byte);
spin_unlock_irqrestore(&rtc_lock, flags);
/* calc hour */ /* calc hour */
if (temp & 0x40) { if (temp & 0x40) {
...@@ -81,7 +84,9 @@ rtc_ds1386_set_time(unsigned long t) ...@@ -81,7 +84,9 @@ rtc_ds1386_set_time(unsigned long t)
u8 byte; u8 byte;
u8 temp; u8 temp;
u8 year, month, day, hour, minute, second; u8 year, month, day, hour, minute, second;
unsigned long flags;
spin_lock_irqsave(&rtc_lock, flags);
/* let us freeze external registers */ /* let us freeze external registers */
byte = READ_RTC(0xB); byte = READ_RTC(0xB);
byte &= 0x3f; byte &= 0x3f;
...@@ -133,6 +138,7 @@ rtc_ds1386_set_time(unsigned long t) ...@@ -133,6 +138,7 @@ rtc_ds1386_set_time(unsigned long t)
if (second != READ_RTC(0x1)) { if (second != READ_RTC(0x1)) {
WRITE_RTC(0x1, second); WRITE_RTC(0x1, second);
} }
spin_unlock_irqrestore(&rtc_lock, flags);
return 0; return 0;
} }
......
...@@ -37,10 +37,25 @@ ...@@ -37,10 +37,25 @@
#include <asm/dec/machtype.h> #include <asm/dec/machtype.h>
/*
* Returns true if a clock update is in progress
*/
static inline unsigned char dec_rtc_is_updating(void)
{
unsigned char uip;
unsigned long flags;
spin_lock_irqsave(&rtc_lock, flags);
uip = (CMOS_READ(RTC_FREQ_SELECT) & RTC_UIP);
spin_unlock_irqrestore(&rtc_lock, flags);
return uip;
}
static unsigned long dec_rtc_get_time(void) static unsigned long dec_rtc_get_time(void)
{ {
unsigned int year, mon, day, hour, min, sec, real_year; unsigned int year, mon, day, hour, min, sec, real_year;
int i; int i;
unsigned long flags;
/* The Linux interpretation of the DS1287 clock register contents: /* The Linux interpretation of the DS1287 clock register contents:
* When the Update-In-Progress (UIP) flag goes from 1 to 0, the * When the Update-In-Progress (UIP) flag goes from 1 to 0, the
...@@ -49,11 +64,12 @@ static unsigned long dec_rtc_get_time(void) ...@@ -49,11 +64,12 @@ static unsigned long dec_rtc_get_time(void)
*/ */
/* read RTC exactly on falling edge of update flag */ /* read RTC exactly on falling edge of update flag */
for (i = 0; i < 1000000; i++) /* may take up to 1 second... */ for (i = 0; i < 1000000; i++) /* may take up to 1 second... */
if (CMOS_READ(RTC_FREQ_SELECT) & RTC_UIP) if (dec_rtc_is_updating())
break; break;
for (i = 0; i < 1000000; i++) /* must try at least 2.228 ms */ for (i = 0; i < 1000000; i++) /* must try at least 2.228 ms */
if (!(CMOS_READ(RTC_FREQ_SELECT) & RTC_UIP)) if (!dec_rtc_is_updating())
break; break;
spin_lock_irqsave(&rtc_lock, flags);
/* Isn't this overkill? UIP above should guarantee consistency */ /* Isn't this overkill? UIP above should guarantee consistency */
do { do {
sec = CMOS_READ(RTC_SECONDS); sec = CMOS_READ(RTC_SECONDS);
...@@ -77,6 +93,7 @@ static unsigned long dec_rtc_get_time(void) ...@@ -77,6 +93,7 @@ static unsigned long dec_rtc_get_time(void)
* of unused BBU RAM locations. * of unused BBU RAM locations.
*/ */
real_year = CMOS_READ(RTC_DEC_YEAR); real_year = CMOS_READ(RTC_DEC_YEAR);
spin_unlock_irqrestore(&rtc_lock, flags);
year += real_year - 72 + 2000; year += real_year - 72 + 2000;
return mktime(year, mon, day, hour, min, sec); return mktime(year, mon, day, hour, min, sec);
...@@ -95,6 +112,8 @@ static int dec_rtc_set_mmss(unsigned long nowtime) ...@@ -95,6 +112,8 @@ static int dec_rtc_set_mmss(unsigned long nowtime)
int real_seconds, real_minutes, cmos_minutes; int real_seconds, real_minutes, cmos_minutes;
unsigned char save_control, save_freq_select; unsigned char save_control, save_freq_select;
/* irq are locally disabled here */
spin_lock(&rtc_lock);
/* tell the clock it's being set */ /* tell the clock it's being set */
save_control = CMOS_READ(RTC_CONTROL); save_control = CMOS_READ(RTC_CONTROL);
CMOS_WRITE((save_control | RTC_SET), RTC_CONTROL); CMOS_WRITE((save_control | RTC_SET), RTC_CONTROL);
...@@ -141,6 +160,7 @@ static int dec_rtc_set_mmss(unsigned long nowtime) ...@@ -141,6 +160,7 @@ static int dec_rtc_set_mmss(unsigned long nowtime)
*/ */
CMOS_WRITE(save_control, RTC_CONTROL); CMOS_WRITE(save_control, RTC_CONTROL);
CMOS_WRITE(save_freq_select, RTC_FREQ_SELECT); CMOS_WRITE(save_freq_select, RTC_FREQ_SELECT);
spin_unlock(&rtc_lock);
return retval; return retval;
} }
......
...@@ -57,7 +57,9 @@ rtc_ds1742_get_time(void) ...@@ -57,7 +57,9 @@ rtc_ds1742_get_time(void)
{ {
unsigned int year, month, day, hour, minute, second; unsigned int year, month, day, hour, minute, second;
unsigned int century; unsigned int century;
unsigned long flags;
spin_lock_irqsave(&rtc_lock, flags);
CMOS_WRITE(RTC_READ, RTC_CONTROL); CMOS_WRITE(RTC_READ, RTC_CONTROL);
second = BCD2BIN(CMOS_READ(RTC_SECONDS) & RTC_SECONDS_MASK); second = BCD2BIN(CMOS_READ(RTC_SECONDS) & RTC_SECONDS_MASK);
minute = BCD2BIN(CMOS_READ(RTC_MINUTES)); minute = BCD2BIN(CMOS_READ(RTC_MINUTES));
...@@ -67,6 +69,7 @@ rtc_ds1742_get_time(void) ...@@ -67,6 +69,7 @@ rtc_ds1742_get_time(void)
year = BCD2BIN(CMOS_READ(RTC_YEAR)); year = BCD2BIN(CMOS_READ(RTC_YEAR));
century = BCD2BIN(CMOS_READ(RTC_CENTURY) & RTC_CENTURY_MASK); century = BCD2BIN(CMOS_READ(RTC_CENTURY) & RTC_CENTURY_MASK);
CMOS_WRITE(0, RTC_CONTROL); CMOS_WRITE(0, RTC_CONTROL);
spin_unlock_irqrestore(&rtc_lock, flags);
year += century * 100; year += century * 100;
...@@ -81,7 +84,9 @@ rtc_ds1742_set_time(unsigned long t) ...@@ -81,7 +84,9 @@ rtc_ds1742_set_time(unsigned long t)
u8 year, month, day, hour, minute, second; u8 year, month, day, hour, minute, second;
u8 cmos_year, cmos_month, cmos_day, cmos_hour, cmos_minute, cmos_second; u8 cmos_year, cmos_month, cmos_day, cmos_hour, cmos_minute, cmos_second;
int cmos_century; int cmos_century;
unsigned long flags;
spin_lock_irqsave(&rtc_lock, flags);
CMOS_WRITE(RTC_READ, RTC_CONTROL); CMOS_WRITE(RTC_READ, RTC_CONTROL);
cmos_second = (u8)(CMOS_READ(RTC_SECONDS) & RTC_SECONDS_MASK); cmos_second = (u8)(CMOS_READ(RTC_SECONDS) & RTC_SECONDS_MASK);
cmos_minute = (u8)CMOS_READ(RTC_MINUTES); cmos_minute = (u8)CMOS_READ(RTC_MINUTES);
...@@ -139,6 +144,7 @@ rtc_ds1742_set_time(unsigned long t) ...@@ -139,6 +144,7 @@ rtc_ds1742_set_time(unsigned long t)
/* RTC_CENTURY and RTC_CONTROL share same address... */ /* RTC_CENTURY and RTC_CONTROL share same address... */
CMOS_WRITE(cmos_century, RTC_CONTROL); CMOS_WRITE(cmos_century, RTC_CONTROL);
spin_unlock_irqrestore(&rtc_lock, flags);
return 0; return 0;
} }
......
...@@ -502,8 +502,7 @@ asmlinkage int irix_sigpoll_sys(unsigned long __user *set, ...@@ -502,8 +502,7 @@ asmlinkage int irix_sigpoll_sys(unsigned long __user *set,
while(1) { while(1) {
long tmp = 0; long tmp = 0;
current->state = TASK_INTERRUPTIBLE; expire = schedule_timeout_interruptible(expire);
expire = schedule_timeout(expire);
for (i=0; i<=4; i++) for (i=0; i<=4; i++)
tmp |= (current->pending.signal.sig[i] & kset.sig[i]); tmp |= (current->pending.signal.sig[i] & kset.sig[i]);
......
...@@ -20,42 +20,42 @@ ...@@ -20,42 +20,42 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/fs.h> #include <linux/fs.h>
#include <linux/init.h> #include <linux/init.h>
#include <asm/uaccess.h>
#include <linux/slab.h>
#include <linux/list.h>
#include <linux/vmalloc.h>
#include <linux/elf.h>
#include <linux/seq_file.h>
#include <linux/syscalls.h>
#include <linux/moduleloader.h>
#include <linux/interrupt.h>
#include <linux/poll.h> #include <linux/poll.h>
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/wait.h> #include <linux/wait.h>
#include <asm/mipsmtregs.h> #include <asm/mipsmtregs.h>
#include <asm/cacheflush.h> #include <asm/bitops.h>
#include <asm/atomic.h>
#include <asm/cpu.h> #include <asm/cpu.h>
#include <asm/processor.h> #include <asm/processor.h>
#include <asm/system.h>
#include <asm/rtlx.h> #include <asm/rtlx.h>
#include <asm/uaccess.h>
#define RTLX_MAJOR 64
#define RTLX_TARG_VPE 1 #define RTLX_TARG_VPE 1
struct rtlx_info *rtlx; static struct rtlx_info *rtlx;
static int major; static int major;
static char module_name[] = "rtlx"; static char module_name[] = "rtlx";
static inline int spacefree(int read, int write, int size); static struct irqaction irq;
static int irq_num;
static inline int spacefree(int read, int write, int size)
{
if (read == write) {
/*
* never fill the buffer completely, so indexes are always
* equal if empty and only empty, or !equal if data available
*/
return size - 1;
}
return ((read + size - write) % size) - 1;
}
static struct chan_waitqueues { static struct chan_waitqueues {
wait_queue_head_t rt_queue; wait_queue_head_t rt_queue;
wait_queue_head_t lx_queue; wait_queue_head_t lx_queue;
} channel_wqs[RTLX_CHANNELS]; } channel_wqs[RTLX_CHANNELS];
static struct irqaction irq;
static int irq_num;
extern void *vpe_get_shared(int index); extern void *vpe_get_shared(int index);
static void rtlx_dispatch(struct pt_regs *regs) static void rtlx_dispatch(struct pt_regs *regs)
...@@ -63,9 +63,8 @@ static void rtlx_dispatch(struct pt_regs *regs) ...@@ -63,9 +63,8 @@ static void rtlx_dispatch(struct pt_regs *regs)
do_IRQ(MIPSCPU_INT_BASE + MIPS_CPU_RTLX_IRQ, regs); do_IRQ(MIPSCPU_INT_BASE + MIPS_CPU_RTLX_IRQ, regs);
} }
irqreturn_t rtlx_interrupt(int irq, void *dev_id, struct pt_regs *regs) static irqreturn_t rtlx_interrupt(int irq, void *dev_id, struct pt_regs *regs)
{ {
irqreturn_t r = IRQ_HANDLED;
int i; int i;
for (i = 0; i < RTLX_CHANNELS; i++) { for (i = 0; i < RTLX_CHANNELS; i++) {
...@@ -75,30 +74,7 @@ irqreturn_t rtlx_interrupt(int irq, void *dev_id, struct pt_regs *regs) ...@@ -75,30 +74,7 @@ irqreturn_t rtlx_interrupt(int irq, void *dev_id, struct pt_regs *regs)
wake_up_interruptible(&channel_wqs[i].lx_queue); wake_up_interruptible(&channel_wqs[i].lx_queue);
} }
return r; return IRQ_HANDLED;
}
void dump_rtlx(void)
{
int i;
printk("id 0x%lx state %d\n", rtlx->id, rtlx->state);
for (i = 0; i < RTLX_CHANNELS; i++) {
struct rtlx_channel *chan = &rtlx->channel[i];
printk(" rt_state %d lx_state %d buffer_size %d\n",
chan->rt_state, chan->lx_state, chan->buffer_size);
printk(" rt_read %d rt_write %d\n",
chan->rt_read, chan->rt_write);
printk(" lx_read %d lx_write %d\n",
chan->lx_read, chan->lx_write);
printk(" rt_buffer <%s>\n", chan->rt_buffer);
printk(" lx_buffer <%s>\n", chan->lx_buffer);
}
} }
/* call when we have the address of the shared structure from the SP side. */ /* call when we have the address of the shared structure from the SP side. */
...@@ -108,7 +84,7 @@ static int rtlx_init(struct rtlx_info *rtlxi) ...@@ -108,7 +84,7 @@ static int rtlx_init(struct rtlx_info *rtlxi)
if (rtlxi->id != RTLX_ID) { if (rtlxi->id != RTLX_ID) {
printk(KERN_WARNING "no valid RTLX id at 0x%p\n", rtlxi); printk(KERN_WARNING "no valid RTLX id at 0x%p\n", rtlxi);
return (-ENOEXEC); return -ENOEXEC;
} }
/* initialise the wait queues */ /* initialise the wait queues */
...@@ -120,9 +96,8 @@ static int rtlx_init(struct rtlx_info *rtlxi) ...@@ -120,9 +96,8 @@ static int rtlx_init(struct rtlx_info *rtlxi)
/* set up for interrupt handling */ /* set up for interrupt handling */
memset(&irq, 0, sizeof(struct irqaction)); memset(&irq, 0, sizeof(struct irqaction));
if (cpu_has_vint) { if (cpu_has_vint)
set_vi_handler(MIPS_CPU_RTLX_IRQ, rtlx_dispatch); set_vi_handler(MIPS_CPU_RTLX_IRQ, rtlx_dispatch);
}
irq_num = MIPSCPU_INT_BASE + MIPS_CPU_RTLX_IRQ; irq_num = MIPSCPU_INT_BASE + MIPS_CPU_RTLX_IRQ;
irq.handler = rtlx_interrupt; irq.handler = rtlx_interrupt;
...@@ -132,7 +107,8 @@ static int rtlx_init(struct rtlx_info *rtlxi) ...@@ -132,7 +107,8 @@ static int rtlx_init(struct rtlx_info *rtlxi)
setup_irq(irq_num, &irq); setup_irq(irq_num, &irq);
rtlx = rtlxi; rtlx = rtlxi;
return (0);
return 0;
} }
/* only allow one open process at a time to open each channel */ /* only allow one open process at a time to open each channel */
...@@ -147,36 +123,36 @@ static int rtlx_open(struct inode *inode, struct file *filp) ...@@ -147,36 +123,36 @@ static int rtlx_open(struct inode *inode, struct file *filp)
if (rtlx == NULL) { if (rtlx == NULL) {
struct rtlx_info **p; struct rtlx_info **p;
if( (p = vpe_get_shared(RTLX_TARG_VPE)) == NULL) { if( (p = vpe_get_shared(RTLX_TARG_VPE)) == NULL) {
printk(" vpe_get_shared is NULL. Has an SP program been loaded?\n"); printk(KERN_ERR "vpe_get_shared is NULL. "
return (-EFAULT); "Has an SP program been loaded?\n");
return -EFAULT;
} }
if (*p == NULL) { if (*p == NULL) {
printk(" vpe_shared %p %p\n", p, *p); printk(KERN_ERR "vpe_shared %p %p\n", p, *p);
return (-EFAULT); return -EFAULT;
} }
if ((ret = rtlx_init(*p)) < 0) if ((ret = rtlx_init(*p)) < 0)
return (ret); return ret;
} }
chan = &rtlx->channel[minor]; chan = &rtlx->channel[minor];
/* already open? */ if (test_and_set_bit(RTLX_STATE_OPENED, &chan->lx_state))
if (chan->lx_state == RTLX_STATE_OPENED) return -EBUSY;
return (-EBUSY);
chan->lx_state = RTLX_STATE_OPENED; return 0;
return (0);
} }
static int rtlx_release(struct inode *inode, struct file *filp) static int rtlx_release(struct inode *inode, struct file *filp)
{ {
int minor; int minor = MINOR(inode->i_rdev);
minor = MINOR(inode->i_rdev); clear_bit(RTLX_STATE_OPENED, &rtlx->channel[minor].lx_state);
rtlx->channel[minor].lx_state = RTLX_STATE_UNUSED; smp_mb__after_clear_bit();
return (0);
return 0;
} }
static unsigned int rtlx_poll(struct file *file, poll_table * wait) static unsigned int rtlx_poll(struct file *file, poll_table * wait)
...@@ -199,12 +175,13 @@ static unsigned int rtlx_poll(struct file *file, poll_table * wait) ...@@ -199,12 +175,13 @@ static unsigned int rtlx_poll(struct file *file, poll_table * wait)
if (spacefree(chan->rt_read, chan->rt_write, chan->buffer_size)) if (spacefree(chan->rt_read, chan->rt_write, chan->buffer_size))
mask |= POLLOUT | POLLWRNORM; mask |= POLLOUT | POLLWRNORM;
return (mask); return mask;
} }
static ssize_t rtlx_read(struct file *file, char __user * buffer, size_t count, static ssize_t rtlx_read(struct file *file, char __user * buffer, size_t count,
loff_t * ppos) loff_t * ppos)
{ {
unsigned long failed;
size_t fl = 0L; size_t fl = 0L;
int minor; int minor;
struct rtlx_channel *lx; struct rtlx_channel *lx;
...@@ -216,7 +193,7 @@ static ssize_t rtlx_read(struct file *file, char __user * buffer, size_t count, ...@@ -216,7 +193,7 @@ static ssize_t rtlx_read(struct file *file, char __user * buffer, size_t count,
/* data available? */ /* data available? */
if (lx->lx_write == lx->lx_read) { if (lx->lx_write == lx->lx_read) {
if (file->f_flags & O_NONBLOCK) if (file->f_flags & O_NONBLOCK)
return (0); // -EAGAIN makes cat whinge return 0; /* -EAGAIN makes cat whinge */
/* go to sleep */ /* go to sleep */
add_wait_queue(&channel_wqs[minor].lx_queue, &wait); add_wait_queue(&channel_wqs[minor].lx_queue, &wait);
...@@ -232,39 +209,39 @@ static ssize_t rtlx_read(struct file *file, char __user * buffer, size_t count, ...@@ -232,39 +209,39 @@ static ssize_t rtlx_read(struct file *file, char __user * buffer, size_t count,
} }
/* find out how much in total */ /* find out how much in total */
count = min( count, count = min(count,
(size_t)(lx->lx_write + lx->buffer_size - lx->lx_read) % lx->buffer_size); (size_t)(lx->lx_write + lx->buffer_size - lx->lx_read) % lx->buffer_size);
/* then how much from the read pointer onwards */ /* then how much from the read pointer onwards */
fl = min( count, (size_t)lx->buffer_size - lx->lx_read); fl = min(count, (size_t)lx->buffer_size - lx->lx_read);
copy_to_user (buffer, &lx->lx_buffer[lx->lx_read], fl); failed = copy_to_user (buffer, &lx->lx_buffer[lx->lx_read], fl);
if (failed) {
count = fl - failed;
goto out;
}
/* and if there is anything left at the beginning of the buffer */ /* and if there is anything left at the beginning of the buffer */
if ( count - fl ) if (count - fl) {
copy_to_user (buffer + fl, lx->lx_buffer, count - fl); failed = copy_to_user (buffer + fl, lx->lx_buffer, count - fl);
if (failed) {
count -= failed;
goto out;
}
}
out:
/* update the index */ /* update the index */
lx->lx_read += count; lx->lx_read += count;
lx->lx_read %= lx->buffer_size; lx->lx_read %= lx->buffer_size;
return (count); return count;
}
static inline int spacefree(int read, int write, int size)
{
if (read == write) {
/* never fill the buffer completely, so indexes are always equal if empty
and only empty, or !equal if data available */
return (size - 1);
}
return ((read + size - write) % size) - 1;
} }
static ssize_t rtlx_write(struct file *file, const char __user * buffer, static ssize_t rtlx_write(struct file *file, const char __user * buffer,
size_t count, loff_t * ppos) size_t count, loff_t * ppos)
{ {
unsigned long failed;
int minor; int minor;
struct rtlx_channel *rt; struct rtlx_channel *rt;
size_t fl; size_t fl;
...@@ -277,7 +254,7 @@ static ssize_t rtlx_write(struct file *file, const char __user * buffer, ...@@ -277,7 +254,7 @@ static ssize_t rtlx_write(struct file *file, const char __user * buffer,
if (!spacefree(rt->rt_read, rt->rt_write, rt->buffer_size)) { if (!spacefree(rt->rt_read, rt->rt_write, rt->buffer_size)) {
if (file->f_flags & O_NONBLOCK) if (file->f_flags & O_NONBLOCK)
return (-EAGAIN); return -EAGAIN;
add_wait_queue(&channel_wqs[minor].rt_queue, &wait); add_wait_queue(&channel_wqs[minor].rt_queue, &wait);
set_current_state(TASK_INTERRUPTIBLE); set_current_state(TASK_INTERRUPTIBLE);
...@@ -290,52 +267,64 @@ static ssize_t rtlx_write(struct file *file, const char __user * buffer, ...@@ -290,52 +267,64 @@ static ssize_t rtlx_write(struct file *file, const char __user * buffer,
} }
/* total number of bytes to copy */ /* total number of bytes to copy */
count = min( count, (size_t)spacefree(rt->rt_read, rt->rt_write, rt->buffer_size) ); count = min(count, (size_t)spacefree(rt->rt_read, rt->rt_write, rt->buffer_size) );
/* first bit from write pointer to the end of the buffer, or count */ /* first bit from write pointer to the end of the buffer, or count */
fl = min(count, (size_t) rt->buffer_size - rt->rt_write); fl = min(count, (size_t) rt->buffer_size - rt->rt_write);
copy_from_user(&rt->rt_buffer[rt->rt_write], buffer, fl); failed = copy_from_user(&rt->rt_buffer[rt->rt_write], buffer, fl);
if (failed) {
count = fl - failed;
goto out;
}
/* if there's any left copy to the beginning of the buffer */ /* if there's any left copy to the beginning of the buffer */
if( count - fl ) if (count - fl) {
copy_from_user(rt->rt_buffer, buffer + fl, count - fl); failed = copy_from_user(rt->rt_buffer, buffer + fl, count - fl);
if (failed) {
count -= failed;
goto out;
}
}
out:
rt->rt_write += count; rt->rt_write += count;
rt->rt_write %= rt->buffer_size; rt->rt_write %= rt->buffer_size;
return(count); return count;
} }
static struct file_operations rtlx_fops = { static struct file_operations rtlx_fops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.open = rtlx_open, .open = rtlx_open,
.release = rtlx_release, .release = rtlx_release,
.write = rtlx_write, .write = rtlx_write,
.read = rtlx_read, .read = rtlx_read,
.poll = rtlx_poll .poll = rtlx_poll
}; };
static int rtlx_module_init(void) static char register_chrdev_failed[] __initdata =
KERN_ERR "rtlx_module_init: unable to register device\n";
static int __init rtlx_module_init(void)
{ {
if ((major = register_chrdev(RTLX_MAJOR, module_name, &rtlx_fops)) < 0) { major = register_chrdev(0, module_name, &rtlx_fops);
printk("rtlx_module_init: unable to register device\n"); if (major < 0) {
return (-EBUSY); printk(register_chrdev_failed);
return major;
} }
if (major == 0) return 0;
major = RTLX_MAJOR;
return (0);
} }
static void rtlx_module_exit(void) static void __exit rtlx_module_exit(void)
{ {
unregister_chrdev(major, module_name); unregister_chrdev(major, module_name);
} }
module_init(rtlx_module_init); module_init(rtlx_module_init);
module_exit(rtlx_module_exit); module_exit(rtlx_module_exit);
MODULE_DESCRIPTION("MIPS RTLX"); MODULE_DESCRIPTION("MIPS RTLX");
MODULE_AUTHOR("Elizabeth Clarke, MIPS Technologies, Inc"); MODULE_AUTHOR("Elizabeth Clarke, MIPS Technologies, Inc.");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
...@@ -384,9 +384,6 @@ int setup_rt_frame(struct k_sigaction * ka, struct pt_regs *regs, ...@@ -384,9 +384,6 @@ int setup_rt_frame(struct k_sigaction * ka, struct pt_regs *regs,
return 0; return 0;
} }
extern void setup_rt_frame_n32(struct k_sigaction * ka,
struct pt_regs *regs, int signr, sigset_t *set, siginfo_t *info);
static inline int handle_signal(unsigned long sig, siginfo_t *info, static inline int handle_signal(unsigned long sig, siginfo_t *info,
struct k_sigaction *ka, sigset_t *oldset, struct pt_regs *regs) struct k_sigaction *ka, sigset_t *oldset, struct pt_regs *regs)
{ {
......
...@@ -647,8 +647,8 @@ static inline void *get_sigframe(struct k_sigaction *ka, struct pt_regs *regs, ...@@ -647,8 +647,8 @@ static inline void *get_sigframe(struct k_sigaction *ka, struct pt_regs *regs,
return (void *)((sp - frame_size) & ALMASK); return (void *)((sp - frame_size) & ALMASK);
} }
void setup_frame_32(struct k_sigaction * ka, struct pt_regs *regs, int setup_frame_32(struct k_sigaction * ka, struct pt_regs *regs,
int signr, sigset_t *set) int signr, sigset_t *set)
{ {
struct sigframe *frame; struct sigframe *frame;
int err = 0; int err = 0;
...@@ -694,13 +694,15 @@ void setup_frame_32(struct k_sigaction * ka, struct pt_regs *regs, ...@@ -694,13 +694,15 @@ void setup_frame_32(struct k_sigaction * ka, struct pt_regs *regs,
current->comm, current->pid, current->comm, current->pid,
frame, regs->cp0_epc, frame->sf_code); frame, regs->cp0_epc, frame->sf_code);
#endif #endif
return; return 1;
give_sigsegv: give_sigsegv:
force_sigsegv(signr, current); force_sigsegv(signr, current);
return 0;
} }
void setup_rt_frame_32(struct k_sigaction * ka, struct pt_regs *regs, int signr, sigset_t *set, siginfo_t *info) int setup_rt_frame_32(struct k_sigaction * ka, struct pt_regs *regs,
int signr, sigset_t *set, siginfo_t *info)
{ {
struct rt_sigframe32 *frame; struct rt_sigframe32 *frame;
int err = 0; int err = 0;
...@@ -763,10 +765,11 @@ void setup_rt_frame_32(struct k_sigaction * ka, struct pt_regs *regs, int signr, ...@@ -763,10 +765,11 @@ void setup_rt_frame_32(struct k_sigaction * ka, struct pt_regs *regs, int signr,
current->comm, current->pid, current->comm, current->pid,
frame, regs->cp0_epc, frame->rs_code); frame, regs->cp0_epc, frame->rs_code);
#endif #endif
return; return 1;
give_sigsegv: give_sigsegv:
force_sigsegv(signr, current); force_sigsegv(signr, current);
return 0;
} }
static inline int handle_signal(unsigned long sig, siginfo_t *info, static inline int handle_signal(unsigned long sig, siginfo_t *info,
......
...@@ -58,10 +58,6 @@ ...@@ -58,10 +58,6 @@
typedef void *vpe_handle; typedef void *vpe_handle;
// defined here because the kernel module loader doesn't have
// anything to do with it.
#define SHN_MIPS_SCOMMON 0xff03
#ifndef ARCH_SHF_SMALL #ifndef ARCH_SHF_SMALL
#define ARCH_SHF_SMALL 0 #define ARCH_SHF_SMALL 0
#endif #endif
...@@ -69,11 +65,8 @@ typedef void *vpe_handle; ...@@ -69,11 +65,8 @@ typedef void *vpe_handle;
/* If this is set, the section belongs in the init part of the module */ /* If this is set, the section belongs in the init part of the module */
#define INIT_OFFSET_MASK (1UL << (BITS_PER_LONG-1)) #define INIT_OFFSET_MASK (1UL << (BITS_PER_LONG-1))
// temp number,
#define VPE_MAJOR 63
static char module_name[] = "vpe"; static char module_name[] = "vpe";
static int major = 0; static int major;
/* grab the likely amount of memory we will need. */ /* grab the likely amount of memory we will need. */
#ifdef CONFIG_MIPS_VPE_LOADER_TOM #ifdef CONFIG_MIPS_VPE_LOADER_TOM
...@@ -98,22 +91,7 @@ enum tc_state { ...@@ -98,22 +91,7 @@ enum tc_state {
TC_STATE_DYNAMIC TC_STATE_DYNAMIC
}; };
struct vpe; struct vpe {
typedef struct tc {
enum tc_state state;
int index;
/* parent VPE */
struct vpe *pvpe;
/* The list of TC's with this VPE */
struct list_head tc;
/* The global list of tc's */
struct list_head list;
} tc_t;
typedef struct vpe {
enum vpe_state state; enum vpe_state state;
/* (device) minor associated with this vpe */ /* (device) minor associated with this vpe */
...@@ -135,7 +113,21 @@ typedef struct vpe { ...@@ -135,7 +113,21 @@ typedef struct vpe {
/* shared symbol address */ /* shared symbol address */
void *shared_ptr; void *shared_ptr;
} vpe_t; };
struct tc {
enum tc_state state;
int index;
/* parent VPE */
struct vpe *pvpe;
/* The list of TC's with this VPE */
struct list_head tc;
/* The global list of tc's */
struct list_head list;
};
struct vpecontrol_ { struct vpecontrol_ {
/* Virtual processing elements */ /* Virtual processing elements */
...@@ -146,7 +138,7 @@ struct vpecontrol_ { ...@@ -146,7 +138,7 @@ struct vpecontrol_ {
} vpecontrol; } vpecontrol;
static void release_progmem(void *ptr); static void release_progmem(void *ptr);
static void dump_vpe(vpe_t * v); static void dump_vpe(struct vpe * v);
extern void save_gp_address(unsigned int secbase, unsigned int rel); extern void save_gp_address(unsigned int secbase, unsigned int rel);
/* get the vpe associated with this minor */ /* get the vpe associated with this minor */
...@@ -197,13 +189,11 @@ struct vpe *alloc_vpe(int minor) ...@@ -197,13 +189,11 @@ struct vpe *alloc_vpe(int minor)
{ {
struct vpe *v; struct vpe *v;
if ((v = kmalloc(sizeof(struct vpe), GFP_KERNEL)) == NULL) { if ((v = kzalloc(sizeof(struct vpe), GFP_KERNEL)) == NULL) {
printk(KERN_WARNING "VPE: alloc_vpe no mem\n"); printk(KERN_WARNING "VPE: alloc_vpe no mem\n");
return NULL; return NULL;
} }
memset(v, 0, sizeof(struct vpe));
INIT_LIST_HEAD(&v->tc); INIT_LIST_HEAD(&v->tc);
list_add_tail(&v->list, &vpecontrol.vpe_list); list_add_tail(&v->list, &vpecontrol.vpe_list);
...@@ -216,13 +206,11 @@ struct tc *alloc_tc(int index) ...@@ -216,13 +206,11 @@ struct tc *alloc_tc(int index)
{ {
struct tc *t; struct tc *t;
if ((t = kmalloc(sizeof(struct tc), GFP_KERNEL)) == NULL) { if ((t = kzalloc(sizeof(struct tc), GFP_KERNEL)) == NULL) {
printk(KERN_WARNING "VPE: alloc_tc no mem\n"); printk(KERN_WARNING "VPE: alloc_tc no mem\n");
return NULL; return NULL;
} }
memset(t, 0, sizeof(struct tc));
INIT_LIST_HEAD(&t->tc); INIT_LIST_HEAD(&t->tc);
list_add_tail(&t->list, &vpecontrol.tc_list); list_add_tail(&t->list, &vpecontrol.tc_list);
...@@ -412,16 +400,17 @@ static int apply_r_mips_26(struct module *me, uint32_t *location, ...@@ -412,16 +400,17 @@ static int apply_r_mips_26(struct module *me, uint32_t *location,
return -ENOEXEC; return -ENOEXEC;
} }
/* Not desperately convinced this is a good check of an overflow condition /*
anyway. But it gets in the way of handling undefined weak symbols which * Not desperately convinced this is a good check of an overflow condition
we want to set to zero. * anyway. But it gets in the way of handling undefined weak symbols which
if ((v & 0xf0000000) != (((unsigned long)location + 4) & 0xf0000000)) { * we want to set to zero.
printk(KERN_ERR * if ((v & 0xf0000000) != (((unsigned long)location + 4) & 0xf0000000)) {
"module %s: relocation overflow\n", * printk(KERN_ERR
me->name); * "module %s: relocation overflow\n",
return -ENOEXEC; * me->name);
} * return -ENOEXEC;
*/ * }
*/
*location = (*location & ~0x03ffffff) | *location = (*location & ~0x03ffffff) |
((*location + (v >> 2)) & 0x03ffffff); ((*location + (v >> 2)) & 0x03ffffff);
...@@ -681,7 +670,7 @@ static void dump_tclist(void) ...@@ -681,7 +670,7 @@ static void dump_tclist(void)
} }
/* We are prepared so configure and start the VPE... */ /* We are prepared so configure and start the VPE... */
int vpe_run(vpe_t * v) int vpe_run(struct vpe * v)
{ {
unsigned long val; unsigned long val;
struct tc *t; struct tc *t;
...@@ -772,7 +761,7 @@ int vpe_run(vpe_t * v) ...@@ -772,7 +761,7 @@ int vpe_run(vpe_t * v)
return 0; return 0;
} }
static unsigned long find_vpe_symbols(vpe_t * v, Elf_Shdr * sechdrs, static unsigned long find_vpe_symbols(struct vpe * v, Elf_Shdr * sechdrs,
unsigned int symindex, const char *strtab, unsigned int symindex, const char *strtab,
struct module *mod) struct module *mod)
{ {
...@@ -792,10 +781,12 @@ static unsigned long find_vpe_symbols(vpe_t * v, Elf_Shdr * sechdrs, ...@@ -792,10 +781,12 @@ static unsigned long find_vpe_symbols(vpe_t * v, Elf_Shdr * sechdrs,
return 0; return 0;
} }
/* Allocates a VPE with some program code space(the load address), copies the contents /*
of the program (p)buffer performing relocatations/etc, free's it when finished. * Allocates a VPE with some program code space(the load address), copies
* the contents of the program (p)buffer performing relocatations/etc,
* free's it when finished.
*/ */
int vpe_elfload(vpe_t * v) int vpe_elfload(struct vpe * v)
{ {
Elf_Ehdr *hdr; Elf_Ehdr *hdr;
Elf_Shdr *sechdrs; Elf_Shdr *sechdrs;
...@@ -931,7 +922,7 @@ int vpe_elfload(vpe_t * v) ...@@ -931,7 +922,7 @@ int vpe_elfload(vpe_t * v)
return err; return err;
} }
static void dump_vpe(vpe_t * v) static void dump_vpe(struct vpe * v)
{ {
struct tc *t; struct tc *t;
...@@ -947,7 +938,7 @@ static void dump_vpe(vpe_t * v) ...@@ -947,7 +938,7 @@ static void dump_vpe(vpe_t * v)
static int vpe_open(struct inode *inode, struct file *filp) static int vpe_open(struct inode *inode, struct file *filp)
{ {
int minor; int minor;
vpe_t *v; struct vpe *v;
/* assume only 1 device at the mo. */ /* assume only 1 device at the mo. */
if ((minor = MINOR(inode->i_rdev)) != 1) { if ((minor = MINOR(inode->i_rdev)) != 1) {
...@@ -1001,7 +992,7 @@ static int vpe_open(struct inode *inode, struct file *filp) ...@@ -1001,7 +992,7 @@ static int vpe_open(struct inode *inode, struct file *filp)
static int vpe_release(struct inode *inode, struct file *filp) static int vpe_release(struct inode *inode, struct file *filp)
{ {
int minor, ret = 0; int minor, ret = 0;
vpe_t *v; struct vpe *v;
Elf_Ehdr *hdr; Elf_Ehdr *hdr;
minor = MINOR(inode->i_rdev); minor = MINOR(inode->i_rdev);
...@@ -1035,7 +1026,7 @@ static ssize_t vpe_write(struct file *file, const char __user * buffer, ...@@ -1035,7 +1026,7 @@ static ssize_t vpe_write(struct file *file, const char __user * buffer,
{ {
int minor; int minor;
size_t ret = count; size_t ret = count;
vpe_t *v; struct vpe *v;
minor = MINOR(file->f_dentry->d_inode->i_rdev); minor = MINOR(file->f_dentry->d_inode->i_rdev);
if ((v = get_vpe(minor)) == NULL) if ((v = get_vpe(minor)) == NULL)
...@@ -1180,14 +1171,11 @@ static int __init vpe_module_init(void) ...@@ -1180,14 +1171,11 @@ static int __init vpe_module_init(void)
return -ENODEV; return -ENODEV;
} }
if ((major = register_chrdev(VPE_MAJOR, module_name, &vpe_fops) < 0)) { if ((major = register_chrdev(0, module_name, &vpe_fops) < 0)) {
printk("VPE loader: unable to register character device\n"); printk("VPE loader: unable to register character device\n");
return -EBUSY; return major;
} }
if (major == 0)
major = VPE_MAJOR;
dmt(); dmt();
dvpe(); dvpe();
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
#include <asm/lasat/lasat.h> #include <asm/lasat/lasat.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <asm/lasat/ds1603.h> #include <asm/lasat/ds1603.h>
#include <asm/time.h>
#include "ds1603.h" #include "ds1603.h"
...@@ -138,19 +139,27 @@ static void rtc_end_op(void) ...@@ -138,19 +139,27 @@ static void rtc_end_op(void)
unsigned long ds1603_read(void) unsigned long ds1603_read(void)
{ {
unsigned long word; unsigned long word;
unsigned long flags;
spin_lock_irqsave(&rtc_lock, flags);
rtc_init_op(); rtc_init_op();
rtc_write_byte(READ_TIME_CMD); rtc_write_byte(READ_TIME_CMD);
word = rtc_read_word(); word = rtc_read_word();
rtc_end_op(); rtc_end_op();
spin_unlock_irqrestore(&rtc_lock, flags);
return word; return word;
} }
int ds1603_set(unsigned long time) int ds1603_set(unsigned long time)
{ {
unsigned long flags;
spin_lock_irqsave(&rtc_lock, flags);
rtc_init_op(); rtc_init_op();
rtc_write_byte(SET_TIME_CMD); rtc_write_byte(SET_TIME_CMD);
rtc_write_word(time); rtc_write_word(time);
rtc_end_op(); rtc_end_op();
spin_unlock_irqrestore(&rtc_lock, flags);
return 0; return 0;
} }
......
...@@ -149,7 +149,9 @@ arch_initcall(per_cpu_mappings); ...@@ -149,7 +149,9 @@ arch_initcall(per_cpu_mappings);
unsigned long m48t37y_get_time(void) unsigned long m48t37y_get_time(void)
{ {
unsigned int year, month, day, hour, min, sec; unsigned int year, month, day, hour, min, sec;
unsigned long flags;
spin_lock_irqsave(&rtc_lock, flags);
/* stop the update */ /* stop the update */
rtc_base[0x7ff8] = 0x40; rtc_base[0x7ff8] = 0x40;
...@@ -166,6 +168,7 @@ unsigned long m48t37y_get_time(void) ...@@ -166,6 +168,7 @@ unsigned long m48t37y_get_time(void)
/* start the update */ /* start the update */
rtc_base[0x7ff8] = 0x00; rtc_base[0x7ff8] = 0x00;
spin_unlock_irqrestore(&rtc_lock, flags);
return mktime(year, month, day, hour, min, sec); return mktime(year, month, day, hour, min, sec);
} }
...@@ -173,11 +176,13 @@ unsigned long m48t37y_get_time(void) ...@@ -173,11 +176,13 @@ unsigned long m48t37y_get_time(void)
int m48t37y_set_time(unsigned long sec) int m48t37y_set_time(unsigned long sec)
{ {
struct rtc_time tm; struct rtc_time tm;
unsigned long flags;
/* convert to a more useful format -- note months count from 0 */ /* convert to a more useful format -- note months count from 0 */
to_tm(sec, &tm); to_tm(sec, &tm);
tm.tm_mon += 1; tm.tm_mon += 1;
spin_lock_irqsave(&rtc_lock, flags);
/* enable writing */ /* enable writing */
rtc_base[0x7ff8] = 0x80; rtc_base[0x7ff8] = 0x80;
...@@ -201,6 +206,7 @@ int m48t37y_set_time(unsigned long sec) ...@@ -201,6 +206,7 @@ int m48t37y_set_time(unsigned long sec)
/* disable writing */ /* disable writing */
rtc_base[0x7ff8] = 0x00; rtc_base[0x7ff8] = 0x00;
spin_unlock_irqrestore(&rtc_lock, flags);
return 0; return 0;
} }
......
...@@ -135,7 +135,9 @@ void setup_wired_tlb_entries(void) ...@@ -135,7 +135,9 @@ void setup_wired_tlb_entries(void)
unsigned long m48t37y_get_time(void) unsigned long m48t37y_get_time(void)
{ {
unsigned int year, month, day, hour, min, sec; unsigned int year, month, day, hour, min, sec;
unsigned long flags;
spin_lock_irqsave(&rtc_lock, flags);
/* stop the update */ /* stop the update */
rtc_base[0x7ff8] = 0x40; rtc_base[0x7ff8] = 0x40;
...@@ -152,6 +154,7 @@ unsigned long m48t37y_get_time(void) ...@@ -152,6 +154,7 @@ unsigned long m48t37y_get_time(void)
/* start the update */ /* start the update */
rtc_base[0x7ff8] = 0x00; rtc_base[0x7ff8] = 0x00;
spin_unlock_irqrestore(&rtc_lock, flags);
return mktime(year, month, day, hour, min, sec); return mktime(year, month, day, hour, min, sec);
} }
...@@ -159,11 +162,13 @@ unsigned long m48t37y_get_time(void) ...@@ -159,11 +162,13 @@ unsigned long m48t37y_get_time(void)
int m48t37y_set_time(unsigned long sec) int m48t37y_set_time(unsigned long sec)
{ {
struct rtc_time tm; struct rtc_time tm;
unsigned long flags;
/* convert to a more useful format -- note months count from 0 */ /* convert to a more useful format -- note months count from 0 */
to_tm(sec, &tm); to_tm(sec, &tm);
tm.tm_mon += 1; tm.tm_mon += 1;
spin_lock_irqsave(&rtc_lock, flags);
/* enable writing */ /* enable writing */
rtc_base[0x7ff8] = 0x80; rtc_base[0x7ff8] = 0x80;
...@@ -187,6 +192,7 @@ int m48t37y_set_time(unsigned long sec) ...@@ -187,6 +192,7 @@ int m48t37y_set_time(unsigned long sec)
/* disable writing */ /* disable writing */
rtc_base[0x7ff8] = 0x00; rtc_base[0x7ff8] = 0x00;
spin_unlock_irqrestore(&rtc_lock, flags);
return 0; return 0;
} }
......
...@@ -140,7 +140,9 @@ unsigned long m48t37y_get_time(void) ...@@ -140,7 +140,9 @@ unsigned long m48t37y_get_time(void)
unsigned char* rtc_base = (unsigned char*)0xfc800000; unsigned char* rtc_base = (unsigned char*)0xfc800000;
#endif #endif
unsigned int year, month, day, hour, min, sec; unsigned int year, month, day, hour, min, sec;
unsigned long flags;
spin_lock_irqsave(&rtc_lock, flags);
/* stop the update */ /* stop the update */
rtc_base[0x7ff8] = 0x40; rtc_base[0x7ff8] = 0x40;
...@@ -157,6 +159,7 @@ unsigned long m48t37y_get_time(void) ...@@ -157,6 +159,7 @@ unsigned long m48t37y_get_time(void)
/* start the update */ /* start the update */
rtc_base[0x7ff8] = 0x00; rtc_base[0x7ff8] = 0x00;
spin_unlock_irqrestore(&rtc_lock, flags);
return mktime(year, month, day, hour, min, sec); return mktime(year, month, day, hour, min, sec);
} }
...@@ -169,11 +172,13 @@ int m48t37y_set_time(unsigned long sec) ...@@ -169,11 +172,13 @@ int m48t37y_set_time(unsigned long sec)
unsigned char* rtc_base = (unsigned char*)0xfc800000; unsigned char* rtc_base = (unsigned char*)0xfc800000;
#endif #endif
struct rtc_time tm; struct rtc_time tm;
unsigned long flags;
/* convert to a more useful format -- note months count from 0 */ /* convert to a more useful format -- note months count from 0 */
to_tm(sec, &tm); to_tm(sec, &tm);
tm.tm_mon += 1; tm.tm_mon += 1;
spin_lock_irqsave(&rtc_lock, flags);
/* enable writing */ /* enable writing */
rtc_base[0x7ff8] = 0x80; rtc_base[0x7ff8] = 0x80;
...@@ -197,6 +202,7 @@ int m48t37y_set_time(unsigned long sec) ...@@ -197,6 +202,7 @@ int m48t37y_set_time(unsigned long sec)
/* disable writing */ /* disable writing */
rtc_base[0x7ff8] = 0x00; rtc_base[0x7ff8] = 0x00;
spin_unlock_irqrestore(&rtc_lock, flags);
return 0; return 0;
} }
......
...@@ -73,7 +73,9 @@ void __init bus_error_init(void) ...@@ -73,7 +73,9 @@ void __init bus_error_init(void)
unsigned long m48t37y_get_time(void) unsigned long m48t37y_get_time(void)
{ {
unsigned int year, month, day, hour, min, sec; unsigned int year, month, day, hour, min, sec;
unsigned long flags;
spin_lock_irqsave(&rtc_lock, flags);
/* Stop the update to the time */ /* Stop the update to the time */
m48t37_base->control = 0x40; m48t37_base->control = 0x40;
...@@ -88,6 +90,7 @@ unsigned long m48t37y_get_time(void) ...@@ -88,6 +90,7 @@ unsigned long m48t37y_get_time(void)
/* Start the update to the time again */ /* Start the update to the time again */
m48t37_base->control = 0x00; m48t37_base->control = 0x00;
spin_unlock_irqrestore(&rtc_lock, flags);
return mktime(year, month, day, hour, min, sec); return mktime(year, month, day, hour, min, sec);
} }
...@@ -95,11 +98,13 @@ unsigned long m48t37y_get_time(void) ...@@ -95,11 +98,13 @@ unsigned long m48t37y_get_time(void)
int m48t37y_set_time(unsigned long sec) int m48t37y_set_time(unsigned long sec)
{ {
struct rtc_time tm; struct rtc_time tm;
unsigned long flags;
/* convert to a more useful format -- note months count from 0 */ /* convert to a more useful format -- note months count from 0 */
to_tm(sec, &tm); to_tm(sec, &tm);
tm.tm_mon += 1; tm.tm_mon += 1;
spin_lock_irqsave(&rtc_lock, flags);
/* enable writing */ /* enable writing */
m48t37_base->control = 0x80; m48t37_base->control = 0x80;
...@@ -123,6 +128,7 @@ int m48t37y_set_time(unsigned long sec) ...@@ -123,6 +128,7 @@ int m48t37y_set_time(unsigned long sec)
/* disable writing */ /* disable writing */
m48t37_base->control = 0x00; m48t37_base->control = 0x00;
spin_unlock_irqrestore(&rtc_lock, flags);
return 0; return 0;
} }
......
...@@ -35,7 +35,9 @@ static unsigned long indy_rtc_get_time(void) ...@@ -35,7 +35,9 @@ static unsigned long indy_rtc_get_time(void)
{ {
unsigned int yrs, mon, day, hrs, min, sec; unsigned int yrs, mon, day, hrs, min, sec;
unsigned int save_control; unsigned int save_control;
unsigned long flags;
spin_lock_irqsave(&rtc_lock, flags);
save_control = hpc3c0->rtcregs[RTC_CMD] & 0xff; save_control = hpc3c0->rtcregs[RTC_CMD] & 0xff;
hpc3c0->rtcregs[RTC_CMD] = save_control | RTC_TE; hpc3c0->rtcregs[RTC_CMD] = save_control | RTC_TE;
...@@ -47,6 +49,7 @@ static unsigned long indy_rtc_get_time(void) ...@@ -47,6 +49,7 @@ static unsigned long indy_rtc_get_time(void)
yrs = BCD2BIN(hpc3c0->rtcregs[RTC_YEAR] & 0xff); yrs = BCD2BIN(hpc3c0->rtcregs[RTC_YEAR] & 0xff);
hpc3c0->rtcregs[RTC_CMD] = save_control; hpc3c0->rtcregs[RTC_CMD] = save_control;
spin_unlock_irqrestore(&rtc_lock, flags);
if (yrs < 45) if (yrs < 45)
yrs += 30; yrs += 30;
...@@ -60,6 +63,7 @@ static int indy_rtc_set_time(unsigned long tim) ...@@ -60,6 +63,7 @@ static int indy_rtc_set_time(unsigned long tim)
{ {
struct rtc_time tm; struct rtc_time tm;
unsigned int save_control; unsigned int save_control;
unsigned long flags;
to_tm(tim, &tm); to_tm(tim, &tm);
...@@ -68,6 +72,7 @@ static int indy_rtc_set_time(unsigned long tim) ...@@ -68,6 +72,7 @@ static int indy_rtc_set_time(unsigned long tim)
if (tm.tm_year >= 100) if (tm.tm_year >= 100)
tm.tm_year -= 100; tm.tm_year -= 100;
spin_lock_irqsave(&rtc_lock, flags);
save_control = hpc3c0->rtcregs[RTC_CMD] & 0xff; save_control = hpc3c0->rtcregs[RTC_CMD] & 0xff;
hpc3c0->rtcregs[RTC_CMD] = save_control | RTC_TE; hpc3c0->rtcregs[RTC_CMD] = save_control | RTC_TE;
...@@ -80,6 +85,7 @@ static int indy_rtc_set_time(unsigned long tim) ...@@ -80,6 +85,7 @@ static int indy_rtc_set_time(unsigned long tim)
hpc3c0->rtcregs[RTC_HUNDREDTH_SECOND] = 0; hpc3c0->rtcregs[RTC_HUNDREDTH_SECOND] = 0;
hpc3c0->rtcregs[RTC_CMD] = save_control; hpc3c0->rtcregs[RTC_CMD] = save_control;
spin_unlock_irqrestore(&rtc_lock, flags);
return 0; return 0;
} }
......
...@@ -144,6 +144,7 @@ static int m41t81_write(uint8_t addr, int b) ...@@ -144,6 +144,7 @@ static int m41t81_write(uint8_t addr, int b)
int m41t81_set_time(unsigned long t) int m41t81_set_time(unsigned long t)
{ {
struct rtc_time tm; struct rtc_time tm;
unsigned long flags;
to_tm(t, &tm); to_tm(t, &tm);
...@@ -153,6 +154,7 @@ int m41t81_set_time(unsigned long t) ...@@ -153,6 +154,7 @@ int m41t81_set_time(unsigned long t)
* believe we should finish writing min within a second. * believe we should finish writing min within a second.
*/ */
spin_lock_irqsave(&rtc_lock, flags);
tm.tm_sec = BIN2BCD(tm.tm_sec); tm.tm_sec = BIN2BCD(tm.tm_sec);
m41t81_write(M41T81REG_SC, tm.tm_sec); m41t81_write(M41T81REG_SC, tm.tm_sec);
...@@ -180,6 +182,7 @@ int m41t81_set_time(unsigned long t) ...@@ -180,6 +182,7 @@ int m41t81_set_time(unsigned long t)
tm.tm_year %= 100; tm.tm_year %= 100;
tm.tm_year = BIN2BCD(tm.tm_year); tm.tm_year = BIN2BCD(tm.tm_year);
m41t81_write(M41T81REG_YR, tm.tm_year); m41t81_write(M41T81REG_YR, tm.tm_year);
spin_unlock_irqrestore(&rtc_lock, flags);
return 0; return 0;
} }
...@@ -187,19 +190,23 @@ int m41t81_set_time(unsigned long t) ...@@ -187,19 +190,23 @@ int m41t81_set_time(unsigned long t)
unsigned long m41t81_get_time(void) unsigned long m41t81_get_time(void)
{ {
unsigned int year, mon, day, hour, min, sec; unsigned int year, mon, day, hour, min, sec;
unsigned long flags;
/* /*
* min is valid if two reads of sec are the same. * min is valid if two reads of sec are the same.
*/ */
for (;;) { for (;;) {
spin_lock_irqsave(&rtc_lock, flags);
sec = m41t81_read(M41T81REG_SC); sec = m41t81_read(M41T81REG_SC);
min = m41t81_read(M41T81REG_MN); min = m41t81_read(M41T81REG_MN);
if (sec == m41t81_read(M41T81REG_SC)) break; if (sec == m41t81_read(M41T81REG_SC)) break;
spin_unlock_irqrestore(&rtc_lock, flags);
} }
hour = m41t81_read(M41T81REG_HR) & 0x3f; hour = m41t81_read(M41T81REG_HR) & 0x3f;
day = m41t81_read(M41T81REG_DT); day = m41t81_read(M41T81REG_DT);
mon = m41t81_read(M41T81REG_MO); mon = m41t81_read(M41T81REG_MO);
year = m41t81_read(M41T81REG_YR); year = m41t81_read(M41T81REG_YR);
spin_unlock_irqrestore(&rtc_lock, flags);
sec = BCD2BIN(sec); sec = BCD2BIN(sec);
min = BCD2BIN(min); min = BCD2BIN(min);
......
...@@ -113,9 +113,11 @@ int xicor_set_time(unsigned long t) ...@@ -113,9 +113,11 @@ int xicor_set_time(unsigned long t)
{ {
struct rtc_time tm; struct rtc_time tm;
int tmp; int tmp;
unsigned long flags;
to_tm(t, &tm); to_tm(t, &tm);
spin_lock_irqsave(&rtc_lock, flags);
/* unlock writes to the CCR */ /* unlock writes to the CCR */
xicor_write(X1241REG_SR, X1241REG_SR_WEL); xicor_write(X1241REG_SR, X1241REG_SR_WEL);
xicor_write(X1241REG_SR, X1241REG_SR_WEL | X1241REG_SR_RWEL); xicor_write(X1241REG_SR, X1241REG_SR_WEL | X1241REG_SR_RWEL);
...@@ -160,6 +162,7 @@ int xicor_set_time(unsigned long t) ...@@ -160,6 +162,7 @@ int xicor_set_time(unsigned long t)
xicor_write(X1241REG_HR, tmp); xicor_write(X1241REG_HR, tmp);
xicor_write(X1241REG_SR, 0); xicor_write(X1241REG_SR, 0);
spin_unlock_irqrestore(&rtc_lock, flags);
return 0; return 0;
} }
...@@ -167,7 +170,9 @@ int xicor_set_time(unsigned long t) ...@@ -167,7 +170,9 @@ int xicor_set_time(unsigned long t)
unsigned long xicor_get_time(void) unsigned long xicor_get_time(void)
{ {
unsigned int year, mon, day, hour, min, sec, y2k; unsigned int year, mon, day, hour, min, sec, y2k;
unsigned long flags;
spin_lock_irqsave(&rtc_lock, flags);
sec = xicor_read(X1241REG_SC); sec = xicor_read(X1241REG_SC);
min = xicor_read(X1241REG_MN); min = xicor_read(X1241REG_MN);
hour = xicor_read(X1241REG_HR); hour = xicor_read(X1241REG_HR);
...@@ -183,6 +188,7 @@ unsigned long xicor_get_time(void) ...@@ -183,6 +188,7 @@ unsigned long xicor_get_time(void)
mon = xicor_read(X1241REG_MO); mon = xicor_read(X1241REG_MO);
year = xicor_read(X1241REG_YR); year = xicor_read(X1241REG_YR);
y2k = xicor_read(X1241REG_Y2K); y2k = xicor_read(X1241REG_Y2K);
spin_unlock_irqrestore(&rtc_lock, flags);
sec = BCD2BIN(sec); sec = BCD2BIN(sec);
min = BCD2BIN(min); min = BCD2BIN(min);
......
...@@ -27,15 +27,15 @@ ...@@ -27,15 +27,15 @@
#include "indycam.h" #include "indycam.h"
//#define INDYCAM_DEBUG #define INDYCAM_MODULE_VERSION "0.0.5"
#define INDYCAM_MODULE_VERSION "0.0.3"
MODULE_DESCRIPTION("SGI IndyCam driver"); MODULE_DESCRIPTION("SGI IndyCam driver");
MODULE_VERSION(INDYCAM_MODULE_VERSION); MODULE_VERSION(INDYCAM_MODULE_VERSION);
MODULE_AUTHOR("Mikael Nousiainen <tmnousia@cc.hut.fi>"); MODULE_AUTHOR("Mikael Nousiainen <tmnousia@cc.hut.fi>");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
// #define INDYCAM_DEBUG
#ifdef INDYCAM_DEBUG #ifdef INDYCAM_DEBUG
#define dprintk(x...) printk("IndyCam: " x); #define dprintk(x...) printk("IndyCam: " x);
#define indycam_regdump(client) indycam_regdump_debug(client) #define indycam_regdump(client) indycam_regdump_debug(client)
...@@ -46,14 +46,14 @@ MODULE_LICENSE("GPL"); ...@@ -46,14 +46,14 @@ MODULE_LICENSE("GPL");
struct indycam { struct indycam {
struct i2c_client *client; struct i2c_client *client;
int version; u8 version;
}; };
static struct i2c_driver i2c_driver_indycam; static struct i2c_driver i2c_driver_indycam;
static const unsigned char initseq[] = { static const u8 initseq[] = {
INDYCAM_CONTROL_AGCENA, /* INDYCAM_CONTROL */ INDYCAM_CONTROL_AGCENA, /* INDYCAM_CONTROL */
INDYCAM_SHUTTER_DEFAULT, /* INDYCAM_SHUTTER */ INDYCAM_SHUTTER_60, /* INDYCAM_SHUTTER */
INDYCAM_GAIN_DEFAULT, /* INDYCAM_GAIN */ INDYCAM_GAIN_DEFAULT, /* INDYCAM_GAIN */
0x00, /* INDYCAM_BRIGHTNESS (read-only) */ 0x00, /* INDYCAM_BRIGHTNESS (read-only) */
INDYCAM_RED_BALANCE_DEFAULT, /* INDYCAM_RED_BALANCE */ INDYCAM_RED_BALANCE_DEFAULT, /* INDYCAM_RED_BALANCE */
...@@ -64,12 +64,11 @@ static const unsigned char initseq[] = { ...@@ -64,12 +64,11 @@ static const unsigned char initseq[] = {
/* IndyCam register handling */ /* IndyCam register handling */
static int indycam_read_reg(struct i2c_client *client, unsigned char reg, static int indycam_read_reg(struct i2c_client *client, u8 reg, u8 *value)
unsigned char *value)
{ {
int ret; int ret;
if (reg == INDYCAM_RESET) { if (reg == INDYCAM_REG_RESET) {
dprintk("indycam_read_reg(): " dprintk("indycam_read_reg(): "
"skipping write-only register %d\n", reg); "skipping write-only register %d\n", reg);
*value = 0; *value = 0;
...@@ -77,24 +76,24 @@ static int indycam_read_reg(struct i2c_client *client, unsigned char reg, ...@@ -77,24 +76,24 @@ static int indycam_read_reg(struct i2c_client *client, unsigned char reg,
} }
ret = i2c_smbus_read_byte_data(client, reg); ret = i2c_smbus_read_byte_data(client, reg);
if (ret < 0) { if (ret < 0) {
printk(KERN_ERR "IndyCam: indycam_read_reg(): read failed, " printk(KERN_ERR "IndyCam: indycam_read_reg(): read failed, "
"register = 0x%02x\n", reg); "register = 0x%02x\n", reg);
return ret; return ret;
} }
*value = (unsigned char)ret; *value = (u8)ret;
return 0; return 0;
} }
static int indycam_write_reg(struct i2c_client *client, unsigned char reg, static int indycam_write_reg(struct i2c_client *client, u8 reg, u8 value)
unsigned char value)
{ {
int err; int err;
if ((reg == INDYCAM_BRIGHTNESS) if ((reg == INDYCAM_REG_BRIGHTNESS)
|| (reg == INDYCAM_VERSION)) { || (reg == INDYCAM_REG_VERSION)) {
dprintk("indycam_write_reg(): " dprintk("indycam_write_reg(): "
"skipping read-only register %d\n", reg); "skipping read-only register %d\n", reg);
return 0; return 0;
...@@ -102,6 +101,7 @@ static int indycam_write_reg(struct i2c_client *client, unsigned char reg, ...@@ -102,6 +101,7 @@ static int indycam_write_reg(struct i2c_client *client, unsigned char reg,
dprintk("Writing Reg %d = 0x%02x\n", reg, value); dprintk("Writing Reg %d = 0x%02x\n", reg, value);
err = i2c_smbus_write_byte_data(client, reg, value); err = i2c_smbus_write_byte_data(client, reg, value);
if (err) { if (err) {
printk(KERN_ERR "IndyCam: indycam_write_reg(): write failed, " printk(KERN_ERR "IndyCam: indycam_write_reg(): write failed, "
"register = 0x%02x, value = 0x%02x\n", reg, value); "register = 0x%02x, value = 0x%02x\n", reg, value);
...@@ -109,13 +109,12 @@ static int indycam_write_reg(struct i2c_client *client, unsigned char reg, ...@@ -109,13 +109,12 @@ static int indycam_write_reg(struct i2c_client *client, unsigned char reg,
return err; return err;
} }
static int indycam_write_block(struct i2c_client *client, unsigned char reg, static int indycam_write_block(struct i2c_client *client, u8 reg,
unsigned char length, unsigned char *data) u8 length, u8 *data)
{ {
unsigned char i; int i, err;
int err;
for (i = reg; i < length; i++) { for (i = 0; i < length; i++) {
err = indycam_write_reg(client, reg + i, data[i]); err = indycam_write_reg(client, reg + i, data[i]);
if (err) if (err)
return err; return err;
...@@ -130,7 +129,7 @@ static int indycam_write_block(struct i2c_client *client, unsigned char reg, ...@@ -130,7 +129,7 @@ static int indycam_write_block(struct i2c_client *client, unsigned char reg,
static void indycam_regdump_debug(struct i2c_client *client) static void indycam_regdump_debug(struct i2c_client *client)
{ {
int i; int i;
unsigned char val; u8 val;
for (i = 0; i < 9; i++) { for (i = 0; i < 9; i++) {
indycam_read_reg(client, i, &val); indycam_read_reg(client, i, &val);
...@@ -139,76 +138,144 @@ static void indycam_regdump_debug(struct i2c_client *client) ...@@ -139,76 +138,144 @@ static void indycam_regdump_debug(struct i2c_client *client)
} }
#endif #endif
static int indycam_get_controls(struct i2c_client *client, static int indycam_get_control(struct i2c_client *client,
struct indycam_control *ctrl) struct indycam_control *ctrl)
{ {
unsigned char ctrl_reg; struct indycam *camera = i2c_get_clientdata(client);
u8 reg;
indycam_read_reg(client, INDYCAM_CONTROL, &ctrl_reg); int ret = 0;
ctrl->agc = (ctrl_reg & INDYCAM_CONTROL_AGCENA)
? INDYCAM_VALUE_ENABLED switch (ctrl->type) {
: INDYCAM_VALUE_DISABLED; case INDYCAM_CONTROL_AGC:
ctrl->awb = (ctrl_reg & INDYCAM_CONTROL_AWBCTL) case INDYCAM_CONTROL_AWB:
? INDYCAM_VALUE_ENABLED ret = indycam_read_reg(client, INDYCAM_REG_CONTROL, &reg);
: INDYCAM_VALUE_DISABLED; if (ret)
indycam_read_reg(client, INDYCAM_SHUTTER, return -EIO;
(unsigned char *)&ctrl->shutter); if (ctrl->type == INDYCAM_CONTROL_AGC)
indycam_read_reg(client, INDYCAM_GAIN, ctrl->value = (reg & INDYCAM_CONTROL_AGCENA)
(unsigned char *)&ctrl->gain); ? 1 : 0;
indycam_read_reg(client, INDYCAM_RED_BALANCE, else
(unsigned char *)&ctrl->red_balance); ctrl->value = (reg & INDYCAM_CONTROL_AWBCTL)
indycam_read_reg(client, INDYCAM_BLUE_BALANCE, ? 1 : 0;
(unsigned char *)&ctrl->blue_balance); break;
indycam_read_reg(client, INDYCAM_RED_SATURATION, case INDYCAM_CONTROL_SHUTTER:
(unsigned char *)&ctrl->red_saturation); ret = indycam_read_reg(client, INDYCAM_REG_SHUTTER, &reg);
indycam_read_reg(client, INDYCAM_BLUE_SATURATION, if (ret)
(unsigned char *)&ctrl->blue_saturation); return -EIO;
indycam_read_reg(client, INDYCAM_GAMMA, ctrl->value = ((s32)reg == 0x00) ? 0xff : ((s32)reg - 1);
(unsigned char *)&ctrl->gamma); break;
case INDYCAM_CONTROL_GAIN:
ret = indycam_read_reg(client, INDYCAM_REG_GAIN, &reg);
if (ret)
return -EIO;
ctrl->value = (s32)reg;
break;
case INDYCAM_CONTROL_RED_BALANCE:
ret = indycam_read_reg(client, INDYCAM_REG_RED_BALANCE, &reg);
if (ret)
return -EIO;
ctrl->value = (s32)reg;
break;
case INDYCAM_CONTROL_BLUE_BALANCE:
ret = indycam_read_reg(client, INDYCAM_REG_BLUE_BALANCE, &reg);
if (ret)
return -EIO;
ctrl->value = (s32)reg;
break;
case INDYCAM_CONTROL_RED_SATURATION:
ret = indycam_read_reg(client,
INDYCAM_REG_RED_SATURATION, &reg);
if (ret)
return -EIO;
ctrl->value = (s32)reg;
break;
case INDYCAM_CONTROL_BLUE_SATURATION:
ret = indycam_read_reg(client,
INDYCAM_REG_BLUE_SATURATION, &reg);
if (ret)
return -EIO;
ctrl->value = (s32)reg;
break;
case INDYCAM_CONTROL_GAMMA:
if (camera->version == CAMERA_VERSION_MOOSE) {
ret = indycam_read_reg(client,
INDYCAM_REG_GAMMA, &reg);
if (ret)
return -EIO;
ctrl->value = (s32)reg;
} else {
ctrl->value = INDYCAM_GAMMA_DEFAULT;
}
break;
default:
ret = -EINVAL;
}
return 0; return ret;
} }
static int indycam_set_controls(struct i2c_client *client, static int indycam_set_control(struct i2c_client *client,
struct indycam_control *ctrl) struct indycam_control *ctrl)
{ {
unsigned char ctrl_reg; struct indycam *camera = i2c_get_clientdata(client);
u8 reg;
int ret = 0;
switch (ctrl->type) {
case INDYCAM_CONTROL_AGC:
case INDYCAM_CONTROL_AWB:
ret = indycam_read_reg(client, INDYCAM_REG_CONTROL, &reg);
if (ret)
break;
indycam_read_reg(client, INDYCAM_CONTROL, &ctrl_reg); if (ctrl->type == INDYCAM_CONTROL_AGC) {
if (ctrl->agc != INDYCAM_VALUE_UNCHANGED) { if (ctrl->value)
if (ctrl->agc) reg |= INDYCAM_CONTROL_AGCENA;
ctrl_reg |= INDYCAM_CONTROL_AGCENA; else
else reg &= ~INDYCAM_CONTROL_AGCENA;
ctrl_reg &= ~INDYCAM_CONTROL_AGCENA; } else {
} if (ctrl->value)
if (ctrl->awb != INDYCAM_VALUE_UNCHANGED) { reg |= INDYCAM_CONTROL_AWBCTL;
if (ctrl->awb) else
ctrl_reg |= INDYCAM_CONTROL_AWBCTL; reg &= ~INDYCAM_CONTROL_AWBCTL;
else }
ctrl_reg &= ~INDYCAM_CONTROL_AWBCTL;
ret = indycam_write_reg(client, INDYCAM_REG_CONTROL, reg);
break;
case INDYCAM_CONTROL_SHUTTER:
reg = (ctrl->value == 0xff) ? 0x00 : (ctrl->value + 1);
ret = indycam_write_reg(client, INDYCAM_REG_SHUTTER, reg);
break;
case INDYCAM_CONTROL_GAIN:
ret = indycam_write_reg(client, INDYCAM_REG_GAIN, ctrl->value);
break;
case INDYCAM_CONTROL_RED_BALANCE:
ret = indycam_write_reg(client, INDYCAM_REG_RED_BALANCE,
ctrl->value);
break;
case INDYCAM_CONTROL_BLUE_BALANCE:
ret = indycam_write_reg(client, INDYCAM_REG_BLUE_BALANCE,
ctrl->value);
break;
case INDYCAM_CONTROL_RED_SATURATION:
ret = indycam_write_reg(client, INDYCAM_REG_RED_SATURATION,
ctrl->value);
break;
case INDYCAM_CONTROL_BLUE_SATURATION:
ret = indycam_write_reg(client, INDYCAM_REG_BLUE_SATURATION,
ctrl->value);
break;
case INDYCAM_CONTROL_GAMMA:
if (camera->version == CAMERA_VERSION_MOOSE) {
ret = indycam_write_reg(client, INDYCAM_REG_GAMMA,
ctrl->value);
}
break;
default:
ret = -EINVAL;
} }
indycam_write_reg(client, INDYCAM_CONTROL, ctrl_reg);
if (ctrl->shutter >= 0)
indycam_write_reg(client, INDYCAM_SHUTTER, ctrl->shutter);
if (ctrl->gain >= 0)
indycam_write_reg(client, INDYCAM_GAIN, ctrl->gain);
if (ctrl->red_balance >= 0)
indycam_write_reg(client, INDYCAM_RED_BALANCE,
ctrl->red_balance);
if (ctrl->blue_balance >= 0)
indycam_write_reg(client, INDYCAM_BLUE_BALANCE,
ctrl->blue_balance);
if (ctrl->red_saturation >= 0)
indycam_write_reg(client, INDYCAM_RED_SATURATION,
ctrl->red_saturation);
if (ctrl->blue_saturation >= 0)
indycam_write_reg(client, INDYCAM_BLUE_SATURATION,
ctrl->blue_saturation);
if (ctrl->gamma >= 0)
indycam_write_reg(client, INDYCAM_GAMMA, ctrl->gamma);
return 0; return ret;
} }
/* I2C-interface */ /* I2C-interface */
...@@ -247,7 +314,8 @@ static int indycam_attach(struct i2c_adapter *adap, int addr, int kind) ...@@ -247,7 +314,8 @@ static int indycam_attach(struct i2c_adapter *adap, int addr, int kind)
if (err) if (err)
goto out_free_camera; goto out_free_camera;
camera->version = i2c_smbus_read_byte_data(client, INDYCAM_VERSION); camera->version = i2c_smbus_read_byte_data(client,
INDYCAM_REG_VERSION);
if (camera->version != CAMERA_VERSION_INDY && if (camera->version != CAMERA_VERSION_INDY &&
camera->version != CAMERA_VERSION_MOOSE) { camera->version != CAMERA_VERSION_MOOSE) {
err = -ENODEV; err = -ENODEV;
...@@ -260,8 +328,7 @@ static int indycam_attach(struct i2c_adapter *adap, int addr, int kind) ...@@ -260,8 +328,7 @@ static int indycam_attach(struct i2c_adapter *adap, int addr, int kind)
indycam_regdump(client); indycam_regdump(client);
// initialize // initialize
err = indycam_write_block(client, 0, sizeof(initseq), err = indycam_write_block(client, 0, sizeof(initseq), (u8 *)&initseq);
(unsigned char *)&initseq);
if (err) { if (err) {
printk(KERN_ERR "IndyCam initalization failed\n"); printk(KERN_ERR "IndyCam initalization failed\n");
err = -EIO; err = -EIO;
...@@ -271,11 +338,10 @@ static int indycam_attach(struct i2c_adapter *adap, int addr, int kind) ...@@ -271,11 +338,10 @@ static int indycam_attach(struct i2c_adapter *adap, int addr, int kind)
indycam_regdump(client); indycam_regdump(client);
// white balance // white balance
err = indycam_write_reg(client, INDYCAM_CONTROL, err = indycam_write_reg(client, INDYCAM_REG_CONTROL,
INDYCAM_CONTROL_AGCENA | INDYCAM_CONTROL_AWBCTL); INDYCAM_CONTROL_AGCENA | INDYCAM_CONTROL_AWBCTL);
if (err) { if (err) {
printk(KERN_ERR "IndyCam white balance " printk(KERN_ERR "IndyCam: White balancing camera failed\n");
"initialization failed\n");
err = -EIO; err = -EIO;
goto out_detach_client; goto out_detach_client;
} }
...@@ -371,13 +437,11 @@ static int indycam_command(struct i2c_client *client, unsigned int cmd, ...@@ -371,13 +437,11 @@ static int indycam_command(struct i2c_client *client, unsigned int cmd,
/* TODO: convert values for indycam_set_controls() */ /* TODO: convert values for indycam_set_controls() */
break; break;
} }
case DECODER_INDYCAM_GET_CONTROLS: { case DECODER_INDYCAM_GET_CONTROL: {
struct indycam_control *ctrl = arg; return indycam_get_control(client, arg);
indycam_get_controls(client, ctrl);
} }
case DECODER_INDYCAM_SET_CONTROLS: { case DECODER_INDYCAM_SET_CONTROL: {
struct indycam_control *ctrl = arg; return indycam_set_control(client, arg);
indycam_set_controls(client, ctrl);
} }
default: default:
return -EINVAL; return -EINVAL;
...@@ -388,12 +452,12 @@ static int indycam_command(struct i2c_client *client, unsigned int cmd, ...@@ -388,12 +452,12 @@ static int indycam_command(struct i2c_client *client, unsigned int cmd,
static struct i2c_driver i2c_driver_indycam = { static struct i2c_driver i2c_driver_indycam = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.name = "indycam", .name = "indycam",
.id = I2C_DRIVERID_INDYCAM, .id = I2C_DRIVERID_INDYCAM,
.flags = I2C_DF_NOTIFY, .flags = I2C_DF_NOTIFY,
.attach_adapter = indycam_probe, .attach_adapter = indycam_probe,
.detach_client = indycam_detach, .detach_client = indycam_detach,
.command = indycam_command, .command = indycam_command,
}; };
static int __init indycam_init(void) static int __init indycam_init(void)
......
...@@ -22,21 +22,21 @@ ...@@ -22,21 +22,21 @@
#define INDYCAM_VERSION_MINOR(x) ((x) & 0x0f) #define INDYCAM_VERSION_MINOR(x) ((x) & 0x0f)
/* Register bus addresses */ /* Register bus addresses */
#define INDYCAM_CONTROL 0x00 #define INDYCAM_REG_CONTROL 0x00
#define INDYCAM_SHUTTER 0x01 #define INDYCAM_REG_SHUTTER 0x01
#define INDYCAM_GAIN 0x02 #define INDYCAM_REG_GAIN 0x02
#define INDYCAM_BRIGHTNESS 0x03 /* read-only */ #define INDYCAM_REG_BRIGHTNESS 0x03 /* read-only */
#define INDYCAM_RED_BALANCE 0x04 #define INDYCAM_REG_RED_BALANCE 0x04
#define INDYCAM_BLUE_BALANCE 0x05 #define INDYCAM_REG_BLUE_BALANCE 0x05
#define INDYCAM_RED_SATURATION 0x06 #define INDYCAM_REG_RED_SATURATION 0x06
#define INDYCAM_BLUE_SATURATION 0x07 #define INDYCAM_REG_BLUE_SATURATION 0x07
#define INDYCAM_GAMMA 0x08 #define INDYCAM_REG_GAMMA 0x08
#define INDYCAM_VERSION 0x0e /* read-only */ #define INDYCAM_REG_VERSION 0x0e /* read-only */
#define INDYCAM_RESET 0x0f /* write-only */ #define INDYCAM_REG_RESET 0x0f /* write-only */
#define INDYCAM_LED 0x46 #define INDYCAM_REG_LED 0x46
#define INDYCAM_ORIENTATION 0x47 #define INDYCAM_REG_ORIENTATION 0x47
#define INDYCAM_BUTTON 0x48 #define INDYCAM_REG_BUTTON 0x48
/* Field definitions of registers */ /* Field definitions of registers */
#define INDYCAM_CONTROL_AGCENA (1<<0) /* automatic gain control */ #define INDYCAM_CONTROL_AGCENA (1<<0) /* automatic gain control */
...@@ -59,13 +59,14 @@ ...@@ -59,13 +59,14 @@
#define INDYCAM_ORIENTATION_BOTTOM_TO_TOP 0x40 #define INDYCAM_ORIENTATION_BOTTOM_TO_TOP 0x40
#define INDYCAM_BUTTON_RELEASED 0x10 #define INDYCAM_BUTTON_RELEASED 0x10
/* Values for controls */
#define INDYCAM_SHUTTER_MIN 0x00 #define INDYCAM_SHUTTER_MIN 0x00
#define INDYCAM_SHUTTER_MAX 0xff #define INDYCAM_SHUTTER_MAX 0xff
#define INDYCAM_GAIN_MIN 0x00 #define INDYCAM_GAIN_MIN 0x00
#define INDYCAM_GAIN_MAX 0xff #define INDYCAM_GAIN_MAX 0xff
#define INDYCAM_RED_BALANCE_MIN 0x00 /* the effect is the opposite? */ #define INDYCAM_RED_BALANCE_MIN 0x00
#define INDYCAM_RED_BALANCE_MAX 0xff #define INDYCAM_RED_BALANCE_MAX 0xff
#define INDYCAM_BLUE_BALANCE_MIN 0x00 /* the effect is the opposite? */ #define INDYCAM_BLUE_BALANCE_MIN 0x00
#define INDYCAM_BLUE_BALANCE_MAX 0xff #define INDYCAM_BLUE_BALANCE_MAX 0xff
#define INDYCAM_RED_SATURATION_MIN 0x00 #define INDYCAM_RED_SATURATION_MIN 0x00
#define INDYCAM_RED_SATURATION_MAX 0xff #define INDYCAM_RED_SATURATION_MAX 0xff
...@@ -74,34 +75,9 @@ ...@@ -74,34 +75,9 @@
#define INDYCAM_GAMMA_MIN 0x00 #define INDYCAM_GAMMA_MIN 0x00
#define INDYCAM_GAMMA_MAX 0xff #define INDYCAM_GAMMA_MAX 0xff
/* Driver interface definitions */ #define INDYCAM_AGC_DEFAULT 1
#define INDYCAM_AWB_DEFAULT 0
#define INDYCAM_VALUE_ENABLED 1 #define INDYCAM_SHUTTER_DEFAULT 0xff
#define INDYCAM_VALUE_DISABLED 0
#define INDYCAM_VALUE_UNCHANGED -1
/* When setting controls, a value of -1 leaves the control unchanged. */
struct indycam_control {
int agc; /* boolean */
int awb; /* boolean */
int shutter;
int gain;
int red_balance;
int blue_balance;
int red_saturation;
int blue_saturation;
int gamma;
};
#define DECODER_INDYCAM_GET_CONTROLS _IOR('d', 193, struct indycam_control)
#define DECODER_INDYCAM_SET_CONTROLS _IOW('d', 194, struct indycam_control)
/* Default values for controls */
#define INDYCAM_AGC_DEFAULT INDYCAM_VALUE_ENABLED
#define INDYCAM_AWB_DEFAULT INDYCAM_VALUE_ENABLED
#define INDYCAM_SHUTTER_DEFAULT INDYCAM_SHUTTER_60
#define INDYCAM_GAIN_DEFAULT 0x80 #define INDYCAM_GAIN_DEFAULT 0x80
#define INDYCAM_RED_BALANCE_DEFAULT 0x18 #define INDYCAM_RED_BALANCE_DEFAULT 0x18
#define INDYCAM_BLUE_BALANCE_DEFAULT 0xa4 #define INDYCAM_BLUE_BALANCE_DEFAULT 0xa4
...@@ -109,4 +85,24 @@ struct indycam_control { ...@@ -109,4 +85,24 @@ struct indycam_control {
#define INDYCAM_BLUE_SATURATION_DEFAULT 0xc0 #define INDYCAM_BLUE_SATURATION_DEFAULT 0xc0
#define INDYCAM_GAMMA_DEFAULT 0x80 #define INDYCAM_GAMMA_DEFAULT 0x80
/* Driver interface definitions */
#define INDYCAM_CONTROL_AGC 0 /* boolean */
#define INDYCAM_CONTROL_AWB 1 /* boolean */
#define INDYCAM_CONTROL_SHUTTER 2
#define INDYCAM_CONTROL_GAIN 3
#define INDYCAM_CONTROL_RED_BALANCE 4
#define INDYCAM_CONTROL_BLUE_BALANCE 5
#define INDYCAM_CONTROL_RED_SATURATION 6
#define INDYCAM_CONTROL_BLUE_SATURATION 7
#define INDYCAM_CONTROL_GAMMA 8
struct indycam_control {
u8 type;
s32 value;
};
#define DECODER_INDYCAM_GET_CONTROL _IOR('d', 193, struct indycam_control)
#define DECODER_INDYCAM_SET_CONTROL _IOW('d', 194, struct indycam_control)
#endif #endif
...@@ -26,71 +26,95 @@ ...@@ -26,71 +26,95 @@
#include "saa7191.h" #include "saa7191.h"
#define SAA7191_MODULE_VERSION "0.0.3" #define SAA7191_MODULE_VERSION "0.0.5"
MODULE_DESCRIPTION("Philips SAA7191 video decoder driver"); MODULE_DESCRIPTION("Philips SAA7191 video decoder driver");
MODULE_VERSION(SAA7191_MODULE_VERSION); MODULE_VERSION(SAA7191_MODULE_VERSION);
MODULE_AUTHOR("Mikael Nousiainen <tmnousia@cc.hut.fi>"); MODULE_AUTHOR("Mikael Nousiainen <tmnousia@cc.hut.fi>");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
// #define SAA7191_DEBUG
#ifdef SAA7191_DEBUG
#define dprintk(x...) printk("SAA7191: " x);
#else
#define dprintk(x...)
#endif
#define SAA7191_SYNC_COUNT 30
#define SAA7191_SYNC_DELAY 100 /* milliseconds */
struct saa7191 { struct saa7191 {
struct i2c_client *client; struct i2c_client *client;
/* the register values are stored here as the actual /* the register values are stored here as the actual
* I2C-registers are write-only */ * I2C-registers are write-only */
unsigned char reg[25]; u8 reg[25];
unsigned char norm; int input;
unsigned char input; int norm;
}; };
static struct i2c_driver i2c_driver_saa7191; static struct i2c_driver i2c_driver_saa7191;
static const unsigned char initseq[] = { static const u8 initseq[] = {
0, /* Subaddress */ 0, /* Subaddress */
0x50, /* SAA7191_REG_IDEL */
0x30, /* SAA7191_REG_HSYB */ 0x50, /* (0x50) SAA7191_REG_IDEL */
0x00, /* SAA7191_REG_HSYS */
0xe8, /* SAA7191_REG_HCLB */ /* 50 Hz signal timing */
0xb6, /* SAA7191_REG_HCLS */ 0x30, /* (0x30) SAA7191_REG_HSYB */
0xf4, /* SAA7191_REG_HPHI */ 0x00, /* (0x00) SAA7191_REG_HSYS */
0x01, /* SAA7191_REG_LUMA - chrominance trap active (CVBS) */ 0xe8, /* (0xe8) SAA7191_REG_HCLB */
0x00, /* SAA7191_REG_HUEC */ 0xb6, /* (0xb6) SAA7191_REG_HCLS */
0xf8, /* SAA7191_REG_CKTQ */ 0xf4, /* (0xf4) SAA7191_REG_HPHI */
0xf8, /* SAA7191_REG_CKTS */
0x90, /* SAA7191_REG_PLSE */ /* control */
0x90, /* SAA7191_REG_SESE */ SAA7191_LUMA_APER_1, /* (0x01) SAA7191_REG_LUMA - CVBS mode */
0x00, /* SAA7191_REG_GAIN */ 0x00, /* (0x00) SAA7191_REG_HUEC */
0x0c, /* SAA7191_REG_STDC - not SECAM, slow time constant */ 0xf8, /* (0xf8) SAA7191_REG_CKTQ */
0x78, /* SAA7191_REG_IOCK - chrominance from CVBS, GPSW1 & 2 off */ 0xf8, /* (0xf8) SAA7191_REG_CKTS */
0x99, /* SAA7191_REG_CTL3 - automatic field detection */ 0x90, /* (0x90) SAA7191_REG_PLSE */
0x00, /* SAA7191_REG_CTL4 */ 0x90, /* (0x90) SAA7191_REG_SESE */
0x2c, /* SAA7191_REG_CHCV */ 0x00, /* (0x00) SAA7191_REG_GAIN */
SAA7191_STDC_NFEN | SAA7191_STDC_HRMV, /* (0x0c) SAA7191_REG_STDC
* - not SECAM,
* slow time constant */
SAA7191_IOCK_OEDC | SAA7191_IOCK_OEHS | SAA7191_IOCK_OEVS
| SAA7191_IOCK_OEDY, /* (0x78) SAA7191_REG_IOCK
* - chroma from CVBS, GPSW1 & 2 off */
SAA7191_CTL3_AUFD | SAA7191_CTL3_SCEN | SAA7191_CTL3_OFTS
| SAA7191_CTL3_YDEL0, /* (0x99) SAA7191_REG_CTL3
* - automatic field detection */
0x00, /* (0x00) SAA7191_REG_CTL4 */
0x2c, /* (0x2c) SAA7191_REG_CHCV - PAL nominal value */
0x00, /* unused */ 0x00, /* unused */
0x00, /* unused */ 0x00, /* unused */
0x34, /* SAA7191_REG_HS6B */
0x0a, /* SAA7191_REG_HS6S */ /* 60 Hz signal timing */
0xf4, /* SAA7191_REG_HC6B */ 0x34, /* (0x34) SAA7191_REG_HS6B */
0xce, /* SAA7191_REG_HC6S */ 0x0a, /* (0x0a) SAA7191_REG_HS6S */
0xf4, /* SAA7191_REG_HP6I */ 0xf4, /* (0xf4) SAA7191_REG_HC6B */
0xce, /* (0xce) SAA7191_REG_HC6S */
0xf4, /* (0xf4) SAA7191_REG_HP6I */
}; };
/* SAA7191 register handling */ /* SAA7191 register handling */
static unsigned char saa7191_read_reg(struct i2c_client *client, static u8 saa7191_read_reg(struct i2c_client *client,
unsigned char reg) u8 reg)
{ {
return ((struct saa7191 *)i2c_get_clientdata(client))->reg[reg]; return ((struct saa7191 *)i2c_get_clientdata(client))->reg[reg];
} }
static int saa7191_read_status(struct i2c_client *client, static int saa7191_read_status(struct i2c_client *client,
unsigned char *value) u8 *value)
{ {
int ret; int ret;
ret = i2c_master_recv(client, value, 1); ret = i2c_master_recv(client, value, 1);
if (ret < 0) { if (ret < 0) {
printk(KERN_ERR "SAA7191: saa7191_read_status(): read failed"); printk(KERN_ERR "SAA7191: saa7191_read_status(): read failed\n");
return ret; return ret;
} }
...@@ -98,17 +122,16 @@ static int saa7191_read_status(struct i2c_client *client, ...@@ -98,17 +122,16 @@ static int saa7191_read_status(struct i2c_client *client,
} }
static int saa7191_write_reg(struct i2c_client *client, unsigned char reg, static int saa7191_write_reg(struct i2c_client *client, u8 reg,
unsigned char value) u8 value)
{ {
((struct saa7191 *)i2c_get_clientdata(client))->reg[reg] = value; ((struct saa7191 *)i2c_get_clientdata(client))->reg[reg] = value;
return i2c_smbus_write_byte_data(client, reg, value); return i2c_smbus_write_byte_data(client, reg, value);
} }
/* the first byte of data must be the first subaddress number (register) */ /* the first byte of data must be the first subaddress number (register) */
static int saa7191_write_block(struct i2c_client *client, static int saa7191_write_block(struct i2c_client *client,
unsigned char length, unsigned char *data) u8 length, u8 *data)
{ {
int i; int i;
int ret; int ret;
...@@ -121,7 +144,7 @@ static int saa7191_write_block(struct i2c_client *client, ...@@ -121,7 +144,7 @@ static int saa7191_write_block(struct i2c_client *client,
ret = i2c_master_send(client, data, length); ret = i2c_master_send(client, data, length);
if (ret < 0) { if (ret < 0) {
printk(KERN_ERR "SAA7191: saa7191_write_block(): " printk(KERN_ERR "SAA7191: saa7191_write_block(): "
"write failed"); "write failed\n");
return ret; return ret;
} }
...@@ -132,8 +155,9 @@ static int saa7191_write_block(struct i2c_client *client, ...@@ -132,8 +155,9 @@ static int saa7191_write_block(struct i2c_client *client,
static int saa7191_set_input(struct i2c_client *client, int input) static int saa7191_set_input(struct i2c_client *client, int input)
{ {
unsigned char luma = saa7191_read_reg(client, SAA7191_REG_LUMA); struct saa7191 *decoder = i2c_get_clientdata(client);
unsigned char iock = saa7191_read_reg(client, SAA7191_REG_IOCK); u8 luma = saa7191_read_reg(client, SAA7191_REG_LUMA);
u8 iock = saa7191_read_reg(client, SAA7191_REG_IOCK);
int err; int err;
switch (input) { switch (input) {
...@@ -159,32 +183,20 @@ static int saa7191_set_input(struct i2c_client *client, int input) ...@@ -159,32 +183,20 @@ static int saa7191_set_input(struct i2c_client *client, int input)
if (err) if (err)
return -EIO; return -EIO;
decoder->input = input;
return 0; return 0;
} }
static int saa7191_set_norm(struct i2c_client *client, int norm) static int saa7191_set_norm(struct i2c_client *client, int norm)
{ {
struct saa7191 *decoder = i2c_get_clientdata(client); struct saa7191 *decoder = i2c_get_clientdata(client);
unsigned char stdc = saa7191_read_reg(client, SAA7191_REG_STDC); u8 stdc = saa7191_read_reg(client, SAA7191_REG_STDC);
unsigned char ctl3 = saa7191_read_reg(client, SAA7191_REG_CTL3); u8 ctl3 = saa7191_read_reg(client, SAA7191_REG_CTL3);
unsigned char chcv = saa7191_read_reg(client, SAA7191_REG_CHCV); u8 chcv = saa7191_read_reg(client, SAA7191_REG_CHCV);
int err; int err;
switch(norm) { switch(norm) {
case SAA7191_NORM_AUTO: {
unsigned char status;
// does status depend on current norm ?
if (saa7191_read_status(client, &status))
return -EIO;
stdc &= ~SAA7191_STDC_SECS;
ctl3 &= ~SAA7191_CTL3_FSEL;
ctl3 |= SAA7191_CTL3_AUFD;
chcv = (status & SAA7191_STATUS_FIDT)
? SAA7191_CHCV_NTSC : SAA7191_CHCV_PAL;
break;
}
case SAA7191_NORM_PAL: case SAA7191_NORM_PAL:
stdc &= ~SAA7191_STDC_SECS; stdc &= ~SAA7191_STDC_SECS;
ctl3 &= ~(SAA7191_CTL3_AUFD | SAA7191_CTL3_FSEL); ctl3 &= ~(SAA7191_CTL3_AUFD | SAA7191_CTL3_FSEL);
...@@ -217,60 +229,335 @@ static int saa7191_set_norm(struct i2c_client *client, int norm) ...@@ -217,60 +229,335 @@ static int saa7191_set_norm(struct i2c_client *client, int norm)
decoder->norm = norm; decoder->norm = norm;
dprintk("ctl3: %02x stdc: %02x chcv: %02x\n", ctl3,
stdc, chcv);
dprintk("norm: %d\n", norm);
return 0; return 0;
} }
static int saa7191_get_controls(struct i2c_client *client, static int saa7191_wait_for_signal(struct i2c_client *client, u8 *status)
struct saa7191_control *ctrl)
{ {
unsigned char hue = saa7191_read_reg(client, SAA7191_REG_HUEC); int i = 0;
unsigned char stdc = saa7191_read_reg(client, SAA7191_REG_STDC);
if (hue < 0x80) { dprintk("Checking for signal...\n");
hue += 0x80;
} else { for (i = 0; i < SAA7191_SYNC_COUNT; i++) {
hue -= 0x80; if (saa7191_read_status(client, status))
return -EIO;
if (((*status) & SAA7191_STATUS_HLCK) == 0) {
dprintk("Signal found\n");
return 0;
}
msleep(SAA7191_SYNC_DELAY);
} }
ctrl->hue = hue;
ctrl->vtrc = (stdc & SAA7191_STDC_VTRC) dprintk("No signal\n");
? SAA7191_VALUE_ENABLED : SAA7191_VALUE_DISABLED;
return 0; return -EBUSY;
} }
static int saa7191_set_controls(struct i2c_client *client, static int saa7191_autodetect_norm_extended(struct i2c_client *client)
struct saa7191_control *ctrl)
{ {
int err; u8 stdc = saa7191_read_reg(client, SAA7191_REG_STDC);
u8 ctl3 = saa7191_read_reg(client, SAA7191_REG_CTL3);
u8 status;
int err = 0;
if (ctrl->hue >= 0) { dprintk("SAA7191 extended signal auto-detection...\n");
unsigned char hue = ctrl->hue & 0xff;
if (hue < 0x80) { stdc &= ~SAA7191_STDC_SECS;
hue += 0x80; ctl3 &= ~(SAA7191_CTL3_FSEL);
} else {
hue -= 0x80; err = saa7191_write_reg(client, SAA7191_REG_STDC, stdc);
if (err) {
err = -EIO;
goto out;
}
err = saa7191_write_reg(client, SAA7191_REG_CTL3, ctl3);
if (err) {
err = -EIO;
goto out;
}
ctl3 |= SAA7191_CTL3_AUFD;
err = saa7191_write_reg(client, SAA7191_REG_CTL3, ctl3);
if (err) {
err = -EIO;
goto out;
}
msleep(SAA7191_SYNC_DELAY);
err = saa7191_wait_for_signal(client, &status);
if (err)
goto out;
if (status & SAA7191_STATUS_FIDT) {
/* 60Hz signal -> NTSC */
dprintk("60Hz signal: NTSC\n");
return saa7191_set_norm(client, SAA7191_NORM_NTSC);
}
/* 50Hz signal */
dprintk("50Hz signal: Trying PAL...\n");
/* try PAL first */
err = saa7191_set_norm(client, SAA7191_NORM_PAL);
if (err)
goto out;
msleep(SAA7191_SYNC_DELAY);
err = saa7191_wait_for_signal(client, &status);
if (err)
goto out;
/* not 50Hz ? */
if (status & SAA7191_STATUS_FIDT) {
dprintk("No 50Hz signal\n");
err = -EAGAIN;
goto out;
}
if (status & SAA7191_STATUS_CODE) {
dprintk("PAL\n");
return 0;
}
dprintk("No color detected with PAL - Trying SECAM...\n");
/* no color detected ? -> try SECAM */
err = saa7191_set_norm(client,
SAA7191_NORM_SECAM);
if (err)
goto out;
msleep(SAA7191_SYNC_DELAY);
err = saa7191_wait_for_signal(client, &status);
if (err)
goto out;
/* not 50Hz ? */
if (status & SAA7191_STATUS_FIDT) {
dprintk("No 50Hz signal\n");
err = -EAGAIN;
goto out;
}
if (status & SAA7191_STATUS_CODE) {
/* Color detected -> SECAM */
dprintk("SECAM\n");
return 0;
}
dprintk("No color detected with SECAM - Going back to PAL.\n");
/* still no color detected ?
* -> set norm back to PAL */
err = saa7191_set_norm(client,
SAA7191_NORM_PAL);
if (err)
goto out;
out:
ctl3 = saa7191_read_reg(client, SAA7191_REG_CTL3);
if (ctl3 & SAA7191_CTL3_AUFD) {
ctl3 &= ~(SAA7191_CTL3_AUFD);
err = saa7191_write_reg(client, SAA7191_REG_CTL3, ctl3);
if (err) {
err = -EIO;
} }
err = saa7191_write_reg(client, SAA7191_REG_HUEC, hue);
if (err)
return -EIO;
} }
if (ctrl->vtrc >= 0) {
unsigned char stdc =
saa7191_read_reg(client, SAA7191_REG_STDC);
if (ctrl->vtrc) { return err;
stdc |= SAA7191_STDC_VTRC; }
} else {
stdc &= ~SAA7191_STDC_VTRC; static int saa7191_autodetect_norm(struct i2c_client *client)
{
u8 status;
dprintk("SAA7191 signal auto-detection...\n");
dprintk("Reading status...\n");
if (saa7191_read_status(client, &status))
return -EIO;
dprintk("Checking for signal...\n");
/* no signal ? */
if (status & SAA7191_STATUS_HLCK) {
dprintk("No signal\n");
return -EBUSY;
}
dprintk("Signal found\n");
if (status & SAA7191_STATUS_FIDT) {
/* 60hz signal -> NTSC */
dprintk("NTSC\n");
return saa7191_set_norm(client, SAA7191_NORM_NTSC);
} else {
/* 50hz signal -> PAL */
dprintk("PAL\n");
return saa7191_set_norm(client, SAA7191_NORM_PAL);
}
}
static int saa7191_get_control(struct i2c_client *client,
struct saa7191_control *ctrl)
{
u8 reg;
int ret = 0;
switch (ctrl->type) {
case SAA7191_CONTROL_BANDPASS:
case SAA7191_CONTROL_BANDPASS_WEIGHT:
case SAA7191_CONTROL_CORING:
reg = saa7191_read_reg(client, SAA7191_REG_LUMA);
switch (ctrl->type) {
case SAA7191_CONTROL_BANDPASS:
ctrl->value = ((s32)reg & SAA7191_LUMA_BPSS_MASK)
>> SAA7191_LUMA_BPSS_SHIFT;
break;
case SAA7191_CONTROL_BANDPASS_WEIGHT:
ctrl->value = ((s32)reg & SAA7191_LUMA_APER_MASK)
>> SAA7191_LUMA_APER_SHIFT;
break;
case SAA7191_CONTROL_CORING:
ctrl->value = ((s32)reg & SAA7191_LUMA_CORI_MASK)
>> SAA7191_LUMA_CORI_SHIFT;
break;
} }
break;
case SAA7191_CONTROL_FORCE_COLOUR:
case SAA7191_CONTROL_CHROMA_GAIN:
reg = saa7191_read_reg(client, SAA7191_REG_GAIN);
if (ctrl->type == SAA7191_CONTROL_FORCE_COLOUR)
ctrl->value = ((s32)reg & SAA7191_GAIN_COLO) ? 1 : 0;
else
ctrl->value = ((s32)reg & SAA7191_GAIN_LFIS_MASK)
>> SAA7191_GAIN_LFIS_SHIFT;
break;
case SAA7191_CONTROL_HUE:
reg = saa7191_read_reg(client, SAA7191_REG_HUEC);
if (reg < 0x80)
reg += 0x80;
else
reg -= 0x80;
ctrl->value = (s32)reg;
break;
case SAA7191_CONTROL_VTRC:
reg = saa7191_read_reg(client, SAA7191_REG_STDC);
ctrl->value = ((s32)reg & SAA7191_STDC_VTRC) ? 1 : 0;
break;
case SAA7191_CONTROL_LUMA_DELAY:
reg = saa7191_read_reg(client, SAA7191_REG_CTL3);
ctrl->value = ((s32)reg & SAA7191_CTL3_YDEL_MASK)
>> SAA7191_CTL3_YDEL_SHIFT;
if (ctrl->value >= 4)
ctrl->value -= 8;
break;
case SAA7191_CONTROL_VNR:
reg = saa7191_read_reg(client, SAA7191_REG_CTL4);
ctrl->value = ((s32)reg & SAA7191_CTL4_VNOI_MASK)
>> SAA7191_CTL4_VNOI_SHIFT;
break;
default:
ret = -EINVAL;
}
err = saa7191_write_reg(client, SAA7191_REG_STDC, stdc); return ret;
if (err) }
return -EIO;
static int saa7191_set_control(struct i2c_client *client,
struct saa7191_control *ctrl)
{
u8 reg;
int ret = 0;
switch (ctrl->type) {
case SAA7191_CONTROL_BANDPASS:
case SAA7191_CONTROL_BANDPASS_WEIGHT:
case SAA7191_CONTROL_CORING:
reg = saa7191_read_reg(client, SAA7191_REG_LUMA);
switch (ctrl->type) {
case SAA7191_CONTROL_BANDPASS:
reg &= ~SAA7191_LUMA_BPSS_MASK;
reg |= (ctrl->value << SAA7191_LUMA_BPSS_SHIFT)
& SAA7191_LUMA_BPSS_MASK;
break;
case SAA7191_CONTROL_BANDPASS_WEIGHT:
reg &= ~SAA7191_LUMA_APER_MASK;
reg |= (ctrl->value << SAA7191_LUMA_APER_SHIFT)
& SAA7191_LUMA_APER_MASK;
break;
case SAA7191_CONTROL_CORING:
reg &= ~SAA7191_LUMA_CORI_MASK;
reg |= (ctrl->value << SAA7191_LUMA_CORI_SHIFT)
& SAA7191_LUMA_CORI_MASK;
break;
}
ret = saa7191_write_reg(client, SAA7191_REG_LUMA, reg);
break;
case SAA7191_CONTROL_FORCE_COLOUR:
case SAA7191_CONTROL_CHROMA_GAIN:
reg = saa7191_read_reg(client, SAA7191_REG_GAIN);
if (ctrl->type == SAA7191_CONTROL_FORCE_COLOUR) {
if (ctrl->value)
reg |= SAA7191_GAIN_COLO;
else
reg &= ~SAA7191_GAIN_COLO;
} else {
reg &= ~SAA7191_GAIN_LFIS_MASK;
reg |= (ctrl->value << SAA7191_GAIN_LFIS_SHIFT)
& SAA7191_GAIN_LFIS_MASK;
}
ret = saa7191_write_reg(client, SAA7191_REG_GAIN, reg);
break;
case SAA7191_CONTROL_HUE:
reg = ctrl->value & 0xff;
if (reg < 0x80)
reg += 0x80;
else
reg -= 0x80;
ret = saa7191_write_reg(client, SAA7191_REG_HUEC, reg);
break;
case SAA7191_CONTROL_VTRC:
reg = saa7191_read_reg(client, SAA7191_REG_STDC);
if (ctrl->value)
reg |= SAA7191_STDC_VTRC;
else
reg &= ~SAA7191_STDC_VTRC;
ret = saa7191_write_reg(client, SAA7191_REG_STDC, reg);
break;
case SAA7191_CONTROL_LUMA_DELAY: {
s32 value = ctrl->value;
if (value < 0)
value += 8;
reg = saa7191_read_reg(client, SAA7191_REG_CTL3);
reg &= ~SAA7191_CTL3_YDEL_MASK;
reg |= (value << SAA7191_CTL3_YDEL_SHIFT)
& SAA7191_CTL3_YDEL_MASK;
ret = saa7191_write_reg(client, SAA7191_REG_CTL3, reg);
break;
}
case SAA7191_CONTROL_VNR:
reg = saa7191_read_reg(client, SAA7191_REG_CTL4);
reg &= ~SAA7191_CTL4_VNOI_MASK;
reg |= (ctrl->value << SAA7191_CTL4_VNOI_SHIFT)
& SAA7191_CTL4_VNOI_MASK;
ret = saa7191_write_reg(client, SAA7191_REG_CTL4, reg);
break;
default:
ret = -EINVAL;
} }
return 0; return ret;
} }
/* I2C-interface */ /* I2C-interface */
...@@ -309,11 +596,7 @@ static int saa7191_attach(struct i2c_adapter *adap, int addr, int kind) ...@@ -309,11 +596,7 @@ static int saa7191_attach(struct i2c_adapter *adap, int addr, int kind)
if (err) if (err)
goto out_free_decoder; goto out_free_decoder;
decoder->input = SAA7191_INPUT_COMPOSITE; err = saa7191_write_block(client, sizeof(initseq), (u8 *)initseq);
decoder->norm = SAA7191_NORM_AUTO;
err = saa7191_write_block(client, sizeof(initseq),
(unsigned char *)initseq);
if (err) { if (err) {
printk(KERN_ERR "SAA7191 initialization failed\n"); printk(KERN_ERR "SAA7191 initialization failed\n");
goto out_detach_client; goto out_detach_client;
...@@ -321,6 +604,14 @@ static int saa7191_attach(struct i2c_adapter *adap, int addr, int kind) ...@@ -321,6 +604,14 @@ static int saa7191_attach(struct i2c_adapter *adap, int addr, int kind)
printk(KERN_INFO "SAA7191 initialized\n"); printk(KERN_INFO "SAA7191 initialized\n");
decoder->input = SAA7191_INPUT_COMPOSITE;
decoder->norm = SAA7191_NORM_PAL;
err = saa7191_autodetect_norm(client);
if (err && (err != -EBUSY)) {
printk(KERN_ERR "SAA7191: Signal auto-detection failed\n");
}
return 0; return 0;
out_detach_client: out_detach_client:
...@@ -368,7 +659,7 @@ static int saa7191_command(struct i2c_client *client, unsigned int cmd, ...@@ -368,7 +659,7 @@ static int saa7191_command(struct i2c_client *client, unsigned int cmd,
} }
case DECODER_GET_STATUS: { case DECODER_GET_STATUS: {
int *iarg = arg; int *iarg = arg;
unsigned char status; u8 status;
int res = 0; int res = 0;
if (saa7191_read_status(client, &status)) { if (saa7191_read_status(client, &status)) {
...@@ -404,7 +695,7 @@ static int saa7191_command(struct i2c_client *client, unsigned int cmd, ...@@ -404,7 +695,7 @@ static int saa7191_command(struct i2c_client *client, unsigned int cmd,
switch (*iarg) { switch (*iarg) {
case VIDEO_MODE_AUTO: case VIDEO_MODE_AUTO:
return saa7191_set_norm(client, SAA7191_NORM_AUTO); return saa7191_autodetect_norm(client);
case VIDEO_MODE_PAL: case VIDEO_MODE_PAL:
return saa7191_set_norm(client, SAA7191_NORM_PAL); return saa7191_set_norm(client, SAA7191_NORM_PAL);
case VIDEO_MODE_NTSC: case VIDEO_MODE_NTSC:
...@@ -446,38 +737,48 @@ static int saa7191_command(struct i2c_client *client, unsigned int cmd, ...@@ -446,38 +737,48 @@ static int saa7191_command(struct i2c_client *client, unsigned int cmd,
int err; int err;
val = (pic->hue >> 8) - 0x80; val = (pic->hue >> 8) - 0x80;
err = saa7191_write_reg(client, SAA7191_REG_HUEC, val); err = saa7191_write_reg(client, SAA7191_REG_HUEC, val);
if (err) if (err)
return -EIO; return -EIO;
break; break;
} }
case DECODER_SAA7191_GET_STATUS: { case DECODER_SAA7191_GET_STATUS: {
struct saa7191_status *status = arg; struct saa7191_status *status = arg;
unsigned char status_reg; u8 status_reg;
if (saa7191_read_status(client, &status_reg)) if (saa7191_read_status(client, &status_reg))
return -EIO; return -EIO;
status->signal = ((status_reg & SAA7191_STATUS_HLCK) == 0) status->signal = ((status_reg & SAA7191_STATUS_HLCK) == 0)
? SAA7191_VALUE_ENABLED : SAA7191_VALUE_DISABLED; ? 1 : 0;
status->ntsc = (status_reg & SAA7191_STATUS_FIDT) status->signal_60hz = (status_reg & SAA7191_STATUS_FIDT)
? SAA7191_VALUE_ENABLED : SAA7191_VALUE_DISABLED; ? 1 : 0;
status->color = (status_reg & SAA7191_STATUS_CODE) status->color = (status_reg & SAA7191_STATUS_CODE) ? 1 : 0;
? SAA7191_VALUE_ENABLED : SAA7191_VALUE_DISABLED;
status->input = decoder->input; status->input = decoder->input;
status->norm = decoder->norm; status->norm = decoder->norm;
break;
} }
case DECODER_SAA7191_SET_NORM: { case DECODER_SAA7191_SET_NORM: {
int *norm = arg; int *norm = arg;
return saa7191_set_norm(client, *norm);
switch (*norm) {
case SAA7191_NORM_AUTO:
return saa7191_autodetect_norm(client);
case SAA7191_NORM_AUTO_EXT:
return saa7191_autodetect_norm_extended(client);
default:
return saa7191_set_norm(client, *norm);
}
} }
case DECODER_SAA7191_GET_CONTROLS: { case DECODER_SAA7191_GET_CONTROL: {
struct saa7191_control *ctrl = arg; return saa7191_get_control(client, arg);
return saa7191_get_controls(client, ctrl);
} }
case DECODER_SAA7191_SET_CONTROLS: { case DECODER_SAA7191_SET_CONTROL: {
struct saa7191_control *ctrl = arg; return saa7191_set_control(client, arg);
return saa7191_set_controls(client, ctrl);
} }
default: default:
return -EINVAL; return -EINVAL;
...@@ -488,12 +789,12 @@ static int saa7191_command(struct i2c_client *client, unsigned int cmd, ...@@ -488,12 +789,12 @@ static int saa7191_command(struct i2c_client *client, unsigned int cmd,
static struct i2c_driver i2c_driver_saa7191 = { static struct i2c_driver i2c_driver_saa7191 = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.name = "saa7191", .name = "saa7191",
.id = I2C_DRIVERID_SAA7191, .id = I2C_DRIVERID_SAA7191,
.flags = I2C_DF_NOTIFY, .flags = I2C_DF_NOTIFY,
.attach_adapter = saa7191_probe, .attach_adapter = saa7191_probe,
.detach_client = saa7191_detach, .detach_client = saa7191_detach,
.command = saa7191_command .command = saa7191_command
}; };
static int saa7191_init(void) static int saa7191_init(void)
......
...@@ -24,8 +24,8 @@ ...@@ -24,8 +24,8 @@
#define SAA7191_REG_HPHI 0x05 #define SAA7191_REG_HPHI 0x05
#define SAA7191_REG_LUMA 0x06 #define SAA7191_REG_LUMA 0x06
#define SAA7191_REG_HUEC 0x07 #define SAA7191_REG_HUEC 0x07
#define SAA7191_REG_CKTQ 0x08 #define SAA7191_REG_CKTQ 0x08 /* bits 3-7 */
#define SAA7191_REG_CKTS 0x09 #define SAA7191_REG_CKTS 0x09 /* bits 3-7 */
#define SAA7191_REG_PLSE 0x0a #define SAA7191_REG_PLSE 0x0a
#define SAA7191_REG_SESE 0x0b #define SAA7191_REG_SESE 0x0b
#define SAA7191_REG_GAIN 0x0c #define SAA7191_REG_GAIN 0x0c
...@@ -43,30 +43,82 @@ ...@@ -43,30 +43,82 @@
/* Status Register definitions */ /* Status Register definitions */
#define SAA7191_STATUS_CODE 0x01 /* color detected flag */ #define SAA7191_STATUS_CODE 0x01 /* color detected flag */
#define SAA7191_STATUS_FIDT 0x20 /* format type NTSC/PAL */ #define SAA7191_STATUS_FIDT 0x20 /* signal type 50/60 Hz */
#define SAA7191_STATUS_HLCK 0x40 /* PLL unlocked/locked */ #define SAA7191_STATUS_HLCK 0x40 /* PLL unlocked(1)/locked(0) */
#define SAA7191_STATUS_STTC 0x80 /* tv/vtr time constant */ #define SAA7191_STATUS_STTC 0x80 /* tv/vtr time constant */
/* Luminance Control Register definitions */ /* Luminance Control Register definitions */
/* input mode select bit:
* 0=CVBS (chrominance trap active), 1=S-Video (trap bypassed) */
#define SAA7191_LUMA_BYPS 0x80 #define SAA7191_LUMA_BYPS 0x80
/* pre-filter (only when chrominance trap is active) */
/* Chroma Gain Control Settings Register definitions */ #define SAA7191_LUMA_PREF 0x40
/* 0=automatic colour-killer enabled, 1=forced colour on */ /* aperture bandpass to select different characteristics with maximums
* (bits 4-5) */
#define SAA7191_LUMA_BPSS_MASK 0x30
#define SAA7191_LUMA_BPSS_SHIFT 4
#define SAA7191_LUMA_BPSS_3 0x30
#define SAA7191_LUMA_BPSS_2 0x20
#define SAA7191_LUMA_BPSS_1 0x10
#define SAA7191_LUMA_BPSS_0 0x00
/* coring range for high frequency components according to 8-bit luminance
* (bits 2-3)
* 0=coring off, n= (+-)n LSB */
#define SAA7191_LUMA_CORI_MASK 0x0c
#define SAA7191_LUMA_CORI_SHIFT 2
#define SAA7191_LUMA_CORI_3 0x0c
#define SAA7191_LUMA_CORI_2 0x08
#define SAA7191_LUMA_CORI_1 0x04
#define SAA7191_LUMA_CORI_0 0x00
/* aperture bandpass filter weights high frequency components of luminance
* signal (bits 0-1)
* 0=factor 0, 1=0.25, 2=0.5, 3=1 */
#define SAA7191_LUMA_APER_MASK 0x03
#define SAA7191_LUMA_APER_SHIFT 0
#define SAA7191_LUMA_APER_3 0x03
#define SAA7191_LUMA_APER_2 0x02
#define SAA7191_LUMA_APER_1 0x01
#define SAA7191_LUMA_APER_0 0x00
/* Chrominance Gain Control Settings Register definitions */
/* colour on: 0=automatic colour-killer enabled, 1=forced colour on */
#define SAA7191_GAIN_COLO 0x80 #define SAA7191_GAIN_COLO 0x80
/* chrominance gain control (AGC filter)
* 0=loop filter time constant slow, 1=medium, 2=fast, 3=actual gain */
#define SAA7191_GAIN_LFIS_MASK 0x60
#define SAA7191_GAIN_LFIS_SHIFT 5
#define SAA7191_GAIN_LFIS_3 0x60
#define SAA7191_GAIN_LFIS_2 0x40
#define SAA7191_GAIN_LFIS_1 0x20
#define SAA7191_GAIN_LFIS_0 0x00
/* Standard/Mode Control Register definitions */ /* Standard/Mode Control Register definitions */
/* tv/vtr mode bit: 0=TV mode (slow time constant), /* tv/vtr mode bit: 0=TV mode (slow time constant),
* 1=VTR mode (fast time constant) */ * 1=VTR mode (fast time constant) */
#define SAA7191_STDC_VTRC 0x80 #define SAA7191_STDC_VTRC 0x80
/* SAA7191B-specific functions enable (RTCO, ODD and GPSW0 outputs)
* 0=outputs set to high-impedance (circuit equals SAA7191), 1=enabled */
#define SAA7191_STDC_NFEN 0x08
/* HREF generation: 0=like SAA7191, 1=HREF is 8xLLC2 clocks earlier */
#define SAA7191_STDC_HRMV 0x04
/* general purpose switch 0
* (not used with VINO afaik) */
#define SAA7191_STDC_GPSW0 0x02
/* SECAM mode bit: 0=other standards, 1=SECAM */ /* SECAM mode bit: 0=other standards, 1=SECAM */
#define SAA7191_STDC_SECS 0x01 #define SAA7191_STDC_SECS 0x01
/* the bit fields above must be or'd with this value */
#define SAA7191_STDC_VALUE 0x0c
/* I/O and Clock Control Register definitions */ /* I/O and Clock Control Register definitions */
/* horizontal clock PLL: 0=PLL closed, /* horizontal clock PLL: 0=PLL closed,
* 1=PLL circuit open and horizontal freq fixed */ * 1=PLL circuit open and horizontal freq fixed */
#define SAA7191_IOCK_HPLL 0x80 #define SAA7191_IOCK_HPLL 0x80
/* colour-difference output enable (outputs UV0-UV7) */
#define SAA7191_IOCK_OEDC 0x40
/* H-sync output enable */
#define SAA7191_IOCK_OEHS 0x20
/* V-sync output enable */
#define SAA7191_IOCK_OEVS 0x10
/* luminance output enable (outputs Y0-Y7) */
#define SAA7191_IOCK_OEDY 0x08
/* S-VHS bit (chrominance from CVBS or from chrominance input): /* S-VHS bit (chrominance from CVBS or from chrominance input):
* 0=controlled by BYPS-bit, 1=from chrominance input */ * 0=controlled by BYPS-bit, 1=from chrominance input */
#define SAA7191_IOCK_CHRS 0x04 #define SAA7191_IOCK_CHRS 0x04
...@@ -83,11 +135,40 @@ ...@@ -83,11 +135,40 @@
/* field select: (if AUFD=0) /* field select: (if AUFD=0)
* 0=50Hz (625 lines), 1=60Hz (525 lines) */ * 0=50Hz (625 lines), 1=60Hz (525 lines) */
#define SAA7191_CTL3_FSEL 0x40 #define SAA7191_CTL3_FSEL 0x40
/* the bit fields above must be or'd with this value */ /* SECAM cross-colour reduction enable */
#define SAA7191_CTL3_VALUE 0x19 #define SAA7191_CTL3_SXCR 0x20
/* sync and clamping pulse enable (HCL and HSY outputs) */
#define SAA7191_CTL3_SCEN 0x10
/* output format: 0=4:1:1, 1=4:2:2 (4:2:2 for VINO) */
#define SAA7191_CTL3_OFTS 0x08
/* luminance delay compensation
* 0=0*2/LLC, 1=+1*2/LLC, 2=+2*2/LLC, 3=+3*2/LLC,
* 4=-4*2/LLC, 5=-3*2/LLC, 6=-2*2/LLC, 7=-1*2/LLC
* step size = 2/LLC = 67.8ns for 50Hz, 81.5ns for 60Hz */
#define SAA7191_CTL3_YDEL_MASK 0x07
#define SAA7191_CTL3_YDEL_SHIFT 0
#define SAA7191_CTL3_YDEL2 0x04
#define SAA7191_CTL3_YDEL1 0x02
#define SAA7191_CTL3_YDEL0 0x01
/* Miscellaneous Control #2 Register definitions */
/* select HREF position
* 0=normal, HREF is matched to YUV output port,
* 1=HREF is matched to CVBS input port */
#define SAA7191_CTL4_HRFS 0x04
/* vertical noise reduction
* 0=normal, 1=searching window, 2=auto-deflection, 3=reduction bypassed */
#define SAA7191_CTL4_VNOI_MASK 0x03
#define SAA7191_CTL4_VNOI_SHIFT 0
#define SAA7191_CTL4_VNOI_3 0x03
#define SAA7191_CTL4_VNOI_2 0x02
#define SAA7191_CTL4_VNOI_1 0x01
#define SAA7191_CTL4_VNOI_0 0x00
/* Chrominance Gain Control Register definitions /* Chrominance Gain Control Register definitions
* (nominal value for UV CCIR level) */ * - for QAM-modulated input signals, effects output amplitude
* (SECAM gain fixed)
* (nominal values for UV CCIR level) */
#define SAA7191_CHCV_NTSC 0x2c #define SAA7191_CHCV_NTSC 0x2c
#define SAA7191_CHCV_PAL 0x59 #define SAA7191_CHCV_PAL 0x59
...@@ -99,16 +180,13 @@ ...@@ -99,16 +180,13 @@
#define SAA7191_NORM_PAL 1 #define SAA7191_NORM_PAL 1
#define SAA7191_NORM_NTSC 2 #define SAA7191_NORM_NTSC 2
#define SAA7191_NORM_SECAM 3 #define SAA7191_NORM_SECAM 3
#define SAA7191_NORM_AUTO_EXT 4 /* extended auto-detection */
#define SAA7191_VALUE_ENABLED 1
#define SAA7191_VALUE_DISABLED 0
#define SAA7191_VALUE_UNCHANGED -1
struct saa7191_status { struct saa7191_status {
/* 0=no signal, 1=signal active*/ /* 0=no signal, 1=signal detected */
int signal; int signal;
/* 0=50hz (pal) signal, 1=60hz (ntsc) signal */ /* 0=50hz (pal) signal, 1=60hz (ntsc) signal */
int ntsc; int signal_60hz;
/* 0=no color detected, 1=color detected */ /* 0=no color detected, 1=color detected */
int color; int color;
...@@ -118,22 +196,60 @@ struct saa7191_status { ...@@ -118,22 +196,60 @@ struct saa7191_status {
int norm; int norm;
}; };
#define SAA7191_HUE_MIN 0x00 #define SAA7191_BANDPASS_MIN 0x00
#define SAA7191_HUE_MAX 0xff #define SAA7191_BANDPASS_MAX 0x03
#define SAA7191_HUE_DEFAULT 0x80 #define SAA7191_BANDPASS_DEFAULT 0x00
#define SAA7191_BANDPASS_WEIGHT_MIN 0x00
#define SAA7191_BANDPASS_WEIGHT_MAX 0x03
#define SAA7191_BANDPASS_WEIGHT_DEFAULT 0x01
#define SAA7191_CORING_MIN 0x00
#define SAA7191_CORING_MAX 0x03
#define SAA7191_CORING_DEFAULT 0x00
#define SAA7191_HUE_MIN 0x00
#define SAA7191_HUE_MAX 0xff
#define SAA7191_HUE_DEFAULT 0x80
#define SAA7191_VTRC_MIN 0x00
#define SAA7191_VTRC_MAX 0x01
#define SAA7191_VTRC_DEFAULT 0x00
#define SAA7191_FORCE_COLOUR_MIN 0x00
#define SAA7191_FORCE_COLOUR_MAX 0x01
#define SAA7191_FORCE_COLOUR_DEFAULT 0x00
#define SAA7191_CHROMA_GAIN_MIN 0x00
#define SAA7191_CHROMA_GAIN_MAX 0x03
#define SAA7191_CHROMA_GAIN_DEFAULT 0x00
#define SAA7191_LUMA_DELAY_MIN -0x04
#define SAA7191_LUMA_DELAY_MAX 0x03
#define SAA7191_LUMA_DELAY_DEFAULT 0x01
#define SAA7191_VNR_MIN 0x00
#define SAA7191_VNR_MAX 0x03
#define SAA7191_VNR_DEFAULT 0x00
#define SAA7191_VTRC_MIN 0x00 #define SAA7191_CONTROL_BANDPASS 0
#define SAA7191_VTRC_MAX 0x01 #define SAA7191_CONTROL_BANDPASS_WEIGHT 1
#define SAA7191_VTRC_DEFAULT 0x00 #define SAA7191_CONTROL_CORING 2
#define SAA7191_CONTROL_FORCE_COLOUR 3 /* boolean */
#define SAA7191_CONTROL_CHROMA_GAIN 4
#define SAA7191_CONTROL_HUE 5
#define SAA7191_CONTROL_VTRC 6 /* boolean */
#define SAA7191_CONTROL_LUMA_DELAY 7
#define SAA7191_CONTROL_VNR 8
struct saa7191_control { struct saa7191_control {
int hue; u8 type;
int vtrc; s32 value;
}; };
#define DECODER_SAA7191_GET_STATUS _IOR('d', 195, struct saa7191_status) #define DECODER_SAA7191_GET_STATUS _IOR('d', 195, struct saa7191_status)
#define DECODER_SAA7191_SET_NORM _IOW('d', 196, int) #define DECODER_SAA7191_SET_NORM _IOW('d', 196, int)
#define DECODER_SAA7191_GET_CONTROLS _IOR('d', 197, struct saa7191_control) #define DECODER_SAA7191_GET_CONTROL _IOR('d', 197, struct saa7191_control)
#define DECODER_SAA7191_SET_CONTROLS _IOW('d', 198, struct saa7191_control) #define DECODER_SAA7191_SET_CONTROL _IOW('d', 198, struct saa7191_control)
#endif #endif
...@@ -12,15 +12,11 @@ ...@@ -12,15 +12,11 @@
/* /*
* TODO: * TODO:
* - remove "hacks" from memory allocation code and implement nopage() * - remove "mark pages reserved-hacks" from memory allocation code
* and implement nopage()
* - check decimation, calculating and reporting image size when * - check decimation, calculating and reporting image size when
* using decimation * using decimation
* - check vino_acquire_input(), vino_set_input() and channel * - implement read(), user mode buffers and overlay (?)
* ownership handling
* - report VINO error-interrupts via ioctls ?
* - implement picture controls (all implemented?)
* - use macros for boolean values (?)
* - implement user mode buffers and overlay (?)
*/ */
#include <linux/init.h> #include <linux/init.h>
...@@ -60,18 +56,16 @@ ...@@ -60,18 +56,16 @@
* debug info. * debug info.
* Note that the debug output also slows down the driver significantly */ * Note that the debug output also slows down the driver significantly */
// #define VINO_DEBUG // #define VINO_DEBUG
// #define VINO_DEBUG_INT
#define VINO_MODULE_VERSION "0.0.3" #define VINO_MODULE_VERSION "0.0.5"
#define VINO_VERSION_CODE KERNEL_VERSION(0, 0, 3) #define VINO_VERSION_CODE KERNEL_VERSION(0, 0, 5)
MODULE_DESCRIPTION("SGI VINO Video4Linux2 driver"); MODULE_DESCRIPTION("SGI VINO Video4Linux2 driver");
MODULE_VERSION(VINO_MODULE_VERSION); MODULE_VERSION(VINO_MODULE_VERSION);
MODULE_AUTHOR("Mikael Nousiainen <tmnousia@cc.hut.fi>"); MODULE_AUTHOR("Mikael Nousiainen <tmnousia@cc.hut.fi>");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
#define mem_map_reserve(p) set_bit(PG_reserved, &((p)->flags))
#define mem_map_unreserve(p) clear_bit(PG_reserved, &((p)->flags))
#ifdef VINO_DEBUG #ifdef VINO_DEBUG
#define dprintk(x...) printk("VINO: " x); #define dprintk(x...) printk("VINO: " x);
#else #else
...@@ -91,15 +85,16 @@ MODULE_LICENSE("GPL"); ...@@ -91,15 +85,16 @@ MODULE_LICENSE("GPL");
#define VINO_MIN_HEIGHT 32 #define VINO_MIN_HEIGHT 32
#define VINO_CLIPPING_START_ODD_D1 1 #define VINO_CLIPPING_START_ODD_D1 1
#define VINO_CLIPPING_START_ODD_PAL 1 #define VINO_CLIPPING_START_ODD_PAL 15
#define VINO_CLIPPING_START_ODD_NTSC 1 #define VINO_CLIPPING_START_ODD_NTSC 12
#define VINO_CLIPPING_START_EVEN_D1 2 #define VINO_CLIPPING_START_EVEN_D1 2
#define VINO_CLIPPING_START_EVEN_PAL 2 #define VINO_CLIPPING_START_EVEN_PAL 15
#define VINO_CLIPPING_START_EVEN_NTSC 2 #define VINO_CLIPPING_START_EVEN_NTSC 12
#define VINO_INPUT_CHANNEL_COUNT 3 #define VINO_INPUT_CHANNEL_COUNT 3
/* the number is the index for vino_inputs */
#define VINO_INPUT_NONE -1 #define VINO_INPUT_NONE -1
#define VINO_INPUT_COMPOSITE 0 #define VINO_INPUT_COMPOSITE 0
#define VINO_INPUT_SVIDEO 1 #define VINO_INPUT_SVIDEO 1
...@@ -107,15 +102,13 @@ MODULE_LICENSE("GPL"); ...@@ -107,15 +102,13 @@ MODULE_LICENSE("GPL");
#define VINO_PAGE_RATIO (PAGE_SIZE / VINO_PAGE_SIZE) #define VINO_PAGE_RATIO (PAGE_SIZE / VINO_PAGE_SIZE)
#define VINO_FIFO_THRESHOLD_DEFAULT 512 #define VINO_FIFO_THRESHOLD_DEFAULT 16
/*#define VINO_FRAMEBUFFER_SIZE (VINO_PAL_WIDTH * VINO_PAL_HEIGHT * 4 \
+ 2 * PAGE_SIZE)*/
#define VINO_FRAMEBUFFER_SIZE ((VINO_PAL_WIDTH \ #define VINO_FRAMEBUFFER_SIZE ((VINO_PAL_WIDTH \
* VINO_PAL_HEIGHT * 4 \ * VINO_PAL_HEIGHT * 4 \
+ 3 * PAGE_SIZE) & ~(PAGE_SIZE - 1)) + 3 * PAGE_SIZE) & ~(PAGE_SIZE - 1))
#define VINO_FRAMEBUFFER_MAX_COUNT 8 #define VINO_FRAMEBUFFER_COUNT_MAX 8
#define VINO_FRAMEBUFFER_UNUSED 0 #define VINO_FRAMEBUFFER_UNUSED 0
#define VINO_FRAMEBUFFER_IN_USE 1 #define VINO_FRAMEBUFFER_IN_USE 1
...@@ -131,24 +124,27 @@ MODULE_LICENSE("GPL"); ...@@ -131,24 +124,27 @@ MODULE_LICENSE("GPL");
#define VINO_DUMMY_DESC_COUNT 4 #define VINO_DUMMY_DESC_COUNT 4
#define VINO_DESC_FETCH_DELAY 5 /* microseconds */ #define VINO_DESC_FETCH_DELAY 5 /* microseconds */
#define VINO_MAX_FRAME_SKIP_COUNT 128
/* the number is the index for vino_data_formats */ /* the number is the index for vino_data_formats */
#define VINO_DATA_FMT_NONE -1 #define VINO_DATA_FMT_NONE -1
#define VINO_DATA_FMT_GREY 0 #define VINO_DATA_FMT_GREY 0
#define VINO_DATA_FMT_RGB332 1 #define VINO_DATA_FMT_RGB332 1
#define VINO_DATA_FMT_RGB32 2 #define VINO_DATA_FMT_RGB32 2
#define VINO_DATA_FMT_YUV 3 #define VINO_DATA_FMT_YUV 3
//#define VINO_DATA_FMT_RGB24 4
#define VINO_DATA_FMT_COUNT 4 #define VINO_DATA_FMT_COUNT 4
/* the number is the index for vino_data_norms */
#define VINO_DATA_NORM_NONE -1 #define VINO_DATA_NORM_NONE -1
#define VINO_DATA_NORM_NTSC 0 #define VINO_DATA_NORM_NTSC 0
#define VINO_DATA_NORM_PAL 1 #define VINO_DATA_NORM_PAL 1
#define VINO_DATA_NORM_SECAM 2 #define VINO_DATA_NORM_SECAM 2
#define VINO_DATA_NORM_D1 3 #define VINO_DATA_NORM_D1 3
/* The following is a special entry that can be used to /* The following are special entries that can be used to
* autodetect the norm. */ * autodetect the norm. */
#define VINO_DATA_NORM_AUTO 0xff #define VINO_DATA_NORM_AUTO 0xfe
#define VINO_DATA_NORM_AUTO_EXT 0xff
#define VINO_DATA_NORM_COUNT 4 #define VINO_DATA_NORM_COUNT 4
...@@ -232,7 +228,7 @@ struct vino_framebuffer_fifo { ...@@ -232,7 +228,7 @@ struct vino_framebuffer_fifo {
unsigned int head; unsigned int head;
unsigned int tail; unsigned int tail;
unsigned int data[VINO_FRAMEBUFFER_MAX_COUNT]; unsigned int data[VINO_FRAMEBUFFER_COUNT_MAX];
}; };
struct vino_framebuffer_queue { struct vino_framebuffer_queue {
...@@ -246,13 +242,20 @@ struct vino_framebuffer_queue { ...@@ -246,13 +242,20 @@ struct vino_framebuffer_queue {
struct vino_framebuffer_fifo in; struct vino_framebuffer_fifo in;
struct vino_framebuffer_fifo out; struct vino_framebuffer_fifo out;
struct vino_framebuffer *buffer[VINO_FRAMEBUFFER_MAX_COUNT]; struct vino_framebuffer *buffer[VINO_FRAMEBUFFER_COUNT_MAX];
spinlock_t queue_lock; spinlock_t queue_lock;
struct semaphore queue_sem; struct semaphore queue_sem;
wait_queue_head_t frame_wait_queue; wait_queue_head_t frame_wait_queue;
}; };
struct vino_interrupt_data {
struct timeval timestamp;
unsigned int frame_counter;
unsigned int skip_count;
unsigned int skip;
};
struct vino_channel_settings { struct vino_channel_settings {
unsigned int channel; unsigned int channel;
...@@ -285,6 +288,8 @@ struct vino_channel_settings { ...@@ -285,6 +288,8 @@ struct vino_channel_settings {
unsigned int users; unsigned int users;
struct vino_interrupt_data int_data;
/* V4L support */ /* V4L support */
struct video_device *v4l_device; struct video_device *v4l_device;
}; };
...@@ -315,7 +320,7 @@ struct vino_settings { ...@@ -315,7 +320,7 @@ struct vino_settings {
/* Module parameters */ /* Module parameters */
/* /*
* Using vino_pixel_conversion the ARGB32-format pixels supplied * Using vino_pixel_conversion the ABGR32-format pixels supplied
* by the VINO chip can be converted to more common formats * by the VINO chip can be converted to more common formats
* like RGBA32 (or probably RGB24 in the future). This way we * like RGBA32 (or probably RGB24 in the future). This way we
* can give out data that can be specified correctly with * can give out data that can be specified correctly with
...@@ -329,7 +334,9 @@ struct vino_settings { ...@@ -329,7 +334,9 @@ struct vino_settings {
* Use non-zero value to enable conversion. * Use non-zero value to enable conversion.
*/ */
static int vino_pixel_conversion = 0; static int vino_pixel_conversion = 0;
module_param_named(pixelconv, vino_pixel_conversion, int, 0); module_param_named(pixelconv, vino_pixel_conversion, int, 0);
MODULE_PARM_DESC(pixelconv, MODULE_PARM_DESC(pixelconv,
"enable pixel conversion (non-zero value enables)"); "enable pixel conversion (non-zero value enables)");
...@@ -345,15 +352,22 @@ static const char *vino_bus_name = "GIO64 bus"; ...@@ -345,15 +352,22 @@ static const char *vino_bus_name = "GIO64 bus";
static const char *vino_v4l_device_name_a = "SGI VINO Channel A"; static const char *vino_v4l_device_name_a = "SGI VINO Channel A";
static const char *vino_v4l_device_name_b = "SGI VINO Channel B"; static const char *vino_v4l_device_name_b = "SGI VINO Channel B";
static void vino_capture_tasklet(unsigned long channel);
DECLARE_TASKLET(vino_tasklet_a, vino_capture_tasklet, VINO_CHANNEL_A);
DECLARE_TASKLET(vino_tasklet_b, vino_capture_tasklet, VINO_CHANNEL_B);
static const struct vino_input vino_inputs[] = { static const struct vino_input vino_inputs[] = {
{ {
.name = "Composite", .name = "Composite",
.std = V4L2_STD_NTSC | V4L2_STD_PAL | V4L2_STD_SECAM, .std = V4L2_STD_NTSC | V4L2_STD_PAL
| V4L2_STD_SECAM,
},{ },{
.name = "S-Video", .name = "S-Video",
.std = V4L2_STD_NTSC | V4L2_STD_PAL | V4L2_STD_SECAM, .std = V4L2_STD_NTSC | V4L2_STD_PAL
| V4L2_STD_SECAM,
},{ },{
.name = "D1 (IndyCam)", .name = "D1/IndyCam",
.std = V4L2_STD_NTSC, .std = V4L2_STD_NTSC,
} }
}; };
...@@ -376,15 +390,10 @@ static const struct vino_data_format vino_data_formats[] = { ...@@ -376,15 +390,10 @@ static const struct vino_data_format vino_data_formats[] = {
.colorspace = V4L2_COLORSPACE_SRGB, .colorspace = V4L2_COLORSPACE_SRGB,
},{ },{
.description = "YUV 4:2:2", .description = "YUV 4:2:2",
.bpp = 4, .bpp = 2,
.pixelformat = V4L2_PIX_FMT_YUYV, // XXX: swapped? .pixelformat = V4L2_PIX_FMT_YUYV, // XXX: swapped?
.colorspace = V4L2_COLORSPACE_SMPTE170M, .colorspace = V4L2_COLORSPACE_SMPTE170M,
}/*,{ }
.description = "24-bit RGB",
.bpp = 3,
.pixelformat = V4L2_PIX_FMT_RGB24,
.colorspace = V4L2_COLORSPACE_SRGB,
}*/
}; };
static const struct vino_data_norm vino_data_norms[] = { static const struct vino_data_norm vino_data_norms[] = {
...@@ -397,18 +406,18 @@ static const struct vino_data_norm vino_data_norms[] = { ...@@ -397,18 +406,18 @@ static const struct vino_data_norm vino_data_norms[] = {
.width = VINO_NTSC_WIDTH, .width = VINO_NTSC_WIDTH,
.height = VINO_NTSC_HEIGHT, .height = VINO_NTSC_HEIGHT,
.odd = { .odd = {
.top = VINO_CLIPPING_START_ODD_NTSC, .top = VINO_CLIPPING_START_ODD_NTSC,
.left = 0, .left = 0,
.bottom = VINO_CLIPPING_START_ODD_NTSC .bottom = VINO_CLIPPING_START_ODD_NTSC
+ VINO_NTSC_HEIGHT / 2 - 1, + VINO_NTSC_HEIGHT / 2 - 1,
.right = VINO_NTSC_WIDTH, .right = VINO_NTSC_WIDTH,
}, },
.even = { .even = {
.top = VINO_CLIPPING_START_EVEN_NTSC, .top = VINO_CLIPPING_START_EVEN_NTSC,
.left = 0, .left = 0,
.bottom = VINO_CLIPPING_START_EVEN_NTSC .bottom = VINO_CLIPPING_START_EVEN_NTSC
+ VINO_NTSC_HEIGHT / 2 - 1, + VINO_NTSC_HEIGHT / 2 - 1,
.right = VINO_NTSC_WIDTH, .right = VINO_NTSC_WIDTH,
}, },
},{ },{
.description = "PAL", .description = "PAL",
...@@ -419,18 +428,18 @@ static const struct vino_data_norm vino_data_norms[] = { ...@@ -419,18 +428,18 @@ static const struct vino_data_norm vino_data_norms[] = {
.width = VINO_PAL_WIDTH, .width = VINO_PAL_WIDTH,
.height = VINO_PAL_HEIGHT, .height = VINO_PAL_HEIGHT,
.odd = { .odd = {
.top = VINO_CLIPPING_START_ODD_PAL, .top = VINO_CLIPPING_START_ODD_PAL,
.left = 0, .left = 0,
.bottom = VINO_CLIPPING_START_ODD_PAL .bottom = VINO_CLIPPING_START_ODD_PAL
+ VINO_PAL_HEIGHT / 2 - 1, + VINO_PAL_HEIGHT / 2 - 1,
.right = VINO_PAL_WIDTH, .right = VINO_PAL_WIDTH,
}, },
.even = { .even = {
.top = VINO_CLIPPING_START_EVEN_PAL, .top = VINO_CLIPPING_START_EVEN_PAL,
.left = 0, .left = 0,
.bottom = VINO_CLIPPING_START_EVEN_PAL .bottom = VINO_CLIPPING_START_EVEN_PAL
+ VINO_PAL_HEIGHT / 2 - 1, + VINO_PAL_HEIGHT / 2 - 1,
.right = VINO_PAL_WIDTH, .right = VINO_PAL_WIDTH,
}, },
},{ },{
.description = "SECAM", .description = "SECAM",
...@@ -441,21 +450,21 @@ static const struct vino_data_norm vino_data_norms[] = { ...@@ -441,21 +450,21 @@ static const struct vino_data_norm vino_data_norms[] = {
.width = VINO_PAL_WIDTH, .width = VINO_PAL_WIDTH,
.height = VINO_PAL_HEIGHT, .height = VINO_PAL_HEIGHT,
.odd = { .odd = {
.top = VINO_CLIPPING_START_ODD_PAL, .top = VINO_CLIPPING_START_ODD_PAL,
.left = 0, .left = 0,
.bottom = VINO_CLIPPING_START_ODD_PAL .bottom = VINO_CLIPPING_START_ODD_PAL
+ VINO_PAL_HEIGHT / 2 - 1, + VINO_PAL_HEIGHT / 2 - 1,
.right = VINO_PAL_WIDTH, .right = VINO_PAL_WIDTH,
}, },
.even = { .even = {
.top = VINO_CLIPPING_START_EVEN_PAL, .top = VINO_CLIPPING_START_EVEN_PAL,
.left = 0, .left = 0,
.bottom = VINO_CLIPPING_START_EVEN_PAL .bottom = VINO_CLIPPING_START_EVEN_PAL
+ VINO_PAL_HEIGHT / 2 - 1, + VINO_PAL_HEIGHT / 2 - 1,
.right = VINO_PAL_WIDTH, .right = VINO_PAL_WIDTH,
}, },
},{ },{
.description = "NTSC (D1 input)", .description = "NTSC/D1",
.std = V4L2_STD_NTSC, .std = V4L2_STD_NTSC,
.fps_min = 6, .fps_min = 6,
.fps_max = 30, .fps_max = 30,
...@@ -463,18 +472,18 @@ static const struct vino_data_norm vino_data_norms[] = { ...@@ -463,18 +472,18 @@ static const struct vino_data_norm vino_data_norms[] = {
.width = VINO_NTSC_WIDTH, .width = VINO_NTSC_WIDTH,
.height = VINO_NTSC_HEIGHT, .height = VINO_NTSC_HEIGHT,
.odd = { .odd = {
.top = VINO_CLIPPING_START_ODD_D1, .top = VINO_CLIPPING_START_ODD_D1,
.left = 0, .left = 0,
.bottom = VINO_CLIPPING_START_ODD_D1 .bottom = VINO_CLIPPING_START_ODD_D1
+ VINO_NTSC_HEIGHT / 2 - 1, + VINO_NTSC_HEIGHT / 2 - 1,
.right = VINO_NTSC_WIDTH, .right = VINO_NTSC_WIDTH,
}, },
.even = { .even = {
.top = VINO_CLIPPING_START_EVEN_D1, .top = VINO_CLIPPING_START_EVEN_D1,
.left = 0, .left = 0,
.bottom = VINO_CLIPPING_START_EVEN_D1 .bottom = VINO_CLIPPING_START_EVEN_D1
+ VINO_NTSC_HEIGHT / 2 - 1, + VINO_NTSC_HEIGHT / 2 - 1,
.right = VINO_NTSC_WIDTH, .right = VINO_NTSC_WIDTH,
}, },
} }
}; };
...@@ -491,7 +500,7 @@ struct v4l2_queryctrl vino_indycam_v4l2_controls[] = { ...@@ -491,7 +500,7 @@ struct v4l2_queryctrl vino_indycam_v4l2_controls[] = {
.step = 1, .step = 1,
.default_value = INDYCAM_AGC_DEFAULT, .default_value = INDYCAM_AGC_DEFAULT,
.flags = 0, .flags = 0,
.reserved = { 0, 0 }, .reserved = { INDYCAM_CONTROL_AGC, 0 },
},{ },{
.id = V4L2_CID_AUTO_WHITE_BALANCE, .id = V4L2_CID_AUTO_WHITE_BALANCE,
.type = V4L2_CTRL_TYPE_BOOLEAN, .type = V4L2_CTRL_TYPE_BOOLEAN,
...@@ -501,7 +510,7 @@ struct v4l2_queryctrl vino_indycam_v4l2_controls[] = { ...@@ -501,7 +510,7 @@ struct v4l2_queryctrl vino_indycam_v4l2_controls[] = {
.step = 1, .step = 1,
.default_value = INDYCAM_AWB_DEFAULT, .default_value = INDYCAM_AWB_DEFAULT,
.flags = 0, .flags = 0,
.reserved = { 0, 0 }, .reserved = { INDYCAM_CONTROL_AWB, 0 },
},{ },{
.id = V4L2_CID_GAIN, .id = V4L2_CID_GAIN,
.type = V4L2_CTRL_TYPE_INTEGER, .type = V4L2_CTRL_TYPE_INTEGER,
...@@ -511,7 +520,7 @@ struct v4l2_queryctrl vino_indycam_v4l2_controls[] = { ...@@ -511,7 +520,7 @@ struct v4l2_queryctrl vino_indycam_v4l2_controls[] = {
.step = 1, .step = 1,
.default_value = INDYCAM_GAIN_DEFAULT, .default_value = INDYCAM_GAIN_DEFAULT,
.flags = 0, .flags = 0,
.reserved = { 0, 0 }, .reserved = { INDYCAM_CONTROL_GAIN, 0 },
},{ },{
.id = V4L2_CID_PRIVATE_BASE, .id = V4L2_CID_PRIVATE_BASE,
.type = V4L2_CTRL_TYPE_INTEGER, .type = V4L2_CTRL_TYPE_INTEGER,
...@@ -521,7 +530,7 @@ struct v4l2_queryctrl vino_indycam_v4l2_controls[] = { ...@@ -521,7 +530,7 @@ struct v4l2_queryctrl vino_indycam_v4l2_controls[] = {
.step = 1, .step = 1,
.default_value = INDYCAM_RED_SATURATION_DEFAULT, .default_value = INDYCAM_RED_SATURATION_DEFAULT,
.flags = 0, .flags = 0,
.reserved = { 0, 0 }, .reserved = { INDYCAM_CONTROL_RED_SATURATION, 0 },
},{ },{
.id = V4L2_CID_PRIVATE_BASE + 1, .id = V4L2_CID_PRIVATE_BASE + 1,
.type = V4L2_CTRL_TYPE_INTEGER, .type = V4L2_CTRL_TYPE_INTEGER,
...@@ -531,7 +540,7 @@ struct v4l2_queryctrl vino_indycam_v4l2_controls[] = { ...@@ -531,7 +540,7 @@ struct v4l2_queryctrl vino_indycam_v4l2_controls[] = {
.step = 1, .step = 1,
.default_value = INDYCAM_BLUE_SATURATION_DEFAULT, .default_value = INDYCAM_BLUE_SATURATION_DEFAULT,
.flags = 0, .flags = 0,
.reserved = { 0, 0 }, .reserved = { INDYCAM_CONTROL_BLUE_SATURATION, 0 },
},{ },{
.id = V4L2_CID_RED_BALANCE, .id = V4L2_CID_RED_BALANCE,
.type = V4L2_CTRL_TYPE_INTEGER, .type = V4L2_CTRL_TYPE_INTEGER,
...@@ -541,7 +550,7 @@ struct v4l2_queryctrl vino_indycam_v4l2_controls[] = { ...@@ -541,7 +550,7 @@ struct v4l2_queryctrl vino_indycam_v4l2_controls[] = {
.step = 1, .step = 1,
.default_value = INDYCAM_RED_BALANCE_DEFAULT, .default_value = INDYCAM_RED_BALANCE_DEFAULT,
.flags = 0, .flags = 0,
.reserved = { 0, 0 }, .reserved = { INDYCAM_CONTROL_RED_BALANCE, 0 },
},{ },{
.id = V4L2_CID_BLUE_BALANCE, .id = V4L2_CID_BLUE_BALANCE,
.type = V4L2_CTRL_TYPE_INTEGER, .type = V4L2_CTRL_TYPE_INTEGER,
...@@ -551,7 +560,7 @@ struct v4l2_queryctrl vino_indycam_v4l2_controls[] = { ...@@ -551,7 +560,7 @@ struct v4l2_queryctrl vino_indycam_v4l2_controls[] = {
.step = 1, .step = 1,
.default_value = INDYCAM_BLUE_BALANCE_DEFAULT, .default_value = INDYCAM_BLUE_BALANCE_DEFAULT,
.flags = 0, .flags = 0,
.reserved = { 0, 0 }, .reserved = { INDYCAM_CONTROL_BLUE_BALANCE, 0 },
},{ },{
.id = V4L2_CID_EXPOSURE, .id = V4L2_CID_EXPOSURE,
.type = V4L2_CTRL_TYPE_INTEGER, .type = V4L2_CTRL_TYPE_INTEGER,
...@@ -561,7 +570,7 @@ struct v4l2_queryctrl vino_indycam_v4l2_controls[] = { ...@@ -561,7 +570,7 @@ struct v4l2_queryctrl vino_indycam_v4l2_controls[] = {
.step = 1, .step = 1,
.default_value = INDYCAM_SHUTTER_DEFAULT, .default_value = INDYCAM_SHUTTER_DEFAULT,
.flags = 0, .flags = 0,
.reserved = { 0, 0 }, .reserved = { INDYCAM_CONTROL_SHUTTER, 0 },
},{ },{
.id = V4L2_CID_GAMMA, .id = V4L2_CID_GAMMA,
.type = V4L2_CTRL_TYPE_INTEGER, .type = V4L2_CTRL_TYPE_INTEGER,
...@@ -571,11 +580,11 @@ struct v4l2_queryctrl vino_indycam_v4l2_controls[] = { ...@@ -571,11 +580,11 @@ struct v4l2_queryctrl vino_indycam_v4l2_controls[] = {
.step = 1, .step = 1,
.default_value = INDYCAM_GAMMA_DEFAULT, .default_value = INDYCAM_GAMMA_DEFAULT,
.flags = 0, .flags = 0,
.reserved = { 0, 0 }, .reserved = { INDYCAM_CONTROL_GAMMA, 0 },
} }
}; };
#define VINO_SAA7191_V4L2_CONTROL_COUNT 2 #define VINO_SAA7191_V4L2_CONTROL_COUNT 9
struct v4l2_queryctrl vino_saa7191_v4l2_controls[] = { struct v4l2_queryctrl vino_saa7191_v4l2_controls[] = {
{ {
...@@ -587,9 +596,59 @@ struct v4l2_queryctrl vino_saa7191_v4l2_controls[] = { ...@@ -587,9 +596,59 @@ struct v4l2_queryctrl vino_saa7191_v4l2_controls[] = {
.step = 1, .step = 1,
.default_value = SAA7191_HUE_DEFAULT, .default_value = SAA7191_HUE_DEFAULT,
.flags = 0, .flags = 0,
.reserved = { 0, 0 }, .reserved = { SAA7191_CONTROL_HUE, 0 },
},{ },{
.id = V4L2_CID_PRIVATE_BASE, .id = V4L2_CID_PRIVATE_BASE,
.type = V4L2_CTRL_TYPE_INTEGER,
.name = "Luminance Bandpass",
.minimum = SAA7191_BANDPASS_MIN,
.maximum = SAA7191_BANDPASS_MAX,
.step = 1,
.default_value = SAA7191_BANDPASS_DEFAULT,
.flags = 0,
.reserved = { SAA7191_CONTROL_BANDPASS, 0 },
},{
.id = V4L2_CID_PRIVATE_BASE + 1,
.type = V4L2_CTRL_TYPE_INTEGER,
.name = "Luminance Bandpass Weight",
.minimum = SAA7191_BANDPASS_WEIGHT_MIN,
.maximum = SAA7191_BANDPASS_WEIGHT_MAX,
.step = 1,
.default_value = SAA7191_BANDPASS_WEIGHT_DEFAULT,
.flags = 0,
.reserved = { SAA7191_CONTROL_BANDPASS_WEIGHT, 0 },
},{
.id = V4L2_CID_PRIVATE_BASE + 2,
.type = V4L2_CTRL_TYPE_INTEGER,
.name = "HF Luminance Coring",
.minimum = SAA7191_CORING_MIN,
.maximum = SAA7191_CORING_MAX,
.step = 1,
.default_value = SAA7191_CORING_DEFAULT,
.flags = 0,
.reserved = { SAA7191_CONTROL_CORING, 0 },
},{
.id = V4L2_CID_PRIVATE_BASE + 3,
.type = V4L2_CTRL_TYPE_BOOLEAN,
.name = "Force Colour",
.minimum = SAA7191_FORCE_COLOUR_MIN,
.maximum = SAA7191_FORCE_COLOUR_MAX,
.step = 1,
.default_value = SAA7191_FORCE_COLOUR_DEFAULT,
.flags = 0,
.reserved = { SAA7191_CONTROL_FORCE_COLOUR, 0 },
},{
.id = V4L2_CID_PRIVATE_BASE + 4,
.type = V4L2_CTRL_TYPE_INTEGER,
.name = "Chrominance Gain Control",
.minimum = SAA7191_CHROMA_GAIN_MIN,
.maximum = SAA7191_CHROMA_GAIN_MAX,
.step = 1,
.default_value = SAA7191_CHROMA_GAIN_DEFAULT,
.flags = 0,
.reserved = { SAA7191_CONTROL_CHROMA_GAIN, 0 },
},{
.id = V4L2_CID_PRIVATE_BASE + 5,
.type = V4L2_CTRL_TYPE_BOOLEAN, .type = V4L2_CTRL_TYPE_BOOLEAN,
.name = "VTR Time Constant", .name = "VTR Time Constant",
.minimum = SAA7191_VTRC_MIN, .minimum = SAA7191_VTRC_MIN,
...@@ -597,7 +656,27 @@ struct v4l2_queryctrl vino_saa7191_v4l2_controls[] = { ...@@ -597,7 +656,27 @@ struct v4l2_queryctrl vino_saa7191_v4l2_controls[] = {
.step = 1, .step = 1,
.default_value = SAA7191_VTRC_DEFAULT, .default_value = SAA7191_VTRC_DEFAULT,
.flags = 0, .flags = 0,
.reserved = { 0, 0 }, .reserved = { SAA7191_CONTROL_VTRC, 0 },
},{
.id = V4L2_CID_PRIVATE_BASE + 6,
.type = V4L2_CTRL_TYPE_INTEGER,
.name = "Luminance Delay Compensation",
.minimum = SAA7191_LUMA_DELAY_MIN,
.maximum = SAA7191_LUMA_DELAY_MAX,
.step = 1,
.default_value = SAA7191_LUMA_DELAY_DEFAULT,
.flags = 0,
.reserved = { SAA7191_CONTROL_LUMA_DELAY, 0 },
},{
.id = V4L2_CID_PRIVATE_BASE + 7,
.type = V4L2_CTRL_TYPE_INTEGER,
.name = "Vertical Noise Reduction",
.minimum = SAA7191_VNR_MIN,
.maximum = SAA7191_VNR_MAX,
.step = 1,
.default_value = SAA7191_VNR_DEFAULT,
.flags = 0,
.reserved = { SAA7191_CONTROL_VNR, 0 },
} }
}; };
...@@ -639,9 +718,10 @@ static struct i2c_algo_sgi_data i2c_sgi_vino_data = ...@@ -639,9 +718,10 @@ static struct i2c_algo_sgi_data i2c_sgi_vino_data =
*/ */
static int i2c_vino_client_reg(struct i2c_client *client) static int i2c_vino_client_reg(struct i2c_client *client)
{ {
unsigned long flags;
int ret = 0; int ret = 0;
spin_lock(&vino_drvdata->input_lock); spin_lock_irqsave(&vino_drvdata->input_lock, flags);
switch (client->driver->id) { switch (client->driver->id) {
case I2C_DRIVERID_SAA7191: case I2C_DRIVERID_SAA7191:
if (vino_drvdata->decoder.driver) if (vino_drvdata->decoder.driver)
...@@ -658,16 +738,17 @@ static int i2c_vino_client_reg(struct i2c_client *client) ...@@ -658,16 +738,17 @@ static int i2c_vino_client_reg(struct i2c_client *client)
default: default:
ret = -ENODEV; ret = -ENODEV;
} }
spin_unlock(&vino_drvdata->input_lock); spin_unlock_irqrestore(&vino_drvdata->input_lock, flags);
return ret; return ret;
} }
static int i2c_vino_client_unreg(struct i2c_client *client) static int i2c_vino_client_unreg(struct i2c_client *client)
{ {
unsigned long flags;
int ret = 0; int ret = 0;
spin_lock(&vino_drvdata->input_lock); spin_lock_irqsave(&vino_drvdata->input_lock, flags);
if (client == vino_drvdata->decoder.driver) { if (client == vino_drvdata->decoder.driver) {
if (vino_drvdata->decoder.owner != VINO_NO_CHANNEL) if (vino_drvdata->decoder.owner != VINO_NO_CHANNEL)
ret = -EBUSY; ret = -EBUSY;
...@@ -679,7 +760,7 @@ static int i2c_vino_client_unreg(struct i2c_client *client) ...@@ -679,7 +760,7 @@ static int i2c_vino_client_unreg(struct i2c_client *client)
else else
vino_drvdata->camera.driver = NULL; vino_drvdata->camera.driver = NULL;
} }
spin_unlock(&vino_drvdata->input_lock); spin_unlock_irqrestore(&vino_drvdata->input_lock, flags);
return ret; return ret;
} }
...@@ -727,7 +808,7 @@ static void vino_free_buffer_with_count(struct vino_framebuffer *fb, ...@@ -727,7 +808,7 @@ static void vino_free_buffer_with_count(struct vino_framebuffer *fb,
dprintk("vino_free_buffer_with_count(): count = %d\n", count); dprintk("vino_free_buffer_with_count(): count = %d\n", count);
for (i = 0; i < count; i++) { for (i = 0; i < count; i++) {
mem_map_unreserve(virt_to_page(fb->desc_table.virtual[i])); ClearPageReserved(virt_to_page(fb->desc_table.virtual[i]));
dma_unmap_single(NULL, dma_unmap_single(NULL,
fb->desc_table.dma_cpu[VINO_PAGE_RATIO * i], fb->desc_table.dma_cpu[VINO_PAGE_RATIO * i],
PAGE_SIZE, DMA_FROM_DEVICE); PAGE_SIZE, DMA_FROM_DEVICE);
...@@ -805,7 +886,7 @@ static int vino_allocate_buffer(struct vino_framebuffer *fb, ...@@ -805,7 +886,7 @@ static int vino_allocate_buffer(struct vino_framebuffer *fb,
dma_data_addr + VINO_PAGE_SIZE * j; dma_data_addr + VINO_PAGE_SIZE * j;
} }
mem_map_reserve(virt_to_page(fb->desc_table.virtual[i])); SetPageReserved(virt_to_page(fb->desc_table.virtual[i]));
} }
/* page_count needs to be set anyway, because the descriptor table has /* page_count needs to be set anyway, because the descriptor table has
...@@ -892,7 +973,7 @@ static int vino_prepare_user_buffer(struct vino_framebuffer *fb, ...@@ -892,7 +973,7 @@ static int vino_prepare_user_buffer(struct vino_framebuffer *fb,
dma_data_addr + VINO_PAGE_SIZE * j; dma_data_addr + VINO_PAGE_SIZE * j;
} }
mem_map_reserve(virt_to_page(fb->desc_table.virtual[i])); SetPageReserved(virt_to_page(fb->desc_table.virtual[i]));
} }
/* page_count needs to be set anyway, because the descriptor table has /* page_count needs to be set anyway, because the descriptor table has
...@@ -933,7 +1014,7 @@ static void vino_sync_buffer(struct vino_framebuffer *fb) ...@@ -933,7 +1014,7 @@ static void vino_sync_buffer(struct vino_framebuffer *fb)
/* Framebuffer fifo functions (need to be locked externally) */ /* Framebuffer fifo functions (need to be locked externally) */
static void vino_fifo_init(struct vino_framebuffer_fifo *f, static inline void vino_fifo_init(struct vino_framebuffer_fifo *f,
unsigned int length) unsigned int length)
{ {
f->length = 0; f->length = 0;
...@@ -941,16 +1022,18 @@ static void vino_fifo_init(struct vino_framebuffer_fifo *f, ...@@ -941,16 +1022,18 @@ static void vino_fifo_init(struct vino_framebuffer_fifo *f,
f->head = 0; f->head = 0;
f->tail = 0; f->tail = 0;
if (length > VINO_FRAMEBUFFER_MAX_COUNT) if (length > VINO_FRAMEBUFFER_COUNT_MAX)
length = VINO_FRAMEBUFFER_MAX_COUNT; length = VINO_FRAMEBUFFER_COUNT_MAX;
f->length = length; f->length = length;
} }
/* returns true/false */ /* returns true/false */
static int vino_fifo_has_id(struct vino_framebuffer_fifo *f, unsigned int id) static inline int vino_fifo_has_id(struct vino_framebuffer_fifo *f,
unsigned int id)
{ {
unsigned int i; unsigned int i;
for (i = f->head; i == (f->tail - 1); i = (i + 1) % f->length) { for (i = f->head; i == (f->tail - 1); i = (i + 1) % f->length) {
if (f->data[i] == id) if (f->data[i] == id)
return 1; return 1;
...@@ -959,13 +1042,15 @@ static int vino_fifo_has_id(struct vino_framebuffer_fifo *f, unsigned int id) ...@@ -959,13 +1042,15 @@ static int vino_fifo_has_id(struct vino_framebuffer_fifo *f, unsigned int id)
return 0; return 0;
} }
#if 0
/* returns true/false */ /* returns true/false */
static int vino_fifo_full(struct vino_framebuffer_fifo *f) static inline int vino_fifo_full(struct vino_framebuffer_fifo *f)
{ {
return (f->used == f->length); return (f->used == f->length);
} }
#endif
static unsigned int vino_fifo_get_used(struct vino_framebuffer_fifo *f) static inline unsigned int vino_fifo_get_used(struct vino_framebuffer_fifo *f)
{ {
return f->used; return f->used;
} }
...@@ -1076,8 +1161,8 @@ static int vino_queue_init(struct vino_framebuffer_queue *q, ...@@ -1076,8 +1161,8 @@ static int vino_queue_init(struct vino_framebuffer_queue *q,
down(&q->queue_sem); down(&q->queue_sem);
if (*length > VINO_FRAMEBUFFER_MAX_COUNT) if (*length > VINO_FRAMEBUFFER_COUNT_MAX)
*length = VINO_FRAMEBUFFER_MAX_COUNT; *length = VINO_FRAMEBUFFER_COUNT_MAX;
q->length = 0; q->length = 0;
...@@ -1313,6 +1398,7 @@ static int vino_queue_get_outgoing(struct vino_framebuffer_queue *q, ...@@ -1313,6 +1398,7 @@ static int vino_queue_get_outgoing(struct vino_framebuffer_queue *q,
return ret; return ret;
} }
#if 0
static int vino_queue_get_total(struct vino_framebuffer_queue *q, static int vino_queue_get_total(struct vino_framebuffer_queue *q,
unsigned int *total) unsigned int *total)
{ {
...@@ -1338,6 +1424,7 @@ static int vino_queue_get_total(struct vino_framebuffer_queue *q, ...@@ -1338,6 +1424,7 @@ static int vino_queue_get_total(struct vino_framebuffer_queue *q,
return ret; return ret;
} }
#endif
static struct vino_framebuffer *vino_queue_peek(struct static struct vino_framebuffer *vino_queue_peek(struct
vino_framebuffer_queue *q, vino_framebuffer_queue *q,
...@@ -1471,12 +1558,14 @@ static void vino_update_line_size(struct vino_channel_settings *vcs) ...@@ -1471,12 +1558,14 @@ static void vino_update_line_size(struct vino_channel_settings *vcs)
dprintk("update_line_size(): before: w = %d, d = %d, " dprintk("update_line_size(): before: w = %d, d = %d, "
"line_size = %d\n", w, d, vcs->line_size); "line_size = %d\n", w, d, vcs->line_size);
/* line size must be multiple of 8 bytes */ /* line size must be multiple of 8 bytes */
lsize = (bpp * (w / d)) & ~7; lsize = (bpp * (w / d)) & ~7;
w = (lsize / bpp) * d; w = (lsize / bpp) * d;
vcs->clipping.right = vcs->clipping.left + w; vcs->clipping.right = vcs->clipping.left + w;
vcs->line_size = lsize; vcs->line_size = lsize;
dprintk("update_line_size(): after: w = %d, d = %d, " dprintk("update_line_size(): after: w = %d, d = %d, "
"line_size = %d\n", w, d, vcs->line_size); "line_size = %d\n", w, d, vcs->line_size);
} }
...@@ -1532,7 +1621,7 @@ static void vino_set_clipping(struct vino_channel_settings *vcs, ...@@ -1532,7 +1621,7 @@ static void vino_set_clipping(struct vino_channel_settings *vcs,
} }
/* execute with input_lock locked */ /* execute with input_lock locked */
static void vino_set_default_clipping(struct vino_channel_settings *vcs) static inline void vino_set_default_clipping(struct vino_channel_settings *vcs)
{ {
vino_set_clipping(vcs, 0, 0, vino_data_norms[vcs->data_norm].width, vino_set_clipping(vcs, 0, 0, vino_data_norms[vcs->data_norm].width,
vino_data_norms[vcs->data_norm].height); vino_data_norms[vcs->data_norm].height);
...@@ -1556,8 +1645,7 @@ static void vino_set_scaling(struct vino_channel_settings *vcs, ...@@ -1556,8 +1645,7 @@ static void vino_set_scaling(struct vino_channel_settings *vcs,
if (d < 1) { if (d < 1) {
d = 1; d = 1;
} } else if (d > 8) {
if (d > 8) {
d = 8; d = 8;
} }
...@@ -1570,7 +1658,7 @@ static void vino_set_scaling(struct vino_channel_settings *vcs, ...@@ -1570,7 +1658,7 @@ static void vino_set_scaling(struct vino_channel_settings *vcs,
} }
/* execute with input_lock locked */ /* execute with input_lock locked */
static void vino_reset_scaling(struct vino_channel_settings *vcs) static inline void vino_set_default_scaling(struct vino_channel_settings *vcs)
{ {
vino_set_scaling(vcs, vcs->clipping.right - vcs->clipping.left, vino_set_scaling(vcs, vcs->clipping.right - vcs->clipping.left,
vcs->clipping.bottom - vcs->clipping.top); vcs->clipping.bottom - vcs->clipping.top);
...@@ -1649,7 +1737,8 @@ static void vino_set_framerate(struct vino_channel_settings *vcs, ...@@ -1649,7 +1737,8 @@ static void vino_set_framerate(struct vino_channel_settings *vcs,
} }
/* execute with input_lock locked */ /* execute with input_lock locked */
static void vino_set_default_framerate(struct vino_channel_settings *vcs) static inline void vino_set_default_framerate(struct
vino_channel_settings *vcs)
{ {
vino_set_framerate(vcs, vino_data_norms[vcs->data_norm].fps_max); vino_set_framerate(vcs, vino_data_norms[vcs->data_norm].fps_max);
} }
...@@ -1687,6 +1776,9 @@ static int vino_dma_setup(struct vino_channel_settings *vcs, ...@@ -1687,6 +1776,9 @@ static int vino_dma_setup(struct vino_channel_settings *vcs,
* should be more than enough time */ * should be more than enough time */
udelay(VINO_DESC_FETCH_DELAY); udelay(VINO_DESC_FETCH_DELAY);
dprintk("vino_dma_setup(): start desc = %08x, next 4 desc = %08x\n",
ch->start_desc_tbl, ch->next_4_desc);
/* set the alpha register */ /* set the alpha register */
ch->alpha = vcs->alpha; ch->alpha = vcs->alpha;
...@@ -1700,9 +1792,6 @@ static int vino_dma_setup(struct vino_channel_settings *vcs, ...@@ -1700,9 +1792,6 @@ static int vino_dma_setup(struct vino_channel_settings *vcs,
VINO_CLIP_EVEN(norm->even.top + VINO_CLIP_EVEN(norm->even.top +
vcs->clipping.bottom / 2 - 1) | vcs->clipping.bottom / 2 - 1) |
VINO_CLIP_X(vcs->clipping.right); VINO_CLIP_X(vcs->clipping.right);
/* FIXME: end-of-field bug workaround
VINO_CLIP_X(VINO_PAL_WIDTH);
*/
/* set the size of actual content in the buffer (DECIMATION !) */ /* set the size of actual content in the buffer (DECIMATION !) */
fb->data_size = ((vcs->clipping.right - vcs->clipping.left) / fb->data_size = ((vcs->clipping.right - vcs->clipping.left) /
...@@ -1802,7 +1891,7 @@ static int vino_dma_setup(struct vino_channel_settings *vcs, ...@@ -1802,7 +1891,7 @@ static int vino_dma_setup(struct vino_channel_settings *vcs,
} }
/* (execute only with vino_lock locked) */ /* (execute only with vino_lock locked) */
static void vino_dma_start(struct vino_channel_settings *vcs) static inline void vino_dma_start(struct vino_channel_settings *vcs)
{ {
u32 ctrl = vino->control; u32 ctrl = vino->control;
...@@ -1813,12 +1902,14 @@ static void vino_dma_start(struct vino_channel_settings *vcs) ...@@ -1813,12 +1902,14 @@ static void vino_dma_start(struct vino_channel_settings *vcs)
} }
/* (execute only with vino_lock locked) */ /* (execute only with vino_lock locked) */
static void vino_dma_stop(struct vino_channel_settings *vcs) static inline void vino_dma_stop(struct vino_channel_settings *vcs)
{ {
u32 ctrl = vino->control; u32 ctrl = vino->control;
ctrl &= (vcs->channel == VINO_CHANNEL_A) ? ctrl &= (vcs->channel == VINO_CHANNEL_A) ?
~VINO_CTRL_A_DMA_ENBL : ~VINO_CTRL_B_DMA_ENBL; ~VINO_CTRL_A_DMA_ENBL : ~VINO_CTRL_B_DMA_ENBL;
ctrl &= (vcs->channel == VINO_CHANNEL_A) ?
~VINO_CTRL_A_INT : ~VINO_CTRL_B_INT;
vino->control = ctrl; vino->control = ctrl;
dprintk("vino_dma_stop():\n"); dprintk("vino_dma_stop():\n");
} }
...@@ -1902,7 +1993,7 @@ static int vino_capture_next(struct vino_channel_settings *vcs, int start) ...@@ -1902,7 +1993,7 @@ static int vino_capture_next(struct vino_channel_settings *vcs, int start)
struct vino_framebuffer *fb; struct vino_framebuffer *fb;
unsigned int incoming, id; unsigned int incoming, id;
int err = 0; int err = 0;
unsigned long flags, flags2; unsigned long flags;
dprintk("vino_capture_next():\n"); dprintk("vino_capture_next():\n");
...@@ -1943,10 +2034,6 @@ static int vino_capture_next(struct vino_channel_settings *vcs, int start) ...@@ -1943,10 +2034,6 @@ static int vino_capture_next(struct vino_channel_settings *vcs, int start)
goto out; goto out;
} }
spin_lock_irqsave(&fb->state_lock, flags2);
fb->state = VINO_FRAMEBUFFER_UNUSED;
spin_unlock_irqrestore(&fb->state_lock, flags2);
if (start) { if (start) {
vcs->capturing = 1; vcs->capturing = 1;
} }
...@@ -1964,7 +2051,7 @@ static int vino_capture_next(struct vino_channel_settings *vcs, int start) ...@@ -1964,7 +2051,7 @@ static int vino_capture_next(struct vino_channel_settings *vcs, int start)
return err; return err;
} }
static int vino_is_capturing(struct vino_channel_settings *vcs) static inline int vino_is_capturing(struct vino_channel_settings *vcs)
{ {
int ret; int ret;
unsigned long flags; unsigned long flags;
...@@ -2076,6 +2163,7 @@ static void vino_capture_stop(struct vino_channel_settings *vcs) ...@@ -2076,6 +2163,7 @@ static void vino_capture_stop(struct vino_channel_settings *vcs)
dprintk("vino_capture_stop():\n"); dprintk("vino_capture_stop():\n");
spin_lock_irqsave(&vcs->capture_lock, flags); spin_lock_irqsave(&vcs->capture_lock, flags);
/* unset capturing to stop queue processing */ /* unset capturing to stop queue processing */
vcs->capturing = 0; vcs->capturing = 0;
...@@ -2121,6 +2209,7 @@ static void vino_capture_stop(struct vino_channel_settings *vcs) ...@@ -2121,6 +2209,7 @@ static void vino_capture_stop(struct vino_channel_settings *vcs)
spin_unlock_irqrestore(&vcs->capture_lock, flags); spin_unlock_irqrestore(&vcs->capture_lock, flags);
} }
#if 0
static int vino_capture_failed(struct vino_channel_settings *vcs) static int vino_capture_failed(struct vino_channel_settings *vcs)
{ {
struct vino_framebuffer *fb; struct vino_framebuffer *fb;
...@@ -2165,9 +2254,31 @@ static int vino_capture_failed(struct vino_channel_settings *vcs) ...@@ -2165,9 +2254,31 @@ static int vino_capture_failed(struct vino_channel_settings *vcs)
return 0; return 0;
} }
#endif
static void vino_skip_frame(struct vino_channel_settings *vcs)
{
struct vino_framebuffer *fb;
unsigned long flags;
unsigned int id;
spin_lock_irqsave(&vcs->capture_lock, flags);
fb = vino_queue_peek(&vcs->fb_queue, &id);
if (!fb) {
spin_unlock_irqrestore(&vcs->capture_lock, flags);
dprintk("vino_skip_frame(): vino_queue_peek() failed!\n");
return;
}
spin_unlock_irqrestore(&vcs->capture_lock, flags);
spin_lock_irqsave(&fb->state_lock, flags);
fb->state = VINO_FRAMEBUFFER_UNUSED;
spin_unlock_irqrestore(&fb->state_lock, flags);
vino_capture_next(vcs, 0);
}
static void vino_frame_done(struct vino_channel_settings *vcs, static void vino_frame_done(struct vino_channel_settings *vcs)
unsigned int fc)
{ {
struct vino_framebuffer *fb; struct vino_framebuffer *fb;
unsigned long flags; unsigned long flags;
...@@ -2181,8 +2292,9 @@ static void vino_frame_done(struct vino_channel_settings *vcs, ...@@ -2181,8 +2292,9 @@ static void vino_frame_done(struct vino_channel_settings *vcs,
} }
spin_unlock_irqrestore(&vcs->capture_lock, flags); spin_unlock_irqrestore(&vcs->capture_lock, flags);
fb->frame_counter = fc; fb->frame_counter = vcs->int_data.frame_counter;
do_gettimeofday(&fb->timestamp); memcpy(&fb->timestamp, &vcs->int_data.timestamp,
sizeof(struct timeval));
spin_lock_irqsave(&fb->state_lock, flags); spin_lock_irqsave(&fb->state_lock, flags);
if (fb->state == VINO_FRAMEBUFFER_IN_USE) if (fb->state == VINO_FRAMEBUFFER_IN_USE)
...@@ -2194,72 +2306,175 @@ static void vino_frame_done(struct vino_channel_settings *vcs, ...@@ -2194,72 +2306,175 @@ static void vino_frame_done(struct vino_channel_settings *vcs,
vino_capture_next(vcs, 0); vino_capture_next(vcs, 0);
} }
static void vino_capture_tasklet(unsigned long channel) {
struct vino_channel_settings *vcs;
vcs = (channel == VINO_CHANNEL_A)
? &vino_drvdata->a : &vino_drvdata->b;
if (vcs->int_data.skip)
vcs->int_data.skip_count++;
if (vcs->int_data.skip && (vcs->int_data.skip_count
<= VINO_MAX_FRAME_SKIP_COUNT)) {
vino_skip_frame(vcs);
} else {
vcs->int_data.skip_count = 0;
vino_frame_done(vcs);
}
}
static irqreturn_t vino_interrupt(int irq, void *dev_id, struct pt_regs *regs) static irqreturn_t vino_interrupt(int irq, void *dev_id, struct pt_regs *regs)
{ {
u32 intr; u32 ctrl, intr;
unsigned int fc_a, fc_b; unsigned int fc_a, fc_b;
int done_a = 0; int handled_a = 0, skip_a = 0, done_a = 0;
int done_b = 0; int handled_b = 0, skip_b = 0, done_b = 0;
#ifdef VINO_DEBUG_INT
int loop = 0;
unsigned int line_count = vino->a.line_count,
page_index = vino->a.page_index,
field_counter = vino->a.field_counter,
start_desc_tbl = vino->a.start_desc_tbl,
next_4_desc = vino->a.next_4_desc;
unsigned int line_count_2,
page_index_2,
field_counter_2,
start_desc_tbl_2,
next_4_desc_2;
#endif
spin_lock(&vino_drvdata->vino_lock); spin_lock(&vino_drvdata->vino_lock);
intr = vino->intr_status; while ((intr = vino->intr_status)) {
fc_a = vino->a.field_counter / 2; fc_a = vino->a.field_counter >> 1;
fc_b = vino->b.field_counter / 2; fc_b = vino->b.field_counter >> 1;
// TODO: handle error-interrupts in some special way ? /* handle error-interrupts in some special way ?
* --> skips frames */
if (intr & VINO_INTSTAT_A) { if (intr & VINO_INTSTAT_A) {
if (intr & VINO_INTSTAT_A_EOF) { if (intr & VINO_INTSTAT_A_EOF) {
vino_drvdata->a.field++; vino_drvdata->a.field++;
if (vino_drvdata->a.field > 1) { if (vino_drvdata->a.field > 1) {
vino_dma_stop(&vino_drvdata->a);
vino_clear_interrupt(&vino_drvdata->a);
vino_drvdata->a.field = 0;
done_a = 1;
} else {
if (vino->a.page_index
!= vino_drvdata->a.line_size) {
vino->a.line_count = 0;
vino->a.page_index =
vino_drvdata->
a.line_size;
vino->a.next_4_desc =
vino->a.start_desc_tbl;
}
}
dprintk("channel A end-of-field "
"interrupt: %04x\n", intr);
} else {
vino_dma_stop(&vino_drvdata->a); vino_dma_stop(&vino_drvdata->a);
vino_clear_interrupt(&vino_drvdata->a); vino_clear_interrupt(&vino_drvdata->a);
vino_drvdata->a.field = 0; vino_drvdata->a.field = 0;
done_a = 1; skip_a = 1;
dprintk("channel A error interrupt: %04x\n",
intr);
} }
dprintk("intr: channel A end-of-field interrupt: "
"%04x\n", intr); #ifdef VINO_DEBUG_INT
} else { line_count_2 = vino->a.line_count;
vino_dma_stop(&vino_drvdata->a); page_index_2 = vino->a.page_index;
vino_clear_interrupt(&vino_drvdata->a); field_counter_2 = vino->a.field_counter;
done_a = 1; start_desc_tbl_2 = vino->a.start_desc_tbl;
dprintk("channel A error interrupt: %04x\n", intr); next_4_desc_2 = vino->a.next_4_desc;
printk("intr = %04x, loop = %d, field = %d\n",
intr, loop, vino_drvdata->a.field);
printk("1- line count = %04d, page index = %04d, "
"start = %08x, next = %08x\n"
" fieldc = %d, framec = %d\n",
line_count, page_index, start_desc_tbl,
next_4_desc, field_counter, fc_a);
printk("12-line count = %04d, page index = %04d, "
" start = %08x, next = %08x\n",
line_count_2, page_index_2, start_desc_tbl_2,
next_4_desc_2);
if (done_a)
printk("\n");
#endif
} }
}
if (intr & VINO_INTSTAT_B) { if (intr & VINO_INTSTAT_B) {
if (intr & VINO_INTSTAT_B_EOF) { if (intr & VINO_INTSTAT_B_EOF) {
vino_drvdata->b.field++; vino_drvdata->b.field++;
if (vino_drvdata->b.field > 1) { if (vino_drvdata->b.field > 1) {
vino_dma_stop(&vino_drvdata->b);
vino_clear_interrupt(&vino_drvdata->b);
vino_drvdata->b.field = 0;
done_b = 1;
}
dprintk("channel B end-of-field "
"interrupt: %04x\n", intr);
} else {
vino_dma_stop(&vino_drvdata->b); vino_dma_stop(&vino_drvdata->b);
vino_clear_interrupt(&vino_drvdata->b); vino_clear_interrupt(&vino_drvdata->b);
vino_drvdata->b.field = 0; vino_drvdata->b.field = 0;
done_b = 1; skip_b = 1;
dprintk("channel B error interrupt: %04x\n",
intr);
} }
dprintk("intr: channel B end-of-field interrupt: "
"%04x\n", intr);
} else {
vino_dma_stop(&vino_drvdata->b);
vino_clear_interrupt(&vino_drvdata->b);
done_b = 1;
dprintk("channel B error interrupt: %04x\n", intr);
} }
}
/* always remember to clear interrupt status */ /* Always remember to clear interrupt status.
vino->intr_status = ~intr; * Disable VINO interrupts while we do this. */
ctrl = vino->control;
vino->control = ctrl & ~(VINO_CTRL_A_INT | VINO_CTRL_B_INT);
vino->intr_status = ~intr;
vino->control = ctrl;
spin_unlock(&vino_drvdata->vino_lock); spin_unlock(&vino_drvdata->vino_lock);
if (done_a) { if ((!handled_a) && (done_a || skip_a)) {
vino_frame_done(&vino_drvdata->a, fc_a); if (!skip_a) {
dprintk("channel A frame done, interrupt: %d\n", intr); do_gettimeofday(&vino_drvdata->
} a.int_data.timestamp);
if (done_b) { vino_drvdata->a.int_data.frame_counter = fc_a;
vino_frame_done(&vino_drvdata->b, fc_b); }
dprintk("channel B frame done, interrupt: %d\n", intr); vino_drvdata->a.int_data.skip = skip_a;
dprintk("channel A %s, interrupt: %d\n",
skip_a ? "skipping frame" : "frame done",
intr);
tasklet_hi_schedule(&vino_tasklet_a);
handled_a = 1;
}
if ((!handled_b) && (done_b || skip_b)) {
if (!skip_b) {
do_gettimeofday(&vino_drvdata->
b.int_data.timestamp);
vino_drvdata->b.int_data.frame_counter = fc_b;
}
vino_drvdata->b.int_data.skip = skip_b;
dprintk("channel B %s, interrupt: %d\n",
skip_b ? "skipping frame" : "frame done",
intr);
tasklet_hi_schedule(&vino_tasklet_b);
handled_b = 1;
}
#ifdef VINO_DEBUG_INT
loop++;
#endif
spin_lock(&vino_drvdata->vino_lock);
} }
spin_unlock(&vino_drvdata->vino_lock);
return IRQ_HANDLED; return IRQ_HANDLED;
} }
...@@ -2279,11 +2494,13 @@ static int vino_get_saa7191_input(int input) ...@@ -2279,11 +2494,13 @@ static int vino_get_saa7191_input(int input)
} }
} }
static int vino_get_saa7191_norm(int norm) static int vino_get_saa7191_norm(unsigned int data_norm)
{ {
switch (norm) { switch (data_norm) {
case VINO_DATA_NORM_AUTO: case VINO_DATA_NORM_AUTO:
return SAA7191_NORM_AUTO; return SAA7191_NORM_AUTO;
case VINO_DATA_NORM_AUTO_EXT:
return SAA7191_NORM_AUTO_EXT;
case VINO_DATA_NORM_PAL: case VINO_DATA_NORM_PAL:
return SAA7191_NORM_PAL; return SAA7191_NORM_PAL;
case VINO_DATA_NORM_NTSC: case VINO_DATA_NORM_NTSC:
...@@ -2297,6 +2514,57 @@ static int vino_get_saa7191_norm(int norm) ...@@ -2297,6 +2514,57 @@ static int vino_get_saa7191_norm(int norm)
} }
} }
static int vino_get_from_saa7191_norm(int saa7191_norm)
{
switch (saa7191_norm) {
case SAA7191_NORM_PAL:
return VINO_DATA_NORM_PAL;
case SAA7191_NORM_NTSC:
return VINO_DATA_NORM_NTSC;
case SAA7191_NORM_SECAM:
return VINO_DATA_NORM_SECAM;
default:
printk(KERN_ERR "VINO: vino_get_from_saa7191_norm(): "
"invalid norm!\n");
return VINO_DATA_NORM_NONE;
}
}
static int vino_saa7191_set_norm(unsigned int *data_norm)
{
int saa7191_norm, new_data_norm;
int err = 0;
saa7191_norm = vino_get_saa7191_norm(*data_norm);
err = i2c_decoder_command(DECODER_SAA7191_SET_NORM,
&saa7191_norm);
if (err)
goto out;
if ((*data_norm == VINO_DATA_NORM_AUTO)
|| (*data_norm == VINO_DATA_NORM_AUTO_EXT)) {
struct saa7191_status status;
err = i2c_decoder_command(DECODER_SAA7191_GET_STATUS,
&status);
if (err)
goto out;
new_data_norm =
vino_get_from_saa7191_norm(status.norm);
if (new_data_norm == VINO_DATA_NORM_NONE) {
err = -EINVAL;
goto out;
}
*data_norm = (unsigned int)new_data_norm;
}
out:
return err;
}
/* execute with input_lock locked */ /* execute with input_lock locked */
static int vino_is_input_owner(struct vino_channel_settings *vcs) static int vino_is_input_owner(struct vino_channel_settings *vcs)
{ {
...@@ -2313,11 +2581,12 @@ static int vino_is_input_owner(struct vino_channel_settings *vcs) ...@@ -2313,11 +2581,12 @@ static int vino_is_input_owner(struct vino_channel_settings *vcs)
static int vino_acquire_input(struct vino_channel_settings *vcs) static int vino_acquire_input(struct vino_channel_settings *vcs)
{ {
unsigned long flags;
int ret = 0; int ret = 0;
dprintk("vino_acquire_input():\n"); dprintk("vino_acquire_input():\n");
spin_lock(&vino_drvdata->input_lock); spin_lock_irqsave(&vino_drvdata->input_lock, flags);
/* First try D1 and then SAA7191 */ /* First try D1 and then SAA7191 */
if (vino_drvdata->camera.driver if (vino_drvdata->camera.driver
...@@ -2332,23 +2601,48 @@ static int vino_acquire_input(struct vino_channel_settings *vcs) ...@@ -2332,23 +2601,48 @@ static int vino_acquire_input(struct vino_channel_settings *vcs)
vcs->data_norm = VINO_DATA_NORM_D1; vcs->data_norm = VINO_DATA_NORM_D1;
} else if (vino_drvdata->decoder.driver } else if (vino_drvdata->decoder.driver
&& (vino_drvdata->decoder.owner == VINO_NO_CHANNEL)) { && (vino_drvdata->decoder.owner == VINO_NO_CHANNEL)) {
int input, data_norm;
int saa7191_input; int saa7191_input;
int saa7191_norm;
if (i2c_use_client(vino_drvdata->decoder.driver)) { if (i2c_use_client(vino_drvdata->decoder.driver)) {
ret = -ENODEV; ret = -ENODEV;
goto out; goto out;
} }
vino_drvdata->decoder.owner = vcs->channel; input = VINO_INPUT_COMPOSITE;
vcs->input = VINO_INPUT_COMPOSITE;
vcs->data_norm = VINO_DATA_NORM_PAL; saa7191_input = vino_get_saa7191_input(input);
ret = i2c_decoder_command(DECODER_SET_INPUT,
&saa7191_input);
if (ret) {
ret = -EINVAL;
goto out;
}
spin_unlock_irqrestore(&vino_drvdata->input_lock, flags);
saa7191_input = vino_get_saa7191_input(vcs->input); /* Don't hold spinlocks while auto-detecting norm
i2c_decoder_command(DECODER_SET_INPUT, &saa7191_input); * as it may take a while... */
saa7191_norm = vino_get_saa7191_norm(vcs->data_norm); data_norm = VINO_DATA_NORM_AUTO_EXT;
i2c_decoder_command(DECODER_SAA7191_SET_NORM, &saa7191_norm);
ret = vino_saa7191_set_norm(&data_norm);
if ((ret == -EBUSY) || (ret == -EAGAIN)) {
data_norm = VINO_DATA_NORM_PAL;
ret = vino_saa7191_set_norm(&data_norm);
}
spin_lock_irqsave(&vino_drvdata->input_lock, flags);
if (ret) {
ret = -EINVAL;
goto out;
}
vino_drvdata->decoder.owner = vcs->channel;
vcs->input = input;
vcs->data_norm = data_norm;
} else { } else {
vcs->input = (vcs->channel == VINO_CHANNEL_A) ? vcs->input = (vcs->channel == VINO_CHANNEL_A) ?
vino_drvdata->b.input : vino_drvdata->a.input; vino_drvdata->b.input : vino_drvdata->a.input;
...@@ -2361,15 +2655,14 @@ static int vino_acquire_input(struct vino_channel_settings *vcs) ...@@ -2361,15 +2655,14 @@ static int vino_acquire_input(struct vino_channel_settings *vcs)
goto out; goto out;
} }
if (vino_is_input_owner(vcs)) { vino_set_default_clipping(vcs);
vino_set_default_clipping(vcs); vino_set_default_scaling(vcs);
vino_set_default_framerate(vcs); vino_set_default_framerate(vcs);
}
dprintk("vino_acquire_input(): %s\n", vino_inputs[vcs->input].name); dprintk("vino_acquire_input(): %s\n", vino_inputs[vcs->input].name);
out: out:
spin_unlock(&vino_drvdata->input_lock); spin_unlock_irqrestore(&vino_drvdata->input_lock, flags);
return ret; return ret;
} }
...@@ -2378,16 +2671,17 @@ static int vino_set_input(struct vino_channel_settings *vcs, int input) ...@@ -2378,16 +2671,17 @@ static int vino_set_input(struct vino_channel_settings *vcs, int input)
{ {
struct vino_channel_settings *vcs2 = (vcs->channel == VINO_CHANNEL_A) ? struct vino_channel_settings *vcs2 = (vcs->channel == VINO_CHANNEL_A) ?
&vino_drvdata->b : &vino_drvdata->a; &vino_drvdata->b : &vino_drvdata->a;
unsigned long flags;
int ret = 0; int ret = 0;
dprintk("vino_set_input():\n"); dprintk("vino_set_input():\n");
spin_lock(&vino_drvdata->input_lock); spin_lock_irqsave(&vino_drvdata->input_lock, flags);
if (vcs->input == input) if (vcs->input == input)
goto out; goto out;
switch(input) { switch (input) {
case VINO_INPUT_COMPOSITE: case VINO_INPUT_COMPOSITE:
case VINO_INPUT_SVIDEO: case VINO_INPUT_SVIDEO:
if (!vino_drvdata->decoder.driver) { if (!vino_drvdata->decoder.driver) {
...@@ -2404,19 +2698,43 @@ static int vino_set_input(struct vino_channel_settings *vcs, int input) ...@@ -2404,19 +2698,43 @@ static int vino_set_input(struct vino_channel_settings *vcs, int input)
} }
if (vino_drvdata->decoder.owner == vcs->channel) { if (vino_drvdata->decoder.owner == vcs->channel) {
int data_norm;
int saa7191_input; int saa7191_input;
int saa7191_norm;
vcs->input = input; saa7191_input = vino_get_saa7191_input(input);
vcs->data_norm = VINO_DATA_NORM_PAL; ret = i2c_decoder_command(DECODER_SET_INPUT,
&saa7191_input);
if (ret) {
vino_drvdata->decoder.owner = VINO_NO_CHANNEL;
ret = -EINVAL;
goto out;
}
spin_unlock_irqrestore(&vino_drvdata->input_lock, flags);
/* Don't hold spinlocks while auto-detecting norm
* as it may take a while... */
data_norm = VINO_DATA_NORM_AUTO_EXT;
ret = vino_saa7191_set_norm(&data_norm);
if ((ret == -EBUSY) || (ret == -EAGAIN)) {
data_norm = VINO_DATA_NORM_PAL;
ret = vino_saa7191_set_norm(&data_norm);
}
saa7191_input = vino_get_saa7191_input(vcs->input); spin_lock_irqsave(&vino_drvdata->input_lock, flags);
i2c_decoder_command(DECODER_SET_INPUT, &saa7191_input);
saa7191_norm = vino_get_saa7191_norm(vcs->data_norm); if (ret) {
i2c_decoder_command(DECODER_SAA7191_SET_NORM, vino_drvdata->decoder.owner = VINO_NO_CHANNEL;
&saa7191_norm); ret = -EINVAL;
goto out;
}
vcs->input = input;
vcs->data_norm = data_norm;
} else { } else {
if (vcs2->input != input) { if (input != vcs2->input) {
ret = -EBUSY; ret = -EBUSY;
goto out; goto out;
} }
...@@ -2471,12 +2789,13 @@ static int vino_set_input(struct vino_channel_settings *vcs, int input) ...@@ -2471,12 +2789,13 @@ static int vino_set_input(struct vino_channel_settings *vcs, int input)
} }
vino_set_default_clipping(vcs); vino_set_default_clipping(vcs);
vino_set_default_scaling(vcs);
vino_set_default_framerate(vcs); vino_set_default_framerate(vcs);
dprintk("vino_set_input(): %s\n", vino_inputs[vcs->input].name); dprintk("vino_set_input(): %s\n", vino_inputs[vcs->input].name);
out: out:
spin_unlock(&vino_drvdata->input_lock); spin_unlock_irqrestore(&vino_drvdata->input_lock, flags);
return ret; return ret;
} }
...@@ -2485,10 +2804,11 @@ static void vino_release_input(struct vino_channel_settings *vcs) ...@@ -2485,10 +2804,11 @@ static void vino_release_input(struct vino_channel_settings *vcs)
{ {
struct vino_channel_settings *vcs2 = (vcs->channel == VINO_CHANNEL_A) ? struct vino_channel_settings *vcs2 = (vcs->channel == VINO_CHANNEL_A) ?
&vino_drvdata->b : &vino_drvdata->a; &vino_drvdata->b : &vino_drvdata->a;
unsigned long flags;
dprintk("vino_release_input():\n"); dprintk("vino_release_input():\n");
spin_lock(&vino_drvdata->input_lock); spin_lock_irqsave(&vino_drvdata->input_lock, flags);
/* Release ownership of the channel /* Release ownership of the channel
* and if the other channel takes input from * and if the other channel takes input from
...@@ -2511,34 +2831,61 @@ static void vino_release_input(struct vino_channel_settings *vcs) ...@@ -2511,34 +2831,61 @@ static void vino_release_input(struct vino_channel_settings *vcs)
} }
vcs->input = VINO_INPUT_NONE; vcs->input = VINO_INPUT_NONE;
spin_unlock(&vino_drvdata->input_lock); spin_unlock_irqrestore(&vino_drvdata->input_lock, flags);
} }
/* execute with input_lock locked */ /* execute with input_lock locked */
static int vino_set_data_norm(struct vino_channel_settings *vcs, static int vino_set_data_norm(struct vino_channel_settings *vcs,
unsigned int data_norm) unsigned int data_norm,
unsigned long *flags)
{ {
int saa7191_norm; int err = 0;
if (data_norm == vcs->data_norm)
return 0;
switch (vcs->input) { switch (vcs->input) {
case VINO_INPUT_D1: case VINO_INPUT_D1:
/* only one "norm" supported */ /* only one "norm" supported */
if (data_norm != VINO_DATA_NORM_D1) if ((data_norm != VINO_DATA_NORM_D1)
&& (data_norm != VINO_DATA_NORM_AUTO)
&& (data_norm != VINO_DATA_NORM_AUTO_EXT))
return -EINVAL; return -EINVAL;
break; break;
case VINO_INPUT_COMPOSITE: case VINO_INPUT_COMPOSITE:
case VINO_INPUT_SVIDEO: case VINO_INPUT_SVIDEO: {
if ((data_norm != VINO_DATA_NORM_PAL)
&& (data_norm != VINO_DATA_NORM_NTSC)
&& (data_norm != VINO_DATA_NORM_SECAM)
&& (data_norm != VINO_DATA_NORM_AUTO)
&& (data_norm != VINO_DATA_NORM_AUTO_EXT))
return -EINVAL;
saa7191_norm = vino_get_saa7191_norm(data_norm); spin_unlock_irqrestore(&vino_drvdata->input_lock, *flags);
/* Don't hold spinlocks while setting norm
* as it may take a while... */
err = vino_saa7191_set_norm(&data_norm);
spin_lock_irqsave(&vino_drvdata->input_lock, *flags);
if (err)
goto out;
i2c_decoder_command(DECODER_SAA7191_SET_NORM, &saa7191_norm);
vcs->data_norm = data_norm; vcs->data_norm = data_norm;
vino_set_default_clipping(vcs);
vino_set_default_scaling(vcs);
vino_set_default_framerate(vcs);
break; break;
}
default: default:
return -EINVAL; return -EINVAL;
} }
return 0; out:
return err;
} }
/* V4L2 helper functions */ /* V4L2 helper functions */
...@@ -2558,8 +2905,9 @@ static int vino_find_data_format(__u32 pixelformat) ...@@ -2558,8 +2905,9 @@ static int vino_find_data_format(__u32 pixelformat)
static int vino_enum_data_norm(struct vino_channel_settings *vcs, __u32 index) static int vino_enum_data_norm(struct vino_channel_settings *vcs, __u32 index)
{ {
int data_norm = VINO_DATA_NORM_NONE; int data_norm = VINO_DATA_NORM_NONE;
unsigned long flags;
spin_lock(&vino_drvdata->input_lock); spin_lock_irqsave(&vino_drvdata->input_lock, flags);
switch(vcs->input) { switch(vcs->input) {
case VINO_INPUT_COMPOSITE: case VINO_INPUT_COMPOSITE:
case VINO_INPUT_SVIDEO: case VINO_INPUT_SVIDEO:
...@@ -2577,7 +2925,7 @@ static int vino_enum_data_norm(struct vino_channel_settings *vcs, __u32 index) ...@@ -2577,7 +2925,7 @@ static int vino_enum_data_norm(struct vino_channel_settings *vcs, __u32 index)
} }
break; break;
} }
spin_unlock(&vino_drvdata->input_lock); spin_unlock_irqrestore(&vino_drvdata->input_lock, flags);
return data_norm; return data_norm;
} }
...@@ -2585,8 +2933,9 @@ static int vino_enum_data_norm(struct vino_channel_settings *vcs, __u32 index) ...@@ -2585,8 +2933,9 @@ static int vino_enum_data_norm(struct vino_channel_settings *vcs, __u32 index)
static int vino_enum_input(struct vino_channel_settings *vcs, __u32 index) static int vino_enum_input(struct vino_channel_settings *vcs, __u32 index)
{ {
int input = VINO_INPUT_NONE; int input = VINO_INPUT_NONE;
unsigned long flags;
spin_lock(&vino_drvdata->input_lock); spin_lock_irqsave(&vino_drvdata->input_lock, flags);
if (vino_drvdata->decoder.driver && vino_drvdata->camera.driver) { if (vino_drvdata->decoder.driver && vino_drvdata->camera.driver) {
switch (index) { switch (index) {
case 0: case 0:
...@@ -2615,7 +2964,7 @@ static int vino_enum_input(struct vino_channel_settings *vcs, __u32 index) ...@@ -2615,7 +2964,7 @@ static int vino_enum_input(struct vino_channel_settings *vcs, __u32 index)
break; break;
} }
} }
spin_unlock(&vino_drvdata->input_lock); spin_unlock_irqrestore(&vino_drvdata->input_lock, flags);
return input; return input;
} }
...@@ -2704,15 +3053,16 @@ static int vino_v4l2_enuminput(struct vino_channel_settings *vcs, ...@@ -2704,15 +3053,16 @@ static int vino_v4l2_enuminput(struct vino_channel_settings *vcs,
} }
static int vino_v4l2_g_input(struct vino_channel_settings *vcs, static int vino_v4l2_g_input(struct vino_channel_settings *vcs,
struct v4l2_input *i) unsigned int *i)
{ {
__u32 index; __u32 index;
int input; int input;
unsigned long flags;
spin_lock(&vino_drvdata->input_lock); spin_lock_irqsave(&vino_drvdata->input_lock, flags);
input = vcs->input; input = vcs->input;
index = vino_find_input_index(vcs); index = vino_find_input_index(vcs);
spin_unlock(&vino_drvdata->input_lock); spin_unlock_irqrestore(&vino_drvdata->input_lock, flags);
dprintk("input = %d\n", input); dprintk("input = %d\n", input);
...@@ -2720,23 +3070,18 @@ static int vino_v4l2_g_input(struct vino_channel_settings *vcs, ...@@ -2720,23 +3070,18 @@ static int vino_v4l2_g_input(struct vino_channel_settings *vcs,
return -EINVAL; return -EINVAL;
} }
memset(i, 0, sizeof(struct v4l2_input)); *i = index;
i->index = index;
i->type = V4L2_INPUT_TYPE_CAMERA;
i->std = vino_inputs[input].std;
strcpy(i->name, vino_inputs[input].name);
return 0; return 0;
} }
static int vino_v4l2_s_input(struct vino_channel_settings *vcs, static int vino_v4l2_s_input(struct vino_channel_settings *vcs,
struct v4l2_input *i) unsigned int *i)
{ {
int input; int input;
dprintk("requested input = %d\n", i->index); dprintk("requested input = %d\n", *i);
input = vino_enum_input(vcs, i->index); input = vino_enum_input(vcs, *i);
if (input == VINO_INPUT_NONE) if (input == VINO_INPUT_NONE)
return -EINVAL; return -EINVAL;
...@@ -2747,7 +3092,9 @@ static int vino_v4l2_enumstd(struct vino_channel_settings *vcs, ...@@ -2747,7 +3092,9 @@ static int vino_v4l2_enumstd(struct vino_channel_settings *vcs,
struct v4l2_standard *s) struct v4l2_standard *s)
{ {
int index = s->index; int index = s->index;
int data_norm = vino_enum_data_norm(vcs, index); int data_norm;
data_norm = vino_enum_data_norm(vcs, index);
dprintk("standard index = %d\n", index); dprintk("standard index = %d\n", index);
if (data_norm == VINO_DATA_NORM_NONE) if (data_norm == VINO_DATA_NORM_NONE)
...@@ -2771,13 +3118,55 @@ static int vino_v4l2_enumstd(struct vino_channel_settings *vcs, ...@@ -2771,13 +3118,55 @@ static int vino_v4l2_enumstd(struct vino_channel_settings *vcs,
return 0; return 0;
} }
static int vino_v4l2_querystd(struct vino_channel_settings *vcs,
v4l2_std_id *std)
{
unsigned long flags;
int err = 0;
spin_lock_irqsave(&vino_drvdata->input_lock, flags);
switch (vcs->input) {
case VINO_INPUT_D1:
*std = vino_inputs[vcs->input].std;
break;
case VINO_INPUT_COMPOSITE:
case VINO_INPUT_SVIDEO: {
struct saa7191_status status;
i2c_decoder_command(DECODER_SAA7191_GET_STATUS, &status);
if (status.signal) {
if (status.signal_60hz) {
*std = V4L2_STD_NTSC;
} else {
*std = V4L2_STD_PAL | V4L2_STD_SECAM;
}
} else {
*std = vino_inputs[vcs->input].std;
}
break;
}
default:
err = -EINVAL;
}
spin_unlock_irqrestore(&vino_drvdata->input_lock, flags);
return err;
}
static int vino_v4l2_g_std(struct vino_channel_settings *vcs, static int vino_v4l2_g_std(struct vino_channel_settings *vcs,
v4l2_std_id *std) v4l2_std_id *std)
{ {
spin_lock(&vino_drvdata->input_lock); unsigned long flags;
dprintk("current standard = %d\n", vcs->data_norm);
spin_lock_irqsave(&vino_drvdata->input_lock, flags);
*std = vino_data_norms[vcs->data_norm].std; *std = vino_data_norms[vcs->data_norm].std;
spin_unlock(&vino_drvdata->input_lock); dprintk("current standard = %d\n", vcs->data_norm);
spin_unlock_irqrestore(&vino_drvdata->input_lock, flags);
return 0; return 0;
} }
...@@ -2785,13 +3174,18 @@ static int vino_v4l2_g_std(struct vino_channel_settings *vcs, ...@@ -2785,13 +3174,18 @@ static int vino_v4l2_g_std(struct vino_channel_settings *vcs,
static int vino_v4l2_s_std(struct vino_channel_settings *vcs, static int vino_v4l2_s_std(struct vino_channel_settings *vcs,
v4l2_std_id *std) v4l2_std_id *std)
{ {
unsigned long flags;
int ret = 0; int ret = 0;
spin_lock(&vino_drvdata->input_lock); spin_lock_irqsave(&vino_drvdata->input_lock, flags);
if (!vino_is_input_owner(vcs)) {
ret = -EBUSY;
goto out;
}
/* check if the standard is valid for the current input */ /* check if the standard is valid for the current input */
if (vino_is_input_owner(vcs) if ((*std) & vino_inputs[vcs->input].std) {
&& (vino_inputs[vcs->input].std & (*std))) {
dprintk("standard accepted\n"); dprintk("standard accepted\n");
/* change the video norm for SAA7191 /* change the video norm for SAA7191
...@@ -2800,24 +3194,33 @@ static int vino_v4l2_s_std(struct vino_channel_settings *vcs, ...@@ -2800,24 +3194,33 @@ static int vino_v4l2_s_std(struct vino_channel_settings *vcs,
if (vcs->input == VINO_INPUT_D1) if (vcs->input == VINO_INPUT_D1)
goto out; goto out;
if ((*std) & V4L2_STD_PAL) { if (((*std) & V4L2_STD_PAL)
vino_set_data_norm(vcs, VINO_DATA_NORM_PAL); && ((*std) & V4L2_STD_NTSC)
vcs->data_norm = VINO_DATA_NORM_PAL; && ((*std) & V4L2_STD_SECAM)) {
ret = vino_set_data_norm(vcs, VINO_DATA_NORM_AUTO_EXT,
&flags);
} else if ((*std) & V4L2_STD_PAL) {
ret = vino_set_data_norm(vcs, VINO_DATA_NORM_PAL,
&flags);
} else if ((*std) & V4L2_STD_NTSC) { } else if ((*std) & V4L2_STD_NTSC) {
vino_set_data_norm(vcs, VINO_DATA_NORM_NTSC); ret = vino_set_data_norm(vcs, VINO_DATA_NORM_NTSC,
vcs->data_norm = VINO_DATA_NORM_NTSC; &flags);
} else if ((*std) & V4L2_STD_SECAM) { } else if ((*std) & V4L2_STD_SECAM) {
vino_set_data_norm(vcs, VINO_DATA_NORM_SECAM); ret = vino_set_data_norm(vcs, VINO_DATA_NORM_SECAM,
vcs->data_norm = VINO_DATA_NORM_SECAM; &flags);
} else { } else {
ret = -EINVAL; ret = -EINVAL;
} }
if (ret) {
ret = -EINVAL;
}
} else { } else {
ret = -EINVAL; ret = -EINVAL;
} }
out: out:
spin_unlock(&vino_drvdata->input_lock); spin_unlock_irqrestore(&vino_drvdata->input_lock, flags);
return ret; return ret;
} }
...@@ -2855,6 +3258,7 @@ static int vino_v4l2_try_fmt(struct vino_channel_settings *vcs, ...@@ -2855,6 +3258,7 @@ static int vino_v4l2_try_fmt(struct vino_channel_settings *vcs,
struct v4l2_format *f) struct v4l2_format *f)
{ {
struct vino_channel_settings tempvcs; struct vino_channel_settings tempvcs;
unsigned long flags;
switch (f->type) { switch (f->type) {
case V4L2_BUF_TYPE_VIDEO_CAPTURE: { case V4L2_BUF_TYPE_VIDEO_CAPTURE: {
...@@ -2863,13 +3267,13 @@ static int vino_v4l2_try_fmt(struct vino_channel_settings *vcs, ...@@ -2863,13 +3267,13 @@ static int vino_v4l2_try_fmt(struct vino_channel_settings *vcs,
dprintk("requested: w = %d, h = %d\n", dprintk("requested: w = %d, h = %d\n",
pf->width, pf->height); pf->width, pf->height);
spin_lock(&vino_drvdata->input_lock); spin_lock_irqsave(&vino_drvdata->input_lock, flags);
memcpy(&tempvcs, vcs, sizeof(struct vino_channel_settings)); memcpy(&tempvcs, vcs, sizeof(struct vino_channel_settings));
spin_unlock(&vino_drvdata->input_lock); spin_unlock_irqrestore(&vino_drvdata->input_lock, flags);
tempvcs.data_format = vino_find_data_format(pf->pixelformat); tempvcs.data_format = vino_find_data_format(pf->pixelformat);
if (tempvcs.data_format == VINO_DATA_FMT_NONE) { if (tempvcs.data_format == VINO_DATA_FMT_NONE) {
tempvcs.data_format = VINO_DATA_FMT_RGB32; tempvcs.data_format = VINO_DATA_FMT_GREY;
pf->pixelformat = pf->pixelformat =
vino_data_formats[tempvcs.data_format]. vino_data_formats[tempvcs.data_format].
pixelformat; pixelformat;
...@@ -2908,10 +3312,13 @@ static int vino_v4l2_try_fmt(struct vino_channel_settings *vcs, ...@@ -2908,10 +3312,13 @@ static int vino_v4l2_try_fmt(struct vino_channel_settings *vcs,
static int vino_v4l2_g_fmt(struct vino_channel_settings *vcs, static int vino_v4l2_g_fmt(struct vino_channel_settings *vcs,
struct v4l2_format *f) struct v4l2_format *f)
{ {
unsigned long flags;
switch (f->type) { switch (f->type) {
case V4L2_BUF_TYPE_VIDEO_CAPTURE: { case V4L2_BUF_TYPE_VIDEO_CAPTURE: {
struct v4l2_pix_format *pf = &f->fmt.pix; struct v4l2_pix_format *pf = &f->fmt.pix;
spin_lock(&vino_drvdata->input_lock);
spin_lock_irqsave(&vino_drvdata->input_lock, flags);
pf->width = (vcs->clipping.right - vcs->clipping.left) / pf->width = (vcs->clipping.right - vcs->clipping.left) /
vcs->decimation; vcs->decimation;
...@@ -2930,7 +3337,7 @@ static int vino_v4l2_g_fmt(struct vino_channel_settings *vcs, ...@@ -2930,7 +3337,7 @@ static int vino_v4l2_g_fmt(struct vino_channel_settings *vcs,
pf->priv = 0; pf->priv = 0;
spin_unlock(&vino_drvdata->input_lock); spin_unlock_irqrestore(&vino_drvdata->input_lock, flags);
break; break;
} }
case V4L2_BUF_TYPE_VIDEO_OVERLAY: case V4L2_BUF_TYPE_VIDEO_OVERLAY:
...@@ -2945,20 +3352,18 @@ static int vino_v4l2_s_fmt(struct vino_channel_settings *vcs, ...@@ -2945,20 +3352,18 @@ static int vino_v4l2_s_fmt(struct vino_channel_settings *vcs,
struct v4l2_format *f) struct v4l2_format *f)
{ {
int data_format; int data_format;
unsigned long flags;
switch (f->type) { switch (f->type) {
case V4L2_BUF_TYPE_VIDEO_CAPTURE: { case V4L2_BUF_TYPE_VIDEO_CAPTURE: {
struct v4l2_pix_format *pf = &f->fmt.pix; struct v4l2_pix_format *pf = &f->fmt.pix;
spin_lock(&vino_drvdata->input_lock);
if (!vino_is_input_owner(vcs)) { spin_lock_irqsave(&vino_drvdata->input_lock, flags);
spin_unlock(&vino_drvdata->input_lock);
return -EINVAL;
}
data_format = vino_find_data_format(pf->pixelformat); data_format = vino_find_data_format(pf->pixelformat);
if (data_format == VINO_DATA_FMT_NONE) { if (data_format == VINO_DATA_FMT_NONE) {
vcs->data_format = VINO_DATA_FMT_RGB32; vcs->data_format = VINO_DATA_FMT_GREY;
pf->pixelformat = pf->pixelformat =
vino_data_formats[vcs->data_format]. vino_data_formats[vcs->data_format].
pixelformat; pixelformat;
...@@ -2985,7 +3390,7 @@ static int vino_v4l2_s_fmt(struct vino_channel_settings *vcs, ...@@ -2985,7 +3390,7 @@ static int vino_v4l2_s_fmt(struct vino_channel_settings *vcs,
pf->priv = 0; pf->priv = 0;
spin_unlock(&vino_drvdata->input_lock); spin_unlock_irqrestore(&vino_drvdata->input_lock, flags);
break; break;
} }
case V4L2_BUF_TYPE_VIDEO_OVERLAY: case V4L2_BUF_TYPE_VIDEO_OVERLAY:
...@@ -3000,12 +3405,15 @@ static int vino_v4l2_cropcap(struct vino_channel_settings *vcs, ...@@ -3000,12 +3405,15 @@ static int vino_v4l2_cropcap(struct vino_channel_settings *vcs,
struct v4l2_cropcap *ccap) struct v4l2_cropcap *ccap)
{ {
const struct vino_data_norm *norm; const struct vino_data_norm *norm;
unsigned long flags;
switch (ccap->type) { switch (ccap->type) {
case V4L2_BUF_TYPE_VIDEO_CAPTURE: case V4L2_BUF_TYPE_VIDEO_CAPTURE:
spin_lock(&vino_drvdata->input_lock); spin_lock_irqsave(&vino_drvdata->input_lock, flags);
norm = &vino_data_norms[vcs->data_norm]; norm = &vino_data_norms[vcs->data_norm];
spin_unlock(&vino_drvdata->input_lock);
spin_unlock_irqrestore(&vino_drvdata->input_lock, flags);
ccap->bounds.left = 0; ccap->bounds.left = 0;
ccap->bounds.top = 0; ccap->bounds.top = 0;
...@@ -3028,16 +3436,18 @@ static int vino_v4l2_cropcap(struct vino_channel_settings *vcs, ...@@ -3028,16 +3436,18 @@ static int vino_v4l2_cropcap(struct vino_channel_settings *vcs,
static int vino_v4l2_g_crop(struct vino_channel_settings *vcs, static int vino_v4l2_g_crop(struct vino_channel_settings *vcs,
struct v4l2_crop *c) struct v4l2_crop *c)
{ {
unsigned long flags;
switch (c->type) { switch (c->type) {
case V4L2_BUF_TYPE_VIDEO_CAPTURE: case V4L2_BUF_TYPE_VIDEO_CAPTURE:
spin_lock(&vino_drvdata->input_lock); spin_lock_irqsave(&vino_drvdata->input_lock, flags);
c->c.left = vcs->clipping.left; c->c.left = vcs->clipping.left;
c->c.top = vcs->clipping.top; c->c.top = vcs->clipping.top;
c->c.width = vcs->clipping.right - vcs->clipping.left; c->c.width = vcs->clipping.right - vcs->clipping.left;
c->c.height = vcs->clipping.bottom - vcs->clipping.top; c->c.height = vcs->clipping.bottom - vcs->clipping.top;
spin_unlock(&vino_drvdata->input_lock); spin_unlock_irqrestore(&vino_drvdata->input_lock, flags);
break; break;
case V4L2_BUF_TYPE_VIDEO_OVERLAY: case V4L2_BUF_TYPE_VIDEO_OVERLAY:
default: default:
...@@ -3050,18 +3460,16 @@ static int vino_v4l2_g_crop(struct vino_channel_settings *vcs, ...@@ -3050,18 +3460,16 @@ static int vino_v4l2_g_crop(struct vino_channel_settings *vcs,
static int vino_v4l2_s_crop(struct vino_channel_settings *vcs, static int vino_v4l2_s_crop(struct vino_channel_settings *vcs,
struct v4l2_crop *c) struct v4l2_crop *c)
{ {
unsigned long flags;
switch (c->type) { switch (c->type) {
case V4L2_BUF_TYPE_VIDEO_CAPTURE: case V4L2_BUF_TYPE_VIDEO_CAPTURE:
spin_lock(&vino_drvdata->input_lock); spin_lock_irqsave(&vino_drvdata->input_lock, flags);
if (!vino_is_input_owner(vcs)) {
spin_unlock(&vino_drvdata->input_lock);
return -EINVAL;
}
vino_set_clipping(vcs, c->c.left, c->c.top, vino_set_clipping(vcs, c->c.left, c->c.top,
c->c.width, c->c.height); c->c.width, c->c.height);
spin_unlock(&vino_drvdata->input_lock); spin_unlock_irqrestore(&vino_drvdata->input_lock, flags);
break; break;
case V4L2_BUF_TYPE_VIDEO_OVERLAY: case V4L2_BUF_TYPE_VIDEO_OVERLAY:
default: default:
...@@ -3074,6 +3482,8 @@ static int vino_v4l2_s_crop(struct vino_channel_settings *vcs, ...@@ -3074,6 +3482,8 @@ static int vino_v4l2_s_crop(struct vino_channel_settings *vcs,
static int vino_v4l2_g_parm(struct vino_channel_settings *vcs, static int vino_v4l2_g_parm(struct vino_channel_settings *vcs,
struct v4l2_streamparm *sp) struct v4l2_streamparm *sp)
{ {
unsigned long flags;
switch (sp->type) { switch (sp->type) {
case V4L2_BUF_TYPE_VIDEO_CAPTURE: { case V4L2_BUF_TYPE_VIDEO_CAPTURE: {
struct v4l2_captureparm *cp = &sp->parm.capture; struct v4l2_captureparm *cp = &sp->parm.capture;
...@@ -3082,9 +3492,11 @@ static int vino_v4l2_g_parm(struct vino_channel_settings *vcs, ...@@ -3082,9 +3492,11 @@ static int vino_v4l2_g_parm(struct vino_channel_settings *vcs,
cp->capability = V4L2_CAP_TIMEPERFRAME; cp->capability = V4L2_CAP_TIMEPERFRAME;
cp->timeperframe.numerator = 1; cp->timeperframe.numerator = 1;
spin_lock(&vino_drvdata->input_lock); spin_lock_irqsave(&vino_drvdata->input_lock, flags);
cp->timeperframe.denominator = vcs->fps; cp->timeperframe.denominator = vcs->fps;
spin_unlock(&vino_drvdata->input_lock);
spin_unlock_irqrestore(&vino_drvdata->input_lock, flags);
// TODO: cp->readbuffers = xxx; // TODO: cp->readbuffers = xxx;
break; break;
...@@ -3100,15 +3512,13 @@ static int vino_v4l2_g_parm(struct vino_channel_settings *vcs, ...@@ -3100,15 +3512,13 @@ static int vino_v4l2_g_parm(struct vino_channel_settings *vcs,
static int vino_v4l2_s_parm(struct vino_channel_settings *vcs, static int vino_v4l2_s_parm(struct vino_channel_settings *vcs,
struct v4l2_streamparm *sp) struct v4l2_streamparm *sp)
{ {
unsigned long flags;
switch (sp->type) { switch (sp->type) {
case V4L2_BUF_TYPE_VIDEO_CAPTURE: { case V4L2_BUF_TYPE_VIDEO_CAPTURE: {
struct v4l2_captureparm *cp = &sp->parm.capture; struct v4l2_captureparm *cp = &sp->parm.capture;
spin_lock(&vino_drvdata->input_lock); spin_lock_irqsave(&vino_drvdata->input_lock, flags);
if (!vino_is_input_owner(vcs)) {
spin_unlock(&vino_drvdata->input_lock);
return -EINVAL;
}
if ((cp->timeperframe.numerator == 0) || if ((cp->timeperframe.numerator == 0) ||
(cp->timeperframe.denominator == 0)) { (cp->timeperframe.denominator == 0)) {
...@@ -3118,7 +3528,8 @@ static int vino_v4l2_s_parm(struct vino_channel_settings *vcs, ...@@ -3118,7 +3528,8 @@ static int vino_v4l2_s_parm(struct vino_channel_settings *vcs,
vino_set_framerate(vcs, cp->timeperframe.denominator / vino_set_framerate(vcs, cp->timeperframe.denominator /
cp->timeperframe.numerator); cp->timeperframe.numerator);
} }
spin_unlock(&vino_drvdata->input_lock);
spin_unlock_irqrestore(&vino_drvdata->input_lock, flags);
// TODO: set buffers according to cp->readbuffers // TODO: set buffers according to cp->readbuffers
break; break;
...@@ -3145,21 +3556,23 @@ static int vino_v4l2_reqbufs(struct vino_channel_settings *vcs, ...@@ -3145,21 +3556,23 @@ static int vino_v4l2_reqbufs(struct vino_channel_settings *vcs,
return -EINVAL; return -EINVAL;
} }
if (vino_is_capturing(vcs)) {
dprintk("busy, capturing\n");
return -EBUSY;
}
dprintk("count = %d\n", rb->count); dprintk("count = %d\n", rb->count);
if (rb->count > 0) { if (rb->count > 0) {
if (vino_is_capturing(vcs)) {
dprintk("busy, capturing\n");
return -EBUSY;
}
if (vino_queue_has_mapped_buffers(&vcs->fb_queue)) { if (vino_queue_has_mapped_buffers(&vcs->fb_queue)) {
dprintk("busy, buffers still mapped\n"); dprintk("busy, buffers still mapped\n");
return -EBUSY; return -EBUSY;
} else { } else {
vcs->streaming = 0;
vino_queue_free(&vcs->fb_queue); vino_queue_free(&vcs->fb_queue);
vino_queue_init(&vcs->fb_queue, &rb->count); vino_queue_init(&vcs->fb_queue, &rb->count);
} }
} else { } else {
vcs->streaming = 0;
vino_capture_stop(vcs); vino_capture_stop(vcs);
vino_queue_free(&vcs->fb_queue); vino_queue_free(&vcs->fb_queue);
} }
...@@ -3302,12 +3715,12 @@ static int vino_v4l2_dqbuf(struct vino_channel_settings *vcs, ...@@ -3302,12 +3715,12 @@ static int vino_v4l2_dqbuf(struct vino_channel_settings *vcs,
err = vino_queue_get_incoming(&vcs->fb_queue, &incoming); err = vino_queue_get_incoming(&vcs->fb_queue, &incoming);
if (err) { if (err) {
dprintk("vino_queue_get_incoming() failed\n"); dprintk("vino_queue_get_incoming() failed\n");
return -EIO; return -EINVAL;
} }
err = vino_queue_get_outgoing(&vcs->fb_queue, &outgoing); err = vino_queue_get_outgoing(&vcs->fb_queue, &outgoing);
if (err) { if (err) {
dprintk("vino_queue_get_outgoing() failed\n"); dprintk("vino_queue_get_outgoing() failed\n");
return -EIO; return -EINVAL;
} }
dprintk("incoming = %d, outgoing = %d\n", incoming, outgoing); dprintk("incoming = %d, outgoing = %d\n", incoming, outgoing);
...@@ -3327,8 +3740,10 @@ static int vino_v4l2_dqbuf(struct vino_channel_settings *vcs, ...@@ -3327,8 +3740,10 @@ static int vino_v4l2_dqbuf(struct vino_channel_settings *vcs,
if (err) { if (err) {
err = vino_wait_for_frame(vcs); err = vino_wait_for_frame(vcs);
if (err) { if (err) {
/* interrupted */ /* interrupted or
vino_capture_failed(vcs); * no frames captured because
* of frame skipping */
// vino_capture_failed(vcs);
return -EIO; return -EIO;
} }
} }
...@@ -3341,10 +3756,12 @@ static int vino_v4l2_dqbuf(struct vino_channel_settings *vcs, ...@@ -3341,10 +3756,12 @@ static int vino_v4l2_dqbuf(struct vino_channel_settings *vcs,
} }
err = vino_check_buffer(vcs, fb); err = vino_check_buffer(vcs, fb);
vino_v4l2_get_buffer_status(vcs, fb, b);
if (err) if (err)
return -EIO; return -EIO;
vino_v4l2_get_buffer_status(vcs, fb, b);
break; break;
} }
case V4L2_BUF_TYPE_VIDEO_OVERLAY: case V4L2_BUF_TYPE_VIDEO_OVERLAY:
...@@ -3401,8 +3818,8 @@ static int vino_v4l2_streamoff(struct vino_channel_settings *vcs) ...@@ -3401,8 +3818,8 @@ static int vino_v4l2_streamoff(struct vino_channel_settings *vcs)
if (!vcs->streaming) if (!vcs->streaming)
return 0; return 0;
vino_capture_stop(vcs);
vcs->streaming = 0; vcs->streaming = 0;
vino_capture_stop(vcs);
return 0; return 0;
} }
...@@ -3410,10 +3827,11 @@ static int vino_v4l2_streamoff(struct vino_channel_settings *vcs) ...@@ -3410,10 +3827,11 @@ static int vino_v4l2_streamoff(struct vino_channel_settings *vcs)
static int vino_v4l2_queryctrl(struct vino_channel_settings *vcs, static int vino_v4l2_queryctrl(struct vino_channel_settings *vcs,
struct v4l2_queryctrl *queryctrl) struct v4l2_queryctrl *queryctrl)
{ {
unsigned long flags;
int i; int i;
int err = 0; int err = 0;
spin_lock(&vino_drvdata->input_lock); spin_lock_irqsave(&vino_drvdata->input_lock, flags);
switch (vcs->input) { switch (vcs->input) {
case VINO_INPUT_D1: case VINO_INPUT_D1:
...@@ -3423,6 +3841,7 @@ static int vino_v4l2_queryctrl(struct vino_channel_settings *vcs, ...@@ -3423,6 +3841,7 @@ static int vino_v4l2_queryctrl(struct vino_channel_settings *vcs,
memcpy(queryctrl, memcpy(queryctrl,
&vino_indycam_v4l2_controls[i], &vino_indycam_v4l2_controls[i],
sizeof(struct v4l2_queryctrl)); sizeof(struct v4l2_queryctrl));
queryctrl->reserved[0] = 0;
goto found; goto found;
} }
} }
...@@ -3437,6 +3856,7 @@ static int vino_v4l2_queryctrl(struct vino_channel_settings *vcs, ...@@ -3437,6 +3856,7 @@ static int vino_v4l2_queryctrl(struct vino_channel_settings *vcs,
memcpy(queryctrl, memcpy(queryctrl,
&vino_saa7191_v4l2_controls[i], &vino_saa7191_v4l2_controls[i],
sizeof(struct v4l2_queryctrl)); sizeof(struct v4l2_queryctrl));
queryctrl->reserved[0] = 0;
goto found; goto found;
} }
} }
...@@ -3448,7 +3868,7 @@ static int vino_v4l2_queryctrl(struct vino_channel_settings *vcs, ...@@ -3448,7 +3868,7 @@ static int vino_v4l2_queryctrl(struct vino_channel_settings *vcs,
} }
found: found:
spin_unlock(&vino_drvdata->input_lock); spin_unlock_irqrestore(&vino_drvdata->input_lock, flags);
return err; return err;
} }
...@@ -3456,70 +3876,72 @@ static int vino_v4l2_queryctrl(struct vino_channel_settings *vcs, ...@@ -3456,70 +3876,72 @@ static int vino_v4l2_queryctrl(struct vino_channel_settings *vcs,
static int vino_v4l2_g_ctrl(struct vino_channel_settings *vcs, static int vino_v4l2_g_ctrl(struct vino_channel_settings *vcs,
struct v4l2_control *control) struct v4l2_control *control)
{ {
struct indycam_control indycam_ctrl; unsigned long flags;
struct saa7191_control saa7191_ctrl; int i;
int err = 0; int err = 0;
spin_lock(&vino_drvdata->input_lock); spin_lock_irqsave(&vino_drvdata->input_lock, flags);
switch (vcs->input) { switch (vcs->input) {
case VINO_INPUT_D1: case VINO_INPUT_D1: {
i2c_camera_command(DECODER_INDYCAM_GET_CONTROLS, struct indycam_control indycam_ctrl;
&indycam_ctrl);
switch(control->id) { for (i = 0; i < VINO_INDYCAM_V4L2_CONTROL_COUNT; i++) {
case V4L2_CID_AUTOGAIN: if (vino_indycam_v4l2_controls[i].id ==
control->value = indycam_ctrl.agc; control->id) {
break; goto found1;
case V4L2_CID_AUTO_WHITE_BALANCE: }
control->value = indycam_ctrl.awb; }
break;
case V4L2_CID_GAIN: err = -EINVAL;
control->value = indycam_ctrl.gain; goto out;
break;
case V4L2_CID_PRIVATE_BASE: found1:
control->value = indycam_ctrl.red_saturation; indycam_ctrl.type = vino_indycam_v4l2_controls[i].reserved[0];
break;
case V4L2_CID_PRIVATE_BASE + 1: err = i2c_camera_command(DECODER_INDYCAM_GET_CONTROL,
control->value = indycam_ctrl.blue_saturation; &indycam_ctrl);
break; if (err) {
case V4L2_CID_RED_BALANCE:
control->value = indycam_ctrl.red_balance;
break;
case V4L2_CID_BLUE_BALANCE:
control->value = indycam_ctrl.blue_balance;
break;
case V4L2_CID_EXPOSURE:
control->value = indycam_ctrl.shutter;
break;
case V4L2_CID_GAMMA:
control->value = indycam_ctrl.gamma;
break;
default:
err = -EINVAL; err = -EINVAL;
goto out;
} }
control->value = indycam_ctrl.value;
break; break;
}
case VINO_INPUT_COMPOSITE: case VINO_INPUT_COMPOSITE:
case VINO_INPUT_SVIDEO: case VINO_INPUT_SVIDEO: {
i2c_decoder_command(DECODER_SAA7191_GET_CONTROLS, struct saa7191_control saa7191_ctrl;
&saa7191_ctrl);
switch(control->id) { for (i = 0; i < VINO_SAA7191_V4L2_CONTROL_COUNT; i++) {
case V4L2_CID_HUE: if (vino_saa7191_v4l2_controls[i].id ==
control->value = saa7191_ctrl.hue; control->id) {
break; goto found2;
case V4L2_CID_PRIVATE_BASE: }
control->value = saa7191_ctrl.vtrc; }
break;
default: err = -EINVAL;
goto out;
found2:
saa7191_ctrl.type = vino_saa7191_v4l2_controls[i].reserved[0];
err = i2c_decoder_command(DECODER_SAA7191_GET_CONTROL,
&saa7191_ctrl);
if (err) {
err = -EINVAL; err = -EINVAL;
goto out;
} }
control->value = saa7191_ctrl.value;
break; break;
}
default: default:
err = -EINVAL; err = -EINVAL;
} }
spin_unlock(&vino_drvdata->input_lock); out:
spin_unlock_irqrestore(&vino_drvdata->input_lock, flags);
return err; return err;
} }
...@@ -3527,15 +3949,21 @@ static int vino_v4l2_g_ctrl(struct vino_channel_settings *vcs, ...@@ -3527,15 +3949,21 @@ static int vino_v4l2_g_ctrl(struct vino_channel_settings *vcs,
static int vino_v4l2_s_ctrl(struct vino_channel_settings *vcs, static int vino_v4l2_s_ctrl(struct vino_channel_settings *vcs,
struct v4l2_control *control) struct v4l2_control *control)
{ {
struct indycam_control indycam_ctrl; unsigned long flags;
struct saa7191_control saa7191_ctrl;
int i; int i;
int err = 0; int err = 0;
spin_lock(&vino_drvdata->input_lock); spin_lock_irqsave(&vino_drvdata->input_lock, flags);
if (!vino_is_input_owner(vcs)) {
err = -EBUSY;
goto out;
}
switch (vcs->input) { switch (vcs->input) {
case VINO_INPUT_D1: case VINO_INPUT_D1: {
struct indycam_control indycam_ctrl;
for (i = 0; i < VINO_INDYCAM_V4L2_CONTROL_COUNT; i++) { for (i = 0; i < VINO_INDYCAM_V4L2_CONTROL_COUNT; i++) {
if (vino_indycam_v4l2_controls[i].id == if (vino_indycam_v4l2_controls[i].id ==
control->id) { control->id) {
...@@ -3544,65 +3972,31 @@ static int vino_v4l2_s_ctrl(struct vino_channel_settings *vcs, ...@@ -3544,65 +3972,31 @@ static int vino_v4l2_s_ctrl(struct vino_channel_settings *vcs,
&& (control->value <= && (control->value <=
vino_indycam_v4l2_controls[i]. vino_indycam_v4l2_controls[i].
maximum)) { maximum)) {
goto ok1; goto found1;
} else { } else {
err = -ERANGE; err = -ERANGE;
goto error; goto out;
} }
} }
} }
err = -EINVAL; err = -EINVAL;
goto error; goto out;
ok1: found1:
indycam_ctrl.agc = INDYCAM_VALUE_UNCHANGED; indycam_ctrl.type = vino_indycam_v4l2_controls[i].reserved[0];
indycam_ctrl.awb = INDYCAM_VALUE_UNCHANGED; indycam_ctrl.value = control->value;
indycam_ctrl.shutter = INDYCAM_VALUE_UNCHANGED;
indycam_ctrl.gain = INDYCAM_VALUE_UNCHANGED;
indycam_ctrl.red_balance = INDYCAM_VALUE_UNCHANGED;
indycam_ctrl.blue_balance = INDYCAM_VALUE_UNCHANGED;
indycam_ctrl.red_saturation = INDYCAM_VALUE_UNCHANGED;
indycam_ctrl.blue_saturation = INDYCAM_VALUE_UNCHANGED;
indycam_ctrl.gamma = INDYCAM_VALUE_UNCHANGED;
switch(control->id) {
case V4L2_CID_AUTOGAIN:
indycam_ctrl.agc = control->value;
break;
case V4L2_CID_AUTO_WHITE_BALANCE:
indycam_ctrl.awb = control->value;
break;
case V4L2_CID_GAIN:
indycam_ctrl.gain = control->value;
break;
case V4L2_CID_PRIVATE_BASE:
indycam_ctrl.red_saturation = control->value;
break;
case V4L2_CID_PRIVATE_BASE + 1:
indycam_ctrl.blue_saturation = control->value;
break;
case V4L2_CID_RED_BALANCE:
indycam_ctrl.red_balance = control->value;
break;
case V4L2_CID_BLUE_BALANCE:
indycam_ctrl.blue_balance = control->value;
break;
case V4L2_CID_EXPOSURE:
indycam_ctrl.shutter = control->value;
break;
case V4L2_CID_GAMMA:
indycam_ctrl.gamma = control->value;
break;
default:
err = -EINVAL;
}
if (!err) err = i2c_camera_command(DECODER_INDYCAM_SET_CONTROL,
i2c_camera_command(DECODER_INDYCAM_SET_CONTROLS, &indycam_ctrl);
&indycam_ctrl); if (err)
err = -EINVAL;
break; break;
}
case VINO_INPUT_COMPOSITE: case VINO_INPUT_COMPOSITE:
case VINO_INPUT_SVIDEO: case VINO_INPUT_SVIDEO: {
struct saa7191_control saa7191_ctrl;
for (i = 0; i < VINO_SAA7191_V4L2_CONTROL_COUNT; i++) { for (i = 0; i < VINO_SAA7191_V4L2_CONTROL_COUNT; i++) {
if (vino_saa7191_v4l2_controls[i].id == if (vino_saa7191_v4l2_controls[i].id ==
control->id) { control->id) {
...@@ -3611,41 +4005,32 @@ static int vino_v4l2_s_ctrl(struct vino_channel_settings *vcs, ...@@ -3611,41 +4005,32 @@ static int vino_v4l2_s_ctrl(struct vino_channel_settings *vcs,
&& (control->value <= && (control->value <=
vino_saa7191_v4l2_controls[i]. vino_saa7191_v4l2_controls[i].
maximum)) { maximum)) {
goto ok2; goto found2;
} else { } else {
err = -ERANGE; err = -ERANGE;
goto error; goto out;
} }
} }
} }
err = -EINVAL; err = -EINVAL;
goto error; goto out;
ok2:
saa7191_ctrl.hue = SAA7191_VALUE_UNCHANGED;
saa7191_ctrl.vtrc = SAA7191_VALUE_UNCHANGED;
switch(control->id) { found2:
case V4L2_CID_HUE: saa7191_ctrl.type = vino_saa7191_v4l2_controls[i].reserved[0];
saa7191_ctrl.hue = control->value; saa7191_ctrl.value = control->value;
break;
case V4L2_CID_PRIVATE_BASE:
saa7191_ctrl.vtrc = control->value;
break;
default:
err = -EINVAL;
}
if (!err) err = i2c_decoder_command(DECODER_SAA7191_SET_CONTROL,
i2c_decoder_command(DECODER_SAA7191_SET_CONTROLS, &saa7191_ctrl);
&saa7191_ctrl); if (err)
err = -EINVAL;
break; break;
}
default: default:
err = -EINVAL; err = -EINVAL;
} }
error: out:
spin_unlock(&vino_drvdata->input_lock); spin_unlock_irqrestore(&vino_drvdata->input_lock, flags);
return err; return err;
} }
...@@ -3865,9 +4250,9 @@ static unsigned int vino_poll(struct file *file, poll_table *pt) ...@@ -3865,9 +4250,9 @@ static unsigned int vino_poll(struct file *file, poll_table *pt)
over: over:
dprintk("poll(): data %savailable\n", dprintk("poll(): data %savailable\n",
(outgoing > 0) ? "" : "not "); (outgoing > 0) ? "" : "not ");
if (outgoing > 0) {
if (outgoing > 0)
ret = POLLIN | POLLRDNORM; ret = POLLIN | POLLRDNORM;
}
error: error:
...@@ -3880,6 +4265,7 @@ static int vino_do_ioctl(struct inode *inode, struct file *file, ...@@ -3880,6 +4265,7 @@ static int vino_do_ioctl(struct inode *inode, struct file *file,
struct video_device *dev = video_devdata(file); struct video_device *dev = video_devdata(file);
struct vino_channel_settings *vcs = video_get_drvdata(dev); struct vino_channel_settings *vcs = video_get_drvdata(dev);
#ifdef VINO_DEBUG
switch (_IOC_TYPE(cmd)) { switch (_IOC_TYPE(cmd)) {
case 'v': case 'v':
dprintk("ioctl(): V4L1 unsupported (0x%08x)\n", cmd); dprintk("ioctl(): V4L1 unsupported (0x%08x)\n", cmd);
...@@ -3891,9 +4277,9 @@ static int vino_do_ioctl(struct inode *inode, struct file *file, ...@@ -3891,9 +4277,9 @@ static int vino_do_ioctl(struct inode *inode, struct file *file,
default: default:
dprintk("ioctl(): unsupported command 0x%08x\n", cmd); dprintk("ioctl(): unsupported command 0x%08x\n", cmd);
} }
#endif
switch (cmd) { switch (cmd) {
/* TODO: V4L1 interface (use compatibility layer?) */
/* V4L2 interface */ /* V4L2 interface */
case VIDIOC_QUERYCAP: { case VIDIOC_QUERYCAP: {
vino_v4l2_querycap(arg); vino_v4l2_querycap(arg);
...@@ -3911,6 +4297,9 @@ static int vino_do_ioctl(struct inode *inode, struct file *file, ...@@ -3911,6 +4297,9 @@ static int vino_do_ioctl(struct inode *inode, struct file *file,
case VIDIOC_ENUMSTD: { case VIDIOC_ENUMSTD: {
return vino_v4l2_enumstd(vcs, arg); return vino_v4l2_enumstd(vcs, arg);
} }
case VIDIOC_QUERYSTD: {
return vino_v4l2_querystd(vcs, arg);
}
case VIDIOC_G_STD: { case VIDIOC_G_STD: {
return vino_v4l2_g_std(vcs, arg); return vino_v4l2_g_std(vcs, arg);
} }
...@@ -4100,8 +4489,7 @@ static int vino_probe(void) ...@@ -4100,8 +4489,7 @@ static int vino_probe(void)
return -ENODEV; return -ENODEV;
} }
printk(KERN_INFO "VINO with chip ID %ld, revision %ld found\n", printk(KERN_INFO "VINO revision %ld found\n", VINO_REV_NUM(rev_id));
VINO_ID_VALUE(rev_id), VINO_REV_NUM(rev_id));
return 0; return 0;
} }
......
...@@ -84,4 +84,13 @@ static inline void __udelay(unsigned long usecs, unsigned long lpj) ...@@ -84,4 +84,13 @@ static inline void __udelay(unsigned long usecs, unsigned long lpj)
#define udelay(usecs) __udelay((usecs),__udelay_val) #define udelay(usecs) __udelay((usecs),__udelay_val)
/* make sure "usecs *= ..." in udelay do not overflow. */
#if HZ >= 1000
#define MAX_UDELAY_MS 1
#elif HZ <= 200
#define MAX_UDELAY_MS 5
#else
#define MAX_UDELAY_MS (1000 / HZ)
#endif
#endif /* _ASM_DELAY_H */ #endif /* _ASM_DELAY_H */
...@@ -119,10 +119,6 @@ ...@@ -119,10 +119,6 @@
#define EOWNERDEAD 165 /* Owner died */ #define EOWNERDEAD 165 /* Owner died */
#define ENOTRECOVERABLE 166 /* State not recoverable */ #define ENOTRECOVERABLE 166 /* State not recoverable */
/* for robust mutexes */
#define EOWNERDEAD 165 /* Owner died */
#define ENOTRECOVERABLE 166 /* State not recoverable */
#define EDQUOT 1133 /* Quota exceeded */ #define EDQUOT 1133 /* Quota exceeded */
#ifdef __KERNEL__ #ifdef __KERNEL__
......
...@@ -147,6 +147,29 @@ struct mace_audio { ...@@ -147,6 +147,29 @@ struct mace_audio {
} chan[3]; } chan[3];
}; };
/* register definitions for parallel port DMA */
struct mace_parport {
/* 0 - do nothing, 1 - pulse terminal count to the device after buffer is drained */
#define MACEPAR_CONTEXT_LASTFLAG BIT(63)
/* Should not cross 4K page boundary */
#define MACEPAR_CONTEXT_DATALEN_MASK 0xfff00000000
/* Can be arbitrarily aligned on any byte boundary on output, 64 byte aligned on input */
#define MACEPAR_CONTEXT_BASEADDR_MASK 0xffffffff
volatile u64 context_a;
volatile u64 context_b;
#define MACEPAR_CTLSTAT_DIRECTION BIT(0) /* 0 - mem->device, 1 - device->mem */
#define MACEPAR_CTLSTAT_ENABLE BIT(1) /* 0 - channel frozen, 1 - channel enabled */
#define MACEPAR_CTLSTAT_RESET BIT(2) /* 0 - channel active, 1 - complete channel reset */
#define MACEPAR_CTLSTAT_CTXB_VALID BIT(3)
#define MACEPAR_CTLSTAT_CTXA_VALID BIT(4)
volatile u64 cntlstat; /* Control/Status register */
#define MACEPAR_DIAG_CTXINUSE BIT(1)
#define MACEPAR_DIAG_DMACTIVE BIT(2) /* 1 - Dma engine is enabled and processing something */
#define MACEPAR_DIAG_CTRMASK 0x3ffc /* Counter of bytes left */
volatile u64 diagnostic; /* RO: diagnostic register */
};
/* ISA Control and DMA registers */ /* ISA Control and DMA registers */
struct mace_isactrl { struct mace_isactrl {
volatile unsigned long ringbase; volatile unsigned long ringbase;
...@@ -199,6 +222,7 @@ struct mace_isactrl { ...@@ -199,6 +222,7 @@ struct mace_isactrl {
volatile unsigned long _pad[0x2000/8 - 4]; volatile unsigned long _pad[0x2000/8 - 4];
volatile unsigned long dp_ram[0x400]; volatile unsigned long dp_ram[0x400];
struct mace_parport parport;
}; };
/* Keyboard & Mouse registers /* Keyboard & Mouse registers
...@@ -277,7 +301,7 @@ struct mace_perif { ...@@ -277,7 +301,7 @@ struct mace_perif {
*/ */
/* Parallel port */ /* Parallel port */
struct mace_parallel { /* later... */ struct mace_parallel {
}; };
struct mace_ecp1284 { /* later... */ struct mace_ecp1284 { /* later... */
......
...@@ -168,8 +168,12 @@ static inline void __ide_mm_outsl(void __iomem * port, void *addr, u32 count) ...@@ -168,8 +168,12 @@ static inline void __ide_mm_outsl(void __iomem * port, void *addr, u32 count)
/* ide_insw calls insw, not __ide_insw. Why? */ /* ide_insw calls insw, not __ide_insw. Why? */
#undef insw #undef insw
#undef insl #undef insl
#undef outsw
#undef outsl
#define insw(port, addr, count) __ide_insw(port, addr, count) #define insw(port, addr, count) __ide_insw(port, addr, count)
#define insl(port, addr, count) __ide_insl(port, addr, count) #define insl(port, addr, count) __ide_insl(port, addr, count)
#define outsw(port, addr, count) __ide_outsw(port, addr, count)
#define outsl(port, addr, count) __ide_outsl(port, addr, count)
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
......
...@@ -33,7 +33,9 @@ static inline int mc146818_set_rtc_mmss(unsigned long nowtime) ...@@ -33,7 +33,9 @@ static inline int mc146818_set_rtc_mmss(unsigned long nowtime)
int real_seconds, real_minutes, cmos_minutes; int real_seconds, real_minutes, cmos_minutes;
unsigned char save_control, save_freq_select; unsigned char save_control, save_freq_select;
int retval = 0; int retval = 0;
unsigned long flags;
spin_lock_irqsave(&rtc_lock, flags);
save_control = CMOS_READ(RTC_CONTROL); /* tell the clock it's being set */ save_control = CMOS_READ(RTC_CONTROL); /* tell the clock it's being set */
CMOS_WRITE((save_control|RTC_SET), RTC_CONTROL); CMOS_WRITE((save_control|RTC_SET), RTC_CONTROL);
...@@ -79,14 +81,30 @@ static inline int mc146818_set_rtc_mmss(unsigned long nowtime) ...@@ -79,14 +81,30 @@ static inline int mc146818_set_rtc_mmss(unsigned long nowtime)
*/ */
CMOS_WRITE(save_control, RTC_CONTROL); CMOS_WRITE(save_control, RTC_CONTROL);
CMOS_WRITE(save_freq_select, RTC_FREQ_SELECT); CMOS_WRITE(save_freq_select, RTC_FREQ_SELECT);
spin_unlock_irqrestore(&rtc_lock, flags);
return retval; return retval;
} }
/*
* Returns true if a clock update is in progress
*/
static inline unsigned char rtc_is_updating(void)
{
unsigned char uip;
unsigned long flags;
spin_lock_irqsave(&rtc_lock, flags);
uip = (CMOS_READ(RTC_FREQ_SELECT) & RTC_UIP);
spin_unlock_irqrestore(&rtc_lock, flags);
return uip;
}
static inline unsigned long mc146818_get_cmos_time(void) static inline unsigned long mc146818_get_cmos_time(void)
{ {
unsigned int year, mon, day, hour, min, sec; unsigned int year, mon, day, hour, min, sec;
int i; int i;
unsigned long flags;
/* /*
* The Linux interpretation of the CMOS clock register contents: * The Linux interpretation of the CMOS clock register contents:
...@@ -97,12 +115,13 @@ static inline unsigned long mc146818_get_cmos_time(void) ...@@ -97,12 +115,13 @@ static inline unsigned long mc146818_get_cmos_time(void)
/* read RTC exactly on falling edge of update flag */ /* read RTC exactly on falling edge of update flag */
for (i = 0 ; i < 1000000 ; i++) /* may take up to 1 second... */ for (i = 0 ; i < 1000000 ; i++) /* may take up to 1 second... */
if (CMOS_READ(RTC_FREQ_SELECT) & RTC_UIP) if (rtc_is_updating())
break; break;
for (i = 0 ; i < 1000000 ; i++) /* must try at least 2.228 ms */ for (i = 0 ; i < 1000000 ; i++) /* must try at least 2.228 ms */
if (!(CMOS_READ(RTC_FREQ_SELECT) & RTC_UIP)) if (!rtc_is_updating())
break; break;
spin_lock_irqsave(&rtc_lock, flags);
do { /* Isn't this overkill ? UIP above should guarantee consistency */ do { /* Isn't this overkill ? UIP above should guarantee consistency */
sec = CMOS_READ(RTC_SECONDS); sec = CMOS_READ(RTC_SECONDS);
min = CMOS_READ(RTC_MINUTES); min = CMOS_READ(RTC_MINUTES);
...@@ -120,6 +139,7 @@ static inline unsigned long mc146818_get_cmos_time(void) ...@@ -120,6 +139,7 @@ static inline unsigned long mc146818_get_cmos_time(void)
BCD_TO_BIN(mon); BCD_TO_BIN(mon);
BCD_TO_BIN(year); BCD_TO_BIN(year);
} }
spin_unlock_irqrestore(&rtc_lock, flags);
year = mc146818_decode_year(year); year = mc146818_decode_year(year);
return mktime(year, mon, day, hour, min, sec); return mktime(year, mon, day, hour, min, sec);
......
...@@ -76,43 +76,43 @@ search_module_dbetables(unsigned long addr) ...@@ -76,43 +76,43 @@ search_module_dbetables(unsigned long addr)
#endif #endif
#ifdef CONFIG_CPU_MIPS32_R1 #ifdef CONFIG_CPU_MIPS32_R1
#define MODULE_PROC_FAMILY "MIPS32_R1" #define MODULE_PROC_FAMILY "MIPS32_R1 "
#elif defined CONFIG_CPU_MIPS32_R2 #elif defined CONFIG_CPU_MIPS32_R2
#define MODULE_PROC_FAMILY "MIPS32_R2" #define MODULE_PROC_FAMILY "MIPS32_R2 "
#elif defined CONFIG_CPU_MIPS64_R1 #elif defined CONFIG_CPU_MIPS64_R1
#define MODULE_PROC_FAMILY "MIPS64_R1" #define MODULE_PROC_FAMILY "MIPS64_R1 "
#elif defined CONFIG_CPU_MIPS64_R2 #elif defined CONFIG_CPU_MIPS64_R2
#define MODULE_PROC_FAMILY "MIPS64_R2" #define MODULE_PROC_FAMILY "MIPS64_R2 "
#elif defined CONFIG_CPU_R3000 #elif defined CONFIG_CPU_R3000
#define MODULE_PROC_FAMILY "R3000" #define MODULE_PROC_FAMILY "R3000 "
#elif defined CONFIG_CPU_TX39XX #elif defined CONFIG_CPU_TX39XX
#define MODULE_PROC_FAMILY "TX39XX" #define MODULE_PROC_FAMILY "TX39XX "
#elif defined CONFIG_CPU_VR41XX #elif defined CONFIG_CPU_VR41XX
#define MODULE_PROC_FAMILY "VR41XX" #define MODULE_PROC_FAMILY "VR41XX "
#elif defined CONFIG_CPU_R4300 #elif defined CONFIG_CPU_R4300
#define MODULE_PROC_FAMILY "R4300" #define MODULE_PROC_FAMILY "R4300 "
#elif defined CONFIG_CPU_R4X00 #elif defined CONFIG_CPU_R4X00
#define MODULE_PROC_FAMILY "R4X00" #define MODULE_PROC_FAMILY "R4X00 "
#elif defined CONFIG_CPU_TX49XX #elif defined CONFIG_CPU_TX49XX
#define MODULE_PROC_FAMILY "TX49XX" #define MODULE_PROC_FAMILY "TX49XX "
#elif defined CONFIG_CPU_R5000 #elif defined CONFIG_CPU_R5000
#define MODULE_PROC_FAMILY "R5000" #define MODULE_PROC_FAMILY "R5000 "
#elif defined CONFIG_CPU_R5432 #elif defined CONFIG_CPU_R5432
#define MODULE_PROC_FAMILY "R5432" #define MODULE_PROC_FAMILY "R5432 "
#elif defined CONFIG_CPU_R6000 #elif defined CONFIG_CPU_R6000
#define MODULE_PROC_FAMILY "R6000" #define MODULE_PROC_FAMILY "R6000 "
#elif defined CONFIG_CPU_NEVADA #elif defined CONFIG_CPU_NEVADA
#define MODULE_PROC_FAMILY "NEVADA" #define MODULE_PROC_FAMILY "NEVADA "
#elif defined CONFIG_CPU_R8000 #elif defined CONFIG_CPU_R8000
#define MODULE_PROC_FAMILY "R8000" #define MODULE_PROC_FAMILY "R8000 "
#elif defined CONFIG_CPU_R10000 #elif defined CONFIG_CPU_R10000
#define MODULE_PROC_FAMILY "R10000" #define MODULE_PROC_FAMILY "R10000 "
#elif defined CONFIG_CPU_RM7000 #elif defined CONFIG_CPU_RM7000
#define MODULE_PROC_FAMILY "RM7000" #define MODULE_PROC_FAMILY "RM7000 "
#elif defined CONFIG_CPU_RM9000 #elif defined CONFIG_CPU_RM9000
#define MODULE_PROC_FAMILY "RM9000" #define MODULE_PROC_FAMILY "RM9000 "
#elif defined CONFIG_CPU_SB1 #elif defined CONFIG_CPU_SB1
#define MODULE_PROC_FAMILY "SB1" #define MODULE_PROC_FAMILY "SB1 "
#else #else
#error MODULE_PROC_FAMILY undefined for your processor configuration #error MODULE_PROC_FAMILY undefined for your processor configuration
#endif #endif
......
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
#ifdef __KERNEL__ #ifdef __KERNEL__
#include <linux/spinlock.h>
#include <linux/rtc.h> #include <linux/rtc.h>
#include <asm/time.h> #include <asm/time.h>
...@@ -29,17 +28,13 @@ ...@@ -29,17 +28,13 @@
#define RTC_24H 0x02 /* 24 hour mode - else hours bit 7 means pm */ #define RTC_24H 0x02 /* 24 hour mode - else hours bit 7 means pm */
#define RTC_DST_EN 0x01 /* auto switch DST - works f. USA only */ #define RTC_DST_EN 0x01 /* auto switch DST - works f. USA only */
static DEFINE_SPINLOCK(mips_rtc_lock);
static inline unsigned int get_rtc_time(struct rtc_time *time) static inline unsigned int get_rtc_time(struct rtc_time *time)
{ {
unsigned long nowtime; unsigned long nowtime;
spin_lock(&mips_rtc_lock);
nowtime = rtc_get_time(); nowtime = rtc_get_time();
to_tm(nowtime, time); to_tm(nowtime, time);
time->tm_year -= 1900; time->tm_year -= 1900;
spin_unlock(&mips_rtc_lock);
return RTC_24H; return RTC_24H;
} }
...@@ -49,12 +44,10 @@ static inline int set_rtc_time(struct rtc_time *time) ...@@ -49,12 +44,10 @@ static inline int set_rtc_time(struct rtc_time *time)
unsigned long nowtime; unsigned long nowtime;
int ret; int ret;
spin_lock(&mips_rtc_lock);
nowtime = mktime(time->tm_year+1900, time->tm_mon+1, nowtime = mktime(time->tm_year+1900, time->tm_mon+1,
time->tm_mday, time->tm_hour, time->tm_min, time->tm_mday, time->tm_hour, time->tm_min,
time->tm_sec); time->tm_sec);
ret = rtc_set_time(nowtime); ret = rtc_set_time(nowtime);
spin_unlock(&mips_rtc_lock);
return ret; return ret;
} }
......
...@@ -16,21 +16,19 @@ ...@@ -16,21 +16,19 @@
#define RTLX_ID (RTLX_xID | RTLX_VERSION) #define RTLX_ID (RTLX_xID | RTLX_VERSION)
#define RTLX_CHANNELS 8 #define RTLX_CHANNELS 8
enum rtlx_state {
RTLX_STATE_UNUSED = 0,
RTLX_STATE_INITIALISED,
RTLX_STATE_REMOTE_READY,
RTLX_STATE_OPENED
};
#define RTLX_BUFFER_SIZE 1024 #define RTLX_BUFFER_SIZE 1024
/*
* lx_state bits
*/
#define RTLX_STATE_OPENED 1UL
/* each channel supports read and write. /* each channel supports read and write.
linux (vpe0) reads lx_buffer and writes rt_buffer linux (vpe0) reads lx_buffer and writes rt_buffer
SP (vpe1) reads rt_buffer and writes lx_buffer SP (vpe1) reads rt_buffer and writes lx_buffer
*/ */
typedef struct rtlx_channel { struct rtlx_channel {
enum rtlx_state rt_state; unsigned long lx_state;
enum rtlx_state lx_state;
int buffer_size; int buffer_size;
...@@ -43,14 +41,12 @@ typedef struct rtlx_channel { ...@@ -43,14 +41,12 @@ typedef struct rtlx_channel {
void *queues; void *queues;
} rtlx_channel_t; };
typedef struct rtlx_info { struct rtlx_info {
unsigned long id; unsigned long id;
enum rtlx_state state;
struct rtlx_channel channel[RTLX_CHANNELS]; struct rtlx_channel channel[RTLX_CHANNELS];
};
} rtlx_info_t; #endif /* _RTLX_H_ */
#endif
...@@ -20,6 +20,9 @@ ...@@ -20,6 +20,9 @@
#include <linux/linkage.h> #include <linux/linkage.h>
#include <linux/ptrace.h> #include <linux/ptrace.h>
#include <linux/rtc.h> #include <linux/rtc.h>
#include <linux/spinlock.h>
extern spinlock_t rtc_lock;
/* /*
* RTC ops. By default, they point to no-RTC functions. * RTC ops. By default, they point to no-RTC functions.
......
...@@ -563,7 +563,7 @@ static void start_adc(struct au1000_state *s) ...@@ -563,7 +563,7 @@ static void start_adc(struct au1000_state *s)
#define DMABUF_DEFAULTORDER (17-PAGE_SHIFT) #define DMABUF_DEFAULTORDER (17-PAGE_SHIFT)
#define DMABUF_MINORDER 1 #define DMABUF_MINORDER 1
extern inline void dealloc_dmabuf(struct au1000_state *s, struct dmabuf *db) static inline void dealloc_dmabuf(struct au1000_state *s, struct dmabuf *db)
{ {
struct page *page, *pend; struct page *page, *pend;
...@@ -667,14 +667,14 @@ static int prog_dmabuf(struct au1000_state *s, struct dmabuf *db) ...@@ -667,14 +667,14 @@ static int prog_dmabuf(struct au1000_state *s, struct dmabuf *db)
return 0; return 0;
} }
extern inline int prog_dmabuf_adc(struct au1000_state *s) static inline int prog_dmabuf_adc(struct au1000_state *s)
{ {
stop_adc(s); stop_adc(s);
return prog_dmabuf(s, &s->dma_adc); return prog_dmabuf(s, &s->dma_adc);
} }
extern inline int prog_dmabuf_dac(struct au1000_state *s) static inline int prog_dmabuf_dac(struct au1000_state *s)
{ {
stop_dac(s); stop_dac(s);
return prog_dmabuf(s, &s->dma_dac); return prog_dmabuf(s, &s->dma_dac);
......
...@@ -435,7 +435,7 @@ static int ac97_codec_not_present(struct ac97_codec *codec) ...@@ -435,7 +435,7 @@ static int ac97_codec_not_present(struct ac97_codec *codec)
/* --------------------------------------------------------------------- */ /* --------------------------------------------------------------------- */
extern inline void static inline void
stop_dac(struct vrc5477_ac97_state *s) stop_dac(struct vrc5477_ac97_state *s)
{ {
struct dmabuf* db = &s->dma_dac; struct dmabuf* db = &s->dma_dac;
...@@ -553,7 +553,7 @@ static void start_dac(struct vrc5477_ac97_state *s) ...@@ -553,7 +553,7 @@ static void start_dac(struct vrc5477_ac97_state *s)
spin_unlock_irqrestore(&s->lock, flags); spin_unlock_irqrestore(&s->lock, flags);
} }
extern inline void stop_adc(struct vrc5477_ac97_state *s) static inline void stop_adc(struct vrc5477_ac97_state *s)
{ {
struct dmabuf* db = &s->dma_adc; struct dmabuf* db = &s->dma_adc;
unsigned long flags; unsigned long flags;
...@@ -652,7 +652,7 @@ static void start_adc(struct vrc5477_ac97_state *s) ...@@ -652,7 +652,7 @@ static void start_adc(struct vrc5477_ac97_state *s)
#define DMABUF_DEFAULTORDER (16-PAGE_SHIFT) #define DMABUF_DEFAULTORDER (16-PAGE_SHIFT)
#define DMABUF_MINORDER 1 #define DMABUF_MINORDER 1
extern inline void dealloc_dmabuf(struct vrc5477_ac97_state *s, static inline void dealloc_dmabuf(struct vrc5477_ac97_state *s,
struct dmabuf *db) struct dmabuf *db)
{ {
if (db->lbuf) { if (db->lbuf) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment