Fix comment style and set default debug level to 0

From: Hans Verkuil <hverkuil@xs4all.nl>

Convert the '//' comments to kernel approved /* */ style comments.
Set the default debug level to 0. As a result of which change some
DEBUG_WARNs to errors or remove them altogether.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>

1 files changed, 33 insertions, 33 deletions

diff --git a/linux/drivers/media/video/ivtv/ivtv-streams.c b/linux/drivers/media/video/ivtv/ivtv-streams.c
index c5704ff1f..73a1c933d 100644
--- a/linux/drivers/media/video/ivtv/ivtv-streams.c
+++ b/linux/drivers/media/video/ivtv/ivtv-streams.c
@@ -315,7 +315,7 @@ static void ivtv_vbi_setup(struct ivtv *itv)
 	int i;
 
 	/* If Embed then streamtype must be Program */
-	// TODO: should we really do this?
+	/* TODO: should we really do this? */
 	if (0 && !raw && itv->vbi.insert_mpeg) {
 		itv->params.stream_type = 0;
 
@@ -336,14 +336,14 @@ static void ivtv_vbi_setup(struct ivtv *itv)
 		itv->vbi.start[1] = 318;
 	}
 
-	// setup VBI registers
+	/* setup VBI registers */
 	itv->video_dec_func(itv, VIDIOC_S_FMT, &itv->vbi.in);
 
-	// determine number of lines and total number of VBI bytes.
-	// A raw line takes 1443 bytes: 2 * 720 + 4 byte frame header - 1
-	// The '- 1' byte is probably an unused U or V byte. Or something...
-	// A sliced line takes 51 bytes: 4 byte frame header, 4 byte internal
-	// header, 42 data bytes + checksum (to be confirmed)
+	/* determine number of lines and total number of VBI bytes.
+	   A raw line takes 1443 bytes: 2 * 720 + 4 byte frame header - 1
+	   The '- 1' byte is probably an unused U or V byte. Or something...
+	   A sliced line takes 51 bytes: 4 byte frame header, 4 byte internal
+	   header, 42 data bytes + checksum (to be confirmed) */
 	if (raw) {
 		lines = itv->vbi.count * 2;
 	} else {
@@ -354,21 +354,21 @@ static void ivtv_vbi_setup(struct ivtv *itv)
 
 	itv->vbi.enc_size = lines * (raw ? itv->vbi.raw_size : itv->vbi.sliced_size);
 
-	// Note: sliced vs raw flag doesn't seem to have any effect
-	// TODO: check mode (0x02) value with older ivtv versions.
+	/* Note: sliced vs raw flag doesn't seem to have any effect
+	   TODO: check mode (0x02) value with older ivtv versions. */
 	data[0] = raw | 0x02 | (0xbd << 8);
 
-	// Every X number of frames a VBI interrupt arrives (frames as in 25 or 30 fps)
+	/* Every X number of frames a VBI interrupt arrives (frames as in 25 or 30 fps) */
 	data[1] = 1;
-	// The VBI frames are stored in a ringbuffer with this size (with a VBI frame as unit)
+	/* The VBI frames are stored in a ringbuffer with this size (with a VBI frame as unit) */
 	data[2] = raw ? 4 : 8;
-	// The start/stop codes determine which VBI lines end up in the raw VBI data area.
-	// The codes are from table 24 in the saa7115 datasheet. Each raw/sliced/video line
-	// is framed with codes FF0000XX where XX is the SAV/EAV (Start/End of Active Video)
-	// code. These values for raw VBI are obtained from a driver disassembly. The sliced
-	// start/stop codes was deduced from this, but they do not appear in the driver.
-	// Other code pairs that I found are: 0x250E6249/0x13545454 and 0x25256262/0x38137F54.
-	// However, I have no idea what these values are for.
+	/* The start/stop codes determine which VBI lines end up in the raw VBI data area.
+	   The codes are from table 24 in the saa7115 datasheet. Each raw/sliced/video line
+	   is framed with codes FF0000XX where XX is the SAV/EAV (Start/End of Active Video)
+	   code. These values for raw VBI are obtained from a driver disassembly. The sliced
+	   start/stop codes was deduced from this, but they do not appear in the driver.
+	   Other code pairs that I found are: 0x250E6249/0x13545454 and 0x25256262/0x38137F54.
+	   However, I have no idea what these values are for. */
 	if (itv->hw_flags & IVTV_HW_CX25840) {
 		/* Setup VBI for the cx25840 digitizer */
 		if (raw) {
@@ -378,9 +378,9 @@ static void ivtv_vbi_setup(struct ivtv *itv)
 			data[3] = 0xB0F0B0F0;
 			data[4] = 0xA0E0A0E0;
 		}
-		// Lines per frame
+		/* Lines per frame */
 		data[5] = lines;
-		// bytes per line
+		/* bytes per line */
 		data[6] = (raw ? itv->vbi.raw_size : itv->vbi.sliced_size);
 	} else {
 		/* Setup VBI for the saa7115 digitizer */
@@ -391,9 +391,9 @@ static void ivtv_vbi_setup(struct ivtv *itv)
 			data[3] = 0xABABECEC;
 			data[4] = 0xB6F1F1F1;
 		}
-		// Lines per frame
+		/* Lines per frame */
 		data[5] = lines;
-		// bytes per line
+		/* bytes per line */
 		data[6] = itv->vbi.enc_size / lines;
 	}
 
