Skip to contentSkip to conversation

fix some info messages

PATCH New Dmitri Belimov 1 participant 1 message Feb 22, 2010 Media (V4L/DVB)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 fix some info messages

Hi

Fix some messages for add information about TM6010

linux/drivers/staging/tm6000/tm6000-alsa.c +4 -3
diff -r ac88a0dd8fb7 linux/drivers/staging/tm6000/tm6000-alsa.c
@@ -1,6 +1,6 @@
 /*
  *
- *  Support for audio capture for tm5600/6000
+ *  Support for audio capture for tm5600/6000/6010
  *    (c) 2007-2008 Mauro Carvalho Chehab <[email protected]>
  *
  *  Based on cx88-alsa.c
@@ -89,11 +89,12 @@
 				Module macros
  ****************************************************************************/
 
-MODULE_DESCRIPTION("ALSA driver module for tm5600/tm6000 based TV cards");
+MODULE_DESCRIPTION("ALSA driver module for tm5600/tm6000/tm6010 based TV cards");
 MODULE_AUTHOR("Mauro Carvalho Chehab <[email protected]>");
 MODULE_LICENSE("GPL");
 MODULE_SUPPORTED_DEVICE("{{Trident,tm5600},"
-			"{{Trident,tm6000}");
+			"{{Trident,tm6000},"
+			"{{Trident,tm6010}");
 static unsigned int debug;
 module_param(debug, int, 0644);
 MODULE_PARM_DESC(debug, "enable debug messages");
linux/drivers/staging/tm6000/tm6000-cards.c +2 -2
diff -r ac88a0dd8fb7 linux/drivers/staging/tm6000/tm6000-cards.c
@@ -1,5 +1,5 @@
 /*
-   tm6000-cards.c - driver for TM5600/TM6000 USB video capture devices
+   tm6000-cards.c - driver for TM5600/TM6000/TM6010 USB video capture devices
 
    Copyright (C) 2006-2007 Mauro Carvalho Chehab <[email protected]>
 
@@ -799,6 +799,6 @@
 module_init(tm6000_module_init);
 module_exit(tm6000_module_exit);
 
-MODULE_DESCRIPTION("Trident TVMaster TM5600/TM6000 USB2 adapter");
+MODULE_DESCRIPTION("Trident TVMaster TM5600/TM6000/TM6010 USB2 adapter");
 MODULE_AUTHOR("Mauro Carvalho Chehab");
 MODULE_LICENSE("GPL");
linux/drivers/staging/tm6000/tm6000-core.c +1 -1
diff -r ac88a0dd8fb7 linux/drivers/staging/tm6000/tm6000-core.c
@@ -1,5 +1,5 @@
 /*
-   tm6000-core.c - driver for TM5600/TM6000 USB video capture devices
+   tm6000-core.c - driver for TM5600/TM6000/TM6010 USB video capture devices
 
    Copyright (C) 2006-2007 Mauro Carvalho Chehab <[email protected]>
 
linux/drivers/staging/tm6000/tm6000-dvb.c +1 -1
diff -r ac88a0dd8fb7 linux/drivers/staging/tm6000/tm6000-dvb.c
@@ -1,5 +1,5 @@
 /*
-   tm6000-dvb.c - dvb-t support for TM5600/TM6000 USB video capture devices
+   tm6000-dvb.c - dvb-t support for TM5600/TM6000/TM6010 USB video capture devices
 
    Copyright (C) 2007 Michel Ludwig <[email protected]>
 
linux/drivers/staging/tm6000/tm6000-i2c.c +1 -1
diff -r ac88a0dd8fb7 linux/drivers/staging/tm6000/tm6000-i2c.c
@@ -1,5 +1,5 @@
 /*
-   tm6000-i2c.c - driver for TM5600/TM6000 USB video capture devices
+   tm6000-i2c.c - driver for TM5600/TM6000/TM6010 USB video capture devices
 
    Copyright (C) 2006-2007 Mauro Carvalho Chehab <[email protected]>
 
linux/drivers/staging/tm6000/tm6000-regs.h +4 -4
diff -r ac88a0dd8fb7 linux/drivers/staging/tm6000/tm6000-regs.h
@@ -1,5 +1,5 @@
 /*
-   tm6000-regs.h - driver for TM5600/TM6000 USB video capture devices
+   tm6000-regs.h - driver for TM5600/TM6000/TM6010 USB video capture devices
 
    Copyright (C) 2006-2007 Mauro Carvalho Chehab <[email protected]>
 
@@ -18,7 +18,7 @@
  */
 
 /*
- * Define TV Master TM5600/TM6000 Request codes
+ * Define TV Master TM5600/TM6000/TM6010 Request codes
  */
 #define REQ_00_SET_IR_VALUE		0
 #define REQ_01_SET_WAKEUP_IRCODE	1
