Get rid of '//' comments, replace them with #if 0 and /**/.

5 files changed, 51 insertions, 22 deletions

diff --git a/linux/drivers/media/video/cx88/cx88-blackbird.c b/linux/drivers/media/video/cx88/cx88-blackbird.c
index 7c4e27a2d..e9848fdc9 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.31 2005/08/16 15:49:31 catalin Exp $
+ * $Id: cx88-blackbird.c,v 1.32 2005/08/16 16:29:52 catalin Exp $
  *
  *  Support for a cx23416 mpeg encoder via cx2388x host port.
  *  "blackbird" reference design.
@@ -63,7 +63,9 @@ static LIST_HEAD(cx8802_devlist);
 #define IVTV_CMD_HW_BLOCKS_RST 0xFFFFFFFF
 
 /* Firmware API commands */
-/* #define IVTV_API_STD_TIMEOUT 0x00010000 // 65536, units?? */
+#if 0
+#define IVTV_API_STD_TIMEOUT 0x00010000 /* 65536, units?? */
+#endif
 #define IVTV_API_STD_TIMEOUT 500
 
 #define BLACKBIRD_API_PING               0x80
@@ -830,7 +832,8 @@ static int blackbird_initialize_codec(struct cx8802_dev *dev)
 			BLACKBIRD_CUSTOM_EXTENSION_USR_DATA,
 			0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
 
-	blackbird_api_cmd(dev, BLACKBIRD_API_INIT_VIDEO_INPUT, 0, 0); /* initialize the video input */
+	/* initialize the video input */
+	blackbird_api_cmd(dev, BLACKBIRD_API_INIT_VIDEO_INPUT, 0, 0);
 
 	msleep(1);
 
@@ -839,11 +842,12 @@ static int blackbird_initialize_codec(struct cx8802_dev *dev)
 	blackbird_api_cmd(dev, BLACKBIRD_API_MUTE_AUDIO, 1, 0, BLACKBIRD_UNMUTE);
 	msleep(1);
 
-	/* blackbird_api_cmd(dev, BLACKBIRD_API_BEGIN_CAPTURE, 2, 0, 0, 0x13); // start capturing to the host interface */
+	/* start capturing to the host interface */
+	/* blackbird_api_cmd(dev, BLACKBIRD_API_BEGIN_CAPTURE, 2, 0, 0, 0x13); */
 	blackbird_api_cmd(dev, BLACKBIRD_API_BEGIN_CAPTURE, 2, 0,
 			BLACKBIRD_MPEG_CAPTURE,
 			BLACKBIRD_RAW_BITS_NONE
-		); /* start capturing to the host interface */
+		);
 	msleep(10);
 
 	blackbird_api_cmd(dev, BLACKBIRD_API_REFRESH_INPUT, 0,0);
diff --git a/linux/drivers/media/video/cx88/cx88-core.c b/linux/drivers/media/video/cx88/cx88-core.c
index e8ea1442d..4d7e1fed7 100644
--- a/linux/drivers/media/video/cx88/cx88-core.c
+++ b/linux/drivers/media/video/cx88/cx88-core.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cx88-core.c,v 1.36 2005/08/16 15:49:31 catalin Exp $
+ * $Id: cx88-core.c,v 1.37 2005/08/16 16:29:52 catalin Exp $
  *
  * device driver for Conexant 2388x based TV cards
  * driver core
@@ -908,7 +908,7 @@ static int set_tvaudio(struct cx88_core *core)
 
 	cx_andor(MO_AFECFG_IO, 0x1f, 0x0);
 	cx88_set_tvaudio(core);
-	// cx88_set_stereo(dev,V4L2_TUNER_MODE_STEREO);
+	/* cx88_set_stereo(dev,V4L2_TUNER_MODE_STEREO); */
 
 	cx_write(MO_AUDD_LNGTH,    128); /* fifo size */
 	cx_write(MO_AUDR_LNGTH,    128); /* fifo size */
diff --git a/linux/drivers/media/video/cx88/cx88-mpeg.c b/linux/drivers/media/video/cx88/cx88-mpeg.c
index c3d00d426..22c953e4c 100644
--- a/linux/drivers/media/video/cx88/cx88-mpeg.c
+++ b/linux/drivers/media/video/cx88/cx88-mpeg.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cx88-mpeg.c,v 1.35 2005/08/16 15:49:31 catalin Exp $
+ * $Id: cx88-mpeg.c,v 1.36 2005/08/16 16:29:52 catalin Exp $
  *
  *  Support for the mpeg transport stream transfers
  *  PCI function #2 of the cx2388x.