@@ -403,7 +403,7 @@ static void ivtv_vbi_setup(struct ivtv *itv)
 
 	ivtv_api(itv, CX2341X_ENC_SET_VBI_CONFIG, 7, data);
 
-	// returns the VBI encoder memory area.
+	/* returns the VBI encoder memory area. */
 	itv->vbi.enc_start = data[2];
 	itv->vbi.fpi = data[0];
 	if (!itv->vbi.fpi)
@@ -412,8 +412,8 @@ static void ivtv_vbi_setup(struct ivtv *itv)
 	IVTV_DEBUG_INFO("Setup VBI start 0x%08x frames %d fpi %d lines 0x%08x\n",
 		itv->vbi.enc_start, data[1], itv->vbi.fpi, itv->digitizer);
 
-	// select VBI lines.
-	// Note that the sliced argument seems to have no effect.
+	/* select VBI lines.
+	   Note that the sliced argument seems to have no effect. */
 	for (i = 2; i <= 24; i++) {
 		int valid;
 
@@ -428,12 +428,12 @@ static void ivtv_vbi_setup(struct ivtv *itv)
 				valid, 0, 0, 0);
 	}
 
-	// Remaining VBI questions:
-	// - Is it possible to select particular VBI lines only for inclusion in the MPEG
-	// stream? Currently you can only get the first X lines.
-	// - Is mixed raw and sliced VBI possible?
-	// - What's the meaning of the raw/sliced flag?
-	// - What's the meaning of params 2, 3 & 4 of the Select VBI command?
+	/* Remaining VBI questions:
+	   - Is it possible to select particular VBI lines only for inclusion in the MPEG
+	   stream? Currently you can only get the first X lines.
+	   - Is mixed raw and sliced VBI possible?
+	   - What's the meaning of the raw/sliced flag?
+	   - What's the meaning of params 2, 3 & 4 of the Select VBI command? */
 }
 
 int ivtv_start_v4l2_encode_stream(struct ivtv_stream *s)
@@ -504,7 +504,7 @@ int ivtv_start_v4l2_encode_stream(struct ivtv_stream *s)
 		   but occasionally. Many thanks go to Leonard Orb who spent a lot of
 		   effort and time trying to trace the cause of the drop outs. */
 		/* 1 frame per DMA */
-		//ivtv_vapi(itv, CX2341X_ENC_SET_DMA_BLOCK_SIZE, 2, 128, 0);
+		/*ivtv_vapi(itv, CX2341X_ENC_SET_DMA_BLOCK_SIZE, 2, 128, 0); */
 		ivtv_vapi(itv, CX2341X_ENC_SET_DMA_BLOCK_SIZE, 2, 1, 1);
 
 		/* Stuff from Windows, we don't know what it is */
@@ -646,7 +646,7 @@ int ivtv_start_v4l2_decode_stream(struct ivtv_stream *s, int gop_offset)
 		return -EINVAL;
 
 	if (test_and_set_bit(IVTV_F_S_STREAMING, &s->s_flags))
-		return 0;	// already started
+		return 0;	/* already started */
 
 	IVTV_DEBUG_INFO("Starting decode stream %s (gop_offset %d)\n", s->name, gop_offset);