Merge in ~mkrufky/pvrusb2-cleanup

From: Mike Isely <isely@pobox.com>



Signed-off-by: Mike Isely <isely@pobox.com>

8 files changed, 36 insertions, 17 deletions

diff --git a/linux/drivers/media/video/Kconfig b/linux/drivers/media/video/Kconfig
index f6889f771..7fb2e7ca5 100644
--- a/linux/drivers/media/video/Kconfig
+++ b/linux/drivers/media/video/Kconfig
@@ -324,6 +324,8 @@ source "drivers/media/video/cx88/Kconfig"
 
 source "drivers/media/video/em28xx/Kconfig"
 
+source "drivers/media/video/pvrusb2/Kconfig"
+
 config VIDEO_OVCAMCHIP
 	tristate "OmniVision Camera Chip support"
 	depends on VIDEO_DEV && I2C
diff --git a/linux/drivers/media/video/Makefile b/linux/drivers/media/video/Makefile
index 87b1ce6e2..02bd94f0f 100644
--- a/linux/drivers/media/video/Makefile
+++ b/linux/drivers/media/video/Makefile
@@ -45,6 +45,8 @@ obj-$(CONFIG_VIDEO_SAA7134) += ir-kbd-i2c.o saa7134/
 obj-$(CONFIG_VIDEO_CX88) += cx88/
 obj-$(CONFIG_VIDEO_EM28XX) += em28xx/
 obj-$(CONFIG_VIDEO_EM28XX) += saa711x.o tvp5150.o
+obj-$(CONFIG_VIDEO_PVRUSB2) += pvrusb2/
+obj-$(CONFIG_VIDEO_PVRUSB2) += msp3400.o
 obj-$(CONFIG_VIDEO_AUDIO_DECODER) += wm8775.o cs53l32a.o
 obj-$(CONFIG_VIDEO_OVCAMCHIP) += ovcamchip/
 obj-$(CONFIG_VIDEO_CPIA2) += cpia2/
diff --git a/linux/drivers/media/video/pvrusb2/Kconfig b/linux/drivers/media/video/pvrusb2/Kconfig
new file mode 100644
index 000000000..1de82f905
--- /dev/null
+++ b/linux/drivers/media/video/pvrusb2/Kconfig
@@ -0,0 +1,15 @@
+config VIDEO_PVRUSB2
+	tristate "Hauppauge WinTV-PVR USB2 support"
+	depends on VIDEO_DEV && USB && I2C && EXPERIMENTAL
+	select FW_LOADER
+	select VIDEO_BUF
+	select VIDEO_TUNER
+	select VIDEO_TVEEPROM
+	select VIDEO_IR
+	select VIDEO_DECODER
+	---help---
+	  This is a video4linux driver for Conexant 23416 based
+	  usb2 personal video recorder devices.
+
+	  To compile this driver as a module, choose M here: the
+	  module will be called pvrusb2
diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-debug.h b/linux/drivers/media/video/pvrusb2/pvrusb2-debug.h
index 078f5f5a0..d95a8588e 100644
--- a/linux/drivers/media/video/pvrusb2/pvrusb2-debug.h
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-debug.h
@@ -22,7 +22,7 @@
 
 extern int pvrusb2_debug;
 
-#define pvr2_trace(msk, fmt, arg...) do {if(msk & pvrusb2_debug) printk(KERN_INFO "pvrusb2 " fmt "\n", ##arg); } while (0)
+#define pvr2_trace(msk, fmt, arg...) do {if(msk & pvrusb2_debug) printk(KERN_INFO "pvrusb2: " fmt "\n", ##arg); } while (0)
 
 /* These are listed in *rough* order of decreasing usefulness and
    increasing noise level. */
diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-encoder.c b/linux/drivers/media/video/pvrusb2/pvrusb2-encoder.c
index 6d797cb55..97931d3c4 100644
--- a/linux/drivers/media/video/pvrusb2/pvrusb2-encoder.c
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-encoder.c
@@ -308,14 +308,14 @@ int pvr2_encoder_configure(struct pvr2_hdw *hdw)
 	   the ivtv driver).  But, if I leave them in, then mplayer
 	   goes nuts with xrun errors.  So for now we don't do this.
 	   It sure would be nice to know what these are for. */
-#ifdef notdef
+#if 0
 	ret |= pvr2_write_encoder_vcmd(hdw, 0xdc, 1, 5);
 	ret |= pvr2_write_encoder_vcmd(hdw, 0xdc, 2, 3, 1);
 	ret |= pvr2_write_encoder_vcmd(hdw, 0xdc, 1, 8);
 #endif
 
 	/* Strange compared to ivtv data. */
