Skip to content

Commit

Permalink
V4L/DVB: tm6000: fix some info messages
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Dmitri Belimov authored and Mauro Carvalho Chehab committed May 18, 2010
1 parent 685b122 commit e28f49b
Show file tree
Hide file tree
Showing 10 changed files with 19 additions and 18 deletions.
7 changes: 4 additions & 3 deletions drivers/staging/tm6000/tm6000-alsa.c
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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");
Expand Down
4 changes: 2 additions & 2 deletions drivers/staging/tm6000/tm6000-cards.c
Original file line number Diff line number Diff line change
@@ -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>
Expand Down Expand Up @@ -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");
2 changes: 1 addition & 1 deletion drivers/staging/tm6000/tm6000-core.c
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/tm6000/tm6000-dvb.c
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/tm6000/tm6000-i2c.c
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
8 changes: 4 additions & 4 deletions drivers/staging/tm6000/tm6000-regs.h
Original file line number Diff line number Diff line change
@@ -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>
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/tm6000/tm6000-stds.c
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/tm6000/tm6000-usb-isoc.h
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
6 changes: 3 additions & 3 deletions drivers/staging/tm6000/tm6000-video.c
Original file line number Diff line number Diff line change
@@ -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>
Expand Down Expand Up @@ -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 |
Expand Down Expand Up @@ -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;
}

Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/tm6000/tm6000.h
Original file line number Diff line number Diff line change
@@ -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>
Expand Down

0 comments on commit e28f49b

Please sign in to comment.