PATCH: gspca-mercurial: fix debugging output

[Hans de Goede <j.w.r.degoede@xxxxxx>]

Hi All,

This patch makes CONFIG_VIDEO_ADV_DEBUG actually work for gspca

Signed-off-by: Hans de Goede <j.w.r.degoede@xxxxxx>

Regards,

Hans

Make CONFIG_VIDEO_ADV_DEBUG actually work for gspca

Signed-off-by: Hans de Goede <j.w.r.degoede@xxxxxx>
--- gspca-2bbb47f61a95/linux/drivers/media/video/gspca/gspca.c.dbg	2008-07-02 11:14:56.000000000 +0200
+++ gspca-2bbb47f61a95/linux/drivers/media/video/gspca/gspca.c	2008-07-02 20:02:12.000000000 +0200
@@ -50,7 +50,7 @@ static int video_nr = -1;
 
 static int comp_fac = 30;	/* Buffer size ratio when compressed in % */
 
-#ifdef VIDEO_ADV_DEBUG
+#ifdef CONFIG_VIDEO_ADV_DEBUG
 int gspca_debug = D_ERR | D_PROBE;
 EXPORT_SYMBOL(gspca_debug);
 
@@ -823,7 +823,7 @@ static int try_fmt_vid_cap(struct gspca_
 	/* (luvcview problem) */
 	if (fmt->fmt.pix.pixelformat == V4L2_PIX_FMT_MJPEG)
 		fmt->fmt.pix.pixelformat = V4L2_PIX_FMT_JPEG;
-#ifdef VIDEO_ADV_DEBUG
+#ifdef CONFIG_VIDEO_ADV_DEBUG
 	if (gspca_debug & D_CONF)
 		PDEBUG_MODE("try fmt cap", fmt->fmt.pix.pixelformat, w, h);
 #endif
@@ -843,7 +843,7 @@ static int try_fmt_vid_cap(struct gspca_
 			/* no chance, return this mode */
 			fmt->fmt.pix.pixelformat =
 					gspca_dev->cam.cam_mode[mode].pixfmt;
-#ifdef VIDEO_ADV_DEBUG
+#ifdef CONFIG_VIDEO_ADV_DEBUG
 			if (gspca_debug & D_CONF) {
 				PDEBUG_MODE("new format",
 					fmt->fmt.pix.pixelformat,
@@ -958,7 +958,7 @@ static int dev_open(struct inode *inode,
 	}
 	gspca_dev->users++;
 	file->private_data = gspca_dev;
-#ifdef VIDEO_ADV_DEBUG
+#ifdef CONFIG_VIDEO_ADV_DEBUG
 	/* activate the v4l2 debug */
 	if (gspca_debug & D_V4L2)
 		gspca_dev->vdev.debug |= 3;
@@ -1231,7 +1231,7 @@ static int vidioc_streamon(struct file *
 		if (ret < 0)
 			goto out;
 	}
-#ifdef VIDEO_ADV_DEBUG
+#ifdef CONFIG_VIDEO_ADV_DEBUG
 	if (gspca_debug & D_STREAM) {
 		PDEBUG_MODE("stream on OK",
 			gspca_dev->pixfmt,
@@ -1986,7 +1986,7 @@ static void __exit gspca_exit(void)
 module_init(gspca_init);
 module_exit(gspca_exit);
 
-#ifdef VIDEO_ADV_DEBUG
+#ifdef CONFIG_VIDEO_ADV_DEBUG
 module_param_named(debug, gspca_debug, int, 0644);
 MODULE_PARM_DESC(debug,
 		"Debug (bit) 0x01:error 0x02:probe 0x04:config"
--- gspca-2bbb47f61a95/linux/drivers/media/video/gspca/gspca.h.dbg	2008-07-02 11:14:56.000000000 +0200
+++ gspca-2bbb47f61a95/linux/drivers/media/video/gspca/gspca.h	2008-07-02 20:10:16.000000000 +0200
@@ -28,7 +28,7 @@
 #define V4L2_CID_SHARPNESS  (V4L2_CID_BASE+27)
 #endif
 
-#ifdef VIDEO_ADV_DEBUG
+#ifdef CONFIG_VIDEO_ADV_DEBUG
 /* GSPCA our debug messages */
 extern int gspca_debug;
 #define PDEBUG(level, fmt, args...) \
--- gspca-2bbb47f61a95/linux/drivers/media/video/gspca/zc3xx.c.dbg	2008-07-02 11:14:56.000000000 +0200
+++ gspca-2bbb47f61a95/linux/drivers/media/video/gspca/zc3xx.c	2008-07-02 20:02:13.000000000 +0200
@@ -6436,7 +6436,7 @@ static void setcontrast(struct gspca_dev
 		0, Tgradient_1, Tgradient_2,
 		Tgradient_3, Tgradient_4, Tgradient_5, Tgradient_6
 	};
-#ifdef VIDEO_ADV_DEBUG
+#ifdef CONFIG_VIDEO_ADV_DEBUG
 	__u8 v[16];
 #endif
 
@@ -6454,7 +6454,7 @@ static void setcontrast(struct gspca_dev
 		else if (g <= 0)
 			g = 1;
 		reg_w(dev, g, 0x0120 + i);	/* gamma */
-#ifdef VIDEO_ADV_DEBUG
+#ifdef CONFIG_VIDEO_ADV_DEBUG
 		if (gspca_debug & D_CONF)
 			v[i] = g;
 #endif
@@ -6474,7 +6474,7 @@ static void setcontrast(struct gspca_dev
 				g = 1;
 		}
 		reg_w(dev, g, 0x0130 + i);	/* gradient */
-#ifdef VIDEO_ADV_DEBUG
+#ifdef CONFIG_VIDEO_ADV_DEBUG
 		if (gspca_debug & D_CONF)
 			v[i] = g;
 #endif

--
video4linux-list mailing list
Unsubscribe mailto:video4linux-list-request@xxxxxxxxxx?subject=unsubscribe
https://www.redhat.com/mailman/listinfo/video4linux-list