]> git.openfabrics.org - ~emulex/infiniband.git/commitdiff
V4L/DVB: tm6000: fix some info messages
authorDmitri Belimov <d.belimov@gmail.com>
Mon, 22 Feb 2010 09:32:15 +0000 (06:32 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Tue, 18 May 2010 03:44:07 +0000 (00:44 -0300)
Fix some messages for add information about TM6010

Signed-off-by: Beholder Intl. Ltd. Dmitry Belimov <d.belimov@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/staging/tm6000/tm6000-alsa.c
drivers/staging/tm6000/tm6000-cards.c
drivers/staging/tm6000/tm6000-core.c
drivers/staging/tm6000/tm6000-dvb.c
drivers/staging/tm6000/tm6000-i2c.c
drivers/staging/tm6000/tm6000-regs.h
drivers/staging/tm6000/tm6000-stds.c
drivers/staging/tm6000/tm6000-usb-isoc.h
drivers/staging/tm6000/tm6000-video.c
drivers/staging/tm6000/tm6000.h

index cf24340e0874720d0f162dd30aa95a83f2f851de..7cc2ac740d8a8d3439fdff2b47deefd0b3498123 100644 (file)
@@ -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 <mchehab@redhat.com>
  *
  *  Based on cx88-alsa.c
@@ -76,11 +76,12 @@ MODULE_PARM_DESC(index, "Index value for tm6000x capture interface(s).");
                                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 <mchehab@redhat.com>");
 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");
index 54571c1e926c76e0e4bd1499369d94f9df52b22f..d4f29fde4b121f0a7219f79002358f9067a054a1 100644 (file)
@@ -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 <mchehab@infradead.org>
 
@@ -795,6 +795,6 @@ static void __exit tm6000_module_exit(void)
 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");
index 3db15c6cd1398a86899c980883948f4acd67e679..bf40aa833ed0e8d9a2b0ff0557f455aa15f8f83b 100644 (file)
@@ -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 <mchehab@infradead.org>
 
index f832b1950c74da939bbdb74124c3c8bc375048e6..1072206f2a713c305133b11c065fe63978199e76 100644 (file)
@@ -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 <michel.ludwig@gmail.com>
 
index 050cbe41c12b2700ca73170063f05d4d0c28f1b1..fa11173e0fad6b17c7a88660d6324ee547f4cfaa 100644 (file)
@@ -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 <mchehab@infradead.org>
 
index 85acc07f62e977fb4e55f54f532d59c7f6e506bc..6c9368878f5b74f003c6ecd68bda60d6790dcff8 100644 (file)
@@ -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 <mchehab@infradead.org>
 
@@ -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 {
index c61d1a61ea3e5c5c34a66b6099c26869cbd7166b..1e142e5d59c53d749725e1ed2deba43799db5a5e 100644 (file)
@@ -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 <mchehab@redhat.com>
 
index 11297763de6fffaf666b488d0df89bc2df00abf2..5a5049acd4ec51f988267e2aaf2d205814c8156c 100644 (file)
@@ -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 <mchehab@infradead.org>
 
index 627b0ddfcd18d278aba11f537edb5495b52a647c..0bee7dfaae4efbffae3b908e03dee10dab90c3fe 100644 (file)
@@ -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 <mchehab@infradead.org>
 
@@ -894,7 +894,7 @@ static int vidioc_querycap (struct file *file, void  *priv,
        //      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 |
@@ -1537,7 +1537,7 @@ int tm6000_v4l2_register(struct tm6000_core *dev)
        vfd->v4l2_dev = &dev->v4l2_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;
 }
 
index f7d71be806b13619910ff33f5211c8d4d688448d..321e60eb9a83e03c06d2635d8c7916ee9c4ab488 100644 (file)
@@ -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 <mchehab@infradead.org>