aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/tm6000
diff options
context:
space:
mode:
authorDmitri Belimov <d.belimov@gmail.com>2010-02-22 04:32:15 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-05-17 23:44:07 -0400
commite28f49b0b2a8e678af62745ffdc4e4f36d7283a6 (patch)
treef4a389a034c66ab782bf36fa7bb64c39e3a004f2 /drivers/staging/tm6000
parent685b122906069f9e7b9995bf2b128137c86b558c (diff)
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 (limited to 'drivers/staging/tm6000')
-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 cf24340e087..7cc2ac740d8 100644
--- a/drivers/staging/tm6000/tm6000-alsa.c
+++ b/drivers/staging/tm6000/tm6000-alsa.c
@@ -1,6 +1,6 @@
1/* 1/*
2 * 2 *
3 * Support for audio capture for tm5600/6000 3 * Support for audio capture for tm5600/6000/6010
4 * (c) 2007-2008 Mauro Carvalho Chehab <mchehab@redhat.com> 4 * (c) 2007-2008 Mauro Carvalho Chehab <mchehab@redhat.com>
5 * 5 *
6 * Based on cx88-alsa.c 6 * Based on cx88-alsa.c
@@ -76,11 +76,12 @@ MODULE_PARM_DESC(index, "Index value for tm6000x capture interface(s).");
76 Module macros 76 Module macros
77 ****************************************************************************/ 77 ****************************************************************************/
78 78
79MODULE_DESCRIPTION("ALSA driver module for tm5600/tm6000 based TV cards"); 79MODULE_DESCRIPTION("ALSA driver module for tm5600/tm6000/tm6010 based TV cards");
80MODULE_AUTHOR("Mauro Carvalho Chehab <mchehab@redhat.com>"); 80MODULE_AUTHOR("Mauro Carvalho Chehab <mchehab@redhat.com>");
81MODULE_LICENSE("GPL"); 81MODULE_LICENSE("GPL");
82MODULE_SUPPORTED_DEVICE("{{Trident,tm5600}," 82MODULE_SUPPORTED_DEVICE("{{Trident,tm5600},"
83 "{{Trident,tm6000}"); 83 "{{Trident,tm6000},"
84 "{{Trident,tm6010}");
84static unsigned int debug; 85static unsigned int debug;
85module_param(debug, int, 0644); 86module_param(debug, int, 0644);
86MODULE_PARM_DESC(debug, "enable debug messages"); 87MODULE_PARM_DESC(debug, "enable debug messages");
diff --git a/drivers/staging/tm6000/tm6000-cards.c b/drivers/staging/tm6000/tm6000-cards.c
index 54571c1e926..d4f29fde4b1 100644
--- a/drivers/staging/tm6000/tm6000-cards.c
+++ b/drivers/staging/tm6000/tm6000-cards.c
@@ -1,5 +1,5 @@
1/* 1/*
2 tm6000-cards.c - driver for TM5600/TM6000 USB video capture devices 2 tm6000-cards.c - driver for TM5600/TM6000/TM6010 USB video capture devices
3 3
4 Copyright (C) 2006-2007 Mauro Carvalho Chehab <mchehab@infradead.org> 4 Copyright (C) 2006-2007 Mauro Carvalho Chehab <mchehab@infradead.org>
5 5
@@ -795,6 +795,6 @@ static void __exit tm6000_module_exit(void)
795module_init(tm6000_module_init); 795module_init(tm6000_module_init);
796module_exit(tm6000_module_exit); 796module_exit(tm6000_module_exit);
797 797
798MODULE_DESCRIPTION("Trident TVMaster TM5600/TM6000 USB2 adapter"); 798MODULE_DESCRIPTION("Trident TVMaster TM5600/TM6000/TM6010 USB2 adapter");
799MODULE_AUTHOR("Mauro Carvalho Chehab"); 799MODULE_AUTHOR("Mauro Carvalho Chehab");
800MODULE_LICENSE("GPL"); 800MODULE_LICENSE("GPL");
diff --git a/drivers/staging/tm6000/tm6000-core.c b/drivers/staging/tm6000/tm6000-core.c
index 3db15c6cd13..bf40aa833ed 100644
--- a/drivers/staging/tm6000/tm6000-core.c
+++ b/drivers/staging/tm6000/tm6000-core.c
@@ -1,5 +1,5 @@
1/* 1/*
2 tm6000-core.c - driver for TM5600/TM6000 USB video capture devices 2 tm6000-core.c - driver for TM5600/TM6000/TM6010 USB video capture devices
3 3
4 Copyright (C) 2006-2007 Mauro Carvalho Chehab <mchehab@infradead.org> 4 Copyright (C) 2006-2007 Mauro Carvalho Chehab <mchehab@infradead.org>
5 5
diff --git a/drivers/staging/tm6000/tm6000-dvb.c b/drivers/staging/tm6000/tm6000-dvb.c
index f832b1950c7..1072206f2a7 100644
--- a/drivers/staging/tm6000/tm6000-dvb.c
+++ b/drivers/staging/tm6000/tm6000-dvb.c
@@ -1,5 +1,5 @@
1/* 1/*
2 tm6000-dvb.c - dvb-t support for TM5600/TM6000 USB video capture devices 2 tm6000-dvb.c - dvb-t support for TM5600/TM6000/TM6010 USB video capture devices
3 3
4 Copyright (C) 2007 Michel Ludwig <michel.ludwig@gmail.com> 4 Copyright (C) 2007 Michel Ludwig <michel.ludwig@gmail.com>
5 5
diff --git a/drivers/staging/tm6000/tm6000-i2c.c b/drivers/staging/tm6000/tm6000-i2c.c
index 050cbe41c12..fa11173e0fa 100644
--- a/drivers/staging/tm6000/tm6000-i2c.c
+++ b/drivers/staging/tm6000/tm6000-i2c.c
@@ -1,5 +1,5 @@
1/* 1/*
2 tm6000-i2c.c - driver for TM5600/TM6000 USB video capture devices 2 tm6000-i2c.c - driver for TM5600/TM6000/TM6010 USB video capture devices
3 3
4 Copyright (C) 2006-2007 Mauro Carvalho Chehab <mchehab@infradead.org> 4 Copyright (C) 2006-2007 Mauro Carvalho Chehab <mchehab@infradead.org>
5 5
diff --git a/drivers/staging/tm6000/tm6000-regs.h b/drivers/staging/tm6000/tm6000-regs.h
index 85acc07f62e..6c9368878f5 100644
--- a/drivers/staging/tm6000/tm6000-regs.h
+++ b/drivers/staging/tm6000/tm6000-regs.h
@@ -1,5 +1,5 @@
1/* 1/*
2 tm6000-regs.h - driver for TM5600/TM6000 USB video capture devices 2 tm6000-regs.h - driver for TM5600/TM6000/TM6010 USB video capture devices
3 3
4 Copyright (C) 2006-2007 Mauro Carvalho Chehab <mchehab@infradead.org> 4 Copyright (C) 2006-2007 Mauro Carvalho Chehab <mchehab@infradead.org>
5 5
@@ -18,7 +18,7 @@
18 */ 18 */
19 19
20/* 20/*
21 * Define TV Master TM5600/TM6000 Request codes 21 * Define TV Master TM5600/TM6000/TM6010 Request codes
22 */ 22 */
23#define REQ_00_SET_IR_VALUE 0 23#define REQ_00_SET_IR_VALUE 0
24#define REQ_01_SET_WAKEUP_IRCODE 1 24#define REQ_01_SET_WAKEUP_IRCODE 1
@@ -49,7 +49,7 @@
49 /* Read : Slave Addr, register, 2, data */ 49 /* Read : Slave Addr, register, 2, data */
50 50
51/* 51/*
52 * Define TV Master TM5600/TM6000 GPIO lines 52 * Define TV Master TM5600/TM6000/TM6010 GPIO lines
53 */ 53 */
54 54
55#define TM6000_GPIO_CLK 0x101 55#define TM6000_GPIO_CLK 0x101
@@ -74,7 +74,7 @@
74#define TM6010_GPIO_7 0x0301 74#define TM6010_GPIO_7 0x0301
75#define TM6010_GPIO_9 0x0305 75#define TM6010_GPIO_9 0x0305
76/* 76/*
77 * Define TV Master TM5600/TM6000 URB message codes and length 77 * Define TV Master TM5600/TM6000/TM6010 URB message codes and length
78 */ 78 */
79 79
80enum { 80enum {
diff --git a/drivers/staging/tm6000/tm6000-stds.c b/drivers/staging/tm6000/tm6000-stds.c
index c61d1a61ea3..1e142e5d59c 100644
--- a/drivers/staging/tm6000/tm6000-stds.c
+++ b/drivers/staging/tm6000/tm6000-stds.c
@@ -1,5 +1,5 @@
1/* 1/*
2 tm6000-stds.c - driver for TM5600/TM6000 USB video capture devices 2 tm6000-stds.c - driver for TM5600/TM6000/TM6010 USB video capture devices
3 3
4 Copyright (C) 2007 Mauro Carvalho Chehab <mchehab@redhat.com> 4 Copyright (C) 2007 Mauro Carvalho Chehab <mchehab@redhat.com>
5 5
diff --git a/drivers/staging/tm6000/tm6000-usb-isoc.h b/drivers/staging/tm6000/tm6000-usb-isoc.h
index 11297763de6..5a5049acd4e 100644
--- a/drivers/staging/tm6000/tm6000-usb-isoc.h
+++ b/drivers/staging/tm6000/tm6000-usb-isoc.h
@@ -1,5 +1,5 @@
1/* 1/*
2 tm6000-buf.c - driver for TM5600/TM6000 USB video capture devices 2 tm6000-buf.c - driver for TM5600/TM6000/TM6010 USB video capture devices
3 3
4 Copyright (C) 2006-2007 Mauro Carvalho Chehab <mchehab@infradead.org> 4 Copyright (C) 2006-2007 Mauro Carvalho Chehab <mchehab@infradead.org>
5 5
diff --git a/drivers/staging/tm6000/tm6000-video.c b/drivers/staging/tm6000/tm6000-video.c
index 627b0ddfcd1..0bee7dfaae4 100644
--- a/drivers/staging/tm6000/tm6000-video.c
+++ b/drivers/staging/tm6000/tm6000-video.c
@@ -1,5 +1,5 @@
1/* 1/*
2 tm6000-video.c - driver for TM5600/TM6000 USB video capture devices 2 tm6000-video.c - driver for TM5600/TM6000/TM6010 USB video capture devices
3 3
4 Copyright (C) 2006-2007 Mauro Carvalho Chehab <mchehab@infradead.org> 4 Copyright (C) 2006-2007 Mauro Carvalho Chehab <mchehab@infradead.org>
5 5
@@ -894,7 +894,7 @@ static int vidioc_querycap (struct file *file, void *priv,
894 // struct tm6000_core *dev = ((struct tm6000_fh *)priv)->dev; 894 // struct tm6000_core *dev = ((struct tm6000_fh *)priv)->dev;
895 895
896 strlcpy(cap->driver, "tm6000", sizeof(cap->driver)); 896 strlcpy(cap->driver, "tm6000", sizeof(cap->driver));
897 strlcpy(cap->card,"Trident TVMaster TM5600/6000", sizeof(cap->card)); 897 strlcpy(cap->card,"Trident TVMaster TM5600/6000/6010", sizeof(cap->card));
898 // strlcpy(cap->bus_info, dev->udev->dev.bus_id, sizeof(cap->bus_info)); 898 // strlcpy(cap->bus_info, dev->udev->dev.bus_id, sizeof(cap->bus_info));
899 cap->version = TM6000_VERSION; 899 cap->version = TM6000_VERSION;
900 cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | 900 cap->capabilities = V4L2_CAP_VIDEO_CAPTURE |
@@ -1537,7 +1537,7 @@ int tm6000_v4l2_register(struct tm6000_core *dev)
1537 vfd->v4l2_dev = &dev->v4l2_dev; 1537 vfd->v4l2_dev = &dev->v4l2_dev;
1538 1538
1539 ret = video_register_device(dev->vfd, VFL_TYPE_GRABBER, video_nr); 1539 ret = video_register_device(dev->vfd, VFL_TYPE_GRABBER, video_nr);
1540 printk(KERN_INFO "Trident TVMaster TM5600/TM6000 USB2 board (Load status: %d)\n", ret); 1540 printk(KERN_INFO "Trident TVMaster TM5600/TM6000/TM6010 USB2 board (Load status: %d)\n", ret);
1541 return ret; 1541 return ret;
1542} 1542}
1543 1543
diff --git a/drivers/staging/tm6000/tm6000.h b/drivers/staging/tm6000/tm6000.h
index f7d71be806b..321e60eb9a8 100644
--- a/drivers/staging/tm6000/tm6000.h
+++ b/drivers/staging/tm6000/tm6000.h
@@ -1,5 +1,5 @@
1/* 1/*
2 tm6000.h - driver for TM5600/TM6000 USB video capture devices 2 tm6000.h - driver for TM5600/TM6000/TM6010 USB video capture devices
3 3
4 Copyright (C) 2006-2007 Mauro Carvalho Chehab <mchehab@infradead.org> 4 Copyright (C) 2006-2007 Mauro Carvalho Chehab <mchehab@infradead.org>
5 5