Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d646e701 authored by Hans de Goede's avatar Hans de Goede Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (8191): gspca: Make CONFIG_VIDEO_ADV_DEBUG actually work. 



Signed-off-by: default avatarHans de Goede <j.w.r.degoede@hhs.nl>
Signed-off-by: default avatarJean-Francois Moine <moinejf@free.fr>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 0c616214

drivers/media/video/gspca/gspca.c

+6 −6
Original line number Diff line number Diff line
@@ -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);
@@ -817,7 +817,7 @@ static int try_fmt_vid_cap(struct gspca_dev *gspca_dev, 
	/* (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
@@ -837,7 +837,7 @@ static int try_fmt_vid_cap(struct gspca_dev *gspca_dev, 
			/* 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,
@@ -952,7 +952,7 @@ static int dev_open(struct inode *inode, struct file *file) 
	}

	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;
@@ -1225,7 +1225,7 @@ static int vidioc_streamon(struct file *file, void *priv, 
		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,
@@ -1980,7 +1980,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"

drivers/media/video/gspca/gspca.h

+1 −1
Original line number Diff line number Diff line
@@ -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...) \

drivers/media/video/gspca/zc3xx.c

+3 −3
Original line number Diff line number Diff line
@@ -6432,7 +6432,7 @@ static void setcontrast(struct gspca_dev *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
@@ -6450,7 +6450,7 @@ static void setcontrast(struct gspca_dev *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
@@ -6470,7 +6470,7 @@ static void setcontrast(struct gspca_dev *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