@@ -49,7 +49,7 @@
 	/* Read : Slave Addr, register, 2, data */
 
 /*
- * Define TV Master TM5600/TM6000 GPIO lines
+ * Define TV Master TM5600/TM6000/TM6010 GPIO lines
  */
 
 #define TM6000_GPIO_CLK		0x101
@@ -74,7 +74,7 @@
 #define TM6010_GPIO_7      0x0301
 #define TM6010_GPIO_9      0x0305
 /*
- * Define TV Master TM5600/TM6000 URB message codes and length
+ * Define TV Master TM5600/TM6000/TM6010 URB message codes and length
  */
 
 enum {
linux/drivers/staging/tm6000/tm6000-stds.c +1 -1
diff -r ac88a0dd8fb7 linux/drivers/staging/tm6000/tm6000-stds.c
@@ -1,5 +1,5 @@
 /*
-   tm6000-stds.c - driver for TM5600/TM6000 USB video capture devices
+   tm6000-stds.c - driver for TM5600/TM6000/TM6010 USB video capture devices
 
    Copyright (C) 2007 Mauro Carvalho Chehab <[email protected]>
 
linux/drivers/staging/tm6000/tm6000-usb-isoc.h +1 -1
diff -r ac88a0dd8fb7 linux/drivers/staging/tm6000/tm6000-usb-isoc.h
@@ -1,5 +1,5 @@
 /*
-   tm6000-buf.c - driver for TM5600/TM6000 USB video capture devices
+   tm6000-buf.c - driver for TM5600/TM6000/TM6010 USB video capture devices
 
    Copyright (C) 2006-2007 Mauro Carvalho Chehab <[email protected]>
 
linux/drivers/staging/tm6000/tm6000-video.c +3 -3
diff -r ac88a0dd8fb7 linux/drivers/staging/tm6000/tm6000-video.c
@@ -1,5 +1,5 @@
 /*
-   tm6000-video.c - driver for TM5600/TM6000 USB video capture devices
+   tm6000-video.c - driver for TM5600/TM6000/TM6010 USB video capture devices
 
    Copyright (C) 2006-2007 Mauro Carvalho Chehab <[email protected]>
 
@@ -925,7 +925,7 @@
 	//	struct tm6000_core *dev = ((struct tm6000_fh *)priv)->dev;
 
 	strlcpy(cap->driver, "tm6000", sizeof(cap->driver));
-	strlcpy(cap->card,"Trident TVMaster TM5600/6000", sizeof(cap->card));
+	strlcpy(cap->card,"Trident TVMaster TM5600/6000/6010", sizeof(cap->card));
 	//	strlcpy(cap->bus_info, dev->udev->dev.bus_id, sizeof(cap->bus_info));
 	cap->version = TM6000_VERSION;
 	cap->capabilities =	V4L2_CAP_VIDEO_CAPTURE |
@@ -1594,7 +1594,7 @@
 	video_set_drvdata(vfd, dev);
 
 	ret = video_register_device(dev->vfd, VFL_TYPE_GRABBER, video_nr);
-	printk(KERN_INFO "Trident TVMaster TM5600/TM6000 USB2 board (Load status: %d)\n", ret);
+	printk(KERN_INFO "Trident TVMaster TM5600/TM6000/TM6010 USB2 board (Load status: %d)\n", ret);
 	return ret;
 }
 
linux/drivers/staging/tm6000/tm6000.h +1 -1
diff -r ac88a0dd8fb7 linux/drivers/staging/tm6000/tm6000.h
@@ -1,5 +1,5 @@
 /*
-   tm6000.h - driver for TM5600/TM6000 USB video capture devices
+   tm6000.h - driver for TM5600/TM6000/TM6010 USB video capture devices
 
    Copyright (C) 2006-2007 Mauro Carvalho Chehab <[email protected]>
 

With my best regards, Dmitry.

linux/drivers/staging/tm6000/tm6000-alsa.c +4 -3
diff -r ac88a0dd8fb7 linux/drivers/staging/tm6000/tm6000-alsa.c
@@ -1,6 +1,6 @@
 /*
  *
- *  Support for audio capture for tm5600/6000
+ *  Support for audio capture for tm5600/6000/6010
  *    (c) 2007-2008 Mauro Carvalho Chehab <[email protected]>
  *
  *  Based on cx88-alsa.c
@@ -89,11 +89,12 @@
 				Module macros
  ****************************************************************************/
 
-MODULE_DESCRIPTION("ALSA driver module for tm5600/tm6000 based TV cards");
+MODULE_DESCRIPTION("ALSA driver module for tm5600/tm6000/tm6010 based TV cards");
 MODULE_AUTHOR("Mauro Carvalho Chehab <[email protected]>");
 MODULE_LICENSE("GPL");
 MODULE_SUPPORTED_DEVICE("{{Trident,tm5600},"
-			"{{Trident,tm6000}");
+			"{{Trident,tm6000},"
+			"{{Trident,tm6010}");
 static unsigned int debug;
 module_param(debug, int, 0644);
 MODULE_PARM_DESC(debug, "enable debug messages");
