diff -urN linux-2.6.25.8.orig/drivers/media/video/Kconfig linux-2.6.25.8/drivers/media/video/Kconfig --- linux-2.6.25.8.orig/drivers/media/video/Kconfig 2008-06-06 16:05:04.000000000 -0700 +++ linux-2.6.25.8/drivers/media/video/Kconfig 2008-06-08 09:09:04.515549133 -0700 @@ -606,6 +606,18 @@ support for the Linux Media Labs LML33R10 MJPEG capture/playback card. +config VIDEO_ZR36120 + tristate "Zoran ZR36120/36125 Video For Linux" + depends on PCI && I2C && VIDEO_V4L1 + help + Support for ZR36120/ZR36125 based frame grabber/overlay boards. + This includes the Victor II, WaveWatcher, Video Wonder, Maxi-TV, + and Buster boards. Please read the material in + for more information. + + To compile this driver as a module, choose M here: the + module will be called zr36120. + config VIDEO_ZORAN_AVS6EYES tristate "AverMedia 6 Eyes support (EXPERIMENTAL)" depends on VIDEO_ZORAN && EXPERIMENTAL && VIDEO_V4L1 diff -urN linux-2.6.25.8.orig/drivers/media/video/Makefile linux-2.6.25.8/drivers/media/video/Makefile --- linux-2.6.25.8.orig/drivers/media/video/Makefile 2008-06-06 16:05:04.000000000 -0700 +++ linux-2.6.25.8/drivers/media/video/Makefile 2008-06-08 09:09:04.519547545 -0700 @@ -2,6 +2,7 @@ # Makefile for the video capture/playback device drivers. # +zoran-objs := zr36120.o zr36120_i2c.o zr36120_mem.o zr36067-objs := zoran_procfs.o zoran_device.o \ zoran_driver.o zoran_card.o tuner-objs := tuner-core.o tuner-types.o @@ -24,6 +25,7 @@ obj-$(CONFIG_VIDEO_TDA7432) += tda7432.o obj-$(CONFIG_VIDEO_TDA9875) += tda9875.o +obj-$(CONFIG_VIDEO_ZR36120) += saa7110.o saa7111.o zoran.o obj-$(CONFIG_VIDEO_SAA6588) += saa6588.o obj-$(CONFIG_VIDEO_SAA5246A) += saa5246a.o obj-$(CONFIG_VIDEO_SAA5249) += saa5249.o diff -urN linux-2.6.25.8.orig/drivers/media/video/zr36120.c linux-2.6.25.8/drivers/media/video/zr36120.c --- linux-2.6.25.8.orig/drivers/media/video/zr36120.c 1969-12-31 16:00:00.000000000 -0800 +++ linux-2.6.25.8/drivers/media/video/zr36120.c 2008-06-08 09:09:04.551547690 -0700 @@ -0,0 +1,2292 @@ +/* + zr36120.c - Zoran 36120/36125 based framegrabbers + + Copyright (C) 1998-1999 Pauline Middelink + Partial port to Linux 2.6 by ??? + Full port to Linux 2.6, and other cleanup by Joachim Feise (Oct. 2005) + Copyright (C) 2005 Joachim Feise + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +#include "zr36120.h" +#include +#include "zr36120_mem.h" + +/* mark an required function argument unused - lintism */ +#define UNUSED(x) (void)(x) + +/* sensible default */ +#ifndef CARDTYPE +#define CARDTYPE 0 +#endif + +/* Anybody who uses more than four? */ +#define ZORAN_MAX 4 + +static int triton1=0; /* triton1 chipset? */ +/*static int cardtype[ZORAN_MAX]={ [ 0 ... ZORAN_MAX-1 ] = CARDTYPE };*/ +static int cardtype[ZORAN_MAX]={ [ 0 ... ZORAN_MAX-1 ] = CARDTYPE }; +static int debug = 0; +static int mode = VIDEO_MODE_NTSC; + +static struct pci_device_id zr36120_pci_tbl[] = { + { PCI_VENDOR_ID_ZORAN,PCI_DEVICE_ID_ZORAN_36120, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, + { 0 } +}; +MODULE_DEVICE_TABLE(pci, zr36120_pci_tbl); + +MODULE_AUTHOR("Pauline Middelink "); +MODULE_AUTHOR("Joachim Feise "); +MODULE_DESCRIPTION("Zoran ZR36120 based framegrabber"); +MODULE_LICENSE("GPL"); + +module_param(triton1, bool, 0); +MODULE_PARM_DESC(triton1, "Running on Triton1 chipset"); + +module_param_array(cardtype, int, NULL, 0); +MODULE_PARM_DESC(cardtype, "The ZR36120-based card type (see sources)"); + +module_param(mode, int, VIDEO_MODE_NTSC); +MODULE_PARM_DESC(mode, "The video mode [0:PAL, 1:NTSC (default), 2:SECAM]"); + +module_param(debug, int, 0); +MODULE_PARM_DESC(debug, "Debug level [0-2:increasing verbosity, 9:debug intr]"); + + +static int zoran_cards; +static struct zoran zorans[ZORAN_MAX]; + +/* + * the meaning of each element can be found in zr36120.h + * Determining the value of gpdir/gpval can be tricky. The + * best way is to run the card under the original software + * and read the values from the general purpose registers + * 0x28 and 0x2C. How you do that is left as an exercise + * to the impatient reader :) + */ +#define T 1 /* to separate the bools from the ints */ +#define F 0 +static struct tvcard tvcards[] = { + /* reported working by */ +/*0*/ { "Trust Victor II", + 2, 0, T, T, T, T, T, F, 0x7F, 0x80, { 1, SVHS(6) }, { 0 } }, + /* reported working by */ +/*1*/ { "Aitech WaveWatcher TV-PCI", + 3, 0, T, F, T, T, T, F, 0x7F, 0x80, { 1, TUNER(3), SVHS(6) }, { 0 } }, + /* reported working by ? */ +/*2*/ { "Genius Video Wonder PCI Video Capture Card", + 2, 0, T, T, T, T, T, F, 0x7F, 0x80, { 1, SVHS(6) }, { 0 } }, + /* reported working by */ +/*3*/ { "Guillemot Maxi-TV PCI", + 2, 0, T, T, T, T, T, F, 0x7F, 0x80, { 1, SVHS(6) }, { 0 } }, + /* reported working by "Craig Whitmore */ +/*4*/ { "Quadrant Buster", + 3, 3, T, F, T, T, T, F, 0x7F, 0x80, { SVHS(1), TUNER(2), 3 }, { 1, 2, 3 } }, + /* reported by */ +/*5*/ { "MediaFocus Satellite TV Card", + 3, 0, T, F, T, F, T, F, 0xE0, 0x11, { 0, TUNER(2), SVHS(4) }, { 0 } }, + /* reported working by */ +/*6*/ { "Genius TV Wonder Pro", + 3, 1, F, T, T, T, T, F, 0x7F, 0x80, { 1, TUNER(2), SVHS(3) }, { 0 } }, + /* reported working by Joel Fuster */ +/*7*/ { "Boca BVPSZ1", + 1, 0, F, T, T, F, T, F, 0xFD, 0x00, { 1 }, { 0 } }, + /* reported working by Joe Feise */ +/*8*/ { "Focus Enhancements InVideo/PCI", + 2, 0, F, F, T, T, T, F, 0x7F, 0x80, { 1, 2 }, { 0 } }, + /* a debug entry which has all inputs mapped */ +/*9*/ { "ZR36120 based framegrabber (all inputs enabled)", + 6, 0, T, T, T, T, T, F, 0x7F, 0x80, { 1, 2, 3, 4, 5, 6 }, { 0 } } +}; +#undef T +#undef F +#define NRTVCARDS (sizeof(tvcards)/sizeof(tvcards[0])) + +#ifdef __sparc__ +#define ENDIANESS 0 +#define ENDIANESS2 ZORAN_VFEC_LE +#else +#define ENDIANESS ZORAN_VFEC_LE +#define ENDIANESS2 0 +#endif + +static struct { const char name[8]; uint mode; uint bpp; } palette2fmt[] = { +/* n/a : 0 */ { "n/a", 0, 0 }, +/* GREY : 1 */ { "GRAY", 0, 0 }, +/* HI240 : 2 */ { "HI240", 0, 0 }, +/* RGB565 : 3 */ { "RGB565", ZORAN_VFEC_RGB_RGB565|ENDIANESS, 2 }, +/* RGB24 : 4 */ { "RGB24", ZORAN_VFEC_RGB_RGB888|ENDIANESS|ZORAN_VFEC_PACK24, 3 }, +/* RGB32 : 5 */ { "RGB32", ZORAN_VFEC_RGB_RGB888|ENDIANESS, 4 }, +/* RGB555 : 6 */ { "RGB555", ZORAN_VFEC_RGB_RGB555|ENDIANESS, 2 }, +/* YUV422 : 7 */ { "YUV422", ZORAN_VFEC_RGB_YUV422|ENDIANESS, 2 }, +/* YUYV : 8 */ { "YUYV", ZORAN_VFEC_RGB_YUV422|ENDIANESS2, 2 }, +/* UYVY : 9 */ { "UYVY", ZORAN_VFEC_RGB_YUV422|ENDIANESS, 2 }, +/* YUV420 : 10 */ { "YUV420", 0, 0 }, +/* YUV411 : 11 */ { "YUV411", 0, 0 }, +/* RAW : 12 */ { "RAW", 0, 0 }, +/* YUV422P : 13 */ { "YUV422P", 0, 0 }, +/* YUV411P : 14 */ { "YUV411P", 0, 0 }}; +#define NRPALETTES (sizeof(palette2fmt)/sizeof(palette2fmt[0])) +#undef ENDIANESS + +struct tvmode +{ + u16 Wt, Wa, Ht, Ha, HStart, VStart; +}; + +static struct tvmode tvmodes[] = { + /* PAL-BDGHI */ +/*00*/ { 864, 768, 625, 576, 85, 17 }, + /* NTSC */ +/*01*/ { 858, 720, 525, 480, 121, 10 }, + /* SECAM */ +/*02*/ { 864, 720, 625, 576, 131, 21 }, +}; +#define TVNORMS (sizeof(tvmodes)/sizeof(tvmodes[0])) + + +/* ----------------------------------------------------------------------- */ +/* ZORAN chipset detector */ +/* shamelessly stolen from bttv.c */ +/* Reason for beeing here: we need to detect if we are running on a */ +/* Triton based chipset, and if so, enable a certain bit */ +/* ----------------------------------------------------------------------- */ +static +void __init handle_chipset(void) +{ + /* Just in case some nut set this to something dangerous */ + if (triton1) + triton1 = ZORAN_VDC_TRICOM; + + if (pci_pci_problems & PCIPCI_TRITON) { + dprintk(0, KERN_INFO "zr36120: Host bridge 82437FX Triton PIIX\n"); + triton1 = ZORAN_VDC_TRICOM; + } +} + +/* ----------------------------------------------------------------------- */ +/* ZORAN functions */ +/* ----------------------------------------------------------------------- */ + +static void zoran_set_geo(struct zoran* ztv, struct vidinfo* i); + +#if 0 /* unused */ +static +void zoran_dump(struct zoran *ztv) +{ + char str[256]; + char *p=str; /* shut up, gcc! */ + int i; + + for (i=0; i<0x60; i+=4) { + if ((i % 16) == 0) { + if (i) dprintk(0, "%s\n", str); + p = str; + p+= sprintf(str, KERN_DEBUG " %04x: ",i); + } + p += sprintf(p, "%08x ",zrread(i)); + } +} +#endif /* unused */ + +static +void reap_states(struct zoran* ztv) +{ + /* count frames */ + ztv->fieldnr++; + + /* + * Are we busy at all? + * This depends on if there is a workqueue AND the + * videotransfer is enabled on the chip... + */ + if (ztv->workqueue && (zrread(ZORAN_VDC) & ZORAN_VDC_VIDEN)) + { + struct vidinfo* newitem; + + /* did we get a complete frame? */ + if (zrread(ZORAN_VSTR) & ZORAN_VSTR_GRAB) + return; + + dprintk(2, CARD_DEBUG "completed %s at %p\n", + CARD, ztv->workqueue->kindof==FBUFFER_GRAB?"grab":"read", + ztv->workqueue); + + /* we are done with this buffer, tell everyone */ + ztv->workqueue->status = FBUFFER_DONE; + ztv->workqueue->fieldnr = ztv->fieldnr; + /* not good, here for BTTV_FIELDNR reasons */ + ztv->lastfieldnr = ztv->fieldnr; + + switch (ztv->workqueue->kindof) { + case FBUFFER_GRAB: + wake_up_interruptible(&ztv->grabq); + break; + + case FBUFFER_VBI: + wake_up_interruptible(&ztv->vbiq); + break; + + default: + dprintk(0, + CARD_INFO "somebody killed the workqueue (kindof=%d)!\n", + CARD, ztv->workqueue->kindof); + } + + /* item completed, skip to next item in queue */ + write_lock(&ztv->lock); + newitem = ztv->workqueue->next; + ztv->workqueue->next = 0; /* mark completed */ + ztv->workqueue = newitem; + write_unlock(&ztv->lock); + } + + /* + * ok, so it seems we have nothing in progress right now. + * Lets see if we can find some work. + */ + if (ztv->workqueue) + { + struct vidinfo* newitem; +again: + + dprintk(2, CARD_DEBUG "starting %s at %p\n", + CARD, ztv->workqueue->kindof==FBUFFER_GRAB?"grab":"read", + ztv->workqueue); + + /* loadup the frame settings */ + read_lock(&ztv->lock); + zoran_set_geo(ztv,ztv->workqueue); + read_unlock(&ztv->lock); + + switch (ztv->workqueue->kindof) { + case FBUFFER_GRAB: + case FBUFFER_VBI: + zrand(~ZORAN_OCR_OVLEN, ZORAN_OCR); + zror(ZORAN_VSTR_SNAPSHOT,ZORAN_VSTR); + zror(ZORAN_VDC_VIDEN,ZORAN_VDC); + + /* start single-shot grab */ + zror(ZORAN_VSTR_GRAB, ZORAN_VSTR); + break; + + default: + dprintk(0, + CARD_INFO "what is this doing on the queue? (kindof=%d)\n", + CARD, ztv->workqueue->kindof); + write_lock(&ztv->lock); + newitem = ztv->workqueue->next; + ztv->workqueue->next = 0; + ztv->workqueue = newitem; + write_unlock(&ztv->lock); + if (newitem) + goto again; /* yeah, sure.. */ + } + /* bye for now */ + return; + } + dprintk(2, CARD_DEBUG "nothing in queue\n", CARD); + + /* + * What? Even the workqueue is empty? Am i really here + * for nothing? Did i come all that way to... do nothing? + */ + + /* do we need to overlay? */ + if (test_bit(STATE_OVERLAY, &ztv->state)) + { + /* are we already overlaying? */ + if (!(zrread(ZORAN_OCR) & ZORAN_OCR_OVLEN) || + !(zrread(ZORAN_VDC) & ZORAN_VDC_VIDEN)) + { + dprintk(2, CARD_DEBUG "starting overlay\n", CARD); + + read_lock(&ztv->lock); + zoran_set_geo(ztv,&ztv->overinfo); + read_unlock(&ztv->lock); + + zror(ZORAN_OCR_OVLEN, ZORAN_OCR); + zrand(~ZORAN_VSTR_SNAPSHOT,ZORAN_VSTR); + zror(ZORAN_VDC_VIDEN,ZORAN_VDC); + } + + /* + * leave overlaying on, but turn interrupts off. + */ + zrand(~ZORAN_ICR_EN,ZORAN_ICR); + return; + } + + /* do we have any VBI idle time processing? */ + if (test_bit(STATE_VBI, &ztv->state)) + { + struct vidinfo* item; + struct vidinfo* lastitem; + + /* protect the workqueue */ + write_lock(&ztv->lock); + lastitem = ztv->workqueue; + if (lastitem) + while (lastitem->next) lastitem = lastitem->next; + for (item=ztv->readinfo; item!=ztv->readinfo+ZORAN_VBI_BUFFERS; item++) + if (item->next == 0 && item->status == FBUFFER_FREE) + { + dprintk(2, CARD_DEBUG "%p added to queue\n",CARD, item); + item->status = FBUFFER_BUSY; + if (!lastitem) + ztv->workqueue = item; + else + lastitem->next = item; + lastitem = item; + } + write_unlock(&ztv->lock); + if (ztv->workqueue) + goto again; /* hey, _i_ graduated :) */ + } + + /* + * Then we must be realy IDLE + */ + dprintk(2, CARD_DEBUG "turning off\n", CARD); + /* nothing further to do, disable DMA and further IRQs */ + zrand(~ZORAN_VDC_VIDEN,ZORAN_VDC); + zrand(~ZORAN_ICR_EN,ZORAN_ICR); +} + +static +irqreturn_t zoran_irq(int irq, void *dev_id) +{ + u32 stat,estat; + int count = 0; + struct zoran *ztv = dev_id; + + UNUSED(irq); + for (;;) { + /* get/clear interrupt status bits */ + stat=zrread(ZORAN_ISR); + estat=stat & zrread(ZORAN_ICR); + if (!estat) + break; + zrwrite(estat,ZORAN_ISR); + dprintk(9, CARD_DEBUG "estat %08x\n", CARD, estat); + dprintk(9, CARD_DEBUG " stat %08x\n", CARD, stat); + + if (estat & ZORAN_ISR_CODE) + { + dprintk(9, CARD_DEBUG "CodReplIRQ\n", CARD); + } + if (estat & ZORAN_ISR_GIRQ0) + { + dprintk(9, CARD_DEBUG "GIRQ0\n", CARD); + if (!ztv->card->usegirq1) + reap_states(ztv); + } + if (estat & ZORAN_ISR_GIRQ1) + { + dprintk(9, CARD_DEBUG "GIRQ1\n", CARD); + if (ztv->card->usegirq1) + reap_states(ztv); + } + + count++; + if (count > 10) + dprintk(0, CARD_ERR "irq loop %d (%x)\n", CARD, count, estat); + if (count > 20) + { + zrwrite(0, ZORAN_ICR); + dprintk(0, CARD_ERR "IRQ lockup, cleared int mask\n", CARD); + } + } + + return IRQ_HANDLED; +} + +static +int zoran_muxsel(struct zoran* ztv, int channel, int mode) +{ + int rv = 0; + int changed = 0; + + /* map the given channel to the cards decoder's channel */ + channel = ztv->card->video_mux[channel] & CHANNEL_MASK; + + /* + * First set the new channel, for AUTO we need the mode of + * the new channel, not the old! + */ + if (ztv->channel != channel) { + /* set the new channel */ + rv = zoran_i2c_command(ztv, DECODER_SET_INPUT, &channel); + ztv->channel = channel; + changed = 1; + } + + /* set the new video mode */ + if (changed || ztv->mode == VIDEO_MODE_AUTO || ztv->mode != mode) { + rv = zoran_i2c_command(ztv, DECODER_SET_NORM, &mode); + if (rv) + return rv; + ztv->mode = mode; + } + + return rv; +} + +/* Tell the interrupt handler what to to. */ +static +void zoran_cap(struct zoran* ztv, int on) +{ + dprintk(2, CARD_DEBUG "zoran_cap(%d) state=%lx\n", CARD, on, ztv->state); + + if (on) { + ztv->running = 1; + + /* + * turn interrupts (back) on. The DMA will be enabled + * inside the irq handler when it detects a restart. + */ + zror(ZORAN_ICR_EN,ZORAN_ICR); + } + else { + /* + * turn both interrupts and DMA off + */ + zrand(~ZORAN_VDC_VIDEN,ZORAN_VDC); + zrand(~ZORAN_ICR_EN,ZORAN_ICR); + + ztv->running = 0; + } +} + +static ulong dmask[] = { + 0xFFFFFFFF, 0xFFFFFFFE, 0xFFFFFFFC, 0xFFFFFFF8, + 0xFFFFFFF0, 0xFFFFFFE0, 0xFFFFFFC0, 0xFFFFFF80, + 0xFFFFFF00, 0xFFFFFE00, 0xFFFFFC00, 0xFFFFF800, + 0xFFFFF000, 0xFFFFE000, 0xFFFFC000, 0xFFFF8000, + 0xFFFF0000, 0xFFFE0000, 0xFFFC0000, 0xFFF80000, + 0xFFF00000, 0xFFE00000, 0xFFC00000, 0xFF800000, + 0xFF000000, 0xFE000000, 0xFC000000, 0xF8000000, + 0xF0000000, 0xE0000000, 0xC0000000, 0x80000000 +}; + +static +void zoran_built_overlay(struct zoran* ztv, int count, struct video_clip *vcp) +{ + ulong* mtop; + int ystep = (ztv->vidXshift + ztv->vidWidth+31)/32; /* next DWORD */ + int i; + + dprintk(2, KERN_DEBUG " overlay at %p, ystep=%d, clips=%d\n", + ztv->overinfo.overlay, ystep, count); + + for (i=0; ix, vp->y, vp->width, vp->height); + } + + /* + * activate the visible portion of the screen + * Note we take some shortcuts here, because we + * know the width can never be < 32. (I.e. a DWORD) + * We also assume the overlay starts somewhere in + * the FIRST dword. + */ + { + int start = ztv->vidXshift; + ulong firstd = dmask[start]; + ulong lastd = ~dmask[(start + ztv->overinfo.w) & 31]; + mtop = ztv->overinfo.overlay; + for (i=0; ioverinfo.h; i++) { + int w = ztv->vidWidth; + ulong* line = mtop; + if (start & 31) { + *line++ = firstd; + w -= 32-(start&31); + } + memset(line, ~0, w/8); + if (w & 31) + line[w/32] = lastd; + mtop += ystep; + } + } + + /* process clipping regions */ + for (i=0; ix < 0 || (uint)vcp->x > ztv->overinfo.w || + vcp->y < 0 || vcp->y > ztv->overinfo.h || + vcp->width < 0 || (uint)(vcp->x+vcp->width) > ztv->overinfo.w || + vcp->height < 0 || (vcp->y+vcp->height) > ztv->overinfo.h) + { + dprintk(2, + CARD_DEBUG "invalid clipzone (%d,%d,%d,%d) not in (0,0,%d,%d), adapting\n", + CARD, vcp->x, vcp->y, vcp->width, vcp->height, + ztv->overinfo.w, ztv->overinfo.h); + if (vcp->x < 0) vcp->x = 0; + if ((uint)vcp->x > ztv->overinfo.w) vcp->x = ztv->overinfo.w; + if (vcp->y < 0) vcp->y = 0; + if (vcp->y > ztv->overinfo.h) vcp->y = ztv->overinfo.h; + if (vcp->width < 0) vcp->width = 0; + if ((uint)(vcp->x+vcp->width) > ztv->overinfo.w) vcp->width = ztv->overinfo.w - vcp->x; + if (vcp->height < 0) vcp->height = 0; + if (vcp->y+vcp->height > ztv->overinfo.h) vcp->height = ztv->overinfo.h - vcp->y; +// continue; + } + + mtop = &ztv->overinfo.overlay[vcp->y*ystep]; + for (h=0; h<=vcp->height; h++) { + int w; + int x = ztv->vidXshift + vcp->x; + for (w=0; w<=vcp->width; w++) { + clear_bit(x&31, &mtop[x/32]); + x++; + } + mtop += ystep; + } + ++vcp; + } + + mtop = ztv->overinfo.overlay; + zrwrite(virt_to_bus(mtop), ZORAN_MTOP); + zrwrite(virt_to_bus(mtop+ystep), ZORAN_MBOT); + zraor((ztv->vidInterlace*ystep)<<0,~ZORAN_OCR_MASKSTRIDE,ZORAN_OCR); +} + +/* + * Program the chip for a setup as described in the vidinfo struct. + * + * Side-effects: calculates vidXshift, vidInterlace, + * vidHeight, vidWidth which are used in a later stage + * to calculate the overlay mask + * + * This is an internal function, as such it does not check the + * validity of the struct members... Spectaculair crashes will + * follow /very/ quick when you're wrong and the chip right :) + */ +static +void zoran_set_geo(struct zoran* ztv, struct vidinfo* i) +{ + ulong top, bot; + int stride; + int winWidth, winHeight; + int maxWidth, maxHeight, maxXOffset, maxYOffset; + long vfec; + + dprintk(2, + CARD_DEBUG "set_geo(rect=(%d,%d,%d,%d), mode=%d, format=%d, bpp=%d, bpl=%d, busadr=%lx, overlay=%p)\n", + CARD, i->x, i->y, i->w, i->h, ztv->mode, i->format, i->bpp, + i->bpl, i->busadr, i->overlay); + + /* + * make sure the DMA transfers are inhibited during our + * reprogramming of the chip + */ + zrand(~ZORAN_VDC_VIDEN,ZORAN_VDC); + + maxWidth = tvmodes[ztv->mode].Wa; + maxHeight = tvmodes[ztv->mode].Ha/2; + maxXOffset = tvmodes[ztv->mode].HStart; + maxYOffset = tvmodes[ztv->mode].VStart; + + /* setup vfec register (keep ExtFl,TopField and VCLKPol settings) */ + vfec = (zrread(ZORAN_VFEC) & (ZORAN_VFEC_EXTFL|ZORAN_VFEC_TOPFIELD|ZORAN_VFEC_VCLKPOL)) | + (palette2fmt[i->format].mode & (ZORAN_VFEC_RGB|ZORAN_VFEC_ERRDIF|ZORAN_VFEC_LE|ZORAN_VFEC_PACK24)); + + /* + * Set top, bottom ptrs. Since these must be DWORD aligned, + * possible adjust the x and the width of the window. + * so the endposition stay the same. The vidXshift will make + * sure we are not writing pixels before the requested x. + */ + ztv->vidXshift = 0; + winWidth = i->w; + if (winWidth < 0) + winWidth = -winWidth; + top = i->busadr + i->x*i->bpp + i->y*i->bpl; + if (top & 3) { + ztv->vidXshift = (top & 3) / i->bpp; + winWidth += ztv->vidXshift; + dprintk(2, KERN_DEBUG " window-x shifted %d pixels left\n", + ztv->vidXshift); + top &= ~3; + } + + /* + * bottom points to next frame but in interleaved mode we want + * to 'mix' the 2 frames to one capture, so 'bot' points to one + * (physical) line below the top line. + */ + bot = top + i->bpl; + zrwrite(top,ZORAN_VTOP); + zrwrite(bot,ZORAN_VBOT); + + /* + * Make sure the winWidth is DWORD aligned too, + * thereby automaticly making sure the stride to the + * next line is DWORD aligned too (as required by spec). + */ + if ((winWidth*i->bpp) & 3) { + dprintk(2, KERN_DEBUG " window-width enlarged by %d pixels\n", + (winWidth*i->bpp) & 3); + winWidth += (winWidth*i->bpp) & 3; + } + + /* determine the DispMode and stride */ + if (i->h >= 0 && i->h <= maxHeight) { + /* single frame grab suffices for this height. */ + vfec |= ZORAN_VFEC_DISPMOD; + ztv->vidInterlace = 0; + stride = i->bpl - (winWidth*i->bpp); + winHeight = i->h; + } + else { + /* interleaving needed for this height */ + ztv->vidInterlace = 1; + stride = i->bpl*2 - (winWidth*i->bpp); + winHeight = i->h/2; + } + if (winHeight < 0) /* can happen for VBI! */ + winHeight = -winHeight; + + /* safety net, sometimes bpl is too short??? */ + if (stride<0) { + dprintk(2, CARD_DEBUG "WARNING stride = %d\n", CARD, stride); + stride = 0; + } + + zraor((winHeight<<12)|(winWidth<<0),~(ZORAN_VDC_VIDWINHT|ZORAN_VDC_VIDWINWID), ZORAN_VDC); + zraor(stride<<16,~ZORAN_VSTR_DISPSTRIDE,ZORAN_VSTR); + + /* remember vidWidth, vidHeight for overlay calculations */ + ztv->vidWidth = winWidth; + ztv->vidHeight = winHeight; + dprintk(2, KERN_DEBUG " top=%08lx, bottom=%08lx\n", top, bot); + dprintk(2, KERN_DEBUG " winWidth=%d, winHeight=%d\n", winWidth, winHeight); + dprintk(2, KERN_DEBUG " maxWidth=%d, maxHeight=%d\n", maxWidth, maxHeight); + dprintk(2, KERN_DEBUG " stride=%d\n", stride); + + /* + * determine horizontal scales and crops + */ + if (i->w < 0) { + int Hstart = 1; + int Hend = Hstart + winWidth; + dprintk(2, KERN_DEBUG " Y: scale=0, start=%d, end=%d\n", + Hstart, Hend); + zraor((Hstart<<10)|(Hend<<0),~(ZORAN_VFEH_HSTART|ZORAN_VFEH_HEND),ZORAN_VFEH); + } + else { + int Wa = maxWidth; + int X = (winWidth*64+Wa-1)/Wa; + int We = winWidth*64/X; + int HorDcm = 64-X; + int hcrop1 = 2*(Wa-We)/4; + /* + * BUGFIX: Juha Nurmela + * found the solution to the color phase shift. + * See ChangeLog for the full explanation) + */ + int Hstart = (maxXOffset + hcrop1) | 1; + int Hend = Hstart + We - 1; + + dprintk(2, KERN_DEBUG " X: scale=%d, start=%d, end=%d\n", + HorDcm, Hstart, Hend); + + zraor((Hstart<<10)|(Hend<<0),~(ZORAN_VFEH_HSTART|ZORAN_VFEH_HEND),ZORAN_VFEH); + vfec |= HorDcm<<14; + + if (HorDcm<16) + vfec |= ZORAN_VFEC_HFILTER_1; /* no filter */ + else if (HorDcm<32) + vfec |= ZORAN_VFEC_HFILTER_3; /* 3 tap filter */ + else if (HorDcm<48) + vfec |= ZORAN_VFEC_HFILTER_4; /* 4 tap filter */ + else vfec |= ZORAN_VFEC_HFILTER_5; /* 5 tap filter */ + } + + /* + * Determine vertical scales and crops + * + * when height is negative, we want to read starting at line 0 + * One day someone might need access to these lines... + */ + if (i->h < 0) { + int Vstart = 0; + int Vend = Vstart + winHeight; + dprintk(2, KERN_DEBUG " Y: scale=0, start=%d, end=%d\n", + Vstart, Vend); + zraor((Vstart<<10)|(Vend<<0),~(ZORAN_VFEV_VSTART|ZORAN_VFEV_VEND),ZORAN_VFEV); + } + else { + int Ha = maxHeight; + int Y = (winHeight*64+Ha-1)/Ha; + int He = winHeight*64/Y; + int VerDcm = 64-Y; + int vcrop1 = 2*(Ha-He)/4; + int Vstart = maxYOffset + vcrop1; + int Vend = Vstart + He - 1; + + dprintk(2, KERN_DEBUG " Y: scale=%d, start=%d, end=%d\n", + VerDcm, Vstart, Vend); + zraor((Vstart<<10)|(Vend<<0),~(ZORAN_VFEV_VSTART|ZORAN_VFEV_VEND),ZORAN_VFEV); + vfec |= VerDcm<<8; + } + + dprintk(2, KERN_DEBUG " F: format=%d(=%s)\n", + i->format, palette2fmt[i->format].name); + + /* setup the requested format */ + zrwrite(vfec, ZORAN_VFEC); +} + +static +void zoran_common_open(struct zoran* ztv, int flags) +{ + UNUSED(flags); + + /* already opened? */ + if (ztv->users++ != 0) + return; + + /* unmute audio */ + /* /what/ audio? */ + + ztv->state = 0; + + /* setup the encoder to the initial values */ + ztv->picture.colour=254<<7; + ztv->picture.brightness=128<<8; + ztv->picture.hue=128<<8; + ztv->picture.contrast=216<<7; + zoran_i2c_command(ztv, DECODER_SET_PICTURE, &ztv->picture); + + /* default to the composite input since my camera is there */ + zoran_muxsel(ztv, 0, mode); +} + +static +void zoran_common_close(struct zoran* ztv) +{ + if (--ztv->users != 0) + return; + + /* mute audio */ + /* /what/ audio? */ + + /* stop the chip */ + zoran_cap(ztv, 0); +} + +/* + * Open a zoran card. Right now the flags are just a hack + */ +static +int zoran_open(struct inode* inode, struct file* file) +{ + unsigned int minor = MINOR(inode->i_rdev); + struct zoran *ztv = NULL; + struct vidinfo* item; + char* pos; + int i; + + if (!try_module_get(THIS_MODULE)) { + dprintk(0, KERN_ERR "failed to acquire lock on myself\n"); + return -EIO; + } + + /* find the device */ + for (i = 0; i < zoran_cards; i++) { + if (zorans[i].video_dev->minor == minor) { + ztv = &zorans[i]; + break; + } + } + if (!ztv) + return -ENODEV; + + if (ztv->have_decoder && + !try_module_get(ztv->decoder->driver->driver.owner)) { + dprintk(0, KERN_ERR "Failed to acquire lock on TV decoder\n"); + module_put(THIS_MODULE); + return -EIO; + } + if (ztv->have_tuner && + !try_module_get(ztv->tuner->driver->driver.owner)) { + dprintk(0, KERN_ERR "Failed to acquire lock on TV tuner\n"); + if (ztv->have_decoder) + module_put(ztv->decoder->driver->driver.owner); + module_put(THIS_MODULE); + return -EIO; + } + + dprintk(2, CARD_DEBUG "open(dev,%d)\n", CARD, file->f_flags); + + /********************************************* + * We really should be doing lazy allocing... + *********************************************/ + /* allocate a frame buffer */ + if (!ztv->fbuffer) + ztv->fbuffer = bmalloc(ZORAN_MAX_FBUFSIZE); + if (!ztv->fbuffer) { + dprintk(0, KERN_INFO "Memory allocation failed\n"); + /* could not get a buffer, bail out */ + module_put(THIS_MODULE); + if (ztv->have_decoder) + module_put(ztv->decoder->driver->driver.owner); + if (ztv->have_tuner) + module_put(ztv->tuner->driver->driver.owner); + return -ENOBUFS; + } + /* at this time we _always_ have a framebuffer */ + memset(ztv->fbuffer,0,ZORAN_MAX_FBUFSIZE); + + if (!ztv->overinfo.overlay) + ztv->overinfo.overlay = kmalloc(1024*1024/8, GFP_KERNEL); + if (!ztv->overinfo.overlay) { + dprintk(0, KERN_INFO "zr32120: Overlay memory allocation failed\n"); + /* could not get an overlay buffer, bail out */ + bfree(ztv->fbuffer, ZORAN_MAX_FBUFSIZE); + module_put(THIS_MODULE); + if (ztv->have_decoder) + module_put(ztv->decoder->driver->driver.owner); + if (ztv->have_tuner) + module_put(ztv->tuner->driver->driver.owner); + return -ENOBUFS; + } + /* at this time we _always_ have a overlay */ + + /* clear buffer status, and give them a DMAable address */ + pos = ztv->fbuffer; + for (item=ztv->grabinfo; item!=ztv->grabinfo+ZORAN_MAX_FBUFFERS; item++) + { + item->status = FBUFFER_FREE; + item->memadr = pos; + item->busadr = virt_to_bus(pos); + pos += ZORAN_MAX_FBUFFER; + } + + /* do the common part of all open's */ + zoran_common_open(ztv, file->f_flags); + + file->private_data = ztv; + + return 0; +} + +static +int zoran_close(struct inode* inode, struct file* file) +{ + struct zoran *ztv = file->private_data; + + UNUSED(inode); + dprintk(2, CARD_DEBUG "close(dev)\n", CARD); + + /* driver specific closure */ + clear_bit(STATE_OVERLAY, &ztv->state); + + zoran_common_close(ztv); + file->private_data = NULL; + + /* + * This is sucky but right now I can't find a good way to + * be sure its safe to free the buffer. We wait 5-6 fields + * which is more than sufficient to be sure. + */ + msleep(100); /* Wait 1/10th of a second */ + + /* free the allocated framebuffer */ + bfree(ztv->fbuffer, ZORAN_MAX_FBUFSIZE); + ztv->fbuffer = 0; + kfree(ztv->overinfo.overlay); + ztv->overinfo.overlay = 0; + + module_put(THIS_MODULE); + if (ztv->have_decoder) + module_put(ztv->decoder->driver->driver.owner); + if (ztv->have_tuner) + module_put(ztv->tuner->driver->driver.owner); + + return 0; +} + +/* + * This read function could be used reentrant in a SMP situation. + * + * This is made possible by the spinlock which is kept till we + * found and marked a buffer for our own use. The lock must + * be released as soon as possible to prevent lock contention. + */ +static +ssize_t zoran_read(struct file* file, char* buf, size_t count, loff_t* ppos) +{ + struct zoran *ztv = file->private_data; + unsigned long max; + struct vidinfo* unused = 0; + struct vidinfo* done = 0; + int nonblock = file->f_flags & O_NONBLOCK; + + UNUSED(ppos); + dprintk(2, CARD_DEBUG "zoran_read(%p,%ld,%d)\n", + CARD, buf, (long)count, nonblock); + + /* find ourself a free or completed buffer */ + for (;;) { + struct vidinfo* item; + + write_lock_irq(&ztv->lock); + for (item=ztv->grabinfo; item!=ztv->grabinfo+ZORAN_MAX_FBUFFERS; item++) + { + if (!unused && item->status == FBUFFER_FREE) + unused = item; + if (!done && item->status == FBUFFER_DONE) + done = item; + } + if (done || unused) + break; + + /* no more free buffers, wait for them. */ + write_unlock_irq(&ztv->lock); + if (nonblock) + return -EWOULDBLOCK; + interruptible_sleep_on(&ztv->grabq); + if (signal_pending(current)) + return -EINTR; + } + + /* Do we have 'ready' data? */ + if (!done) { + /* no? than this will take a while... */ + if (nonblock) { + write_unlock_irq(&ztv->lock); + return -EWOULDBLOCK; + } + + /* mark the unused buffer as wanted */ + unused->status = FBUFFER_BUSY; + unused->w = 320; + unused->h = 240; + unused->format = VIDEO_PALETTE_RGB24; + unused->bpp = palette2fmt[unused->format].bpp; + unused->bpl = unused->w * unused->bpp; + unused->next = 0; + { /* add to tail of queue */ + struct vidinfo* oldframe = ztv->workqueue; + if (!oldframe) ztv->workqueue = unused; + else { + while (oldframe->next) oldframe = oldframe->next; + oldframe->next = unused; + } + } + write_unlock_irq(&ztv->lock); + + /* tell the state machine we want it filled /NOW/ */ + zoran_cap(ztv, 1); + + /* wait till this buffer gets grabbed */ + wait_event_interruptible(ztv->grabq, + (unused->status != FBUFFER_BUSY)); + /* see if a signal did it */ + if (signal_pending(current)) + return -EINTR; + done = unused; + } + else + write_unlock_irq(&ztv->lock); + + /* Yes! we got data! */ + max = done->bpl * done->h; + if (count > max) + count = max; + if (copy_to_user((void*)buf, done->memadr, count)) + count = -EFAULT; + + /* keep the engine running */ + done->status = FBUFFER_FREE; +// zoran_cap(ztv,1); + + /* tell listeners this buffer became free */ + wake_up_interruptible(&ztv->grabq); + + /* goodbye */ + dprintk(2, CARD_DEBUG "zoran_read() returns %lu\n", CARD, (long)count); + return count; +} + +static +ssize_t zoran_write(struct file* file, const char* data, size_t count, loff_t* ppos) +{ + struct zoran *ztv = file->private_data; + UNUSED(ztv); UNUSED(data); UNUSED(count); UNUSED(ppos); + dprintk(2, CARD_DEBUG "zoran_write\n", CARD); + return -EINVAL; +} + +static +unsigned int zoran_poll(struct file* file, poll_table* wait) +{ + struct zoran *ztv = file->private_data; + struct vidinfo* item; + unsigned int mask = 0; + + poll_wait(file, &ztv->grabq, wait); + + for (item=ztv->grabinfo; item!=ztv->grabinfo+ZORAN_MAX_FBUFFERS; item++) + if (item->status == FBUFFER_DONE) + { + mask |= (POLLIN | POLLRDNORM); + break; + } + + dprintk(2, CARD_DEBUG "zoran_poll()=%x\n", CARD, mask); + + return mask; +} + +/* append a new clipregion to the vector of video_clips */ +static +void new_clip(struct video_window* vw, struct video_clip* vcp, int x, int y, int w, int h) +{ + vcp[vw->clipcount].x = x; + vcp[vw->clipcount].y = y; + vcp[vw->clipcount].width = w; + vcp[vw->clipcount].height = h; + vw->clipcount++; +} + +static +int zoran_do_ioctl(struct inode* inode, struct file* file, unsigned int cmd, void* arg) +{ + struct zoran *ztv = file->private_data; + + UNUSED(inode); + + switch (cmd) { + case VIDIOCGCAP: + { + struct video_capability* c = arg; + dprintk(1, CARD_DEBUG "VIDIOCGCAP\n", CARD); + + memset(c, 0, sizeof(struct video_capability)); + strcpy(c->name,ztv->video_dev->name); + c->type = VID_TYPE_CAPTURE| + VID_TYPE_OVERLAY| + VID_TYPE_CLIPPING| + VID_TYPE_FRAMERAM| + VID_TYPE_SCALES; + if (ztv->have_tuner) + c->type |= VID_TYPE_TUNER; + if (ztv->have_decoder) { + c->channels = ztv->card->video_inputs; + c->audios = ztv->card->audio_inputs; + } else + /* no decoder -> no channels */ + c->channels = c->audios = 0; + c->maxwidth = tvmodes[ztv->mode].Wa; /*768*/ + c->maxheight = tvmodes[ztv->mode].Ha; /*576*/ + c->minwidth = 32; + c->minheight = 32; + break; + } + + case VIDIOCGCHAN: + { + struct video_channel* v = arg; + int mux; + int channel = v->channel; + + dprintk(1, CARD_DEBUG "VIDIOCGCHAN(%d)\n", CARD, v->channel); + memset(v, 0, sizeof(struct video_channel)); + v->flags = VIDEO_VC_AUDIO; + v->tuners = 0; + v->type = VIDEO_TYPE_CAMERA; + v->norm = ztv->mode; + /* too many inputs? no decoder -> no channels */ + if (!ztv->have_decoder || channel < 0 || channel >= ztv->card->video_inputs) + { + dprintk(1, CARD_DEBUG "VIDIOCGCHAN invalid\n", CARD); + return -EINVAL; + } + + /* now determine the name of the channel */ + mux = ztv->card->video_mux[channel]; + if (mux & IS_TUNER) { + /* lets assume only one tuner, yes? */ + strcpy(v->name,"Television"); + v->type = VIDEO_TYPE_TV; + if (ztv->have_tuner) { + v->flags |= VIDEO_VC_TUNER; + v->tuners = 1; + } + } + else if (mux & IS_SVHS) + sprintf(v->name, "S-Video-%d", channel); + else + sprintf(v->name, "CVBS-%d", channel); + + break; + } + + case VIDIOCSCHAN: + { /* set video channel */ + struct video_channel* v=arg; + dprintk(1, CARD_DEBUG "VIDIOCSCHAN(%d,%d)\n", CARD, v->channel, v->norm); + + /* too many inputs? no decoder -> no channels */ + if (!ztv->have_decoder || v->channel >= ztv->card->video_inputs || v->channel < 0) + { + dprintk(1, CARD_DEBUG" VIDIOSCHAN invalid\n", CARD); + return -EINVAL; + } + + if (v->norm != VIDEO_MODE_PAL && + v->norm != VIDEO_MODE_NTSC && + v->norm != VIDEO_MODE_SECAM && + v->norm != VIDEO_MODE_AUTO) + return -EOPNOTSUPP; + + /* make it happen, nr1! */ + return zoran_muxsel(ztv, v->channel, v->norm); + } + + case VIDIOCGTUNER: + { + struct video_tuner* v=arg; + dprintk(1, CARD_DEBUG "VIDIOCGTUNER(%d)\n", CARD, v->tuner); + + /* Only no or one tuner for now */ + if (!ztv->have_tuner || v->tuner) + return -EINVAL; + + /*memset(v, 0, sizeof(struct video_tuner));*/ + strcpy(v->name,"Television"); + v->rangelow = 0; + v->rangehigh = ~0; + v->flags = VIDEO_TUNER_PAL|VIDEO_TUNER_NTSC|VIDEO_TUNER_SECAM; + v->mode = ztv->mode; + v->signal = 0xFFFF; /* unknown */ + + break; + } + + case VIDIOCSTUNER: + { + struct video_tuner* v=arg; + dprintk(1, CARD_DEBUG "VIDIOCSTUNER(%d,%d)\n", CARD, v->tuner, v->mode); + + /* Only no or one tuner for now */ + if (!ztv->have_tuner || v->tuner) + return -EINVAL; + + /* and it only has certain valid modes */ + if( v->mode != VIDEO_MODE_PAL && + v->mode != VIDEO_MODE_NTSC && + v->mode != VIDEO_MODE_SECAM) + return -EOPNOTSUPP; + + /* engage! */ + return zoran_muxsel(ztv, v->tuner, v->mode); + } + + case VIDIOCGPICT: + { + struct video_picture* p = &(ztv->picture); + struct video_picture* parg = arg; + dprintk(1, CARD_DEBUG "VIDIOCGPICT\n", CARD); + p->depth = ztv->depth; + p->palette = ztv->overinfo.format; + memcpy(parg, p, sizeof(struct video_picture)); + break; + } + + case VIDIOCSPICT: + { + struct video_picture* p = arg; + dprintk(1, CARD_DEBUG "VIDIOCSPICT(%d,%d,%d,%d,%d,%d,%d)\n", CARD, + p->brightness, p->hue, p->colour, p->contrast, p->whiteness, + p->depth, p->palette); + + /* depth must match with framebuffer */ + if (p->depth != ztv->depth) + return -EINVAL; + + /* check if palette matches this bpp */ + if (p->palette>NRPALETTES || + palette2fmt[p->palette].bpp != ztv->overinfo.bpp) + return -EINVAL; + + write_lock_irq(&ztv->lock); + ztv->overinfo.format = p->palette; + ztv->picture = *p; + write_unlock_irq(&ztv->lock); + + /* tell the decoder */ + zoran_i2c_command(ztv, DECODER_SET_PICTURE, &p); + break; + } + + case VIDIOCGWIN: + { + struct video_window* vw = arg; + dprintk(1, CARD_DEBUG "VIDIOCGWIN\n", CARD); + memset(vw, 0, sizeof(struct video_window)); + read_lock(&ztv->lock); + vw->x = ztv->overinfo.x; + vw->y = ztv->overinfo.y; + vw->width = ztv->overinfo.w; + vw->height = ztv->overinfo.h; + vw->chromakey= 0; + vw->flags = 0; + if (ztv->vidInterlace) + vw->flags|=VIDEO_WINDOW_INTERLACE; + read_unlock(&ztv->lock); + break; + } + + case VIDIOCSWIN: + { + struct video_window* vw = arg; + struct video_clip *vcp = NULL; + int on; + dprintk(1, CARD_DEBUG "VIDIOCSWIN(%d,%d,%d,%d,%x,%d)\n", CARD, + vw->x, vw->y, vw->width, vw->height, vw->flags, vw->clipcount); + + if (vw->flags || + vw->width<32 || vw->width>tvmodes[ztv->mode].Wa || + vw->height<32 || vw->height>tvmodes[ztv->mode].Ha) + return -EINVAL; + + if (vw->clipcount != VIDEO_CLIP_BITMAP && + (vw->clipcount <0 || vw->clipcount>256)) + return -EDOM; /* Too many! */ + + /* + * Do any clips. Note that it now possble + * to get a clipmap when clipcount has a + * 'magic' value. In a clipmap, '1' denotes + * a clipped pixel, not a visible pixel! + */ + if (vw->clipcount == VIDEO_CLIP_BITMAP) { + vcp = vmalloc(VIDEO_CLIPMAP_SIZE); + if (vcp == NULL) + return -ENOMEM; + if (copy_from_user(vcp, vw->clips, VIDEO_CLIPMAP_SIZE)) { + dprintk(1, CARD_DEBUG "VIDIOCSWIN copy error[1]\n", CARD); + vfree(vcp); + return -EFAULT; + } + } else if (vw->clipcount) { + vcp = vmalloc(sizeof(struct video_clip)*(vw->clipcount+4)); + if (vcp==NULL) + return -ENOMEM; + if (vw->clipcount && copy_from_user(vcp, vw->clips, sizeof(struct video_clip)*vw->clipcount)) { + dprintk(1, CARD_DEBUG "VIDIOCSWIN copy error[2]\n", CARD); + vfree(vcp); + return -EFAULT; + } + } + + on = ztv->running; + if (on) + zoran_cap(ztv, 0); + + /* + * strange, it seems xawtv sometimes calls us with 0 + * x and/or y position. Ignore these values + */ + if (vw->x == 0) + vw->x = ztv->overinfo.x; + if (vw->y == 0) + vw->y = ztv->overinfo.y; + + /* by now we are committed to the new data... */ + write_lock_irq(&ztv->lock); + ztv->overinfo.x = vw->x; + ztv->overinfo.y = vw->y; + ztv->overinfo.w = vw->width; + ztv->overinfo.h = vw->height; + write_unlock_irq(&ztv->lock); + + /* + * Impose display clips + */ + if (vw->x+vw->width > ztv->swidth) + new_clip(vw, vcp, ztv->swidth-vw->x, 0, vw->width-1, vw->height-1); + if (vw->y+vw->height > ztv->sheight) + new_clip(vw, vcp, 0, ztv->sheight-vw->y, vw->width-1, vw->height-1); + + /* built the requested clipping zones */ + zoran_set_geo(ztv, &ztv->overinfo); + zoran_built_overlay(ztv, vw->clipcount, vcp); + vfree(vcp); + + /* if we were on, restart the video engine */ + if (on) + zoran_cap(ztv, 1); + break; + } + + case VIDIOCCAPTURE: + { + int* v = (int*)arg; + dprintk(1, CARD_DEBUG "VIDIOCCAPTURE(%d)\n", CARD, *v); + + if (*v == 0) { + clear_bit(STATE_OVERLAY, &ztv->state); + zoran_cap(ztv, 1); + } + else { + /* is VIDIOCSFBUF, VIDIOCSWIN done? */ + if (ztv->overinfo.busadr==0 || ztv->overinfo.w<32 || ztv->overinfo.h<32) + { + dprintk(1, CARD_DEBUG "VIDIOCAPTURE not done\n", CARD); + return -EINVAL; + } + + set_bit(STATE_OVERLAY, &ztv->state); + zoran_cap(ztv, 1); + } + break; + } + + case VIDIOCGFBUF: + { + struct video_buffer* v=arg; + dprintk(1, CARD_DEBUG "VIDIOCGFBUF\n",CARD); + read_lock(&ztv->lock); + v->base = (void *)ztv->overinfo.busadr; + v->height = ztv->sheight; + v->width = ztv->swidth; + v->depth = ztv->depth; + v->bytesperline = ztv->overinfo.bpl; + read_unlock(&ztv->lock); + break; + } + + case VIDIOCSFBUF: + { + struct video_buffer* v=arg; + if(!capable(CAP_SYS_ADMIN)) + return -EPERM; + dprintk(1, CARD_DEBUG "VIDIOCSFBUF(%p,%d,%d,%d,%d)\n", CARD, + v->base, v->width, v->height, v->depth, v->bytesperline); + + if (v->depth!=15 && v->depth!=16 && v->depth!=24 && v->depth!=32) + return -EINVAL; + if (v->bytesperline<1) + return -EINVAL; + if (ztv->running) + return -EBUSY; + write_lock_irq(&ztv->lock); + ztv->overinfo.busadr = (ulong)v->base; + ztv->sheight = v->height; + ztv->swidth = v->width; + ztv->depth = v->depth; /* bits per pixel */ + ztv->overinfo.bpp = ((v->depth+1)&0x38)/8;/* bytes per pixel */ + ztv->overinfo.bpl = v->bytesperline; /* bytes per line */ + write_unlock_irq(&ztv->lock); + break; + } + + case VIDIOCKEY: + { + /* Will be handled higher up .. */ + break; + } + + case VIDIOCSYNC: + { + int* i = arg; + dprintk(1, CARD_DEBUG "VIDEOCSYNC(%d)\n", CARD, *i); + if (*i<0 || *i>ZORAN_MAX_FBUFFERS) + { + dprintk(1, CARD_DEBUG "VIDEOCSYNC invalid buffer\n", CARD); + return -EINVAL; + } + switch (ztv->grabinfo[*i].status) { + case FBUFFER_FREE: + return -EINVAL; + case FBUFFER_BUSY: + /* wait till this buffer gets grabbed */ + wait_event_interruptible(ztv->grabq, + (ztv->grabinfo[*i].status != FBUFFER_BUSY)); + /* see if a signal did it */ + if (signal_pending(current)) + return -EINTR; + /* don't fall through; a DONE buffer is not UNUSED */ + break; + case FBUFFER_DONE: + ztv->grabinfo[*i].status = FBUFFER_FREE; + /* tell ppl we have a spare buffer */ + wake_up_interruptible(&ztv->grabq); + break; + } + dprintk(1, CARD_DEBUG "VIDEOCSYNC(%d) returns\n",CARD, *i); + break; + } + + case VIDIOCMCAPTURE: + { + struct video_mmap* vm = arg; + struct vidinfo* frame; + dprintk(1, CARD_DEBUG "VIDIOCMCAPTURE(%d,(%d,%d),%d)\n", + CARD, vm->frame, vm->width, vm->height, vm->format); + + /* sanity checks */ + if (vm->frame<0 || vm->frame>ZORAN_MAX_FBUFFERS || + vm->width<32 || vm->width>tvmodes[ztv->mode].Wa || + vm->height<32 || vm->height>tvmodes[ztv->mode].Ha || + vm->format>NRPALETTES || + palette2fmt[vm->format].bpp == 0) + { + dprintk(1, CARD_DEBUG "VIDIOMCAPTURE sanity check failed.\n", + CARD); + return -EINVAL; + } + + /* we are allowed to take over UNUSED and DONE buffers */ + frame = &ztv->grabinfo[vm->frame]; + if (frame->status == FBUFFER_BUSY) + return -EBUSY; + + /* setup the other parameters if they are given */ + write_lock_irq(&ztv->lock); + frame->w = vm->width; + frame->h = vm->height; + frame->format = vm->format; + frame->bpp = palette2fmt[frame->format].bpp; + frame->bpl = frame->w*frame->bpp; + frame->status = FBUFFER_BUSY; + frame->next = 0; + { /* add to tail of queue */ + struct vidinfo* oldframe = ztv->workqueue; + if (!oldframe) ztv->workqueue = frame; + else { + while (oldframe->next) oldframe = oldframe->next; + oldframe->next = frame; + } + } + write_unlock_irq(&ztv->lock); + zoran_cap(ztv, 1); + break; + } + + case VIDIOCGMBUF: + { + struct video_mbuf* mb = arg; + int i; + dprintk(1, CARD_DEBUG "VIDIOCGMBUF\n", CARD); + mb->size = ZORAN_MAX_FBUFSIZE; + mb->frames = ZORAN_MAX_FBUFFERS; + for (i=0; ioffsets[i] = i*ZORAN_MAX_FBUFFER; + break; + } + + case VIDIOCGUNIT: + { + struct video_unit* vu = arg; + dprintk(1, CARD_DEBUG "VIDIOCGUNIT\n", CARD); + vu->video = ztv->video_dev->minor; + vu->vbi = ztv->vbi_dev->minor; + vu->radio = VIDEO_NO_UNIT; + vu->audio = VIDEO_NO_UNIT; + vu->teletext = VIDEO_NO_UNIT; + break; + } + + case VIDIOCGFREQ: + { + unsigned long* v = arg; + dprintk(1, CARD_DEBUG "VIDIOCGFREQ\n", CARD); + *v = ztv->tuner_freq; + break; + } + + case VIDIOCSFREQ: + { + unsigned long* v = (unsigned long*)arg; + dprintk(1, CARD_DEBUG "VIDIOCSFREQ\n", CARD); + + if (ztv->have_tuner) { + int fixme = (int)*v; + if (zoran_i2c_tuner_command(ztv, VIDIOC_S_FREQUENCY, &fixme) < 0) + return -EAGAIN; + } + ztv->tuner_freq = *v; + break; + } + + default: + return -ENOIOCTLCMD; + } + return 0; +} + +static +int zoran_ioctl (struct inode* inode, struct file* file, unsigned int cmd, unsigned long arg) +{ + return video_usercopy(inode, file, cmd, arg, zoran_do_ioctl); +} + + +static +int zoran_mmap (struct file* file, struct vm_area_struct* vma) +{ + struct zoran *ztv = file->private_data; + unsigned long size = (vma->vm_end - vma->vm_start); + unsigned long start = vma->vm_start; + unsigned long pos; + + //dprintk(2, CARD_DEBUG "zoran_mmap(0x%p,%ld)\n", CARD, adr, size); + + /* sanity checks */ + if (size > ZORAN_MAX_FBUFSIZE || !ztv->fbuffer) + return -EINVAL; + + /* start mapping the whole shabang to user memory */ + pos = (unsigned long)ztv->fbuffer; + while (size>0) { + unsigned long pfn = virt_to_phys((void*)pos) >> PAGE_SHIFT; + if (remap_pfn_range(vma, start, pfn, PAGE_SIZE, PAGE_SHARED)) + return -EAGAIN; + start += PAGE_SIZE; + pos += PAGE_SIZE; + size -= PAGE_SIZE; + } + return 0; +} + +static +void zoran_vdev_release(struct video_device* vdev) +{ + kfree(vdev); +} + +static struct file_operations zoran_fops = { + .owner = THIS_MODULE, + .open = zoran_open, + .release = zoran_close, + .ioctl = zoran_ioctl, + .llseek = no_llseek, + .read = zoran_read, + .write = zoran_write, + .mmap = zoran_mmap, + .poll = zoran_poll, +}; + +static struct video_device zr36120_template= +{ + .owner = THIS_MODULE, + .name = "zr36120", + .type = VID_TYPE_TUNER|VID_TYPE_CAPTURE|VID_TYPE_OVERLAY, + .fops = &zoran_fops, + .release = zoran_vdev_release, + .minor = -1, +}; + +static +int vbi_open(struct inode* inode, struct file* file) +{ + unsigned int minor = MINOR(inode->i_rdev); + struct zoran *ztv = NULL; + struct vidinfo* item; + int i; + + if (!try_module_get(THIS_MODULE)) { + dprintk(0, KERN_ERR "failed to acquire lock on myself\n"); + return -EIO; + } + + /* find the device */ + for (i = 0; i < zoran_cards; i++) { + if (zorans[i].video_dev->minor == minor) { + ztv = &zorans[i]; + break; + } + } + + dprintk(2, CARD_DEBUG "vbi_open(dev,%d)\n", CARD, file->f_flags); + + /* + * During VBI device open, we continiously grab VBI-like + * data in the vbi buffer when we have nothing to do. + * Only when there is an explicit request for VBI data + * (read call) we /force/ a read. + */ + + /* allocate buffers */ + for (item=ztv->readinfo; item!=ztv->readinfo+ZORAN_VBI_BUFFERS; item++) + { + item->status = FBUFFER_FREE; + + /* alloc */ + if (!item->memadr) { + item->memadr = bmalloc(ZORAN_VBI_BUFSIZE); + if (!item->memadr) { + /* could not get a buffer, bail out */ + while (item != ztv->readinfo) { + item--; + bfree(item->memadr, ZORAN_VBI_BUFSIZE); + item->memadr = 0; + item->busadr = 0; + } + module_put(THIS_MODULE); + return -ENOBUFS; + } + } + + /* determine the DMAable address */ + item->busadr = virt_to_bus(item->memadr); + } + + /* do the common part of all open's */ + zoran_common_open(ztv, file->f_flags); + + set_bit(STATE_VBI, &ztv->state); + /* start read-ahead */ + zoran_cap(ztv, 1); + + return 0; +} + +static +int vbi_close(struct inode* inode, struct file* file) +{ + struct zoran *ztv = file->private_data; + struct vidinfo* item; + + UNUSED(inode); + dprintk(2, CARD_DEBUG "vbi_close(dev)\n", CARD); + + /* driver specific closure */ + clear_bit(STATE_VBI, &ztv->state); + + zoran_common_close(ztv); + + /* + * This is sucky but right now I can't find a good way to + * be sure its safe to free the buffer. We wait 5-6 fields + * which is more than sufficient to be sure. + */ + msleep(100); /* Wait 1/10th of a second */ + + for (item=ztv->readinfo; item!=ztv->readinfo+ZORAN_VBI_BUFFERS; item++) + { + if (item->memadr) + bfree(item->memadr, ZORAN_VBI_BUFSIZE); + item->memadr = 0; + } + + module_put(THIS_MODULE); + + return 0; +} + +/* + * This read function could be used reentrant in a SMP situation. + * + * This is made possible by the spinlock which is kept till we + * found and marked a buffer for our own use. The lock must + * be released as soon as possible to prevent lock contention. + */ +static +ssize_t vbi_read(struct file* file, char* buf, size_t count, loff_t* ppos) +{ + struct zoran *ztv = file->private_data; + unsigned long max; + struct vidinfo* unused = 0; + struct vidinfo* done = 0; + int nonblock = file->f_flags & O_NONBLOCK; + + UNUSED(ppos); + dprintk(2, CARD_DEBUG "vbi_read(0x%p,%ld,%d)\n", + CARD, buf, (long)count, nonblock); + + /* find ourself a free or completed buffer */ + for (;;) { + struct vidinfo* item; + + write_lock_irq(&ztv->lock); + for (item=ztv->readinfo; item!=ztv->readinfo+ZORAN_VBI_BUFFERS; item++) { + if (!unused && item->status == FBUFFER_FREE) + unused = item; + if (!done && item->status == FBUFFER_DONE) + done = item; + } + if (done || unused) + break; + + /* no more free buffers, wait for them. */ + write_unlock_irq(&ztv->lock); + if (nonblock) + return -EWOULDBLOCK; + interruptible_sleep_on(&ztv->vbiq); + if (signal_pending(current)) + return -EINTR; + } + + /* Do we have 'ready' data? */ + if (!done) { + /* no? than this will take a while... */ + if (nonblock) { + write_unlock_irq(&ztv->lock); + return -EWOULDBLOCK; + } + + /* mark the unused buffer as wanted */ + unused->status = FBUFFER_BUSY; + unused->next = 0; + { /* add to tail of queue */ + struct vidinfo* oldframe = ztv->workqueue; + if (!oldframe) ztv->workqueue = unused; + else { + while (oldframe->next) oldframe = oldframe->next; + oldframe->next = unused; + } + } + write_unlock_irq(&ztv->lock); + + /* tell the state machine we want it filled /NOW/ */ + zoran_cap(ztv, 1); + + /* wait till this buffer gets grabbed */ + wait_event_interruptible(ztv->vbiq, + (unused->status != FBUFFER_BUSY)); + /* see if a signal did it */ + if (signal_pending(current)) + return -EINTR; + done = unused; + } + else + write_unlock_irq(&ztv->lock); + + /* Yes! we got data! */ + max = done->bpl * -done->h; + if (count > max) + count = max; + + /* check if the user gave us enough room to write the data */ + if (!access_ok(VERIFY_WRITE, buf, count)) { + count = -EFAULT; + goto out; + } + + /* + * Now transform/strip the data from YUV to Y-only + * NB. Assume the Y is in the LSB of the YUV data. + */ + { + unsigned char* optr = buf; + unsigned char* eptr = buf+count; + unsigned long* lptr = (unsigned long*)eptr; + lptr--; + + /* are we beeing accessed from an old driver? */ + if (count == 2*19*2048) { + /* + * Extreme HACK, old VBI programs expect 2048 points + * of data, and we only got 864 orso. Double each + * datapoint and clear the rest of the line. + * This way we have appear to have a + * sample_frequency of 29.5 Mc. + */ + int x,y; + unsigned char* iptr = done->memadr+1; + for (y=done->h; optrw; x++) + { + unsigned char a = iptr[x*2]; + __put_user(a, optr++); + __put_user(a, optr++); + } + /* and clear the rest of the line */ + for (x*=2; optrbpl; x++) + __put_user(0, optr++); + /* next line */ + iptr += done->bpl; + } + } + else { + /* + * Other (probably newer) programs asked + * us what geometry we are using, and are + * reading the correct size. + */ + int x,y; + unsigned char* iptr = done->memadr+1; + for (y=done->h; optrw; x++) + __put_user(iptr[x*2], optr++); + /* and clear the rest of the line */ + for (;optrbpl; x++) + __put_user(0, optr++); + /* next line */ + iptr += done->bpl; + } + } + + /* API compliance: + * place the framenumber (half fieldnr) in the last long + */ + __put_user(done->fieldnr/2, lptr); + } + + /* keep the engine running */ + done->status = FBUFFER_FREE; + zoran_cap(ztv, 1); + + /* tell listeners this buffer just became free */ + wake_up_interruptible(&ztv->vbiq); + + /* goodbye */ +out: + dprintk(2, CARD_DEBUG "vbi_read() returns %lu\n", + CARD, (unsigned long)count); + return count; +} + +static +unsigned int vbi_poll(struct file* file, poll_table* wait) +{ + struct zoran *ztv = file->private_data; + struct vidinfo* item; + unsigned int mask = 0; + + poll_wait(file, &ztv->vbiq, wait); + + for (item=ztv->readinfo; item!=ztv->readinfo+ZORAN_VBI_BUFFERS; item++) + if (item->status == FBUFFER_DONE) + { + mask |= (POLLIN | POLLRDNORM); + break; + } + + dprintk(2, CARD_DEBUG "vbi_poll()=%x\n", CARD, mask); + + return mask; +} + +static +int vbi_do_ioctl(struct inode* inode, struct file* file, unsigned int cmd, void* arg) +{ + struct zoran *ztv = file->private_data; + + UNUSED(inode); + + switch (cmd) { + case VIDIOCGVBIFMT: + { + struct vbi_format f; + dprintk(1, CARD_DEBUG "VIDIOCGVBIINFO\n", CARD); + f.sampling_rate = 14750000UL; + f.samples_per_line = -ztv->readinfo[0].w; + f.sample_format = VIDEO_PALETTE_RAW; + f.start[0] = f.start[1] = ztv->readinfo[0].y; + f.start[1] += 312; + f.count[0] = f.count[1] = -ztv->readinfo[0].h; + f.flags = VBI_INTERLACED; + if (copy_to_user(arg,&f,sizeof(f))) + return -EFAULT; + break; + } + case VIDIOCSVBIFMT: + { + struct vbi_format f; + int i; + if (copy_from_user(&f, arg,sizeof(f))) + return -EFAULT; + dprintk(1, CARD_DEBUG "VIDIOCSVBIINFO(%d,%d,%d,%d,%d,%d,%d,%x)\n", + CARD, f.sampling_rate, f.samples_per_line, f.sample_format, + f.start[0], f.start[1], f.count[0], f.count[1], f.flags); + + /* lots of parameters are fixed... (PAL) */ + if (f.sampling_rate != 14750000UL || + f.samples_per_line > 864 || + f.sample_format != VIDEO_PALETTE_RAW || + f.start[0] < 0 || + f.start[0] != f.start[1]-312 || + f.count[0] != f.count[1] || + f.start[0]+f.count[0] >= 288 || + f.flags != VBI_INTERLACED) + return -EINVAL; + + write_lock_irq(&ztv->lock); + ztv->readinfo[0].y = f.start[0]; + ztv->readinfo[0].w = -f.samples_per_line; + ztv->readinfo[0].h = -f.count[0]; + ztv->readinfo[0].bpl = f.samples_per_line*ztv->readinfo[0].bpp; + for (i=1; ireadinfo[i] = ztv->readinfo[i]; + write_unlock_irq(&ztv->lock); + break; + } + default: + return -ENOIOCTLCMD; + } + return 0; +} + +static +int vbi_ioctl(struct inode* inode, struct file* file, unsigned int cmd, unsigned long arg) +{ + return video_usercopy(inode, file, cmd, arg, vbi_do_ioctl); +} + + +static struct file_operations vbi_fops = +{ + .owner = THIS_MODULE, + .open = vbi_open, + .release = vbi_close, + .read = vbi_read, + .write = zoran_write, + .llseek = no_llseek, + .poll = vbi_poll, + .ioctl = vbi_ioctl, +}; + +static struct video_device vbi_template= +{ + .owner = THIS_MODULE, + .name = "zr36120", + .type = VID_TYPE_CAPTURE|VID_TYPE_TELETEXT, + .fops = &vbi_fops, + .release = zoran_vdev_release, + .minor = -1, +}; + +/* + * Scan for a Zoran chip, request the irq and map the io memory + */ +static +int __init find_zoran(void) +{ + int result; + struct zoran *ztv; + struct pci_dev *dev = NULL; + unsigned char revision; + int zoran_num=0; + + while ((dev = pci_find_device(PCI_VENDOR_ID_ZORAN, PCI_DEVICE_ID_ZORAN_36120, dev))) + { + /* Ok, a ZR36120/ZR36125 found! */ + ztv = &zorans[zoran_num]; + ztv->dev = dev; + + if (pci_enable_device(dev)) { + dprintk(0, KERN_WARNING "zr36120-%d: Can't enable device\n", + zoran_num); + return -EIO; + } + + if (!request_mem_region(pci_resource_start(dev, 0), + pci_resource_len(dev, 0), + "zr36120")) { + dprintk(0, KERN_WARNING "zr36120-%d: Can't request io memory (0x%lx\n", + zoran_num, pci_resource_start(dev, 0)); + return -EBUSY; + } + + ztv->zoran_adr = pci_resource_start(dev, 0); + + pci_read_config_byte(dev, PCI_CLASS_REVISION, &revision); + dprintk(0, KERN_INFO "zr36120-%d: Zoran %x (rev %d) ", + zoran_num, dev->device, revision); + dprintk(0, "bus: %d, devfn: %d, irq: %d, ", + dev->bus->number, dev->devfn, dev->irq); + dprintk(0, "memory: 0x%08lx.\n", ztv->zoran_adr); + + /*ztv->zoran_mem = ioremap(ztv->zoran_adr, 0x1000);*/ + ztv->zoran_mem = ioremap(ztv->zoran_adr, pci_resource_len(dev, 0)); + dprintk(2, KERN_DEBUG "zr36120-%d: mapped-memory at 0x%p\n", + zoran_num, ztv->zoran_mem); + + result = request_irq(dev->irq, zoran_irq, + IRQF_SHARED|IRQF_DISABLED, "zr36120", ztv); + if (result==-EINVAL) + { + iounmap(ztv->zoran_mem); + dprintk(0, KERN_ERR "zr36120-%d: Bad irq number or handler\n", + zoran_num); + return -EINVAL; + } + if (result==-EBUSY) + dprintk(0, KERN_ERR + "zr36120-%d: IRQ %d busy, change your PnP config in BIOS\n", + zoran_num, dev->irq); + if (result < 0) { + iounmap(ztv->zoran_mem); + return result; + } + /* Enable bus-mastering */ + pci_set_master(dev); + pci_set_drvdata(dev, ztv); + + zoran_num++; + } + if(zoran_num) + dprintk(0, KERN_INFO "zr36120: %d Zoran card(s) found.\n",zoran_num); + return zoran_num; +} + +static +int __init init_zoran(int card) +{ + struct zoran *ztv = &zorans[card]; + int i; + void* alloc_mem1, * alloc_mem2; + + /* if the given cardtype valid? */ + if (cardtype[card]>=NRTVCARDS) { + dprintk(0, KERN_INFO "zr36120: Invalid cardtype(%d) detected\n", + cardtype[card]); + return -1; + } + + if (!(alloc_mem1 = kmalloc(sizeof(struct video_device), GFP_KERNEL)) || + !(alloc_mem2 = kmalloc(sizeof(struct video_device), GFP_KERNEL))) { + dprintk(0, KERN_ERR + "zr36120: failed to kmalloc data for video_device entries\n"); + if (alloc_mem1) + kfree(alloc_mem1); + return -1; + } + + /* reset the zoran */ + zrand(~ZORAN_PCI_SOFTRESET,ZORAN_PCI); + udelay(10); + zror(ZORAN_PCI_SOFTRESET,ZORAN_PCI); + udelay(10); + + /* zoran chip specific details */ + ztv->card = tvcards+cardtype[card]; /* point to the selected card */ + ztv->mode = 0; /* PAL */ + ztv->tuner_freq = 0; + + /* videocard details */ + ztv->swidth = 800; + ztv->sheight = 600; + ztv->depth = 16; + + /* State details */ + ztv->fbuffer = 0; + ztv->overinfo.kindof = FBUFFER_OVERLAY; + ztv->overinfo.status = FBUFFER_FREE; + ztv->overinfo.x = 0; + ztv->overinfo.y = 0; + ztv->overinfo.w = 768; /* 640 */ + ztv->overinfo.h = 576; /* 480 */ + ztv->overinfo.format = VIDEO_PALETTE_RGB565; + ztv->overinfo.bpp = palette2fmt[ztv->overinfo.format].bpp; + ztv->overinfo.bpl = ztv->overinfo.bpp*ztv->swidth; + ztv->overinfo.busadr = 0; + ztv->overinfo.memadr = 0; + ztv->overinfo.overlay = 0; + for (i=0; igrabinfo[i] = ztv->overinfo; + ztv->grabinfo[i].kindof = FBUFFER_GRAB; + } + init_waitqueue_head(&ztv->grabq); + + /* VBI details */ + ztv->readinfo[0] = ztv->overinfo; + ztv->readinfo[0].kindof = FBUFFER_VBI; + ztv->readinfo[0].w = -864; + ztv->readinfo[0].h = -38; + ztv->readinfo[0].format = VIDEO_PALETTE_YUV422; + ztv->readinfo[0].bpp = palette2fmt[ztv->readinfo[0].format].bpp; + ztv->readinfo[0].bpl = 1024*ztv->readinfo[0].bpp; + for (i=1; ireadinfo[i] = ztv->readinfo[0]; + init_waitqueue_head(&ztv->vbiq); + + /* maintenance data */ + ztv->have_decoder = 0; + ztv->have_tuner = 0; + ztv->tuner_type = 0; + ztv->running = 0; + ztv->users = 0; + rwlock_init(&ztv->lock); + ztv->workqueue = 0; + ztv->fieldnr = 0; + ztv->lastfieldnr = 0; + ztv->mode = mode; + ztv->channel = 0; + + if (triton1) + zrand(~ZORAN_VDC_TRICOM, ZORAN_VDC); + + /* external FL determines TOP frame */ + if (ztv->card->ext_fl) { + /* positive signal => topfield? */ + if (ztv->card->fld_pos) + zror(ZORAN_VFEC_EXTFL|ZORAN_VFEC_TOPFIELD, ZORAN_VFEC); + else + zror(ZORAN_VFEC_EXTFL, ZORAN_VFEC); + } + + /* set HSpol */ + if (ztv->card->hsync_pos) + zrwrite(ZORAN_VFEH_HSPOL, ZORAN_VFEH); + /* set VSpol */ + if (ztv->card->vsync_pos) + zrwrite(ZORAN_VFEV_VSPOL, ZORAN_VFEV); + + /* Set the proper General Purpose register bits */ + /* implicit: no softreset, 0 waitstates */ + zrwrite(ZORAN_PCI_SOFTRESET|(ztv->card->gpdir<<0), ZORAN_PCI); + /* implicit: 3 duration and recovery PCI clocks on guest 0-3 */ + zrwrite(ztv->card->gpval<<24, ZORAN_GUEST); + + /* clear interrupt status */ + zrwrite(~0, ZORAN_ISR); + + /* + * Now add the template and register the device unit + */ + ztv->video_dev = alloc_mem1; + memcpy(ztv->video_dev, &zr36120_template, sizeof(struct video_device)); + ztv->video_dev->priv = ztv; + if (video_register_device(ztv->video_dev, VFL_TYPE_GRABBER, 0) < 0) { + kfree(alloc_mem1); + kfree(alloc_mem2); + return -1; + } + + ztv->vbi_dev = alloc_mem2; + memcpy(ztv->vbi_dev, &vbi_template, sizeof(struct video_device)); + ztv->vbi_dev->priv = ztv; + if (video_register_device(ztv->vbi_dev, VFL_TYPE_VBI, 0) < 0) { + video_unregister_device(ztv->video_dev); + kfree(alloc_mem1); + kfree(alloc_mem2); + return -1; + } + ztv->i2cbr = 0; + if (zoran_i2c_load(ztv, debug) < 0) { + dprintk(0, KERN_ERR "%s: can't initialize i2c bus\n", + ztv->i2c_adapter.name); + } + + /* set interrupt mask - the PIN enable will be set later */ + zrwrite(ZORAN_ICR_GIRQ0|ZORAN_ICR_GIRQ1|ZORAN_ICR_CODE, ZORAN_ICR); + + dprintk(0, KERN_INFO "%s: installed %s\n", + ztv->i2c_adapter.name, ztv->card->name); + return 0; +} + +static +void release_zoran(int max) +{ + struct zoran *ztv; + int i; + + for (i=0;idev->irq,ztv); + + /* unregister i2c_bus */ + zoran_i2c_unload(ztv); + + /* unmap and free memory */ + if (ztv->zoran_mem) + iounmap(ztv->zoran_mem); + + release_mem_region(pci_resource_start(ztv->dev, 0), + pci_resource_len(ztv->dev, 0)); + pci_set_drvdata(ztv->dev, NULL); + + video_unregister_device(ztv->video_dev); + video_unregister_device(ztv->vbi_dev); + } +} + +void __exit zr36120_exit(void) +{ + release_zoran(zoran_cards); +} + +int __init zr36120_init(void) +{ + int card; + + handle_chipset(); + zoran_cards = find_zoran(); + if (zoran_cards<0) + { + /* no cards found, no need for a driver */ + dprintk(0, KERN_WARNING "zr36120: no cards found\n"); + return -EIO; + } + + /* initialize Zorans */ + for (card=0; card + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ + +#ifndef _ZR36120_H +#define _ZR36120_H + +#ifdef __KERNEL__ + +#include +#include + +#include +#include +#include + +#include + +/* + * Debug print macro, allows debugging by module parameter + * 0 - minimal info + * 1 - ioctl debugging + * 2 - general debugging + * 9 - intr debugging + */ +#define dprintk(num, format, args...) \ + do { \ + if (debug >= num) \ + printk(format, ##args); \ + } while (0) + +#define PDEBUG 0 /* Debug PCI writes */ + + +#define ZORAN_MAX_FBUFFERS 2 +#define ZORAN_MAX_FBUFFER (768*576*3) +#define ZORAN_MAX_FBUFSIZE (ZORAN_MAX_FBUFFERS*ZORAN_MAX_FBUFFER) + +#define ZORAN_VBI_BUFFERS 8 +#define ZORAN_VBI_BUFSIZE (44*1024*2) + +struct tvcard { + char* name; /* name of the cardtype */ + int video_inputs; /* number of channels defined in video_mux */ + int audio_inputs; /* number of channels defined in audio_mux */ + __u32 swapi2c:1, /* need to swap i2c wires SDA/SCL? */ + usegirq1:1, /* VSYNC at GIRQ1 instead of GIRQ0? */ + vsync_pos:1, /* positive VSYNC signal? */ + hsync_pos:1, /* positive HSYNC signal? */ + ext_fl:1, /* external field detection? */ + fld_pos:1, /* positive field signal = top? */ + gpdir:8, /* General Purpose Direction register */ + gpval:8; /* General Purpose Value register */ + int video_mux[6]; /* mapping channel number to physical input */ +#define IS_TUNER 0x80 +#define IS_SVHS 0x40 +#define CHANNEL_MASK 0x3F + int audio_mux[6]; /* mapping channel number to physical input */ +}; + +#define TUNER(x) ((x)|IS_TUNER) +#define SVHS(x) ((x)|IS_SVHS) + +struct vidinfo { + struct vidinfo* next; /* next active buffer */ + uint kindof; +#define FBUFFER_OVERLAY 0 +#define FBUFFER_GRAB 1 +#define FBUFFER_VBI 2 + uint status; +#define FBUFFER_FREE 0 +#define FBUFFER_BUSY 1 +#define FBUFFER_DONE 2 + ulong fieldnr; /* # of field, not framer! */ + uint x,y; + int w,h; /* w,h can be negative! */ + uint format; /* index in palette2fmt[] */ + uint bpp; /* lookup from palette2fmt[] */ + uint bpl; /* calc: width * bpp */ + ulong busadr; /* bus addr for DMA engine */ + char* memadr; /* kernel addr for making copies */ + ulong* overlay; /* kernel addr of overlay mask */ +}; + +struct zoran +{ + struct video_device* video_dev; +#define CARD_DEBUG KERN_DEBUG "%s(%lu): " +#define CARD_INFO KERN_INFO "%s(%lu): " +#define CARD_ERR KERN_ERR "%s(%lu): " +#define CARD ztv->video_dev->name,ztv->fieldnr + + /* zoran chip specific details */ + struct i2c_adapter i2c_adapter; /* i2c registration data */ + struct i2c_algo_bit_data + i2c_algo; /* i2c bit-banging algorithm */ + unsigned int i2cbr; /* i2c state cache */ + struct i2c_client* decoder, + * tuner; /* pointer to the decoder+tuner */ + struct pci_dev* dev; /* ptr to PCI device */ + ulong zoran_adr; /* bus address of IO memory */ + char* zoran_mem; /* kernel address of IO memory */ + struct tvcard* card; /* the cardtype */ + uint mode; /* 0=PAL, 1=NTSC, 2=SECAM */ + uint channel; /* input channel */ + uint tuner_freq; /* Current freq in kHz */ + struct video_picture picture; /* Current picture params */ + + /* videocard details */ + uint swidth; /* screen width */ + uint sheight; /* screen height */ + uint depth; /* depth in bits */ + + /* State details */ + char* fbuffer; /* framebuffers for mmap */ + struct vidinfo overinfo; /* overlay data */ + struct vidinfo grabinfo[ZORAN_MAX_FBUFFERS]; /* grabbing data*/ + wait_queue_head_t grabq; /* grabbers queue */ + + /* VBI details */ + struct video_device *vbi_dev; + struct vidinfo readinfo[2]; /* VBI data - flip buffers */ + wait_queue_head_t vbiq; /* vbi queue */ + + /* maintenance data */ + int have_decoder; /* did we detect a mux? */ + int have_tuner; /* did we detect a tuner? */ + int users; /* howmany video/vbi open? */ + int tuner_type; /* tuner type, when found */ + int running; /* are we rolling? */ + rwlock_t lock; + long state; /* what is requested of us? */ +#define STATE_OVERLAY 0 +#define STATE_VBI 1 + struct vidinfo* workqueue; /* buffers to grab, head is active */ + ulong fieldnr; /* #field, ticked every VSYNC */ + ulong lastfieldnr; /* #field, ticked every GRAB */ + + int vidInterlace; /* calculated */ + int vidXshift; /* calculated */ + uint vidWidth; /* calculated */ + uint vidHeight; /* calculated */ +}; + +/* defined in zr36120_i2c */ +extern int zoran_i2c_load (struct zoran *ztv, int debugflag); +extern void zoran_i2c_unload (struct zoran *ztv); +extern int zoran_i2c_command (struct zoran *ztv, int cmd, void *data); +extern int zoran_i2c_tuner_command (struct zoran *ztv, int cmd, void *data); + +#define zrwrite(dat,adr) writel((dat),(char *) (ztv->zoran_mem+(adr))) +#define zrread(adr) readl(ztv->zoran_mem+(adr)) + +#if PDEBUG == 0 +#define zrand(dat,adr) zrwrite((dat) & zrread(adr), adr) +#define zror(dat,adr) zrwrite((dat) | zrread(adr), adr) +#define zraor(dat,mask,adr) zrwrite( ((dat)&~(mask)) | ((mask)&zrread(adr)), adr) +#else +#define zrand(dat, adr) \ +do { \ + ulong data = (dat) & zrread((adr)); \ + zrwrite(data, (adr)); \ + if (0 != (~(dat) & zrread((adr)))) \ + printk(KERN_DEBUG "zoran: zrand at %d(%d) detected set bits(%x)\n", __LINE__, (adr), (dat)); \ +} while(0) + +#define zror(dat, adr) \ +do { \ + ulong data = (dat) | zrread((adr)); \ + zrwrite(data, (adr)); \ + if ((dat) != ((dat) & zrread(adr))) \ + printk(KERN_DEBUG "zoran: zror at %d(%d) detected unset bits(%x)\n", __LINE__, (adr), (dat)); \ +} while(0) + +#define zraor(dat, mask, adr) \ +do { \ + ulong data; \ + if ((dat) & (mask)) \ + printk(KERN_DEBUG "zoran: zraor at %d(%d) detected bits(%x:%x)\n", __LINE__, (adr), (dat), (mask)); \ + data = ((dat)&~(mask)) | ((mask) & zrread((adr))); \ + zrwrite(data,(adr)); \ + if ( (dat) != (~(mask) & zrread((adr))) ) \ + printk(KERN_DEBUG "zoran: zraor at %d(%d) could not set all bits(%x:%x)\n", __LINE__, (adr), (dat), (mask)); \ +} while(0) +#endif + +#endif + +/* zoran PCI address space */ +#define ZORAN_VFEH 0x000 /* Video Front End Horizontal Conf. */ +#define ZORAN_VFEH_HSPOL (1<<30) +#define ZORAN_VFEH_HSTART (0x3FF<<10) +#define ZORAN_VFEH_HEND (0x3FF<<0) + +#define ZORAN_VFEV 0x004 /* Video Front End Vertical Conf. */ +#define ZORAN_VFEV_VSPOL (1<<30) +#define ZORAN_VFEV_VSTART (0x3FF<<10) +#define ZORAN_VFEV_VEND (0x3FF<<0) + +#define ZORAN_VFEC 0x008 /* Video Front End Scaler and Pixel */ +#define ZORAN_VFEC_EXTFL (1<<26) +#define ZORAN_VFEC_TOPFIELD (1<<25) +#define ZORAN_VFEC_VCLKPOL (1<<24) +#define ZORAN_VFEC_HFILTER (7<<21) +#define ZORAN_VFEC_HFILTER_1 (0<<21) /* no lumi, 3-tap chromo */ +#define ZORAN_VFEC_HFILTER_2 (1<<21) /* 3-tap lumi, 3-tap chromo */ +#define ZORAN_VFEC_HFILTER_3 (2<<21) /* 4-tap lumi, 4-tap chromo */ +#define ZORAN_VFEC_HFILTER_4 (3<<21) /* 5-tap lumi, 4-tap chromo */ +#define ZORAN_VFEC_HFILTER_5 (4<<21) /* 4-tap lumi, 4-tap chromo */ +#define ZORAN_VFEC_DUPFLD (1<<20) +#define ZORAN_VFEC_HORDCM (63<<14) +#define ZORAN_VFEC_VERDCM (63<<8) +#define ZORAN_VFEC_DISPMOD (1<<6) +#define ZORAN_VFEC_RGB (3<<3) +#define ZORAN_VFEC_RGB_YUV422 (0<<3) +#define ZORAN_VFEC_RGB_RGB888 (1<<3) +#define ZORAN_VFEC_RGB_RGB565 (2<<3) +#define ZORAN_VFEC_RGB_RGB555 (3<<3) +#define ZORAN_VFEC_ERRDIF (1<<2) +#define ZORAN_VFEC_PACK24 (1<<1) +#define ZORAN_VFEC_LE (1<<0) + +#define ZORAN_VTOP 0x00C /* Video Display "Top" */ + +#define ZORAN_VBOT 0x010 /* Video Display "Bottom" */ + +#define ZORAN_VSTR 0x014 /* Video Display Stride */ +#define ZORAN_VSTR_DISPSTRIDE (0xFFFF<<16) +#define ZORAN_VSTR_VIDOVF (1<<8) +#define ZORAN_VSTR_SNAPSHOT (1<<1) +#define ZORAN_VSTR_GRAB (1<<0) + +#define ZORAN_VDC 0x018 /* Video Display Conf. */ +#define ZORAN_VDC_VIDEN (1<<31) +#define ZORAN_VDC_MINPIX (0x1F<<25) +#define ZORAN_VDC_TRICOM (1<<24) +#define ZORAN_VDC_VIDWINHT (0x3FF<<12) +#define ZORAN_VDC_VIDWINWID (0x3FF<<0) + +#define ZORAN_MTOP 0x01C /* Masking Map "Top" */ + +#define ZORAN_MBOT 0x020 /* Masking Map "Bottom" */ + +#define ZORAN_OCR 0x024 /* Overlay Control */ +#define ZORAN_OCR_OVLEN (1<<15) +#define ZORAN_OCR_MASKSTRIDE (0xFF<<0) + +#define ZORAN_PCI 0x028 /* System, PCI and GPP Control */ +#define ZORAN_PCI_SOFTRESET (1<<24) +#define ZORAN_PCI_WAITSTATE (3<<16) +#define ZORAN_PCI_GENPURDIR (0xFF<<0) + +#define ZORAN_GUEST 0x02C /* GuestBus Control */ + +#define ZORAN_CSOURCE 0x030 /* Code Source Address */ + +#define ZORAN_CTRANS 0x034 /* Code Transfer Control */ + +#define ZORAN_CMEM 0x038 /* Code Memory Pointer */ + +#define ZORAN_ISR 0x03C /* Interrupt Status Register */ +#define ZORAN_ISR_CODE (1<<28) +#define ZORAN_ISR_GIRQ0 (1<<29) +#define ZORAN_ISR_GIRQ1 (1<<30) + +#define ZORAN_ICR 0x040 /* Interrupt Control Register */ +#define ZORAN_ICR_EN (1<<24) +#define ZORAN_ICR_CODE (1<<28) +#define ZORAN_ICR_GIRQ0 (1<<29) +#define ZORAN_ICR_GIRQ1 (1<<30) + +#define ZORAN_I2C 0x044 /* I2C-Bus */ +#define ZORAN_I2C_SCL (1<<0) +#define ZORAN_I2C_SDA (1<<1) + +#define ZORAN_POST 0x200 /* PostOffice */ +#define ZORAN_POST_PEN (1<<25) +#define ZORAN_POST_TIME (1<<24) +#define ZORAN_POST_DIR (1<<23) +#define ZORAN_POST_GUESTID (3<<20) +#define ZORAN_POST_GUEST (7<<16) +#define ZORAN_POST_DATA (0xFF<<0) + +#endif diff -urN linux-2.6.25.8.orig/drivers/media/video/zr36120_i2c.c linux-2.6.25.8/drivers/media/video/zr36120_i2c.c --- linux-2.6.25.8.orig/drivers/media/video/zr36120_i2c.c 1969-12-31 16:00:00.000000000 -0800 +++ linux-2.6.25.8/drivers/media/video/zr36120_i2c.c 2008-06-08 09:09:04.599550794 -0700 @@ -0,0 +1,227 @@ +/* + zr36120_i2c.c - Zoran 36120/36125 based framegrabbers + + Copyright (C) 1998-1999 Pauline Middelink + Partial port to Linux 2.6 by ??? + Full port to Linux 2.6, and other cleanup by Joachim Feise (Oct. 2005) + Copyright (C) 2005 Joachim Feise + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ + +#include +#include +#include + +#include +#include +#include + +#include "zr36120.h" +#include + +static int debug = 0; + +/* ----------------------------------------------------------------------- */ +/* I2C functions */ +/* ----------------------------------------------------------------------- */ + +/* software I2C functions */ + +#define I2C_DELAY 20 + +/* software I2C functions */ +static int zoran_i2c_getsda (void* data) +{ + struct zoran* ztv = (struct zoran*)data; + return zrread(ZORAN_I2C) & (ztv->card->swapi2c ? ZORAN_I2C_SCL : ZORAN_I2C_SDA); +} + +static +int zoran_i2c_getscl (void* data) +{ + struct zoran* ztv = (struct zoran*)data; + return zrread(ZORAN_I2C) & (ztv->card->swapi2c ? ZORAN_I2C_SDA : ZORAN_I2C_SCL); +} + +static +void zoran_i2c_setsda (void* data, int state) +{ + struct zoran* ztv = (struct zoran*)data; + if (state) + ztv->i2cbr |= (ztv->card->swapi2c ? ZORAN_I2C_SCL : ZORAN_I2C_SDA); + else + ztv->i2cbr &= ~(ztv->card->swapi2c ? ZORAN_I2C_SCL : ZORAN_I2C_SDA); + zrwrite(ztv->i2cbr, ZORAN_I2C); +} + +static +void zoran_i2c_setscl (void* data, int state) +{ + struct zoran* ztv = (struct zoran*)data; + if (state) + ztv->i2cbr |= (ztv->card->swapi2c ? ZORAN_I2C_SDA : ZORAN_I2C_SCL); + else + ztv->i2cbr &= ~(ztv->card->swapi2c ? ZORAN_I2C_SDA : ZORAN_I2C_SCL); + zrwrite(ztv->i2cbr, ZORAN_I2C); +} + +static +int attach_inform(struct i2c_client* client) +{ + struct zoran* ztv = (struct zoran*)i2c_get_adapdata(client->adapter); + struct video_decoder_capability dc; + int rv; + + dprintk(2, CARD_DEBUG "attach_inform, id: %d\n", CARD, client->driver->id); + + if (ztv->users > 0) { + dprintk(0, KERN_ERR "cannot connect i2c devices while running\n"); + return -EBUSY; + } + + switch (client->driver->id) { + case I2C_DRIVERID_SAA7110: + case I2C_DRIVERID_SAA7111A: + dprintk(2, CARD_INFO "decoder attached\n", CARD); + + ztv->decoder = client; + /* fetch the capabilites of the decoder */ + rv = zoran_i2c_command(ztv, DECODER_GET_CAPABILITIES, &dc); + if (rv) { + dprintk(2, CARD_DEBUG "decoder is not V4L aware!\n", + CARD); + break; + } + dprintk(2, CARD_DEBUG "capabilities %d %d %d\n", + CARD, dc.flags, dc.inputs, dc.outputs); + + /* Test if the decoder can de VBI transfers */ + if (dc.flags & 16 /*VIDEO_DECODER_VBI*/) + ztv->have_decoder = 2; + else + ztv->have_decoder = 1; + break; + + case I2C_DRIVERID_TUNER: + ztv->have_tuner = 1; + ztv->tuner = client; + dprintk(2, CARD_INFO "tuner attached\n", CARD); + if (ztv->tuner_type >= 0) + { + if (zoran_i2c_tuner_command(ztv ,TUNER_SET_TYPE_ADDR, + &ztv->tuner_type)<0) + dprintk(2, CARD_INFO + "attach_inform; tuner won't be set to type %d\n", + CARD, ztv->tuner_type); + } + break; + + default: + dprintk(2, CARD_INFO "attach_inform; unknown device id=%d\n", + CARD, client->driver->id); + return -1; + } + + return 0; +} + +static +int detach_inform(struct i2c_client* client) +{ + struct zoran *ztv = (struct zoran*)i2c_get_adapdata(client->adapter); + + dprintk(2, CARD_DEBUG "detach_inform, id: %d\n", CARD, client->driver->id); + + switch (client->driver->id) { + case I2C_DRIVERID_SAA7110: + case I2C_DRIVERID_SAA7111A: + ztv->have_decoder = 0; + ztv->decoder = NULL; + dprintk(2, CARD_INFO "decoder detached\n", CARD); + break; + + case I2C_DRIVERID_TUNER: + ztv->have_tuner = 0; + ztv->tuner = NULL; + dprintk(2, CARD_INFO "tuner detached\n", CARD); + break; + + default: + dprintk(2, CARD_INFO "detach_inform; unknown device id=%d\n", + CARD, client->driver->id); + break; + } + + return 0; +} + +static struct i2c_algo_bit_data zoran_i2c_bit_data_template = { + .setsda = zoran_i2c_setsda, + .setscl = zoran_i2c_setscl, + .getsda = zoran_i2c_getsda, + .getscl = zoran_i2c_getscl, + .udelay = I2C_DELAY, + .timeout = 100, +}; + +static struct i2c_adapter zoran_i2c_adapter_template = { + .name = "zr36120", + .id = I2C_HW_B_ZR36120, + .algo = NULL, + .client_register = attach_inform, + .client_unregister = detach_inform, +}; + +int zoran_i2c_load (struct zoran *ztv, int debugflag) +{ + debug = debugflag; + + memcpy(&ztv->i2c_algo, &zoran_i2c_bit_data_template, + sizeof(struct i2c_algo_bit_data)); + ztv->i2c_algo.data = ztv; + memcpy(&ztv->i2c_adapter, &zoran_i2c_adapter_template, + sizeof(struct i2c_adapter)); + i2c_set_adapdata(&ztv->i2c_adapter, ztv); + ztv->i2c_adapter.algo_data = &ztv->i2c_algo; + + /* give the output a defined value */ + zoran_i2c_setscl(ztv, 1); + zoran_i2c_setsda(ztv, 1); + + return i2c_bit_add_bus(&ztv->i2c_adapter); +} + +void zoran_i2c_unload (struct zoran *ztv) +{ + i2c_del_adapter(&ztv->i2c_adapter); + debug = 0; +} + +int zoran_i2c_command (struct zoran *ztv, int cmd, void *data) +{ + if (!ztv->decoder) + return -EIO; + + return ztv->decoder->driver->command(ztv->decoder, cmd, data); +} + +int zoran_i2c_tuner_command (struct zoran *ztv, int cmd, void *data) +{ + if (!ztv->tuner) + return -EIO; + + return ztv->tuner->driver->command(ztv->tuner, cmd, data); +} diff -urN linux-2.6.25.8.orig/drivers/media/video/zr36120_mem.c linux-2.6.25.8/drivers/media/video/zr36120_mem.c --- linux-2.6.25.8.orig/drivers/media/video/zr36120_mem.c 1969-12-31 16:00:00.000000000 -0800 +++ linux-2.6.25.8/drivers/media/video/zr36120_mem.c 2008-06-08 09:09:04.623551121 -0700 @@ -0,0 +1,81 @@ +/* + zr36120_mem.c - Zoran 36120/36125 based framegrabbers + + Copyright (C) 1998-1999 Pauline Middelink + Partial port to Linux 2.6 by ??? + Full port to Linux 2.6, and other cleanup by Joachim Feise (Oct. 2005) + Copyright (C) 2005 Joachim Feise + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ + +#include +#include +#include +#include +#include +#ifdef CONFIG_BIGPHYS_AREA +#include +#endif + +#include "zr36120.h" +#include "zr36120_mem.h" + +/*******************************/ +/* Memory management functions */ +/*******************************/ + +void* bmalloc(unsigned long size) +{ + void* mem; +#ifdef CONFIG_BIGPHYS_AREA + mem = bigphysarea_alloc_pages(size/PAGE_SIZE, 1, GFP_KERNEL); +#else + /* + * The following function got a lot of memory at boottime, + * so we know its always there... + */ + mem = (void*)__get_free_pages(GFP_USER|GFP_DMA, get_order(size)); +#endif + if (mem) { + unsigned long adr = (unsigned long)mem; + while (size > 0) { + SetPageReserved(virt_to_page(adr)); + adr += PAGE_SIZE; + size -= PAGE_SIZE; + } + } + return mem; +} + +void bfree(void* mem, unsigned long size) +{ + if (mem) { + unsigned long adr = (unsigned long)mem; + unsigned long siz = size; + while (siz > 0) { + ClearPageReserved(virt_to_page(adr)); + adr += PAGE_SIZE; + siz -= PAGE_SIZE; + } +#ifdef CONFIG_BIGPHYS_AREA + bigphysarea_free_pages(mem); +#else + free_pages((unsigned long)mem,get_order(size)); +#endif + } +} + +MODULE_LICENSE("GPL"); diff -urN linux-2.6.25.8.orig/drivers/media/video/zr36120_mem.h linux-2.6.25.8/drivers/media/video/zr36120_mem.h --- linux-2.6.25.8.orig/drivers/media/video/zr36120_mem.h 1969-12-31 16:00:00.000000000 -0800 +++ linux-2.6.25.8/drivers/media/video/zr36120_mem.h 2008-06-08 09:09:04.647551852 -0700 @@ -0,0 +1,25 @@ +/* + zr36120_mem.h - Zoran 36120/36125 based framegrabbers + + Copyright (C) 1998-1999 Pauline Middelink + Partial port to Linux 2.6 by ??? + Full port to Linux 2.6, and other cleanup by Joachim Feise (Oct. 2005) + Copyright (C) 2005 Joachim Feise + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ + +void* bmalloc(unsigned long size); +void bfree(void* mem, unsigned long size); diff -urN linux-2.6.25.8.orig/include/linux/i2c-id.h linux-2.6.25.8/include/linux/i2c-id.h --- linux-2.6.25.8.orig/include/linux/i2c-id.h 2008-06-06 16:05:04.000000000 -0700 +++ linux-2.6.25.8/include/linux/i2c-id.h 2008-06-08 09:10:12.497868536 -0700 @@ -58,6 +58,7 @@ #define I2C_DRIVERID_VPX3220 42 /* video decoder+vbi/vtxt */ #define I2C_DRIVERID_ADV7175 48 /* ADV 7175/7176 video encoder */ #define I2C_DRIVERID_SAA7114 49 /* video decoder */ +#define I2C_DRIVERID_ZR36120 50 /* Zoran 36120 video encoder */ #define I2C_DRIVERID_ADV7170 54 /* video encoder */ #define I2C_DRIVERID_SAA7191 57 /* video decoder */ #define I2C_DRIVERID_INDYCAM 58 /* SGI IndyCam */ @@ -125,6 +126,7 @@ #define I2C_HW_B_CX2341X 0x010020 /* Conexant CX2341X MPEG encoder cards */ #define I2C_HW_B_INTELFB 0x010021 /* intel framebuffer driver */ #define I2C_HW_B_CX23885 0x010022 /* conexant 23885 based tv cards (bus1) */ +#define I2C_HW_B_ZR36120 0x010023 /* Zoran 36120/36125 based boards */ /* --- PCF 8584 based algorithms */ #define I2C_HW_P_ELEK 0x020002 /* Elektor ISA Bus inteface card */