diff options
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/drivers/media/video/bttv-risc.c | 6 | ||||
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-blackbird.c | 4 | ||||
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-cards.c | 1 | ||||
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88.h | 6 | ||||
| -rw-r--r-- | linux/include/media/tuner.h | 1 |
5 files changed, 12 insertions, 6 deletions
diff --git a/linux/drivers/media/video/bttv-risc.c b/linux/drivers/media/video/bttv-risc.c index 523f77ad4..33bf3a490 100644 --- a/linux/drivers/media/video/bttv-risc.c +++ b/linux/drivers/media/video/bttv-risc.c @@ -55,6 +55,8 @@ bttv_risc_packed(struct bttv *btv, struct btcx_riscmem *risc, instructions += 2; if ((rc = btcx_riscmem_alloc(btv->c.pci,risc,instructions*8)) < 0) return rc; + dprintk("bttv%d: risc packed: bpl %d lines %d instr %d size %d ptr %p\n", + btv->c.nr, bpl, lines, instructions, risc->size, risc->cpu); /* sync instruction */ rp = risc->cpu; @@ -99,8 +101,10 @@ bttv_risc_packed(struct bttv *btv, struct btcx_riscmem *risc, offset += todo; } offset += padding; + dprintk("bttv%d: risc packed: line %d ptr %p\n", + btv->c.nr, line, rp); } - dprintk("bttv%d: risc planar: %d sglist elems\n", btv->c.nr, (int)(sg-sglist)); + dprintk("bttv%d: risc packed: %d sglist elems\n", btv->c.nr, (int)(sg-sglist)); /* save pointer to jmp instruction address */ risc->jmp = rp; diff --git a/linux/drivers/media/video/cx88/cx88-blackbird.c b/linux/drivers/media/video/cx88/cx88-blackbird.c index 47772322b..5d1b83107 100644 --- a/linux/drivers/media/video/cx88/cx88-blackbird.c +++ b/linux/drivers/media/video/cx88/cx88-blackbird.c @@ -1,5 +1,5 @@ /* - * $Id: cx88-blackbird.c,v 1.3 2004/07/30 15:26:01 kraxel Exp $ + * $Id: cx88-blackbird.c,v 1.4 2004/08/23 10:38:54 kraxel Exp $ * * Support for a cx23416 mpeg encoder via cx2388x host port. * "blackbird" reference design. @@ -26,9 +26,9 @@ #include <linux/module.h> #include <linux/init.h> -#include <linux/device.h> #include <linux/fs.h> #include <linux/delay.h> +#include <linux/device.h> #include <linux/firmware.h> #include "cx88.h" diff --git a/linux/drivers/media/video/cx88/cx88-cards.c b/linux/drivers/media/video/cx88/cx88-cards.c index 9bca7ea75..8098d9ad3 100644 --- a/linux/drivers/media/video/cx88/cx88-cards.c +++ b/linux/drivers/media/video/cx88/cx88-cards.c @@ -148,6 +148,7 @@ struct cx88_board cx88_boards[] = { [CX88_BOARD_AVERTV_303] = { .name = "AverTV Studio 303 (M126)", .tuner_type = TUNER_PHILIPS_PAL_DK, + .tda9887_conf = TDA9887_PRESENT, .input = {{ .type = CX88_VMUX_TELEVISION, .vmux = 0, diff --git a/linux/drivers/media/video/cx88/cx88.h b/linux/drivers/media/video/cx88/cx88.h index 3502d378a..aa32b1e4b 100644 --- a/linux/drivers/media/video/cx88/cx88.h +++ b/linux/drivers/media/video/cx88/cx88.h @@ -1,5 +1,5 @@ /* - * $Id: cx88.h,v 1.23 2004/07/30 13:43:39 kraxel Exp $ + * $Id: cx88.h,v 1.24 2004/08/23 10:38:54 kraxel Exp $ * * v4l2 device driver for cx2388x based TV cards * @@ -344,8 +344,8 @@ struct cx8802_dev { /* ----------------------------------------------------------- */ #define cx_read(reg) readl(core->lmmio + ((reg)>>2)) -#define cx_write(reg,value) writel((value), core->lmmio + ((reg)>>2)); -#define cx_writeb(reg,value) writeb((value), core->bmmio + (reg)); +#define cx_write(reg,value) writel((value), core->lmmio + ((reg)>>2)) +#define cx_writeb(reg,value) writeb((value), core->bmmio + (reg)) #define cx_andor(reg,mask,value) \ writel((readl(core->lmmio+((reg)>>2)) & ~(mask)) |\ diff --git a/linux/include/media/tuner.h b/linux/include/media/tuner.h index 59de608b2..f90d882c4 100644 --- a/linux/include/media/tuner.h +++ b/linux/include/media/tuner.h @@ -70,6 +70,7 @@ #define TUNER_PHILIPS_FM1236_MK3 43 #define TUNER_PHILIPS_4IN1 44 /* ATI TV Wonder Pro - Conexant */ #define TUNER_MICROTUNE_4049FM5 45 +#define TUNER_LG_NTSC_TAPE 47 #define NOTUNER 0 #define PAL 1 /* PAL_BG */ |