diff options
author | Dmitri Belimov <d.belimov@gmail.com> | 2010-02-22 04:32:15 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-05-17 23:44:07 -0400 |
commit | e28f49b0b2a8e678af62745ffdc4e4f36d7283a6 (patch) | |
tree | f4a389a034c66ab782bf36fa7bb64c39e3a004f2 /drivers | |
parent | 685b122906069f9e7b9995bf2b128137c86b558c (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')
-rw-r--r-- | drivers/staging/tm6000/tm6000-alsa.c | 7 | ||||
-rw-r--r-- | drivers/staging/tm6000/tm6000-cards.c | 4 | ||||
-rw-r--r-- | drivers/staging/tm6000/tm6000-core.c | 2 | ||||
-rw-r--r-- | drivers/staging/tm6000/tm6000-dvb.c | 2 | ||||
-rw-r--r-- | drivers/staging/tm6000/tm6000-i2c.c | 2 | ||||
-rw-r--r-- | drivers/staging/tm6000/tm6000-regs.h | 8 | ||||
-rw-r--r-- | drivers/staging/tm6000/tm6000-stds.c | 2 | ||||
-rw-r--r-- | drivers/staging/tm6000/tm6000-usb-isoc.h | 2 | ||||
-rw-r--r-- | drivers/staging/tm6000/tm6000-video.c | 6 | ||||
-rw-r--r-- | drivers/staging/tm6000/tm6000.h | 2 |
10 files changed, 19 insertions, 18 deletions
diff --git a/drivers/staging/tm6000/tm6000-alsa.c b/drivers/staging/tm6000/tm6000-alsa.c index cf24340e0874..7cc2ac740d8a 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 | ||
79 | MODULE_DESCRIPTION("ALSA driver module for tm5600/tm6000 based TV cards"); | 79 | MODULE_DESCRIPTION("ALSA driver module for tm5600/tm6000/tm6010 based TV cards"); |
80 | MODULE_AUTHOR("Mauro Carvalho Chehab <mchehab@redhat.com>"); | 80 | MODULE_AUTHOR("Mauro Carvalho Chehab <mchehab@redhat.com>"); |
81 | MODULE_LICENSE("GPL"); | 81 | MODULE_LICENSE("GPL"); |
82 | MODULE_SUPPORTED_DEVICE("{{Trident,tm5600}," | 82 | MODULE_SUPPORTED_DEVICE("{{Trident,tm5600}," |
83 | "{{Trident,tm6000}"); | 83 | "{{Trident,tm6000}," |
84 | "{{Trident,tm6010}"); | ||
84 | static unsigned int debug; | 85 | static unsigned int debug; |
85 | module_param(debug, int, 0644); | 86 | module_param(debug, int, 0644); |
86 | MODULE_PARM_DESC(debug, "enable debug messages"); | 87 | MODULE_PARM_DESC(debug, "enable debug messages"); |
diff --git a/drivers/staging/tm6000/tm6000-cards.c b/drivers/staging/tm6000/tm6000-cards.c index 54571c1e926c..d4f29fde4b12 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) | |||
795 | module_init(tm6000_module_init); | 795 | module_init(tm6000_module_init); |
796 | module_exit(tm6000_module_exit); | 796 | module_exit(tm6000_module_exit); |
797 | 797 | ||
798 | MODULE_DESCRIPTION("Trident TVMaster TM5600/TM6000 USB2 adapter"); | 798 | MODULE_DESCRIPTION("Trident TVMaster TM5600/TM6000/TM6010 USB2 adapter"); |
799 | MODULE_AUTHOR("Mauro Carvalho Chehab"); | 799 | MODULE_AUTHOR("Mauro Carvalho Chehab"); |
800 | MODULE_LICENSE("GPL"); | 800 | MODULE_LICENSE("GPL"); |
diff --git a/drivers/staging/tm6000/tm6000-core.c b/drivers/staging/tm6000/tm6000-core.c index 3db15c6cd139..bf40aa833ed0 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 f832b1950c74..1072206f2a71 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 050cbe41c12b..fa11173e0fad 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 85acc07f62e9..6c9368878f5b 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 | ||
80 | enum { | 80 | enum { |
diff --git a/drivers/staging/tm6000/tm6000-stds.c b/drivers/staging/tm6000/tm6000-stds.c index c61d1a61ea3e..1e142e5d59c5 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 11297763de6f..5a5049acd4ec 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 627b0ddfcd18..0bee7dfaae4e 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 f7d71be806b1..321e60eb9a83 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 | ||