@@ -92,12 +92,16 @@ static int cx8802_start_dma(struct cx8802_dev    *dev,
 	if (cx88_boards[core->board].blackbird) {
 		cx_write(MO_PINMUX_IO, 0x88); /* enable MPEG parallel IO */
 
-		// cx_write(TS_F2_CMD_STAT_MM, 0x2900106); /* F2_CMD_STAT_MM defaults + master + memory space */
+#if 0
+		cx_write(TS_F2_CMD_STAT_MM, 0x2900106); /* F2_CMD_STAT_MM defaults + master + memory space */
+#endif
 		cx_write(TS_GEN_CNTRL, 0x46); /* punctured clock TS & posedge driven & software reset */
 		udelay(100);
 
 		cx_write(TS_HW_SOP_CNTRL, 0x408); /* mpeg start byte */
-		//cx_write(TS_HW_SOP_CNTRL, 0x2F0BC0); /* mpeg start byte ts: 0x2F0BC0 ? */
+#if 0
+		cx_write(TS_HW_SOP_CNTRL, 0x2F0BC0); /* mpeg start byte ts: 0x2F0BC0 ? */
+#endif
 		cx_write(TS_VALERR_CNTRL, 0x2000);
 
 		cx_write(TS_GEN_CNTRL, 0x06); /* punctured clock TS & posedge driven */
@@ -113,7 +117,9 @@ static int cx8802_start_dma(struct cx8802_dev    *dev,
 	dprintk( 0, "setting the interrupt mask\n" );
 	cx_set(MO_PCI_INTMSK, core->pci_irqmask | 0x04);
 	cx_set(MO_TS_INTMSK,  0x1f0011);
-	//cx_write(MO_TS_INTMSK,  0x0f0011);
+#if 0
+	cx_write(MO_TS_INTMSK,  0x0f0011);
+#endif
 
 	/* start dma */
 	cx_set(MO_DEV_CNTRL2, (1<<5));
@@ -213,7 +219,9 @@ void cx8802_buf_queue(struct cx8802_dev *dev, struct cx88_buffer *buf)
 		mod_timer(&q->timeout, jiffies+BUFFER_TIMEOUT);
 		dprintk(0,"[%p/%d] %s - first active\n",
 			buf, buf->vb.i, __FUNCTION__);
-		//udelay(100);
+#if 0
+		udelay(100);
+#endif
 
 	} else {
 		dprintk( 1, "queue is not empty - append to active\n" );
@@ -224,7 +232,9 @@ void cx8802_buf_queue(struct cx8802_dev *dev, struct cx88_buffer *buf)
 		prev->risc.jmp[1] = cpu_to_le32(buf->risc.dma);
 		dprintk( 1, "[%p/%d] %s - append to active\n",
 			buf, buf->vb.i, __FUNCTION__);
-		//udelay(100);
+#if 0
+		udelay(100);
+#endif
 	}
 }
 
@@ -394,7 +404,10 @@ int cx8802_init_common(struct cx8802_dev *dev)
 	       dev->pci_lat,pci_resource_start(dev->pci,0));
 
 	/* initialize driver struct */
-	/* init_MUTEX(&core->lock); // moved to cx88_core_get */
+#if 0
+	/* moved to cx88_core_get */
+	init_MUTEX(&core->lock);
+#endif
 	spin_lock_init(&dev->slock);
 
 	/* init dma queue */
diff --git a/linux/drivers/media/video/cx88/cx88-video.c b/linux/drivers/media/video/cx88/cx88-video.c
index 35ec3f3b2..0698809a1 100644
--- a/linux/drivers/media/video/cx88/cx88-video.c
+++ b/linux/drivers/media/video/cx88/cx88-video.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cx88-video.c,v 1.85 2005/08/16 15:49:31 catalin Exp $
+ * $Id: cx88-video.c,v 1.86 2005/08/16 16:29:52 catalin Exp $
  *
  * device driver for Conexant 2388x based TV cards
  * video4linux video interface
@@ -1620,7 +1620,7 @@ int cx88_do_ioctl(struct inode *inode, struct file *file, int radio,
 			if ((CX88_VMUX_TELEVISION == INPUT(n)->type)
 			    || (CX88_VMUX_CABLE == INPUT(n)->type)) {
 				strcpy(a->name,"Television");
-				// FIXME figure out if stereo received and set V4L2_AUDCAP_STEREO.
+				/* FIXME figure out if stereo received and set V4L2_AUDCAP_STEREO. */
 				return 0;
 			}
 			break;
@@ -1632,7 +1632,7 @@ int cx88_do_ioctl(struct inode *inode, struct file *file, int radio,
 			}
 			break;
 		}
-		// Audio input not available.
+		/* Audio input not available. */
 		return -EINVAL;
 	}
 #endif
@@ -2125,7 +2125,10 @@ static int __devinit cx8800_initdev(struct pci_dev *pci_dev,
 	}
 
 	/* initialize driver struct */
-	/* init_MUTEX(&dev->lock); // moved to cx88_core_get */
+#if 0
+	/* moved to cx88_core_get */
+	init_MUTEX(&dev->lock);
+#endif
 	spin_lock_init(&dev->slock);
 	core->tvnorm = tvnorms;
 
diff --git a/linux/drivers/media/video/cx88/cx88.h b/linux/drivers/media/video/cx88/cx88.h
index 2e30d831f..b97dda941 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.73 2005/08/16 15:49:32 catalin Exp $
+ * $Id: cx88.h,v 1.74 2005/08/16 16:29:52 catalin Exp $
  *
  * v4l2 device driver for cx2388x based TV cards
  *
@@ -341,7 +341,10 @@ struct cx8800_suspend_state {
 struct cx8800_dev {
 	struct cx88_core           *core;
 	struct list_head           devlist;
-	/* struct semaphore           lock; // moved to cx88_core */
+#if 0
+	/* moved to cx88_core */
+	struct semaphore           lock;
+#endif
 	spinlock_t                 slock;
 
 	/* various device info */
@@ -365,7 +368,10 @@ struct cx8800_dev {
 	struct cx88_dmaqueue       vbiq;
 
 	/* various v4l controls */
-	/* u32                        freq; // moved to cx88_core */
+#if 0
+	/* moved to cx88_core */
+	u32                        freq;
+#endif
 
 	/* other global state info */
 	struct cx8800_suspend_state state;
@@ -393,7 +399,10 @@ struct cx8802_suspend_state {
 
 struct cx8802_dev {
 	struct cx88_core           *core;
-	/* struct semaphore           lock; // moved to cx88_core ? */
+#if 0
+	/* moved to cx88_core ? */
+	struct semaphore           lock;
+#endif
 	spinlock_t                 slock;
 
 	/* pci i/o */