-#ifdef notdef
+#if 0
 	ret |= pvr2_write_encoder_vcmd(hdw, CX2341X_ENC_SET_NUM_VSYNC_LINES, 2,
 				       0x0120, 0x0120);
 	ret |= pvr2_write_encoder_vcmd(hdw, CX2341X_ENC_SET_NUM_VSYNC_LINES, 2,
diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c b/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c
index d3b223d09..8ec637e5e 100644
--- a/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c
@@ -46,7 +46,7 @@ static int pvr2_i2c_write(struct pvr2_hdw *hdw, /* Context */
 	/* Return value - default 0 means success */
 	int ret;
 
-#ifdef notdef
+#if 0
 	trace_i2c("pvr2_i2c_write");
 #endif
 
@@ -87,7 +87,7 @@ static int pvr2_i2c_write(struct pvr2_hdw *hdw, /* Context */
 			}
 		}
 	}
-#ifdef notdef
+#if 0
 	trace_i2c("i2c_write(%d) len=%d ret=%d stat=%d",i2c_addr,length,ret,
 		  hdw->cmd_buffer[0]);
 #endif
@@ -107,7 +107,7 @@ static int pvr2_i2c_read(struct pvr2_hdw *hdw, /* Context */
 	/* Return value - default 0 means success */
 	int ret;
 
-#ifdef notdef
+#if 0
 	trace_i2c("pvr2_i2c_read");
 #endif
 
@@ -145,7 +145,7 @@ static int pvr2_i2c_read(struct pvr2_hdw *hdw, /* Context */
 		}
 	}
 
-#ifdef notdef
+#if 0
 	trace_i2c("i2c_read(%d) wlen=%d rlen=%d ret=%d stat=%d",
 		  i2c_addr,dlen,rlen,ret,hdw->cmd_buffer[0]);
 #endif
diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-io.c b/linux/drivers/media/video/pvrusb2/pvrusb2-io.c
index b01975af4..a6bc3befe 100644
--- a/linux/drivers/media/video/pvrusb2/pvrusb2-io.c
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-io.c
@@ -36,7 +36,7 @@
 
 // #define SANITY_CHECK_BUFFERS
 
-#ifdef notdef
+#if 0
 #define BUFFER_CHECK(bp) do { \
 	if ((bp)->signature != BUFFER_SIG) { \
 		pvr2_trace(PVR2_TRACE_ERROR_LEGS, \
diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-v4l2.c b/linux/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
index ba99db26c..017d30ad0 100644
--- a/linux/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
@@ -124,7 +124,7 @@ static struct v4l2_tuner pvr_v4l2_tuners[]= {
 		.afc            = 0,
 		.reserved       = {0,0,0,0}
 	}
-#ifdef notdef
+#if 0
 	{
 		.index    = 1,
 		.name   = "Radio Tuner",
@@ -306,7 +306,7 @@ static int cnv_cid_v4l2_pvr2(int id)
 	return -1;
 }
 
-#ifdef notdef
+#if 0
 static int cnv_cid_pvr2_v4l2(int id)
 {
 	switch (id) {
@@ -877,8 +877,8 @@ static int pvr2_v4l2_do_ioctl(struct inode *inode, struct file *file,
 static void pvr2_v4l2_dev_destroy(struct pvr2_v4l2_dev *dip)
 {
 	pvr2_trace(PVR2_TRACE_INIT,
-		   "Unregistering v4l video device (%s, minor=%d)",
-		   pvr2_config_get_name(dip->config),dip->vdev->minor);
+		   "unregistering device video%d [%s]",
+		   dip->vdev->minor,pvr2_config_get_name(dip->config));
 	video_unregister_device(dip->vdev);
 }
 
@@ -1168,7 +1168,7 @@ static void pvr2_v4l2_dev_init(struct pvr2_v4l2_dev *dip,
 			       struct pvr2_v4l2 *vp,
 			       enum pvr2_config cfg)
 {
-#ifdef notdef
+#if 0
 	struct usb_device *usbdev;
 #endif
 	int mindevnum;
@@ -1177,7 +1177,7 @@ static void pvr2_v4l2_dev_init(struct pvr2_v4l2_dev *dip,
 	dip->v4lp = vp;
 	dip->config = cfg;
 
-#ifdef notdef
+#if 0
 	usbdev = pvr2_hdw_get_dev(vp->channel.mc_head->hdw);
 #endif
 
@@ -1212,7 +1212,7 @@ static void pvr2_v4l2_dev_init(struct pvr2_v4l2_dev *dip,
 	}
 
 	memcpy(dip->vdev,&vdev_template,sizeof(vdev_template));
-#ifdef notdef
+#if 0
 	/* ????? This relation may be problematic on a disconnect.  Is this
 	   really needed?  I can't seem to find a reason for it.  This
 	   can't be a required thing - what if the video device being set
@@ -1232,8 +1232,8 @@ static void pvr2_v4l2_dev_init(struct pvr2_v4l2_dev *dip,
 		err("Failed to register pvrusb2 v4l video device");
 	} else {
 		pvr2_trace(PVR2_TRACE_INIT,
-			   "Registered pvrusb2 v4l device, minor=%d",
-			   dip->vdev->minor);
+			   "registered device video%d [%s]",
+			   dip->vdev->minor,pvr2_config_get_name(dip->config));
 	}
 	pvr2_hdw_v4l_store_minor_number(vp->channel.mc_head->hdw,
 					dip->vdev->minor);