aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntti Palosaari <crope@iki.fi>2008-05-28 02:57:39 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-07-20 06:07:56 -0400
commit53af158a901a32dd8639fbe03db5354ab711d8f0 (patch)
treef3eaf247681f57bb0eba656b7357cfc0f24d59d4
parentbbf23af2b10926c0d489d74814d9744cd495c3bc (diff)
V4L/DVB (7952): AU6610: various cosmetic changes
- update license comments - change MODULE_DESCRIPTION from device specific to chipset specific - correct debug switch from deb_rc to deb_info - correct MPEG2 stream interval from 1.25 to 1 - change frontend_attach error code from -EIO to -ENODEV Signed-off-by: Antti Palosaari <crope@iki.fi> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
-rw-r--r--drivers/media/dvb/dvb-usb/au6610.c38
-rw-r--r--drivers/media/dvb/dvb-usb/au6610.h22
2 files changed, 45 insertions, 15 deletions
diff --git a/drivers/media/dvb/dvb-usb/au6610.c b/drivers/media/dvb/dvb-usb/au6610.c
index a0895fba2e5f..eb34cc3894e0 100644
--- a/drivers/media/dvb/dvb-usb/au6610.c
+++ b/drivers/media/dvb/dvb-usb/au6610.c
@@ -1,24 +1,31 @@
1/* DVB USB compliant linux driver for Sigmatek DVB-110 DVB-T USB2.0 receiver 1/*
2 * DVB USB Linux driver for Alcor Micro AU6610 DVB-T USB2.0.
2 * 3 *
3 * Copyright (C) 2006 Antti Palosaari <crope@iki.fi> 4 * Copyright (C) 2006 Antti Palosaari <crope@iki.fi>
4 * 5 *
5 * This program is free software; you can redistribute it and/or modify it 6 * This program is free software; you can redistribute it and/or modify
6 * under the terms of the GNU General Public License as published by the 7 * it under the terms of the GNU General Public License as published by
7 * Free Software Foundation, version 2. 8 * the Free Software Foundation; either version 2 of the License, or
9 * (at your option) any later version.
8 * 10 *
9 * see Documentation/dvb/README.dvb-usb for more information 11 * This program is distributed in the hope that it will be useful,
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14 * GNU General Public License for more details.
15 *
16 * You should have received a copy of the GNU General Public License
17 * along with this program; if not, write to the Free Software
18 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
10 */ 19 */
11 20
12#include "au6610.h" 21#include "au6610.h"
13
14#include "zl10353.h" 22#include "zl10353.h"
15#include "qt1010.h" 23#include "qt1010.h"
16 24
17/* debug */ 25/* debug */
18static int dvb_usb_au6610_debug; 26static int dvb_usb_au6610_debug;
19module_param_named(debug, dvb_usb_au6610_debug, int, 0644); 27module_param_named(debug, dvb_usb_au6610_debug, int, 0644);
20MODULE_PARM_DESC(debug, "set debugging level (1=rc (or-able))." 28MODULE_PARM_DESC(debug, "set debugging level" DVB_USB_DEBUG_STATUS);
21 DVB_USB_DEBUG_STATUS);
22DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr); 29DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
23 30
24static int au6610_usb_msg(struct dvb_usb_device *d, u8 operation, u8 addr, 31static int au6610_usb_msg(struct dvb_usb_device *d, u8 operation, u8 addr,
@@ -126,7 +133,7 @@ static int au6610_zl10353_frontend_attach(struct dvb_usb_adapter *adap)
126 adap->fe = dvb_attach(zl10353_attach, &au6610_zl10353_config, 133 adap->fe = dvb_attach(zl10353_attach, &au6610_zl10353_config,
127 &adap->dev->i2c_adap); 134 &adap->dev->i2c_adap);
128 if (adap->fe == NULL) 135 if (adap->fe == NULL)
129 return -EIO; 136 return -ENODEV;
130 137
131 return 0; 138 return 0;
132} 139}
@@ -161,7 +168,7 @@ static int au6610_probe(struct usb_interface *intf,
161 alt = usb_altnum_to_altsetting(intf, AU6610_ALTSETTING); 168 alt = usb_altnum_to_altsetting(intf, AU6610_ALTSETTING);
162 169
163 if (alt == NULL) { 170 if (alt == NULL) {
164 deb_rc("no alt found!\n"); 171 deb_info("%s: no alt found!\n", __func__);
165 return -ENODEV; 172 return -ENODEV;
166 } 173 }
167 ret = usb_set_interface(d->udev, alt->desc.bInterfaceNumber, 174 ret = usb_set_interface(d->udev, alt->desc.bInterfaceNumber,
@@ -171,7 +178,6 @@ static int au6610_probe(struct usb_interface *intf,
171 return ret; 178 return ret;
172} 179}
173 180
174
175static struct usb_device_id au6610_table [] = { 181static struct usb_device_id au6610_table [] = {
176 { USB_DEVICE(USB_VID_ALCOR_MICRO, USB_PID_SIGMATEK_DVB_110) }, 182 { USB_DEVICE(USB_VID_ALCOR_MICRO, USB_PID_SIGMATEK_DVB_110) },
177 { } /* Terminating entry */ 183 { } /* Terminating entry */
@@ -180,8 +186,11 @@ MODULE_DEVICE_TABLE(usb, au6610_table);
180 186
181static struct dvb_usb_device_properties au6610_properties = { 187static struct dvb_usb_device_properties au6610_properties = {
182 .caps = DVB_USB_IS_AN_I2C_ADAPTER, 188 .caps = DVB_USB_IS_AN_I2C_ADAPTER,
189
183 .usb_ctrl = DEVICE_SPECIFIC, 190 .usb_ctrl = DEVICE_SPECIFIC,
184 .size_of_priv = 0, 191
192 .size_of_priv = 0,
193
185 .num_adapters = 1, 194 .num_adapters = 1,
186 .adapter = { 195 .adapter = {
187 { 196 {
@@ -196,12 +205,13 @@ static struct dvb_usb_device_properties au6610_properties = {
196 .isoc = { 205 .isoc = {
197 .framesperurb = 40, 206 .framesperurb = 40,
198 .framesize = 942, 207 .framesize = 942,
199 .interval = 1.25, /* 125 us */ 208 .interval = 1,
200 } 209 }
201 } 210 }
202 }, 211 },
203 } 212 }
204 }, 213 },
214
205 .i2c_algo = &au6610_i2c_algo, 215 .i2c_algo = &au6610_i2c_algo,
206 216
207 .num_device_descs = 1, 217 .num_device_descs = 1,
@@ -243,6 +253,6 @@ module_init(au6610_module_init);
243module_exit(au6610_module_exit); 253module_exit(au6610_module_exit);
244 254
245MODULE_AUTHOR("Antti Palosaari <crope@iki.fi>"); 255MODULE_AUTHOR("Antti Palosaari <crope@iki.fi>");
246MODULE_DESCRIPTION("Driver Sigmatek DVB-110 DVB-T USB2.0 / AU6610"); 256MODULE_DESCRIPTION("Driver for Alcor Micro AU6610 DVB-T USB2.0");
247MODULE_VERSION("0.1"); 257MODULE_VERSION("0.1");
248MODULE_LICENSE("GPL"); 258MODULE_LICENSE("GPL");
diff --git a/drivers/media/dvb/dvb-usb/au6610.h b/drivers/media/dvb/dvb-usb/au6610.h
index abca6291c725..7849abe2c614 100644
--- a/drivers/media/dvb/dvb-usb/au6610.h
+++ b/drivers/media/dvb/dvb-usb/au6610.h
@@ -1,10 +1,30 @@
1/*
2 * DVB USB Linux driver for Alcor Micro AU6610 DVB-T USB2.0.
3 *
4 * Copyright (C) 2006 Antti Palosaari <crope@iki.fi>
5 *
6 * This program is free software; you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License as published by
8 * the Free Software Foundation; either version 2 of the License, or
9 * (at your option) any later version.
10 *
11 * This program is distributed in the hope that it will be useful,
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14 * GNU General Public License for more details.
15 *
16 * You should have received a copy of the GNU General Public License
17 * along with this program; if not, write to the Free Software
18 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
19 */
20
1#ifndef _DVB_USB_AU6610_H_ 21#ifndef _DVB_USB_AU6610_H_
2#define _DVB_USB_AU6610_H_ 22#define _DVB_USB_AU6610_H_
3 23
4#define DVB_USB_LOG_PREFIX "au6610" 24#define DVB_USB_LOG_PREFIX "au6610"
5#include "dvb-usb.h" 25#include "dvb-usb.h"
6 26
7#define deb_rc(args...) dprintk(dvb_usb_au6610_debug, 0x01, args) 27#define deb_info(args...) dprintk(dvb_usb_au6610_debug, 0x01, args)
8 28
9#define AU6610_REQ_I2C_WRITE 0x14 29#define AU6610_REQ_I2C_WRITE 0x14
10#define AU6610_REQ_I2C_READ 0x13 30#define AU6610_REQ_I2C_READ 0x13