cx23885: General cleanup of old code.

From: Steven Toth <stoth@hauppauge.com>

Removed unused code.

Signed-off-by: Steven Toth <stoth@hauppauge.com>
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>

6 files changed, 4 insertions, 118 deletions

diff --git a/linux/drivers/media/video/cx23885/cx23885-cards.c b/linux/drivers/media/video/cx23885/cx23885-cards.c
index 4a5db9075..e35d221da 100644
--- a/linux/drivers/media/video/cx23885/cx23885-cards.c
+++ b/linux/drivers/media/video/cx23885/cx23885-cards.c
@@ -173,13 +173,6 @@ static void hauppauge_eeprom(struct cx23885_dev *dev, u8 *eeprom_data)
 
 	tveeprom_hauppauge_analog(&dev->i2c_bus[0].i2c_client, &tv, eeprom_data);
 
-#if 0
-	// FIXME:
-	core->tuner_type = tv.tuner_type;
-	core->tuner_formats = tv.tuner_formats;
-	core->has_radio  = tv.has_radio;
-#endif
-
 	/* Make sure we support the board model */
 	switch (tv.model)
 	{
diff --git a/linux/drivers/media/video/cx23885/cx23885-core.c b/linux/drivers/media/video/cx23885/cx23885-core.c
index 654f5a185..b1a010a6d 100644
--- a/linux/drivers/media/video/cx23885/cx23885-core.c
+++ b/linux/drivers/media/video/cx23885/cx23885-core.c
@@ -369,16 +369,13 @@ void cx23885_wakeup(struct cx23885_tsport *port,
 			break;
 		buf = list_entry(q->active.next,
 				 struct cx23885_buffer, vb.queue);
-#if 0
-		if (buf->count > count)
-			break;
-#else
+
 		/* count comes from the hw and is is 16bit wide --
 		 * this trick handles wrap-arounds correctly for
 		 * up to 32767 buffers in flight... */
 		if ((s16) (count - buf->count) < 0)
 			break;
-#endif
+
 		do_gettimeofday(&buf->vb.ts);
 		dprintk(2, "[%p/%d] wakeup reg=%d buf=%d\n", buf, buf->vb.i,
 			count, buf->count);
@@ -426,22 +423,18 @@ int cx23885_sram_channel_setup(struct cx23885_dev *dev,
 		lines = 6;
 	BUG_ON(lines < 2);
 
-#if 1
 	cx_write(8 + 0, cpu_to_le32(RISC_JUMP | RISC_IRQ1 | RISC_CNT_INC) );
 	cx_write(8 + 4, cpu_to_le32(8) );
 	cx_write(8 + 8, cpu_to_le32(0) );
-#endif
 
 	/* write CDT */
 	for (i = 0; i < lines; i++) {
 		dprintk(2, "%s() 0x%08x <- 0x%08x\n", __FUNCTION__, cdt + 16*i,
 			ch->fifo_start + bpl*i);
 		cx_write(cdt + 16*i, ch->fifo_start + bpl*i);
-#if 1
 		cx_write(cdt + 16*i +  4, 0);
 		cx_write(cdt + 16*i +  8, 0);
 		cx_write(cdt + 16*i + 12, 0);
-#endif
 	}
 
 	/* write CMDS */
@@ -920,7 +913,6 @@ int cx23885_risc_buffer(struct pci_dev *pci, struct btcx_riscmem *risc,
 	/* write and jump need and extra dword */
 	instructions  = fields * (1 + ((bpl + padding) * lines) / PAGE_SIZE + lines);
 	instructions += 2;
-	//if ((rc = btcx_riscmem_alloc(pci,risc,instructions*8)) < 0)
 	if ((rc = btcx_riscmem_alloc(pci,risc,instructions*12)) < 0)
 		return rc;
 
@@ -955,7 +947,6 @@ int cx23885_risc_databuffer(struct pci_dev *pci, struct btcx_riscmem *risc,
 	instructions  = 1 + (bpl * lines) / PAGE_SIZE + lines;
 	instructions += 1;
 
-	//if ((rc = btcx_riscmem_alloc(pci,risc,instructions*8)) < 0)
 	if ((rc = btcx_riscmem_alloc(pci,risc,instructions*12)) < 0)
 		return rc;
 
@@ -980,7 +971,6 @@ int cx23885_risc_stopper(struct pci_dev *pci, struct btcx_riscmem *risc,
 
 	/* write risc instructions */
 	rp = risc->cpu;
-	//*(rp++) = cpu_to_le32(RISC_WRITECR  | RISC_IRQ2 | RISC_IMM);
 	*(rp++) = cpu_to_le32(RISC_WRITECR  | RISC_IRQ2);
 	*(rp++) = cpu_to_le32(reg);
 	*(rp++) = cpu_to_le32(value);
@@ -1028,16 +1018,11 @@ static int cx23885_start_dma(struct cx23885_tsport *port,
 		return -EINVAL;
 	}
 
-	// FIXME: review the need for these two lines
-	dprintk( 1, "%s() doing .dvb\n", __FUNCTION__);
 	udelay(100);
 
 	cx_write(port->reg_hw_sop_ctrl, 0x47 << 16 | 188 << 4);
 	cx_write(port->reg_ts_clk_en, port->ts_clk_en_val);
 
-	// FIXME: review the need for this
-	cx_write(GPIO2, 0x00);
-
 	switch (dev->board) {
 	case CX23885_BOARD_HAUPPAUGE_HVR1250:
 	case CX23885_BOARD_HAUPPAUGE_HVR1800lp:
@@ -1047,7 +1032,6 @@ static int cx23885_start_dma(struct cx23885_tsport *port,
 			__FUNCTION__);
 		break;
 	default:
-		// FIXME
 		printk(KERN_ERR "%s() error, default case", __FUNCTION__ );
 	}
 
@@ -1068,39 +1052,11 @@ static int cx23885_start_dma(struct cx23885_tsport *port,
 		cx_set(PCI_INT_MSK, dev->pci_irqmask | port->pci_irqmask);
 		break;
 	default:
-		// FIXME: generate a sensible switch-default message
 		printk(KERN_ERR "%s() error, default case", __FUNCTION__ );
 	}
 
-	dprintk(1, "%s() Register Dump\n", __FUNCTION__);
-	dprintk(1, "%s() set port ts_int_msk, now %x\n", __FUNCTION__, cx_read(port->reg_ts_int_msk) );
-	dprintk(1, "%s() DEV_CNTRL2      0x%08x\n", __FUNCTION__, cx_read(DEV_CNTRL2) );
-	dprintk(1, "%s() PCI_INT_MSK     0x%08x\n", __FUNCTION__, cx_read(PCI_INT_MSK) );
-	dprintk(1, "%s() VID_A_INT_MSK   0x%08x\n", __FUNCTION__, cx_read(VID_A_INT_MSK) );
-	dprintk(1, "%s() VID_B_INT_MSK   0x%08x\n", __FUNCTION__, cx_read(VID_B_INT_MSK) );
-	dprintk(1, "%s() VID_C_INT_MSK   0x%08x\n", __FUNCTION__, cx_read(VID_C_INT_MSK) );
-	dprintk(1, "%s() VID_A_DMA_CTL   0x%08x\n", __FUNCTION__, cx_read(VID_A_DMA_CTL) );
-	dprintk(1, "%s() VID_B_DMA_CTL   0x%08x\n", __FUNCTION__, cx_read(VID_B_DMA_CTL) );
-	dprintk(1, "%s() VID_C_DMA_CTL   0x%08x\n", __FUNCTION__, cx_read(VID_C_DMA_CTL) );
-	dprintk(1, "%s() AUD_INT_INT_MSK 0x%08x\n", __FUNCTION__, cx_read(AUDIO_INT_INT_MSK) );
-	dprintk(1, "%s() AUD_INT_DMA_CTL 0x%08x\n", __FUNCTION__, cx_read(AUD_INT_DMA_CTL) );
-	dprintk(1, "%s() AUD_EXT_INT_MSK 0x%08x\n", __FUNCTION__, cx_read(AUDIO_EXT_INT_MSK) );
-	dprintk(1, "%s() AUD_EXT_DMA_CTL 0x%08x\n", __FUNCTION__, cx_read(AUD_EXT_DMA_CTL) );
-
 	cx_set(DEV_CNTRL2, (1<<5)); /* Enable RISC controller */
 
-	dprintk(1, "%s() set dev_cntrl2, now %x\n", __FUNCTION__, cx_read(DEV_CNTRL2) );
-	dprintk(1, "%s() VID_C_DMA_CTL   , now %x\n", __FUNCTION__, cx_read(port->reg_dma_ctl) );
-	dprintk(1, "%s() VID_C_DMA_CTL   , now %x\n", __FUNCTION__, cx_read(VID_C_DMA_CTL) );
-	dprintk(1, "%s() PAD_CTRL %x\n", __FUNCTION__, cx_read(PAD_CTRL) );
-	dprintk(1, "%s() GPIO2 %x\n", __FUNCTION__, cx_read(GPIO2) );
-	dprintk(1, "%s() VID_C_LN_LNGTH  , now %x\n", __FUNCTION__, cx_read(port->reg_lngth) );
-	dprintk(1, "%s() VID_C_HW_SOP_CTL, now %x\n", __FUNCTION__, cx_read(port->reg_hw_sop_ctrl) );
-	dprintk(1, "%s() VID_C_GEN_CTL   , now %x\n", __FUNCTION__, cx_read(port->reg_gen_ctrl) );
-	dprintk(1, "%s() VID_C_SOP_STATUS, now %x\n", __FUNCTION__, cx_read(VID_C_SOP_STATUS) );
-	dprintk(1, "%s() VID_C_TS_CLK_EN , now %x\n", __FUNCTION__, cx_read(VID_C_TS_CLK_EN) );
-	dprintk(1, "%s() VID_C_FIFO_OVLST, now %x\n", __FUNCTION__, cx_read(VID_C_FIFO_OVFL_STAT) );
-	dprintk(1, "%s() VID_C_INT_MSTAT , now 0x%08x\n", __FUNCTION__, cx_read(VID_C_INT_MSTAT) );
 	return 0;
 }
 
@@ -1230,10 +1186,6 @@ void cx23885_buf_queue(struct cx23885_tsport *port, struct cx23885_buffer *buf)
 		mod_timer(&cx88q->timeout, jiffies + BUFFER_TIMEOUT);
 		dprintk(1, "[%p/%d] %s - first active\n",
 			buf, buf->vb.i, __FUNCTION__);
-#if 0
-		udelay(100);
-#endif
-
 	} else {
 		dprintk( 1, "queue is not empty - append to active\n" );
 		prev = list_entry(cx88q->active.prev, struct cx23885_buffer,
@@ -1245,9 +1197,6 @@ void cx23885_buf_queue(struct cx23885_tsport *port, struct cx23885_buffer *buf)
 		prev->risc.jmp[2] = cpu_to_le32(0); /* 64 bit bits 63-32 */
 		dprintk( 1, "[%p/%d] %s - append to active\n",
 			 buf, buf->vb.i, __FUNCTION__);
-#if 0
-		udelay(100);
-#endif
 	}
 }
 
diff --git a/linux/drivers/media/video/cx23885/cx23885-dvb.c b/linux/drivers/media/video/cx23885/cx23885-dvb.c
index a4dd46da8..22e40129f 100644
--- a/linux/drivers/media/video/cx23885/cx23885-dvb.c
+++ b/linux/drivers/media/video/cx23885/cx23885-dvb.c
@@ -34,7 +34,7 @@
 #include "s5h1409.h"
 #include "mt2131.h"
 
-static unsigned int debug = 2;
+static unsigned int debug = 0;
 
 #define dprintk(level,fmt, arg...)	if (debug >= level) \
 	printk(KERN_DEBUG "%s: " fmt, dev->name, ## arg)
@@ -107,14 +107,6 @@ static struct s5h1409_config hauppauge_hvr1250_config = {
 	.status_mode   = S5H1409_DEMODLOCKING
 };
 
-
-#if 0
-/* FIXME: For older pre production samples */
-static struct mt2131_config hauppauge_hvr1800lp_rev1_tunerconfig = {
-	0x60
-};
-#endif
-
 static struct mt2131_config hauppauge_hvr1800lp_rev2_tunerconfig = {
 	0x61
 };
diff --git a/linux/drivers/media/video/cx23885/cx23885-i2c.c b/linux/drivers/media/video/cx23885/cx23885-i2c.c
index c3551b17f..22594396b 100644
--- a/linux/drivers/media/video/cx23885/cx23885-i2c.c
+++ b/linux/drivers/media/video/cx23885/cx23885-i2c.c
@@ -86,11 +86,6 @@ static int i2c_sendbytes(struct i2c_adapter *i2c_adap,
 	int retval, cnt;
 
 	dprintk(1, "%s()\n", __FUNCTION__);
-#if 0
-	/* sanity checks */
-	if (0 == msg->len)
-		return -EINVAL;
-#endif
 	/* Deal with i2c probe functions with zero payload */
 	if (msg->len == 0) {
 		cx_write(bus->reg_addr, msg->addr << 25);
@@ -136,7 +131,6 @@ static int i2c_sendbytes(struct i2c_adapter *i2c_adap,
 		if (cnt < msg->len-1 || !last)
 			ctrl |= I2C_NOSTOP | I2C_EXTEND;
 
-		//printk("addr = 0x%08x  wdata = 0x%08x  ctrl = 0x%08x\n", addr, wdata, ctrl);
 		cx_write(bus->reg_addr, addr);
 		cx_write(bus->reg_wdata, wdata);
 		cx_write(bus->reg_ctrl, ctrl);
@@ -305,7 +299,6 @@ static struct i2c_adapter cx23885_i2c_adap_template = {
 #endif
 	.id                = I2C_HW_B_CX23885,
 	.algo              = &cx23885_i2c_algo_template,
-//	.class             = I2C_CLASS_TV_ANALOG,
 	.client_register   = attach_inform,
 	.client_unregister = detach_inform,
 };
@@ -356,13 +349,9 @@ int cx23885_i2c_register(struct cx23885_i2c *bus)
 
 	strlcpy(bus->i2c_adap.name, bus->dev->name,
 		sizeof(bus->i2c_adap.name));
-#if 0
-	bus->i2c_algo.data = dev;
-	bus->i2c_adap.algo_data = dev;
-#else
+
 	bus->i2c_algo.data = bus;
 	bus->i2c_adap.algo_data = bus;
-#endif
 	i2c_add_adapter(&bus->i2c_adap);
 
 	bus->i2c_client.adapter = &bus->i2c_adap;
diff --git a/linux/drivers/media/video/cx23885/cx23885-reg.h b/linux/drivers/media/video/cx23885/cx23885-reg.h
index f8db47418..6527bd3b4 100644
--- a/linux/drivers/media/video/cx23885/cx23885-reg.h
+++ b/linux/drivers/media/video/cx23885/cx23885-reg.h
@@ -22,7 +22,6 @@
 #ifndef _CX23885_REG_H_
 #define _CX23885_REG_H_
 
-
 /*
 Address Map
 0x00000000 -> 0x00009000   TX SRAM  (Fifos)
@@ -50,8 +49,6 @@ Channel manager Data Structure entry = 20 DWORD
   5  InstructionQueueSize
 ...  Reserved
  19  Reserved
-
-
 */
 
 /* Risc Instructions */
@@ -70,26 +67,9 @@ Channel manager Data Structure entry = 20 DWORD
 #define RISC_WRITERM		 0xB0000000
 #define RISC_WRITECM		 0xC0000000
 #define RISC_WRITECR		 0xD0000000
-
-#if 0
-#define RISC_SYNC_ODD		 0x80000000
-#define RISC_SYNC_EVEN		 0x80000200
-#define RISC_RESYNC_ODD		 0x80008000
-#define RISC_RESYNC_EVEN	 0x80008200
-#endif
-
-/* Do we need these? */
 #define RISC_WRITEC		 0x50000000
 #define RISC_READC		 0xA0000000
 
-/* Is this used? */
-#define RISC_IMM		 0x00000001
-
-#if 0
-#define RISC_CNT_NONE		 0x00000000
-#define RISC_CNT_RSVR		 0x00020000
-#define RISC_JMP_SRP         	 0x01
-#endif
 
 /* Audio and Video Core */
 #define HOST_REG1		0x00000000
diff --git a/linux/drivers/media/video/cx23885/cx23885.h b/linux/drivers/media/video/cx23885/cx23885.h
index aa5b5b1eb..66cc04cfa 100644
--- a/linux/drivers/media/video/cx23885/cx23885.h
+++ b/linux/drivers/media/video/cx23885/cx23885.h
@@ -252,23 +252,6 @@ struct sram_channel {
 #define cx_set(reg,bit)          cx_andor((reg),(bit),(bit))
 #define cx_clear(reg,bit)        cx_andor((reg),(bit),0)
 
-#if 0
-#define cx_writeb(reg,value)     writeb((value), dev->bmmio + (reg))
-
-
-#define cx_wait(d) { if (need_resched()) schedule(); else udelay(d); }
-
-/* shadow registers */
-#define cx_sread(sreg)		    (dev->shadow[sreg])
-#define cx_swrite(sreg,reg,value) \
-  (dev->shadow[sreg] = value, \
-   writel(dev->shadow[sreg], dev->lmmio + ((reg)>>2)))
-#define cx_sandor(sreg,reg,mask,value) \
-  (dev->shadow[sreg] = (dev->shadow[sreg] & ~(mask)) | ((value) & (mask)), \
-   writel(dev->shadow[sreg], dev->lmmio + ((reg)>>2)))
-
-#endif
-
 extern int cx23885_sram_channel_setup(struct cx23885_dev *dev,
 	struct sram_channel *ch,
 	unsigned int bpl, u32 risc);