summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitri Belimov <d.belimov@gmail.com>2010-02-22 06:32:15 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-05-18 00:44:07 -0300
commite28f49b0b2a8e678af62745ffdc4e4f36d7283a6 (patch)
treef4a389a034c66ab782bf36fa7bb64c39e3a004f2
parent685b122906069f9e7b9995bf2b128137c86b558c (diff)
downloadop-kernel-dev-e28f49b0b2a8e678af62745ffdc4e4f36d7283a6.zip
op-kernel-dev-e28f49b0b2a8e678af62745ffdc4e4f36d7283a6.tar.gz
V4L/DVB: tm6000: fix some info messages
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>
Diffstat
-rw-r--r--drivers/staging/tm6000/tm6000-alsa.c7
-rw-r--r--drivers/staging/tm6000/tm6000-cards.c4
-rw-r--r--drivers/staging/tm6000/tm6000-core.c2
-rw-r--r--drivers/staging/tm6000/tm6000-dvb.c2
-rw-r--r--drivers/staging/tm6000/tm6000-i2c.c2
-rw-r--r--drivers/staging/tm6000/tm6000-regs.h8
-rw-r--r--drivers/staging/tm6000/tm6000-stds.c2
-rw-r--r--drivers/staging/tm6000/tm6000-usb-isoc.h2
-rw-r--r--drivers/staging/tm6000/tm6000-video.c6
-rw-r--r--drivers/staging/tm6000/tm6000.h2
10 files changed, 19 insertions, 18 deletions
diff --git a/drivers/staging/tm6000/tm6000-alsa.c b/drivers/staging/tm6000/tm6000-alsa.c
index cf24340..7cc2ac7 100644
--- a/drivers/staging/tm6000/tm6000-alsa.c
+++ b/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 <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");
diff --git a/drivers/staging/tm6000/tm6000-cards.c b/drivers/staging/tm6000/tm6000-cards.c
index 54571c1..d4f29fd 100644
--- a/drivers/staging/tm6000/tm6000-cards.c
+++ b/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 <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");
diff --git a/drivers/staging/tm6000/tm6000-core.c b/drivers/staging/tm6000/tm6000-core.c
index 3db15c6..bf40aa8 100644
--- a/drivers/staging/tm6000/tm6000-core.c
+++ b/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 <mchehab@infradead.org>
diff --git a/drivers/staging/tm6000/tm6000-dvb.c b/drivers/staging/tm6000/tm6000-dvb.c
index f832b19..1072206 100644
--- a/drivers/staging/tm6000/tm6000-dvb.c
+++ b/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 <michel.ludwig@gmail.com>
diff --git a/drivers/staging/tm6000/tm6000-i2c.c b/drivers/staging/tm6000/tm6000-i2c.c
index 050cbe4..fa11173 100644
--- a/drivers/staging/tm6000/tm6000-i2c.c
+++ b/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 <mchehab@infradead.org>
diff --git a/drivers/staging/tm6000/tm6000-regs.h b/drivers/staging/tm6000/tm6000-regs.h
index 85acc07..6c93688 100644
--- a/drivers/staging/tm6000/tm6000-regs.h
+++ b/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 <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 {
diff --git a/drivers/staging/tm6000/tm6000-stds.c b/drivers/staging/tm6000/tm6000-stds.c
index c61d1a6..1e142e5 100644
--- a/drivers/staging/tm6000/tm6000-stds.c
+++ b/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 <mchehab@redhat.com>
diff --git a/drivers/staging/tm6000/tm6000-usb-isoc.h b/drivers/staging/tm6000/tm6000-usb-isoc.h
index 1129776..5a5049a 100644
--- a/drivers/staging/tm6000/tm6000-usb-isoc.h
+++ b/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 <mchehab@infradead.org>
diff --git a/drivers/staging/tm6000/tm6000-video.c b/drivers/staging/tm6000/tm6000-video.c
index 627b0dd..0bee7df 100644
--- a/drivers/staging/tm6000/tm6000-video.c
+++ b/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 <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;
}
diff --git a/drivers/staging/tm6000/tm6000.h b/drivers/staging/tm6000/tm6000.h
index f7d71be..321e60e 100644
--- a/drivers/staging/tm6000/tm6000.h
+++ b/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 <mchehab@infradead.org>
OpenPOWER on IntegriCloud