Skip to content

L
linux-davinci-2.6.23
Commit f823f679 authored by Jiri Slaby's avatar Jiri Slaby Committed by Mauro Carvalho Chehab
Browse files
Options 

V4L/DVB (3344e): Stradis Lindent


Stradis Lindent + some handwork
Signed-off-by: default avatarJiri Slaby <jirislaby@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 91fb8357
Show whitespace changes
Inline Side-by-side
Showing with 389 additions and 414 deletions
drivers/media/video/stradis.c
View file @ f823f679
...@@ -63,7 +63,6 @@ static int video_nr = -1; ...@@ -63,7 +63,6 @@ static int video_nr = -1;
module_param(video_nr, int, 0); module_param(video_nr, int, 0);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
#define nDebNormal 0x00480000 #define nDebNormal 0x00480000
#define nDebNoInc 0x00480000 #define nDebNoInc 0x00480000
#define nDebVideo 0xd0480000 #define nDebVideo 0xd0480000
...@@ -99,7 +98,12 @@ MODULE_LICENSE("GPL"); ...@@ -99,7 +98,12 @@ MODULE_LICENSE("GPL");
#ifdef USE_RESCUE_EEPROM_SDM275 #ifdef USE_RESCUE_EEPROM_SDM275
static unsigned char rescue_eeprom[64] = { static unsigned char rescue_eeprom[64] = {
0x00,0x01,0x04,0x13,0x26,0x0f,0x10,0x00,0x00,0x00,0x43,0x63,0x22,0x01,0x29,0x15,0x73,0x00,0x1f, 'd', 'e', 'c', 'x', 'l', 'd', 'v', 'a',0x02,0x00,0x01,0x00,0xcc,0xa4,0x63,0x09,0xe2,0x10,0x00,0x0a,0x00,0x02,0x02, 'd', 'e', 'c', 'x', 'l', 'a',0x00,0x00,0x42,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, 0x00, 0x01, 0x04, 0x13, 0x26, 0x0f, 0x10, 0x00, 0x00, 0x00, 0x43, 0x63,
0x22, 0x01, 0x29, 0x15, 0x73, 0x00, 0x1f, 'd', 'e', 'c', 'x', 'l',
'd', 'v', 'a', 0x02, 0x00, 0x01, 0x00, 0xcc, 0xa4, 0x63, 0x09, 0xe2,
0x10, 0x00, 0x0a, 0x00, 0x02, 0x02, 'd', 'e', 'c', 'x', 'l', 'a',
0x00, 0x00, 0x42, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00,
}; };
#endif #endif
...@@ -140,8 +144,9 @@ static int I2CRead(struct saa7146 *saa, unsigned char addr, ...@@ -140,8 +144,9 @@ static int I2CRead(struct saa7146 *saa, unsigned char addr,
if (saaread(SAA7146_I2C_STATUS) & 0x3c) if (saaread(SAA7146_I2C_STATUS) & 0x3c)
I2CWipe(saa); I2CWipe(saa);
for (i = 0; i < 1000 && for (i = 0;
(saaread(SAA7146_I2C_STATUS) & SAA7146_I2C_BUSY); i++) i < 1000 && (saaread(SAA7146_I2C_STATUS) & SAA7146_I2C_BUSY);
i++)
schedule(); schedule();
if (i == 1000) if (i == 1000)
I2CWipe(saa); I2CWipe(saa);
...@@ -213,20 +218,22 @@ static void attach_inform(struct saa7146 *saa, int id) ...@@ -213,20 +218,22 @@ static void attach_inform(struct saa7146 *saa, int id)
{ {
int i; int i;
DEBUG(printk(KERN_DEBUG "stradis%d: i2c: device found=%02x\n", saa->nr, id)); DEBUG(printk(KERN_DEBUG "stradis%d: i2c: device found=%02x\n", saa->nr,
id));
if (id == 0xa0) { /* we have rev2 or later board, fill in info */ if (id == 0xa0) { /* we have rev2 or later board, fill in info */
for (i = 0; i < 64; i++) for (i = 0; i < 64; i++)
saa->boardcfg[i] = I2CRead(saa, 0xa0, i, 1); saa->boardcfg[i] = I2CRead(saa, 0xa0, i, 1);
#ifdef USE_RESCUE_EEPROM_SDM275 #ifdef USE_RESCUE_EEPROM_SDM275
if (saa->boardcfg[0] != 0) { if (saa->boardcfg[0] != 0) {
printk("stradis%d: WARNING: EEPROM STORED VALUES HAVE BEEN IGNORED\n", saa->nr); printk("stradis%d: WARNING: EEPROM STORED VALUES HAVE "
"BEEN IGNORED\n", saa->nr);
for (i = 0; i < 64; i++) for (i = 0; i < 64; i++)
saa->boardcfg[i] = rescue_eeprom[i]; saa->boardcfg[i] = rescue_eeprom[i];
} }
#endif #endif
printk("stradis%d: config =", saa->nr); printk("stradis%d: config =", saa->nr);
for (i = 0; i < 51; i++) { for (i = 0; i < 51; i++) {
printk(" %02x",saa->boardcfg[i]); printk(" %02x", saa->boardcfg[i]);
} }
printk("\n"); printk("\n");
} }
...@@ -254,12 +261,14 @@ static int wait_for_debi_done(struct saa7146 *saa) ...@@ -254,12 +261,14 @@ static int wait_for_debi_done(struct saa7146 *saa)
for (i = 0; i < 500000 && for (i = 0; i < 500000 &&
(saaread(SAA7146_PSR) & SAA7146_PSR_DEBI_S); i++) (saaread(SAA7146_PSR) & SAA7146_PSR_DEBI_S); i++)
saaread(SAA7146_MC2); saaread(SAA7146_MC2);
if (i > debiwait_maxwait) if (i > debiwait_maxwait)
printk("wait-for-debi-done maxwait: %d\n", printk("wait-for-debi-done maxwait: %d\n",
debiwait_maxwait = i); debiwait_maxwait = i);
if (i == 500000) if (i == 500000)
return -1; return -1;
return 0; return 0;
} }
...@@ -330,16 +339,15 @@ static void do_irq_send_data(struct saa7146 *saa) ...@@ -330,16 +339,15 @@ static void do_irq_send_data(struct saa7146 *saa)
return; return;
} }
/* if at least 1 block audio waiting and audio fifo isn't full */ /* if at least 1 block audio waiting and audio fifo isn't full */
if (audbytes >= 2048 && (debiread(saa, debNormal, if (audbytes >= 2048 && (debiread(saa, debNormal, IBM_MP2_AUD_FIFO, 2)
IBM_MP2_AUD_FIFO, 2) & 0xff) < 60) { & 0xff) < 60) {
if (saa->audhead > saa->audtail) if (saa->audhead > saa->audtail)
split = 65536 - saa->audhead; split = 65536 - saa->audhead;
else else
split = 0; split = 0;
audbytes = 2048; audbytes = 2048;
if (split > 0 && split < 2048) { if (split > 0 && split < 2048) {
memcpy(saa->dmadebi, saa->audbuf + saa->audhead, memcpy(saa->dmadebi, saa->audbuf + saa->audhead, split);
split);
saa->audhead = 0; saa->audhead = 0;
audbytes -= split; audbytes -= split;
} else } else
...@@ -348,7 +356,7 @@ static void do_irq_send_data(struct saa7146 *saa) ...@@ -348,7 +356,7 @@ static void do_irq_send_data(struct saa7146 *saa)
audbytes); audbytes);
saa->audhead += audbytes; saa->audhead += audbytes;
saa->audhead &= 0xffff; saa->audhead &= 0xffff;
debiwrite(saa, debAudio, (NewCard? IBM_MP2_AUD_FIFO : debiwrite(saa, debAudio, (NewCard ? IBM_MP2_AUD_FIFO :
IBM_MP2_AUD_FIFOW), 0, 2048); IBM_MP2_AUD_FIFOW), 0, 2048);
wake_up_interruptible(&saa->audq); wake_up_interruptible(&saa->audq);
/* if at least 1 block video waiting and video fifo isn't full */ /* if at least 1 block video waiting and video fifo isn't full */
...@@ -360,8 +368,7 @@ static void do_irq_send_data(struct saa7146 *saa) ...@@ -360,8 +368,7 @@ static void do_irq_send_data(struct saa7146 *saa)
split = 0; split = 0;
vidbytes = 30720; vidbytes = 30720;
if (split > 0 && split < 30720) { if (split > 0 && split < 30720) {
memcpy(saa->dmadebi, saa->vidbuf + saa->vidhead, memcpy(saa->dmadebi, saa->vidbuf + saa->vidhead, split);
split);
saa->vidhead = 0; saa->vidhead = 0;
vidbytes -= split; vidbytes -= split;
} else } else
...@@ -383,10 +390,10 @@ static void send_osd_data(struct saa7146 *saa) ...@@ -383,10 +390,10 @@ static void send_osd_data(struct saa7146 *saa)
if (size > 30720) if (size > 30720)
size = 30720; size = 30720;
/* ensure some multiple of 8 bytes is transferred */ /* ensure some multiple of 8 bytes is transferred */
size = 8 * ((size + 8)>>3); size = 8 * ((size + 8) >> 3);
if (size) { if (size) {
debiwrite(saa, debNormal, IBM_MP2_OSD_ADDR, debiwrite(saa, debNormal, IBM_MP2_OSD_ADDR,
(saa->osdhead>>3), 2); (saa->osdhead >> 3), 2);
memcpy(saa->dmadebi, &saa->osdbuf[saa->osdhead], size); memcpy(saa->dmadebi, &saa->osdbuf[saa->osdhead], size);
saa->osdhead += size; saa->osdhead += size;
/* block transfer of next 8 bytes to ~32k bytes */ /* block transfer of next 8 bytes to ~32k bytes */
...@@ -400,7 +407,7 @@ static void send_osd_data(struct saa7146 *saa) ...@@ -400,7 +407,7 @@ static void send_osd_data(struct saa7146 *saa)
static irqreturn_t saa7146_irq(int irq, void *dev_id, struct pt_regs *regs) static irqreturn_t saa7146_irq(int irq, void *dev_id, struct pt_regs *regs)
{ {
struct saa7146 *saa = (struct saa7146 *) dev_id; struct saa7146 *saa = dev_id;
u32 stat, astat; u32 stat, astat;
int count; int count;
int handled = 0; int handled = 0;
...@@ -578,7 +585,7 @@ static int ibm_send_command(struct saa7146 *saa, ...@@ -578,7 +585,7 @@ static int ibm_send_command(struct saa7146 *saa,
int i; int i;
if (chain) if (chain)
debiwrite(saa, debNormal, IBM_MP2_COMMAND, (command << 1) | 1, 2); debiwrite(saa, debNormal, IBM_MP2_COMMAND, (command << 1)| 1,2);
else else
debiwrite(saa, debNormal, IBM_MP2_COMMAND, command << 1, 2); debiwrite(saa, debNormal, IBM_MP2_COMMAND, command << 1, 2);
debiwrite(saa, debNormal, IBM_MP2_CMD_DATA, data, 2); debiwrite(saa, debNormal, IBM_MP2_CMD_DATA, data, 2);
...@@ -628,11 +635,9 @@ static void initialize_cs8420(struct saa7146 *saa, int pro) ...@@ -628,11 +635,9 @@ static void initialize_cs8420(struct saa7146 *saa, int pro)
else else
sequence = mode8420con; sequence = mode8420con;
for (i = 0; i < INIT8420LEN; i++) for (i = 0; i < INIT8420LEN; i++)
I2CWrite(saa, 0x20, init8420[i * 2], I2CWrite(saa, 0x20, init8420[i * 2], init8420[i * 2 + 1], 2);
init8420[i * 2 + 1], 2);
for (i = 0; i < MODE8420LEN; i++) for (i = 0; i < MODE8420LEN; i++)
I2CWrite(saa, 0x20, sequence[i * 2], I2CWrite(saa, 0x20, sequence[i * 2], sequence[i * 2 + 1], 2);
sequence[i * 2 + 1], 2);
printk("stradis%d: CS8420 initialized\n", saa->nr); printk("stradis%d: CS8420 initialized\n", saa->nr);
} }
...@@ -648,35 +653,36 @@ static void initialize_saa7121(struct saa7146 *saa, int dopal) ...@@ -648,35 +653,36 @@ static void initialize_saa7121(struct saa7146 *saa, int dopal)
/* initialize PAL/NTSC video encoder */ /* initialize PAL/NTSC video encoder */
for (i = 0; i < INIT7121LEN; i++) { for (i = 0; i < INIT7121LEN; i++) {
if (NewCard) { /* handle new card encoder differences */ if (NewCard) { /* handle new card encoder differences */
if (sequence[i*2] == 0x3a) if (sequence[i * 2] == 0x3a)
I2CWrite(saa, 0x88, 0x3a, 0x13, 2); I2CWrite(saa, 0x88, 0x3a, 0x13, 2);
else if (sequence[i*2] == 0x6b) else if (sequence[i * 2] == 0x6b)
I2CWrite(saa, 0x88, 0x6b, 0x20, 2); I2CWrite(saa, 0x88, 0x6b, 0x20, 2);
else if (sequence[i*2] == 0x6c) else if (sequence[i * 2] == 0x6c)
I2CWrite(saa, 0x88, 0x6c, I2CWrite(saa, 0x88, 0x6c,
dopal ? 0x09 : 0xf5, 2); dopal ? 0x09 : 0xf5, 2);
else if (sequence[i*2] == 0x6d) else if (sequence[i * 2] == 0x6d)
I2CWrite(saa, 0x88, 0x6d, I2CWrite(saa, 0x88, 0x6d,
dopal ? 0x20 : 0x00, 2); dopal ? 0x20 : 0x00, 2);
else if (sequence[i*2] == 0x7a) else if (sequence[i * 2] == 0x7a)
I2CWrite(saa, 0x88, 0x7a, I2CWrite(saa, 0x88, 0x7a,
dopal ? (PALFirstActive - 1) : dopal ? (PALFirstActive - 1) :
(NTSCFirstActive - 4), 2); (NTSCFirstActive - 4), 2);
else if (sequence[i*2] == 0x7b) else if (sequence[i * 2] == 0x7b)
I2CWrite(saa, 0x88, 0x7b, I2CWrite(saa, 0x88, 0x7b,
dopal ? PALLastActive : dopal ? PALLastActive :
NTSCLastActive, 2); NTSCLastActive, 2);
else I2CWrite(saa, 0x88, sequence[i * 2], else
I2CWrite(saa, 0x88, sequence[i * 2],
sequence[i * 2 + 1], 2); sequence[i * 2 + 1], 2);
} else { } else {
if (sequence[i*2] == 0x6b && mod) if (sequence[i * 2] == 0x6b && mod)
I2CWrite(saa, 0x88, 0x6b, I2CWrite(saa, 0x88, 0x6b,
(sequence[i * 2 + 1] ^ 0x09), 2); (sequence[i * 2 + 1] ^ 0x09), 2);
else if (sequence[i*2] == 0x7a) else if (sequence[i * 2] == 0x7a)
I2CWrite(saa, 0x88, 0x7a, I2CWrite(saa, 0x88, 0x7a,
dopal ? (PALFirstActive - 1) : dopal ? (PALFirstActive - 1) :
(NTSCFirstActive - 4), 2); (NTSCFirstActive - 4), 2);
else if (sequence[i*2] == 0x7b) else if (sequence[i * 2] == 0x7b)
I2CWrite(saa, 0x88, 0x7b, I2CWrite(saa, 0x88, 0x7b,
dopal ? PALLastActive : dopal ? PALLastActive :
NTSCLastActive, 2); NTSCLastActive, 2);
...@@ -700,7 +706,8 @@ static void set_genlock_offset(struct saa7146 *saa, int noffset) ...@@ -700,7 +706,8 @@ static void set_genlock_offset(struct saa7146 *saa, int noffset)
nCode = noffset + 0x100; nCode = noffset + 0x100;
if (nCode == 1) if (nCode == 1)
nCode = 0x401; nCode = 0x401;
else if (nCode < 1) nCode = 0x400 + PixelsPerLine + nCode; else if (nCode < 1)
nCode = 0x400 + PixelsPerLine + nCode;
debiwrite(saa, debNormal, XILINX_GLDELAY, nCode, 2); debiwrite(saa, debNormal, XILINX_GLDELAY, nCode, 2);
} }
...@@ -715,28 +722,26 @@ static void set_out_format(struct saa7146 *saa, int mode) ...@@ -715,28 +722,26 @@ static void set_out_format(struct saa7146 *saa, int mode)
mdelay(50); mdelay(50);
saawrite(0x012002c0, SAA7146_NUM_LINE_BYTE1); saawrite(0x012002c0, SAA7146_NUM_LINE_BYTE1);
if (NewCard) { if (NewCard) {
debiwrite(saa, debNormal, IBM_MP2_DISP_MODE, debiwrite(saa, debNormal, IBM_MP2_DISP_MODE, 0xe100, 2);
0xe100, 2);
mdelay(50); mdelay(50);
} }
debiwrite(saa, debNormal, IBM_MP2_DISP_MODE, debiwrite(saa, debNormal, IBM_MP2_DISP_MODE,
NewCard ? 0xe500: 0x6500, 2); NewCard ? 0xe500 : 0x6500, 2);
debiwrite(saa, debNormal, IBM_MP2_DISP_DLY, debiwrite(saa, debNormal, IBM_MP2_DISP_DLY,
(1 << 8) | (1 << 8) |
(NewCard ? PALFirstActive : PALFirstActive-6), 2); (NewCard ? PALFirstActive : PALFirstActive - 6), 2);
} else { /* NTSC */ } else { /* NTSC */
debiwrite(saa, debNormal, XILINX_CTL0, 0x0800, 2); debiwrite(saa, debNormal, XILINX_CTL0, 0x0800, 2);
mdelay(50); mdelay(50);
saawrite(0x00f002c0, SAA7146_NUM_LINE_BYTE1); saawrite(0x00f002c0, SAA7146_NUM_LINE_BYTE1);
debiwrite(saa, debNormal, IBM_MP2_DISP_MODE, debiwrite(saa, debNormal, IBM_MP2_DISP_MODE,
NewCard ? 0xe100: 0x6100, 2); NewCard ? 0xe100 : 0x6100, 2);
debiwrite(saa, debNormal, IBM_MP2_DISP_DLY, debiwrite(saa, debNormal, IBM_MP2_DISP_DLY,
(1 << 8) | (1 << 8) |
(NewCard ? NTSCFirstActive : NTSCFirstActive-6), 2); (NewCard ? NTSCFirstActive : NTSCFirstActive - 6), 2);
} }
} }
/* Intialize bitmangler to map from a byte value to the mangled word that /* Intialize bitmangler to map from a byte value to the mangled word that
* must be output to program the Xilinx part through the DEBI port. * must be output to program the Xilinx part through the DEBI port.
* Xilinx Data Bit->DEBI Bit: 0->15 1->7 2->6 3->12 4->11 5->2 6->1 7->0 * Xilinx Data Bit->DEBI Bit: 0->15 1->7 2->6 3->12 4->11 5->2 6->1 7->0
...@@ -786,21 +791,19 @@ static int initialize_fpga(struct video_code *bitdata) ...@@ -786,21 +791,19 @@ static int initialize_fpga(struct video_code *bitdata)
if (NewCard) { /* SDM2xxx */ if (NewCard) { /* SDM2xxx */
if (!strncmp(bitdata->loadwhat, "decoder2", 8)) if (!strncmp(bitdata->loadwhat, "decoder2", 8))
continue; /* fpga not for this card */ continue; /* fpga not for this card */
if (!strncmp(&saa->boardcfg[42], if (!strncmp(&saa->boardcfg[42], bitdata->loadwhat, 8))
bitdata->loadwhat, 8)) {
loadfile = 1; loadfile = 1;
} else if (loadtwo && !strncmp(&saa->boardcfg[19], else if (loadtwo && !strncmp(&saa->boardcfg[19],
bitdata->loadwhat, 8)) { bitdata->loadwhat, 8))
loadfile = 2; loadfile = 2;
} else if (!saa->boardcfg[42] && /* special */ else if (!saa->boardcfg[42] && !strncmp("decxl",
!strncmp("decxl", bitdata->loadwhat, 8)) { bitdata->loadwhat, 8))
loadfile = 1; loadfile = 1; /* special */
} else else
continue; /* fpga not for this card */ continue; /* fpga not for this card */
if (loadfile != 1 && loadfile != 2) { if (loadfile != 1 && loadfile != 2)
continue; /* skip to next card */ continue; /* skip to next card */
} if (saa->boardcfg[0] && loadfile == 1)
if (saa->boardcfg[0] && loadfile == 1 )
continue; /* skip to next card */ continue; /* skip to next card */
if (saa->boardcfg[0] != 1 && loadfile == 2) if (saa->boardcfg[0] != 1 && loadfile == 2)
continue; /* skip to next card */ continue; /* skip to next card */
...@@ -835,8 +838,9 @@ static int initialize_fpga(struct video_code *bitdata) ...@@ -835,8 +838,9 @@ static int initialize_fpga(struct video_code *bitdata)
/* Release Xilinx INIT signal (WS2) */ /* Release Xilinx INIT signal (WS2) */
saawrite(0x00000000, SAA7146_GPIO_CTRL); saawrite(0x00000000, SAA7146_GPIO_CTRL);
/* Wait for the INIT to go High */ /* Wait for the INIT to go High */
for (i = 0; i < 10000 && for (i = 0;
!(saaread(SAA7146_PSR) & SAA7146_PSR_PIN2); i++) i < 10000 && !(saaread(SAA7146_PSR) & SAA7146_PSR_PIN2);
i++)
schedule(); schedule();
if (i == 1000) { if (i == 1000) {
printk(KERN_INFO "stradis%d: no fpga INIT\n", saa->nr); printk(KERN_INFO "stradis%d: no fpga INIT\n", saa->nr);
...@@ -849,15 +853,11 @@ send_fpga_stuff: ...@@ -849,15 +853,11 @@ send_fpga_stuff:
bitmangler[bitdata->data[i]]; bitmangler[bitdata->data[i]];
debiwrite(saa, 0x01420000, 0, 0, debiwrite(saa, 0x01420000, 0, 0,
((bitdata->datasize - startindex) + 5)); ((bitdata->datasize - startindex) + 5));
if (loadtwo) { if (loadtwo && loadfile == 1) {
if (loadfile == 1) { printk("stradis%d: awaiting 2nd FPGA bitfile\n",
printk("stradis%d: "
"awaiting 2nd FPGA bitfile\n",
saa->nr); saa->nr);
continue; /* skip to next card */ continue; /* skip to next card */
} }
}
} else { } else {
for (i = startindex; i < bitdata->datasize; i++) for (i = startindex; i < bitdata->datasize; i++)
dmabuf[i - startindex] = dmabuf[i - startindex] =
...@@ -865,8 +865,9 @@ send_fpga_stuff: ...@@ -865,8 +865,9 @@ send_fpga_stuff:
debiwrite(saa, 0x014a0000, 0, 0, debiwrite(saa, 0x014a0000, 0, 0,
((bitdata->datasize - startindex) + 5) * 2); ((bitdata->datasize - startindex) + 5) * 2);
} }
for (i = 0; i < 1000 && for (i = 0;
!(saaread(SAA7146_PSR) & SAA7146_PSR_PIN2); i++) i < 1000 && !(saaread(SAA7146_PSR) & SAA7146_PSR_PIN2);
i++)
schedule(); schedule();
if (i == 1000) { if (i == 1000) {
printk(KERN_INFO "stradis%d: FPGA load failed\n", printk(KERN_INFO "stradis%d: FPGA load failed\n",
...@@ -923,10 +924,10 @@ send_fpga_stuff: ...@@ -923,10 +924,10 @@ send_fpga_stuff:
/* we must init CS8420 first since rev b pulls i2s */ /* we must init CS8420 first since rev b pulls i2s */
/* master clock low and CS4341 needs i2s master to */ /* master clock low and CS4341 needs i2s master to */
/* run the i2c port. */ /* run the i2c port. */
if (HaveCS8420) { if (HaveCS8420)
/* 0=consumer, 1=pro */ /* 0=consumer, 1=pro */
initialize_cs8420(saa, 0); initialize_cs8420(saa, 0);
}
mdelay(5); mdelay(5);
if (HaveCS4341) if (HaveCS4341)
initialize_cs4341(saa); initialize_cs4341(saa);
...@@ -946,6 +947,7 @@ send_fpga_stuff: ...@@ -946,6 +947,7 @@ send_fpga_stuff:
debiwrite(saa, debNormal, XILINX_CTL0, 0x8080, 2); debiwrite(saa, debNormal, XILINX_CTL0, 0x8080, 2);
#endif #endif
} }
return failure; return failure;
} }
...@@ -986,10 +988,10 @@ static int do_ibm_reset(struct saa7146 *saa) ...@@ -986,10 +988,10 @@ static int do_ibm_reset(struct saa7146 *saa)
/* we must init CS8420 first since rev b pulls i2s */ /* we must init CS8420 first since rev b pulls i2s */
/* master clock low and CS4341 needs i2s master to */ /* master clock low and CS4341 needs i2s master to */
/* run the i2c port. */ /* run the i2c port. */
if (HaveCS8420) { if (HaveCS8420)
/* 0=consumer, 1=pro */ /* 0=consumer, 1=pro */
initialize_cs8420(saa, 1); initialize_cs8420(saa, 1);
}
mdelay(5); mdelay(5);
if (HaveCS4341) if (HaveCS4341)
initialize_cs4341(saa); initialize_cs4341(saa);
...@@ -1009,7 +1011,7 @@ static int do_ibm_reset(struct saa7146 *saa) ...@@ -1009,7 +1011,7 @@ static int do_ibm_reset(struct saa7146 *saa)
} }
if (HaveCS3310) { if (HaveCS3310) {
int i = CS3310MaxLvl; int i = CS3310MaxLvl;
debiwrite(saa, debNormal, XILINX_CS3310_CMPLT, ((i<<8)|i), 2); debiwrite(saa, debNormal, XILINX_CS3310_CMPLT, ((i << 8)| i),2);
} }
/* start video decoder */ /* start video decoder */
debiwrite(saa, debNormal, IBM_MP2_CHIP_CONTROL, ChipControl, 2); debiwrite(saa, debNormal, IBM_MP2_CHIP_CONTROL, ChipControl, 2);
...@@ -1022,6 +1024,7 @@ static int do_ibm_reset(struct saa7146 *saa) ...@@ -1022,6 +1024,7 @@ static int do_ibm_reset(struct saa7146 *saa)
/* clear pending interrupts */ /* clear pending interrupts */
debiread(saa, debNormal, IBM_MP2_HOST_INT, 2); debiread(saa, debNormal, IBM_MP2_HOST_INT, 2);
debiwrite(saa, debNormal, XILINX_CTL0, 0x1711, 2); debiwrite(saa, debNormal, XILINX_CTL0, 0x1711, 2);
return 0; return 0;
} }
...@@ -1035,8 +1038,8 @@ static int initialize_ibmmpeg2(struct video_code *microcode) ...@@ -1035,8 +1038,8 @@ static int initialize_ibmmpeg2(struct video_code *microcode)
saa = &saa7146s[num]; saa = &saa7146s[num];
/* check that FPGA is loaded */ /* check that FPGA is loaded */
debiwrite(saa, debNormal, IBM_MP2_OSD_SIZE, 0xa55a, 2); debiwrite(saa, debNormal, IBM_MP2_OSD_SIZE, 0xa55a, 2);
if ((i = debiread(saa, debNormal, IBM_MP2_OSD_SIZE, 2)) != i = debiread(saa, debNormal, IBM_MP2_OSD_SIZE, 2);
0xa55a) { if (i != 0xa55a) {
printk(KERN_INFO "stradis%d: %04x != 0xa55a\n", printk(KERN_INFO "stradis%d: %04x != 0xa55a\n",
saa->nr, i); saa->nr, i);
#if 0 #if 0
...@@ -1075,33 +1078,31 @@ static int initialize_ibmmpeg2(struct video_code *microcode) ...@@ -1075,33 +1078,31 @@ static int initialize_ibmmpeg2(struct video_code *microcode)
debiwrite(saa, debNormal, IBM_MP2_AUD_CTL, 0x4552, 2); debiwrite(saa, debNormal, IBM_MP2_AUD_CTL, 0x4552, 2);
if (ibm_send_command(saa, IBM_MP2_CONFIG_DECODER, if (ibm_send_command(saa, IBM_MP2_CONFIG_DECODER,
0xe000, 1)) { 0xe000, 1)) {
printk(KERN_ERR printk(KERN_ERR "stradis%d: IBM config "
"stradis%d: IBM config failed\n", "failed\n", saa->nr);
saa->nr);
return -1; return -1;
} }
/* set PWM to center value */ /* set PWM to center value */
if (NewCard) { if (NewCard) {
debiwrite(saa, debNormal, XILINX_PWM, debiwrite(saa, debNormal, XILINX_PWM,
saa->boardcfg[14] + saa->boardcfg[14] +
(saa->boardcfg[13]<<8), 2); (saa->boardcfg[13] << 8), 2);
} else } else
debiwrite(saa, debNormal, XILINX_PWM, debiwrite(saa, debNormal, XILINX_PWM, 0x46, 2);
0x46, 2);
if (HaveCS3310) { if (HaveCS3310) {
i = CS3310MaxLvl; i = CS3310MaxLvl;
debiwrite(saa, debNormal, debiwrite(saa, debNormal, XILINX_CS3310_CMPLT,
XILINX_CS3310_CMPLT, ((i<<8)|i), 2); (i << 8) | i, 2);
} }
printk(KERN_INFO printk(KERN_INFO "stradis%d: IBM MPEGCD%d Inited\n",
"stradis%d: IBM MPEGCD%d Initialized\n",
saa->nr, 18 + (debiread(saa, debNormal, saa->nr, 18 + (debiread(saa, debNormal,
IBM_MP2_CHIP_CONTROL, 2) >> 12)); IBM_MP2_CHIP_CONTROL, 2) >> 12));
/* start video decoder */ /* start video decoder */
debiwrite(saa, debNormal, IBM_MP2_CHIP_CONTROL, debiwrite(saa, debNormal, IBM_MP2_CHIP_CONTROL,
ChipControl, 2); ChipControl, 2);
debiwrite(saa, debNormal, IBM_MP2_RB_THRESHOLD, debiwrite(saa, debNormal, IBM_MP2_RB_THRESHOLD, 0x4037,
0x4037, 2); /* 256k vid, 3520 bytes aud */ 2); /* 256k vid, 3520 bytes aud */
debiwrite(saa, debNormal, IBM_MP2_AUD_CTL, 0x4573, 2); debiwrite(saa, debNormal, IBM_MP2_AUD_CTL, 0x4573, 2);
ibm_send_command(saa, IBM_MP2_PLAY, 0, 0); ibm_send_command(saa, IBM_MP2_PLAY, 0, 0);
/* enable buffer threshold irq */ /* enable buffer threshold irq */
...@@ -1114,24 +1115,22 @@ static int initialize_ibmmpeg2(struct video_code *microcode) ...@@ -1114,24 +1115,22 @@ static int initialize_ibmmpeg2(struct video_code *microcode)
saa->boardcfg[0] = 37; saa->boardcfg[0] = 37;
} }
} }
return 0; return 0;
} }
static u32 palette2fmt[] = static u32 palette2fmt[] = { /* some of these YUV translations are wrong */
{ /* some of these YUV translations are wrong */
0xffffffff, 0x86000000, 0x87000000, 0x80000000, 0x8100000, 0x82000000, 0xffffffff, 0x86000000, 0x87000000, 0x80000000, 0x8100000, 0x82000000,
0x83000000, 0x00000000, 0x03000000, 0x03000000, 0x0a00000, 0x03000000, 0x83000000, 0x00000000, 0x03000000, 0x03000000, 0x0a00000, 0x03000000,
0x06000000, 0x00000000, 0x03000000, 0x0a000000, 0x0300000 0x06000000, 0x00000000, 0x03000000, 0x0a000000, 0x0300000
}; };
static int bpp2fmt[4] = static int bpp2fmt[4] = {
{
VIDEO_PALETTE_HI240, VIDEO_PALETTE_RGB565, VIDEO_PALETTE_RGB24, VIDEO_PALETTE_HI240, VIDEO_PALETTE_RGB565, VIDEO_PALETTE_RGB24,
VIDEO_PALETTE_RGB32 VIDEO_PALETTE_RGB32
}; };
/* I wish I could find a formula to calculate these... */ /* I wish I could find a formula to calculate these... */
static u32 h_prescale[64] = static u32 h_prescale[64] = {
{
0x10000000, 0x18040202, 0x18080000, 0x380c0606, 0x38100204, 0x38140808, 0x10000000, 0x18040202, 0x18080000, 0x380c0606, 0x38100204, 0x38140808,
0x38180000, 0x381c0000, 0x3820161c, 0x38242a3b, 0x38281230, 0x382c4460, 0x38180000, 0x381c0000, 0x3820161c, 0x38242a3b, 0x38281230, 0x382c4460,
0x38301040, 0x38340080, 0x38380000, 0x383c0000, 0x3840fefe, 0x3844ee9f, 0x38301040, 0x38340080, 0x38380000, 0x383c0000, 0x3840fefe, 0x3844ee9f,
...@@ -1144,8 +1143,7 @@ static u32 h_prescale[64] = ...@@ -1144,8 +1143,7 @@ static u32 h_prescale[64] =
0x38d80000, 0x38dc0000, 0x38e00000, 0x38e40000, 0x38e80000, 0x38ec0000, 0x38d80000, 0x38dc0000, 0x38e00000, 0x38e40000, 0x38e80000, 0x38ec0000,
0x38f00000, 0x38f40000, 0x38f80000, 0x38fc0000, 0x38f00000, 0x38f40000, 0x38f80000, 0x38fc0000,
}; };
static u32 v_gain[64] = static u32 v_gain[64] = {
{
0x016000ff, 0x016100ff, 0x016100ff, 0x016200ff, 0x016200ff, 0x016200ff, 0x016000ff, 0x016100ff, 0x016100ff, 0x016200ff, 0x016200ff, 0x016200ff,
0x016200ff, 0x016300ff, 0x016300ff, 0x016300ff, 0x016300ff, 0x016300ff, 0x016200ff, 0x016300ff, 0x016300ff, 0x016300ff, 0x016300ff, 0x016300ff,
0x016300ff, 0x016300ff, 0x016300ff, 0x016400ff, 0x016400ff, 0x016400ff, 0x016300ff, 0x016300ff, 0x016300ff, 0x016400ff, 0x016400ff, 0x016400ff,
...@@ -1159,7 +1157,6 @@ static u32 v_gain[64] = ...@@ -1159,7 +1157,6 @@ static u32 v_gain[64] =
0x016400ff, 0x016400ff, 0x016400ff, 0x016400ff, 0x016400ff, 0x016400ff, 0x016400ff, 0x016400ff,
}; };
static void saa7146_set_winsize(struct saa7146 *saa) static void saa7146_set_winsize(struct saa7146 *saa)
{ {
u32 format; u32 format;
...@@ -1174,24 +1171,23 @@ static void saa7146_set_winsize(struct saa7146 *saa) ...@@ -1174,24 +1171,23 @@ static void saa7146_set_winsize(struct saa7146 *saa)
saawrite(saa->win.vidadr + saa->win.bpl * saa->win.sheight, saawrite(saa->win.vidadr + saa->win.bpl * saa->win.sheight,
SAA7146_PROT_ADDR1); SAA7146_PROT_ADDR1);
saawrite(0, SAA7146_PAGE1); saawrite(0, SAA7146_PAGE1);
saawrite(format|0x60, SAA7146_CLIP_FORMAT_CTRL); saawrite(format | 0x60, SAA7146_CLIP_FORMAT_CTRL);
offset = (704 / (saa->win.width - 1)) & 0x3f; offset = (704 / (saa->win.width - 1)) & 0x3f;
saawrite(h_prescale[offset], SAA7146_HPS_H_PRESCALE); saawrite(h_prescale[offset], SAA7146_HPS_H_PRESCALE);
offset = (720896 / saa->win.width) / (offset + 1); offset = (720896 / saa->win.width) / (offset + 1);
saawrite((offset<<12)|0x0c, SAA7146_HPS_H_SCALE); saawrite((offset << 12) | 0x0c, SAA7146_HPS_H_SCALE);
if (CurrentMode == VIDEO_MODE_NTSC) { if (CurrentMode == VIDEO_MODE_NTSC) {
yacl = /*(480 / saa->win.height - 1) & 0x3f*/ 0; yacl = /*(480 / saa->win.height - 1) & 0x3f */ 0;
ysci = 1024 - (saa->win.height * 1024 / 480); ysci = 1024 - (saa->win.height * 1024 / 480);
} else { } else {
yacl = /*(576 / saa->win.height - 1) & 0x3f*/ 0; yacl = /*(576 / saa->win.height - 1) & 0x3f */ 0;
ysci = 1024 - (saa->win.height * 1024 / 576); ysci = 1024 - (saa->win.height * 1024 / 576);
} }
saawrite((1<<31)|(ysci<<21)|(yacl<<15), SAA7146_HPS_V_SCALE); saawrite((1 << 31) | (ysci << 21) | (yacl << 15), SAA7146_HPS_V_SCALE);
saawrite(v_gain[yacl], SAA7146_HPS_V_GAIN); saawrite(v_gain[yacl], SAA7146_HPS_V_GAIN);
saawrite(((SAA7146_MC2_UPLD_DMA1 | SAA7146_MC2_UPLD_HPS_V | saawrite(((SAA7146_MC2_UPLD_DMA1 | SAA7146_MC2_UPLD_HPS_V |
SAA7146_MC2_UPLD_HPS_H) << 16) | (SAA7146_MC2_UPLD_DMA1 | SAA7146_MC2_UPLD_HPS_H) << 16) | (SAA7146_MC2_UPLD_DMA1 |
SAA7146_MC2_UPLD_HPS_V | SAA7146_MC2_UPLD_HPS_H), SAA7146_MC2_UPLD_HPS_V | SAA7146_MC2_UPLD_HPS_H), SAA7146_MC2);
SAA7146_MC2);
} }
/* clip_draw_rectangle(cm,x,y,w,h) -- handle clipping an area /* clip_draw_rectangle(cm,x,y,w,h) -- handle clipping an area
...@@ -1226,8 +1222,8 @@ static void clip_draw_rectangle(u32 *clipmap, int x, int y, int w, int h) ...@@ -1226,8 +1222,8 @@ static void clip_draw_rectangle(u32 *clipmap, int x, int y, int w, int h)
startword = (x >> 5); startword = (x >> 5);
endword = ((x + w) >> 5); endword = ((x + w) >> 5);
bitsleft = (0xffffffff >> (x & 31)); bitsleft = (0xffffffff >> (x & 31));
bitsright = (0xffffffff << (~((x + w) - (endword<<5)))); bitsright = (0xffffffff << (~((x + w) - (endword << 5))));
temp = &clipmap[(y<<5) + startword]; temp = &clipmap[(y << 5) + startword];
w = endword - startword; w = endword - startword;
if (!w) { if (!w) {
bitsleft |= bitsright; bitsleft |= bitsright;
...@@ -1252,9 +1248,9 @@ static void make_clip_tab(struct saa7146 *saa, struct video_clip *cr, int ncr) ...@@ -1252,9 +1248,9 @@ static void make_clip_tab(struct saa7146 *saa, struct video_clip *cr, int ncr)
u32 *clipmap; u32 *clipmap;
clipmap = saa->dmavid2; clipmap = saa->dmavid2;
if((width=saa->win.width)>1023) if ((width = saa->win.width) > 1023)
width = 1023; /* sanity check */ width = 1023; /* sanity check */
if((height=saa->win.height)>640) if ((height = saa->win.height) > 640)
height = 639; /* sanity check */ height = 639; /* sanity check */
if (ncr > 0) { /* rectangles pased */ if (ncr > 0) { /* rectangles pased */
/* convert rectangular clips to a bitmap */ /* convert rectangular clips to a bitmap */
...@@ -1266,14 +1262,15 @@ static void make_clip_tab(struct saa7146 *saa, struct video_clip *cr, int ncr) ...@@ -1266,14 +1262,15 @@ static void make_clip_tab(struct saa7146 *saa, struct video_clip *cr, int ncr)
/* clip against viewing window AND screen /* clip against viewing window AND screen
so we do not have to rely on the user program so we do not have to rely on the user program
*/ */
clip_draw_rectangle(clipmap,(saa->win.x+width>saa->win.swidth) ? clip_draw_rectangle(clipmap, (saa->win.x + width > saa->win.swidth) ?
(saa->win.swidth-saa->win.x) : width, 0, 1024, 768); (saa->win.swidth - saa->win.x) : width, 0, 1024, 768);
clip_draw_rectangle(clipmap,0,(saa->win.y+height>saa->win.sheight) ? clip_draw_rectangle(clipmap, 0,
(saa->win.sheight-saa->win.y) : height,1024,768); (saa->win.y + height > saa->win.sheight) ?
if (saa->win.x<0) (saa->win.sheight - saa->win.y) : height, 1024, 768);
clip_draw_rectangle(clipmap, 0, 0, -(saa->win.x), 768); if (saa->win.x < 0)
if (saa->win.y<0) clip_draw_rectangle(clipmap, 0, 0, -saa->win.x, 768);
clip_draw_rectangle(clipmap, 0, 0, 1024, -(saa->win.y)); if (saa->win.y < 0)
clip_draw_rectangle(clipmap, 0, 0, 1024, -saa->win.y);
} }
static int saa_ioctl(struct inode *inode, struct file *file, static int saa_ioctl(struct inode *inode, struct file *file,
...@@ -1287,10 +1284,8 @@ static int saa_ioctl(struct inode *inode, struct file *file, ...@@ -1287,10 +1284,8 @@ static int saa_ioctl(struct inode *inode, struct file *file,
{ {
struct video_capability b; struct video_capability b;
strcpy(b.name, saa->video_dev.name); strcpy(b.name, saa->video_dev.name);
b.type = VID_TYPE_CAPTURE | b.type = VID_TYPE_CAPTURE | VID_TYPE_OVERLAY |
VID_TYPE_OVERLAY | VID_TYPE_CLIPPING | VID_TYPE_FRAMERAM |
VID_TYPE_CLIPPING |
VID_TYPE_FRAMERAM |
VID_TYPE_SCALES; VID_TYPE_SCALES;
b.channels = 1; b.channels = 1;
b.audios = 1; b.audios = 1;
...@@ -1328,7 +1323,8 @@ static int saa_ioctl(struct inode *inode, struct file *file, ...@@ -1328,7 +1323,8 @@ static int saa_ioctl(struct inode *inode, struct file *file,
if (p.palette < sizeof(palette2fmt) / sizeof(u32)) { if (p.palette < sizeof(palette2fmt) / sizeof(u32)) {
format = palette2fmt[p.palette]; format = palette2fmt[p.palette];
saa->win.color_fmt = format; saa->win.color_fmt = format;
saawrite(format|0x60, SAA7146_CLIP_FORMAT_CTRL); saawrite(format | 0x60,
SAA7146_CLIP_FORMAT_CTRL);
} }
saawrite(((p.brightness & 0xff00) << 16) | saawrite(((p.brightness & 0xff00) << 16) |
((p.contrast & 0xfe00) << 7) | ((p.contrast & 0xfe00) << 7) |
...@@ -1337,8 +1333,8 @@ static int saa_ioctl(struct inode *inode, struct file *file, ...@@ -1337,8 +1333,8 @@ static int saa_ioctl(struct inode *inode, struct file *file,
/* upload changed registers */ /* upload changed registers */
saawrite(((SAA7146_MC2_UPLD_HPS_H | saawrite(((SAA7146_MC2_UPLD_HPS_H |
SAA7146_MC2_UPLD_HPS_V) << 16) | SAA7146_MC2_UPLD_HPS_V) << 16) |
SAA7146_MC2_UPLD_HPS_H | SAA7146_MC2_UPLD_HPS_V, SAA7146_MC2_UPLD_HPS_H |
SAA7146_MC2); SAA7146_MC2_UPLD_HPS_V, SAA7146_MC2);
return 0; return 0;
} }
case VIDIOCSWIN: case VIDIOCSWIN:
...@@ -1349,11 +1345,14 @@ static int saa_ioctl(struct inode *inode, struct file *file, ...@@ -1349,11 +1345,14 @@ static int saa_ioctl(struct inode *inode, struct file *file,
if (copy_from_user(&vw, arg, sizeof(vw))) if (copy_from_user(&vw, arg, sizeof(vw)))
return -EFAULT; return -EFAULT;
if (vw.flags || vw.width < 16 || vw.height < 16) { /* stop capture */ /* stop capture */
saawrite((SAA7146_MC1_TR_E_1 << 16), SAA7146_MC1); if (vw.flags || vw.width < 16 || vw.height < 16) {
saawrite((SAA7146_MC1_TR_E_1 << 16),
SAA7146_MC1);
return -EINVAL; return -EINVAL;
} }
if (saa->win.bpp < 4) { /* 32-bit align start and adjust width */ /* 32-bit align start and adjust width */
if (saa->win.bpp < 4) {
int i = vw.x; int i = vw.x;
vw.x = (vw.x + 3) & ~3; vw.x = (vw.x + 3) & ~3;
i = vw.x - i; i = vw.x - i;
...@@ -1384,12 +1383,12 @@ static int saa_ioctl(struct inode *inode, struct file *file, ...@@ -1384,12 +1383,12 @@ static int saa_ioctl(struct inode *inode, struct file *file,
if (copy_from_user(saa->dmavid2, vw.clips, if (copy_from_user(saa->dmavid2, vw.clips,
VIDEO_CLIPMAP_SIZE)) VIDEO_CLIPMAP_SIZE))
return -EFAULT; return -EFAULT;
} } else if (vw.clipcount > 16384) {
else if (vw.clipcount > 16384) {
return -EINVAL; return -EINVAL;
} else if (vw.clipcount > 0) { } else if (vw.clipcount > 0) {
if ((vcp = vmalloc(sizeof(struct video_clip) * vcp = vmalloc(sizeof(struct video_clip) *
(vw.clipcount))) == NULL) vw.clipcount);
if (vcp == NULL)
return -ENOMEM; return -ENOMEM;
if (copy_from_user(vcp, vw.clips, if (copy_from_user(vcp, vw.clips,
sizeof(struct video_clip) * sizeof(struct video_clip) *
...@@ -1399,6 +1398,7 @@ static int saa_ioctl(struct inode *inode, struct file *file, ...@@ -1399,6 +1398,7 @@ static int saa_ioctl(struct inode *inode, struct file *file,
} }
} else /* nothing clipped */ } else /* nothing clipped */
memset(saa->dmavid2, 0, VIDEO_CLIPMAP_SIZE); memset(saa->dmavid2, 0, VIDEO_CLIPMAP_SIZE);
make_clip_tab(saa, vcp, vw.clipcount); make_clip_tab(saa, vcp, vw.clipcount);
if (vw.clipcount > 0) if (vw.clipcount > 0)
vfree(vcp); vfree(vcp);
...@@ -1445,7 +1445,7 @@ static int saa_ioctl(struct inode *inode, struct file *file, ...@@ -1445,7 +1445,7 @@ static int saa_ioctl(struct inode *inode, struct file *file,
case VIDIOCGFBUF: case VIDIOCGFBUF:
{ {
struct video_buffer v; struct video_buffer v;
v.base = (void *) saa->win.vidadr; v.base = (void *)saa->win.vidadr;
v.height = saa->win.sheight; v.height = saa->win.sheight;
v.width = saa->win.swidth; v.width = saa->win.swidth;
v.depth = saa->win.depth; v.depth = saa->win.depth;
...@@ -1467,15 +1467,16 @@ static int saa_ioctl(struct inode *inode, struct file *file, ...@@ -1467,15 +1467,16 @@ static int saa_ioctl(struct inode *inode, struct file *file,
v.height > 16 && v.bytesperline > 16) v.height > 16 && v.bytesperline > 16)
return -EINVAL; return -EINVAL;
if (v.base) if (v.base)
saa->win.vidadr = (unsigned long) v.base; saa->win.vidadr = (unsigned long)v.base;
saa->win.sheight = v.height; saa->win.sheight = v.height;
saa->win.swidth = v.width; saa->win.swidth = v.width;
saa->win.bpp = ((v.depth + 7) & 0x38) / 8; saa->win.bpp = ((v.depth + 7) & 0x38) / 8;
saa->win.depth = v.depth; saa->win.depth = v.depth;
saa->win.bpl = v.bytesperline; saa->win.bpl = v.bytesperline;
DEBUG(printk("Display at %p is %d by %d, bytedepth %d, bpl %d\n", DEBUG(printk("Display at %p is %d by %d, bytedepth %d, "
v.base, v.width, v.height, saa->win.bpp, saa->win.bpl)); "bpl %d\n", v.base, v.width, v.height,
saa->win.bpp, saa->win.bpl));
saa7146_set_winsize(saa); saa7146_set_winsize(saa);
return 0; return 0;
} }
...@@ -1503,21 +1504,18 @@ static int saa_ioctl(struct inode *inode, struct file *file, ...@@ -1503,21 +1504,18 @@ static int saa_ioctl(struct inode *inode, struct file *file,
int i; int i;
if (copy_from_user(&v, arg, sizeof(v))) if (copy_from_user(&v, arg, sizeof(v)))
return -EFAULT; return -EFAULT;
i = (~(v.volume>>8))&0xff; i = (~(v.volume >> 8)) & 0xff;
if (!HaveCS4341) { if (!HaveCS4341) {
if (v.flags & VIDEO_AUDIO_MUTE) { if (v.flags & VIDEO_AUDIO_MUTE)
debiwrite(saa, debNormal, debiwrite(saa, debNormal,
IBM_MP2_FRNT_ATTEN, IBM_MP2_FRNT_ATTEN, 0xffff, 2);
0xffff, 2);
}
if (!(v.flags & VIDEO_AUDIO_MUTE)) if (!(v.flags & VIDEO_AUDIO_MUTE))
debiwrite(saa, debNormal, debiwrite(saa, debNormal,
IBM_MP2_FRNT_ATTEN, IBM_MP2_FRNT_ATTEN, 0x0000, 2);
0x0000, 2);
if (v.flags & VIDEO_AUDIO_VOLUME) if (v.flags & VIDEO_AUDIO_VOLUME)
debiwrite(saa, debNormal, debiwrite(saa, debNormal,
IBM_MP2_FRNT_ATTEN, IBM_MP2_FRNT_ATTEN,
(i<<8)|i, 2); (i << 8) | i, 2);
} else { } else {
if (v.flags & VIDEO_AUDIO_MUTE) if (v.flags & VIDEO_AUDIO_MUTE)
cs4341_setlevel(saa, 0xff, 0xff); cs4341_setlevel(saa, 0xff, 0xff);
...@@ -1545,7 +1543,7 @@ static int saa_ioctl(struct inode *inode, struct file *file, ...@@ -1545,7 +1543,7 @@ static int saa_ioctl(struct inode *inode, struct file *file,
case VIDIOCSPLAYMODE: case VIDIOCSPLAYMODE:
{ {
struct video_play_mode pmode; struct video_play_mode pmode;
if (copy_from_user((void *) &pmode, arg, if (copy_from_user((void *)&pmode, arg,
sizeof(struct video_play_mode))) sizeof(struct video_play_mode)))
return -EFAULT; return -EFAULT;
switch (pmode.mode) { switch (pmode.mode) {
...@@ -1556,29 +1554,22 @@ static int saa_ioctl(struct inode *inode, struct file *file, ...@@ -1556,29 +1554,22 @@ static int saa_ioctl(struct inode *inode, struct file *file,
set_out_format(saa, pmode.p1); set_out_format(saa, pmode.p1);
return 0; return 0;
case VID_PLAY_GENLOCK: case VID_PLAY_GENLOCK:
debiwrite(saa, debNormal, debiwrite(saa, debNormal, XILINX_CTL0,
XILINX_CTL0, pmode.p1 ? 0x8000 : 0x8080, 2);
(pmode.p1 ? 0x8000 : 0x8080),
2);
if (NewCard) if (NewCard)
set_genlock_offset(saa, set_genlock_offset(saa, pmode.p2);
pmode.p2);
return 0; return 0;
case VID_PLAY_NORMAL: case VID_PLAY_NORMAL:
debiwrite(saa, debNormal, debiwrite(saa, debNormal,
IBM_MP2_CHIP_CONTROL, IBM_MP2_CHIP_CONTROL, ChipControl, 2);
ChipControl, 2); ibm_send_command(saa, IBM_MP2_PLAY, 0, 0);
ibm_send_command(saa,
IBM_MP2_PLAY, 0, 0);
saa->playmode = pmode.mode; saa->playmode = pmode.mode;
return 0; return 0;
case VID_PLAY_PAUSE: case VID_PLAY_PAUSE:
/* IBM removed the PAUSE command */ /* IBM removed the PAUSE command */
/* they say use SINGLE_FRAME now */ /* they say use SINGLE_FRAME now */
case VID_PLAY_SINGLE_FRAME: case VID_PLAY_SINGLE_FRAME:
ibm_send_command(saa, ibm_send_command(saa, IBM_MP2_SINGLE_FRAME,0,0);
IBM_MP2_SINGLE_FRAME,
0, 0);
if (saa->playmode == pmode.mode) { if (saa->playmode == pmode.mode) {
debiwrite(saa, debNormal, debiwrite(saa, debNormal,
IBM_MP2_CHIP_CONTROL, IBM_MP2_CHIP_CONTROL,
...@@ -1587,105 +1578,87 @@ static int saa_ioctl(struct inode *inode, struct file *file, ...@@ -1587,105 +1578,87 @@ static int saa_ioctl(struct inode *inode, struct file *file,
saa->playmode = pmode.mode; saa->playmode = pmode.mode;
return 0; return 0;
case VID_PLAY_FAST_FORWARD: case VID_PLAY_FAST_FORWARD:
ibm_send_command(saa, ibm_send_command(saa, IBM_MP2_FAST_FORWARD,0,0);
IBM_MP2_FAST_FORWARD, 0, 0);
saa->playmode = pmode.mode; saa->playmode = pmode.mode;
return 0; return 0;
case VID_PLAY_SLOW_MOTION: case VID_PLAY_SLOW_MOTION:
ibm_send_command(saa, ibm_send_command(saa, IBM_MP2_SLOW_MOTION,
IBM_MP2_SLOW_MOTION,
pmode.p1, 0); pmode.p1, 0);
saa->playmode = pmode.mode; saa->playmode = pmode.mode;
return 0; return 0;
case VID_PLAY_IMMEDIATE_NORMAL: case VID_PLAY_IMMEDIATE_NORMAL:
/* ensure transfers resume */ /* ensure transfers resume */
debiwrite(saa, debNormal, debiwrite(saa, debNormal,
IBM_MP2_CHIP_CONTROL, IBM_MP2_CHIP_CONTROL, ChipControl, 2);
ChipControl, 2); ibm_send_command(saa, IBM_MP2_IMED_NORM_PLAY,
ibm_send_command(saa, 0, 0);
IBM_MP2_IMED_NORM_PLAY, 0, 0);
saa->playmode = VID_PLAY_NORMAL; saa->playmode = VID_PLAY_NORMAL;
return 0; return 0;
case VID_PLAY_SWITCH_CHANNELS: case VID_PLAY_SWITCH_CHANNELS:
saa->audhead = saa->audtail = 0; saa->audhead = saa->audtail = 0;
saa->vidhead = saa->vidtail = 0; saa->vidhead = saa->vidtail = 0;
ibm_send_command(saa, ibm_send_command(saa, IBM_MP2_FREEZE_FRAME,0,1);
IBM_MP2_FREEZE_FRAME, 0, 1); ibm_send_command(saa, IBM_MP2_RESET_AUD_RATE,
ibm_send_command(saa, 0, 1);
IBM_MP2_RESET_AUD_RATE, 0, 1); debiwrite(saa, debNormal, IBM_MP2_CHIP_CONTROL,
debiwrite(saa, debNormal, 0, 2);
IBM_MP2_CHIP_CONTROL, 0, 2); ibm_send_command(saa, IBM_MP2_CHANNEL_SWITCH,
ibm_send_command(saa, 0, 1);
IBM_MP2_CHANNEL_SWITCH, 0, 1); debiwrite(saa, debNormal, IBM_MP2_CHIP_CONTROL,
debiwrite(saa, debNormal,
IBM_MP2_CHIP_CONTROL,
ChipControl, 2); ChipControl, 2);
ibm_send_command(saa, ibm_send_command(saa, IBM_MP2_PLAY, 0, 0);
IBM_MP2_PLAY, 0, 0);
saa->playmode = VID_PLAY_NORMAL; saa->playmode = VID_PLAY_NORMAL;
return 0; return 0;
case VID_PLAY_FREEZE_FRAME: case VID_PLAY_FREEZE_FRAME:
ibm_send_command(saa, ibm_send_command(saa, IBM_MP2_FREEZE_FRAME,0,0);
IBM_MP2_FREEZE_FRAME, 0, 0);
saa->playmode = pmode.mode; saa->playmode = pmode.mode;
return 0; return 0;
case VID_PLAY_STILL_MODE: case VID_PLAY_STILL_MODE:
ibm_send_command(saa, ibm_send_command(saa, IBM_MP2_SET_STILL_MODE,
IBM_MP2_SET_STILL_MODE, 0, 0); 0, 0);
saa->playmode = pmode.mode; saa->playmode = pmode.mode;
return 0; return 0;
case VID_PLAY_MASTER_MODE: case VID_PLAY_MASTER_MODE:
if (pmode.p1 == VID_PLAY_MASTER_NONE) if (pmode.p1 == VID_PLAY_MASTER_NONE)
saa->boardcfg[1] = 0x13; saa->boardcfg[1] = 0x13;
else if (pmode.p1 == else if (pmode.p1 == VID_PLAY_MASTER_VIDEO)
VID_PLAY_MASTER_VIDEO)
saa->boardcfg[1] = 0x23; saa->boardcfg[1] = 0x23;
else if (pmode.p1 == else if (pmode.p1 == VID_PLAY_MASTER_AUDIO)
VID_PLAY_MASTER_AUDIO)
saa->boardcfg[1] = 0x43; saa->boardcfg[1] = 0x43;
else else
return -EINVAL; return -EINVAL;
debiwrite(saa, debNormal, debiwrite(saa, debNormal,
IBM_MP2_CHIP_CONTROL, IBM_MP2_CHIP_CONTROL, ChipControl, 2);
ChipControl, 2);
return 0; return 0;
case VID_PLAY_ACTIVE_SCANLINES: case VID_PLAY_ACTIVE_SCANLINES:
if (CurrentMode == VIDEO_MODE_PAL) { if (CurrentMode == VIDEO_MODE_PAL) {
if (pmode.p1 < 1 || if (pmode.p1 < 1 || pmode.p2 > 625)
pmode.p2 > 625)
return -EINVAL; return -EINVAL;
saa->boardcfg[5] = pmode.p1; saa->boardcfg[5] = pmode.p1;
saa->boardcfg[55] = (pmode.p1 + saa->boardcfg[55] = (pmode.p1 +
(pmode.p2/2) - 1) & (pmode.p2 / 2) - 1) & 0xff;
0xff;
} else { } else {
if (pmode.p1 < 4 || if (pmode.p1 < 4 || pmode.p2 > 525)
pmode.p2 > 525)
return -EINVAL; return -EINVAL;
saa->boardcfg[4] = pmode.p1; saa->boardcfg[4] = pmode.p1;
saa->boardcfg[54] = (pmode.p1 + saa->boardcfg[54] = (pmode.p1 +
(pmode.p2/2) - 4) & (pmode.p2 / 2) - 4) & 0xff;
0xff;
} }
set_out_format(saa, CurrentMode); set_out_format(saa, CurrentMode);
case VID_PLAY_RESET: case VID_PLAY_RESET:
return do_ibm_reset(saa); return do_ibm_reset(saa);
case VID_PLAY_END_MARK: case VID_PLAY_END_MARK:
if (saa->endmarktail < if (saa->endmarktail < saa->endmarkhead) {
saa->endmarkhead) {
if (saa->endmarkhead - if (saa->endmarkhead -
saa->endmarktail < 2) saa->endmarktail < 2)
return -ENOSPC; return -ENOSPC;
} else if (saa->endmarkhead <= } else if (saa->endmarkhead <=saa->endmarktail){
saa->endmarktail) { if (saa->endmarktail - saa->endmarkhead
if (saa->endmarktail - > (MAX_MARKS - 2))
saa->endmarkhead >
(MAX_MARKS - 2))
return -ENOSPC; return -ENOSPC;
} else } else
return -ENOSPC; return -ENOSPC;
saa->endmark[saa->endmarktail] = saa->endmark[saa->endmarktail] = saa->audtail;
saa->audtail;
saa->endmarktail++; saa->endmarktail++;
if (saa->endmarktail >= MAX_MARKS) if (saa->endmarktail >= MAX_MARKS)
saa->endmarktail = 0; saa->endmarktail = 0;
...@@ -1695,7 +1668,7 @@ static int saa_ioctl(struct inode *inode, struct file *file, ...@@ -1695,7 +1668,7 @@ static int saa_ioctl(struct inode *inode, struct file *file,
case VIDIOCSWRITEMODE: case VIDIOCSWRITEMODE:
{ {
int mode; int mode;
if (copy_from_user((void *) &mode, arg, sizeof(int))) if (copy_from_user((void *)&mode, arg, sizeof(int)))
return -EFAULT; return -EFAULT;
if (mode == VID_WRITE_MPEG_AUD || if (mode == VID_WRITE_MPEG_AUD ||
mode == VID_WRITE_MPEG_VID || mode == VID_WRITE_MPEG_VID ||
...@@ -1724,8 +1697,8 @@ static int saa_ioctl(struct inode *inode, struct file *file, ...@@ -1724,8 +1697,8 @@ static int saa_ioctl(struct inode *inode, struct file *file,
return -EFAULT; return -EFAULT;
} }
ucode.data = udata; ucode.data = udata;
if (!strncmp(ucode.loadwhat, "decoder.aud", 11) if (!strncmp(ucode.loadwhat, "decoder.aud", 11) ||
|| !strncmp(ucode.loadwhat, "decoder.vid", 11)) !strncmp(ucode.loadwhat, "decoder.vid", 11))
i = initialize_ibmmpeg2(&ucode); i = initialize_ibmmpeg2(&ucode);
else else
i = initialize_fpga(&ucode); i = initialize_fpga(&ucode);
...@@ -1770,14 +1743,14 @@ static int saa_mmap(struct file *file, struct vm_area_struct *vma) ...@@ -1770,14 +1743,14 @@ static int saa_mmap(struct file *file, struct vm_area_struct *vma)
return -EINVAL; return -EINVAL;
} }
static ssize_t saa_read(struct file *file, char __user *buf, static ssize_t saa_read(struct file *file, char __user * buf,
size_t count, loff_t *ppos) size_t count, loff_t * ppos)
{ {
return -EINVAL; return -EINVAL;
} }
static ssize_t saa_write(struct file *file, const char __user *buf, static ssize_t saa_write(struct file *file, const char __user * buf,
size_t count, loff_t *ppos) size_t count, loff_t * ppos)
{ {
struct saa7146 *saa = file->private_data; struct saa7146 *saa = file->private_data;
unsigned long todo = count; unsigned long todo = count;
...@@ -1788,7 +1761,8 @@ static ssize_t saa_write(struct file *file, const char __user *buf, ...@@ -1788,7 +1761,8 @@ static ssize_t saa_write(struct file *file, const char __user *buf,
if (saa->writemode == VID_WRITE_MPEG_AUD) { if (saa->writemode == VID_WRITE_MPEG_AUD) {
spin_lock_irqsave(&saa->lock, flags); spin_lock_irqsave(&saa->lock, flags);
if (saa->audhead <= saa->audtail) if (saa->audhead <= saa->audtail)
blocksize = 65536-(saa->audtail - saa->audhead); blocksize = 65536 -
(saa->audtail - saa->audhead);
else else
blocksize = saa->audhead - saa->audtail; blocksize = saa->audhead - saa->audtail;
spin_unlock_irqrestore(&saa->lock, flags); spin_unlock_irqrestore(&saa->lock, flags);
...@@ -1801,7 +1775,8 @@ static ssize_t saa_write(struct file *file, const char __user *buf, ...@@ -1801,7 +1775,8 @@ static ssize_t saa_write(struct file *file, const char __user *buf,
} }
spin_lock_irqsave(&saa->lock, flags); spin_lock_irqsave(&saa->lock, flags);
if (saa->audhead <= saa->audtail) { if (saa->audhead <= saa->audtail) {
blocksize = 65536-(saa->audtail - saa->audhead); blocksize = 65536 -
(saa->audtail - saa->audhead);
split = 65536 - saa->audtail; split = 65536 - saa->audtail;
} else { } else {
blocksize = saa->audhead - saa->audtail; blocksize = saa->audhead - saa->audtail;
...@@ -1833,7 +1808,8 @@ static ssize_t saa_write(struct file *file, const char __user *buf, ...@@ -1833,7 +1808,8 @@ static ssize_t saa_write(struct file *file, const char __user *buf,
} else if (saa->writemode == VID_WRITE_MPEG_VID) { } else if (saa->writemode == VID_WRITE_MPEG_VID) {
spin_lock_irqsave(&saa->lock, flags); spin_lock_irqsave(&saa->lock, flags);
if (saa->vidhead <= saa->vidtail) if (saa->vidhead <= saa->vidtail)
blocksize=524288-(saa->vidtail - saa->vidhead); blocksize = 524288 -
(saa->vidtail - saa->vidhead);
else else
blocksize = saa->vidhead - saa->vidtail; blocksize = saa->vidhead - saa->vidtail;
spin_unlock_irqrestore(&saa->lock, flags); spin_unlock_irqrestore(&saa->lock, flags);
...@@ -1846,7 +1822,8 @@ static ssize_t saa_write(struct file *file, const char __user *buf, ...@@ -1846,7 +1822,8 @@ static ssize_t saa_write(struct file *file, const char __user *buf,
} }
spin_lock_irqsave(&saa->lock, flags); spin_lock_irqsave(&saa->lock, flags);
if (saa->vidhead <= saa->vidtail) { if (saa->vidhead <= saa->vidtail) {
blocksize=524288-(saa->vidtail - saa->vidhead); blocksize = 524288 -
(saa->vidtail - saa->vidhead);
split = 524288 - saa->vidtail; split = 524288 - saa->vidtail;
} else { } else {
blocksize = saa->vidhead - saa->vidtail; blocksize = saa->vidhead - saa->vidtail;
...@@ -1923,8 +1900,7 @@ static int saa_release(struct inode *inode, struct file *file) ...@@ -1923,8 +1900,7 @@ static int saa_release(struct inode *inode, struct file *file)
return 0; return 0;
} }
static struct file_operations saa_fops = static struct file_operations saa_fops = {
{
.owner = THIS_MODULE, .owner = THIS_MODULE,
.open = saa_open, .open = saa_open,
.release = saa_release, .release = saa_release,
...@@ -1937,8 +1913,7 @@ static struct file_operations saa_fops = ...@@ -1937,8 +1913,7 @@ static struct file_operations saa_fops =
}; };
/* template for video_device-structure */ /* template for video_device-structure */
static struct video_device saa_template = static struct video_device saa_template = {
{
.name = "SAA7146A", .name = "SAA7146A",
.type = VID_TYPE_CAPTURE | VID_TYPE_OVERLAY, .type = VID_TYPE_CAPTURE | VID_TYPE_OVERLAY,
.hardware = VID_HARDWARE_SAA7146, .hardware = VID_HARDWARE_SAA7146,
...@@ -2055,7 +2030,7 @@ static int __devinit init_saa7146(struct pci_dev *pdev) ...@@ -2055,7 +2030,7 @@ static int __devinit init_saa7146(struct pci_dev *pdev)
saawrite(0x00000000, SAA7146_DD1_STREAM_A); saawrite(0x00000000, SAA7146_DD1_STREAM_A);
saawrite(0x00000000, SAA7146_BRS_CTRL); saawrite(0x00000000, SAA7146_BRS_CTRL);
saawrite(0x80400040, SAA7146_BCS_CTRL); saawrite(0x80400040, SAA7146_BCS_CTRL);
saawrite(0x0000e000 /*| (1<<29)*/, SAA7146_HPS_CTRL); saawrite(0x0000e000 /*| (1<<29) */ , SAA7146_HPS_CTRL);
saawrite(0x00000060, SAA7146_CLIP_FORMAT_CTRL); saawrite(0x00000060, SAA7146_CLIP_FORMAT_CTRL);
saawrite(0x00000000, SAA7146_ACON1); saawrite(0x00000000, SAA7146_ACON1);
saawrite(0x00000000, SAA7146_ACON2); saawrite(0x00000000, SAA7146_ACON2);
...@@ -2209,6 +2184,7 @@ static struct pci_device_id stradis_pci_tbl[] = { ...@@ -2209,6 +2184,7 @@ static struct pci_device_id stradis_pci_tbl[] = {
{ PCI_DEVICE(PCI_VENDOR_ID_PHILIPS, PCI_DEVICE_ID_PHILIPS_SAA7146) }, { PCI_DEVICE(PCI_VENDOR_ID_PHILIPS, PCI_DEVICE_ID_PHILIPS_SAA7146) },
{ 0 } { 0 }
}; };
MODULE_DEVICE_TABLE(pci, stradis_pci_tbl); MODULE_DEVICE_TABLE(pci, stradis_pci_tbl);
static struct pci_driver stradis_driver = { static struct pci_driver stradis_driver = {
...@@ -2231,7 +2207,6 @@ int __init stradis_init(void) ...@@ -2231,7 +2207,6 @@ int __init stradis_init(void)
return retval; return retval;
} }
void __exit stradis_exit(void) void __exit stradis_exit(void)
{ {
pci_unregister_driver(&stradis_driver); pci_unregister_driver(&stradis_driver);
......
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