linux/drivers/staging/tm6000/tm6000-cards.c +2 -2
diff -r ac88a0dd8fb7 linux/drivers/staging/tm6000/tm6000-cards.c
@@ -1,5 +1,5 @@
 /*
-   tm6000-cards.c - driver for TM5600/TM6000 USB video capture devices
+   tm6000-cards.c - driver for TM5600/TM6000/TM6010 USB video capture devices
 
    Copyright (C) 2006-2007 Mauro Carvalho Chehab <[email protected]>
 
@@ -799,6 +799,6 @@
 module_init(tm6000_module_init);
 module_exit(tm6000_module_exit);
 
-MODULE_DESCRIPTION("Trident TVMaster TM5600/TM6000 USB2 adapter");
+MODULE_DESCRIPTION("Trident TVMaster TM5600/TM6000/TM6010 USB2 adapter");
 MODULE_AUTHOR("Mauro Carvalho Chehab");
 MODULE_LICENSE("GPL");
linux/drivers/staging/tm6000/tm6000-core.c +1 -1
diff -r ac88a0dd8fb7 linux/drivers/staging/tm6000/tm6000-core.c
@@ -1,5 +1,5 @@
 /*
-   tm6000-core.c - driver for TM5600/TM6000 USB video capture devices
+   tm6000-core.c - driver for TM5600/TM6000/TM6010 USB video capture devices
 
    Copyright (C) 2006-2007 Mauro Carvalho Chehab <[email protected]>
 
linux/drivers/staging/tm6000/tm6000-dvb.c +1 -1
diff -r ac88a0dd8fb7 linux/drivers/staging/tm6000/tm6000-dvb.c
@@ -1,5 +1,5 @@
 /*
-   tm6000-dvb.c - dvb-t support for TM5600/TM6000 USB video capture devices
+   tm6000-dvb.c - dvb-t support for TM5600/TM6000/TM6010 USB video capture devices
 
    Copyright (C) 2007 Michel Ludwig <[email protected]>
 
linux/drivers/staging/tm6000/tm6000-i2c.c +1 -1
diff -r ac88a0dd8fb7 linux/drivers/staging/tm6000/tm6000-i2c.c
@@ -1,5 +1,5 @@
 /*
-   tm6000-i2c.c - driver for TM5600/TM6000 USB video capture devices
+   tm6000-i2c.c - driver for TM5600/TM6000/TM6010 USB video capture devices
 
    Copyright (C) 2006-2007 Mauro Carvalho Chehab <[email protected]>
 
linux/drivers/staging/tm6000/tm6000-regs.h +4 -4
diff -r ac88a0dd8fb7 linux/drivers/staging/tm6000/tm6000-regs.h
@@ -1,5 +1,5 @@
 /*
-   tm6000-regs.h - driver for TM5600/TM6000 USB video capture devices
+   tm6000-regs.h - driver for TM5600/TM6000/TM6010 USB video capture devices
 
    Copyright (C) 2006-2007 Mauro Carvalho Chehab <[email protected]>
 
@@ -18,7 +18,7 @@
  */
 
 /*
- * Define TV Master TM5600/TM6000 Request codes
+ * Define TV Master TM5600/TM6000/TM6010 Request codes
  */
 #define REQ_00_SET_IR_VALUE		0
 #define REQ_01_SET_WAKEUP_IRCODE	1
@@ -49,7 +49,7 @@
 	/* Read : Slave Addr, register, 2, data */
 
 /*
- * Define TV Master TM5600/TM6000 GPIO lines
+ * Define TV Master TM5600/TM6000/TM6010 GPIO lines
  */
 
 #define TM6000_GPIO_CLK		0x101
@@ -74,7 +74,7 @@
 #define TM6010_GPIO_7      0x0301
 #define TM6010_GPIO_9      0x0305
 /*
- * Define TV Master TM5600/TM6000 URB message codes and length
+ * Define TV Master TM5600/TM6000/TM6010 URB message codes and length
  */
 
 enum {
linux/drivers/staging/tm6000/tm6000-stds.c +1 -1
diff -r ac88a0dd8fb7 linux/drivers/staging/tm6000/tm6000-stds.c
@@ -1,5 +1,5 @@
 /*
-   tm6000-stds.c - driver for TM5600/TM6000 USB video capture devices
+   tm6000-stds.c - driver for TM5600/TM6000/TM6010 USB video capture devices
 
    Copyright (C) 2007 Mauro Carvalho Chehab <[email protected]>
 
linux/drivers/staging/tm6000/tm6000-usb-isoc.h +1 -1
diff -r ac88a0dd8fb7 linux/drivers/staging/tm6000/tm6000-usb-isoc.h
@@ -1,5 +1,5 @@
 /*
-   tm6000-buf.c - driver for TM5600/TM6000 USB video capture devices
+   tm6000-buf.c - driver for TM5600/TM6000/TM6010 USB video capture devices
 
    Copyright (C) 2006-2007 Mauro Carvalho Chehab <[email protected]>
 
linux/drivers/staging/tm6000/tm6000-video.c +3 -3
diff -r ac88a0dd8fb7 linux/drivers/staging/tm6000/tm6000-video.c
@@ -1,5 +1,5 @@
 /*
-   tm6000-video.c - driver for TM5600/TM6000 USB video capture devices
+   tm6000-video.c - driver for TM5600/TM6000/TM6010 USB video capture devices
 
    Copyright (C) 2006-2007 Mauro Carvalho Chehab <[email protected]>
 
@@ -925,7 +925,7 @@
 	//	struct tm6000_core *dev = ((struct tm6000_fh *)priv)->dev;
 
 	strlcpy(cap->driver, "tm6000", sizeof(cap->driver));
-	strlcpy(cap->card,"Trident TVMaster TM5600/6000", sizeof(cap->card));
+	strlcpy(cap->card,"Trident TVMaster TM5600/6000/6010", sizeof(cap->card));
 	//	strlcpy(cap->bus_info, dev->udev->dev.bus_id, sizeof(cap->bus_info));
 	cap->version = TM6000_VERSION;
 	cap->capabilities =	V4L2_CAP_VIDEO_CAPTURE |
@@ -1594,7 +1594,7 @@
 	video_set_drvdata(vfd, dev);
 
 	ret = video_register_device(dev->vfd, VFL_TYPE_GRABBER, video_nr);
-	printk(KERN_INFO "Trident TVMaster TM5600/TM6000 USB2 board (Load status: %d)\n", ret);
+	printk(KERN_INFO "Trident TVMaster TM5600/TM6000/TM6010 USB2 board (Load status: %d)\n", ret);
 	return ret;
 }
 
linux/drivers/staging/tm6000/tm6000.h +1 -1
diff -r ac88a0dd8fb7 linux/drivers/staging/tm6000/tm6000.h
@@ -1,5 +1,5 @@
 /*
-   tm6000.h - driver for TM5600/TM6000 USB video capture devices
+   tm6000.h - driver for TM5600/TM6000/TM6010 USB video capture devices
 
    Copyright (C) 2006-2007 Mauro Carvalho Chehab <[email protected]>