Skip to content

L
linux
Commit 4d43e13f authored by Patrick Boettcher's avatar Patrick Boettcher Committed by Mauro Carvalho Chehab
Browse files
Options

V4L/DVB (4643): Multi-input patch for DVB-USB device 

This patch is the first commit of the Multiple Input Patch for the DVB-USB frame
work.
It changes the DVB-USB-device to be able to have more than one streaming input
(e.g. multiple DVB-T sources) on one device. This is a necessary feature for
the upcoming DiB7700 driven devices.
Signed-off-by: default avatarPatrick Boettcher <pb@linuxtv.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 8ccb3dcd
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1017 additions and 1005 deletions
drivers/media/dvb/dvb-usb/Kconfig
View file @ 4d43e13f
...@@ -39,20 +39,8 @@ config DVB_USB_DIBUSB_MB ...@@ -39,20 +39,8 @@ config DVB_USB_DIBUSB_MB
Support for USB 1.1 and 2.0 DVB-T receivers based on reference designs made by Support for USB 1.1 and 2.0 DVB-T receivers based on reference designs made by
DiBcom (<http://www.dibcom.fr>) equipped with a DiB3000M-B demodulator. DiBcom (<http://www.dibcom.fr>) equipped with a DiB3000M-B demodulator.
Devices supported by this driver: For an up-to-date list of devices supported by this driver, have a look
Artec T1 USB1.1 boxes on the Linux-DVB Wiki at www.linuxtv.org.
Avermedia AverTV DVBT USB1.1
Compro Videomate DVB-U2000 - DVB-T USB
DiBcom USB1.1 reference devices (non-public)
Grandtec DVB-T USB
Hama DVB-T USB1.1-Box
KWorld/JetWay/ADSTech V-Stream XPERT DTV - DVB-T USB1.1 and USB2.0
TwinhanDTV Magic Box (VP7041e)
TwinhanDTV USB-Ter (VP7041)
Ultima Electronic/Artec T1 USB TVBOX
The VP7041 seems to be identical to "CTS Portable" (Chinese
Television System).
Say Y if you own such a device and want to use it. You should build it as Say Y if you own such a device and want to use it. You should build it as
a module. a module.
...@@ -69,12 +57,28 @@ config DVB_USB_DIBUSB_MC ...@@ -69,12 +57,28 @@ config DVB_USB_DIBUSB_MC
select DVB_DIB3000MC select DVB_DIB3000MC
select DVB_TUNER_MT2060 select DVB_TUNER_MT2060
help help
Support for 2.0 DVB-T receivers based on reference designs made by Support for USB2.0 DVB-T receivers based on reference designs made by
DiBcom (<http://www.dibcom.fr>) equipped with a DiB3000M-C/P demodulator. DiBcom (<http://www.dibcom.fr>) equipped with a DiB3000M-C/P demodulator.
Devices supported by this driver: For an up-to-date list of devices supported by this driver, have a look
Artec T1 USB2.0 boxes on the Linux-DVB Wiki at www.linuxtv.org.
DiBcom USB2.0 reference devices (non-public)
Say Y if you own such a device and want to use it. You should build it as
a module.
config DVB_USB_DIB0700
tristate "DiBcom DiB0700 USB DVB devices (see help for supported devices)"
depends on DVB_USB
select DVB_DIB7000M
select DVB_TUNER_MT2060
help
Support for USB2.0/1.1 DVB receivers based on the DiB0700 USB bridge. The
USB bridge is also present in devices having the DiB7700 DVB-T-USB
silicon. This chip can be found in devices offered by Hauppauge,
Avermedia and other big and small companies.
For an up-to-date list of devices supported by this driver, have a look
on the Linux-DVB Wiki at www.linuxtv.org.
Say Y if you own such a device and want to use it. You should build it as Say Y if you own such a device and want to use it. You should build it as
a module. a module.
......
drivers/media/dvb/dvb-usb/Makefile
View file @ 4d43e13f
dvb-usb-objs = dvb-usb-firmware.o dvb-usb-init.o dvb-usb-urb.o dvb-usb-i2c.o dvb-usb-dvb.o dvb-usb-remote.o dvb-usb-objs = dvb-usb-firmware.o dvb-usb-init.o dvb-usb-urb.o dvb-usb-i2c.o dvb-usb-dvb.o dvb-usb-remote.o usb-urb.o
obj-$(CONFIG_DVB_USB) += dvb-usb.o obj-$(CONFIG_DVB_USB) += dvb-usb.o
dvb-usb-vp7045-objs = vp7045.o vp7045-fe.o dvb-usb-vp7045-objs = vp7045.o vp7045-fe.o
...@@ -36,4 +36,6 @@ obj-$(CONFIG_DVB_USB_DIGITV) += dvb-usb-digitv.o ...@@ -36,4 +36,6 @@ obj-$(CONFIG_DVB_USB_DIGITV) += dvb-usb-digitv.o
dvb-usb-cxusb-objs = cxusb.o dvb-usb-cxusb-objs = cxusb.o
obj-$(CONFIG_DVB_USB_CXUSB) += dvb-usb-cxusb.o obj-$(CONFIG_DVB_USB_CXUSB) += dvb-usb-cxusb.o
dvb-usb-dib0700-objs = dib0700_core.o dib0700_devices.o
EXTRA_CFLAGS = -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends/ EXTRA_CFLAGS = -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends/
drivers/media/dvb/dvb-usb/a800.c
View file @ 4d43e13f
...@@ -27,7 +27,8 @@ static int a800_power_ctrl(struct dvb_usb_device *d, int onoff) ...@@ -27,7 +27,8 @@ static int a800_power_ctrl(struct dvb_usb_device *d, int onoff)
} }
/* assure to put cold to 0 for iManufacturer == 1 */ /* assure to put cold to 0 for iManufacturer == 1 */
static int a800_identify_state(struct usb_device *udev, struct dvb_usb_properties *props,struct dvb_usb_device_description **desc, int *cold) static int a800_identify_state(struct usb_device *udev, struct dvb_usb_device_properties *props,
struct dvb_usb_device_description **desc, int *cold)
{ {
*cold = udev->descriptor.iManufacturer != 1; *cold = udev->descriptor.iManufacturer != 1;
return 0; return 0;
...@@ -88,7 +89,7 @@ static int a800_rc_query(struct dvb_usb_device *d, u32 *event, int *state) ...@@ -88,7 +89,7 @@ static int a800_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
} }
/* USB Driver stuff */ /* USB Driver stuff */
static struct dvb_usb_properties a800_properties; static struct dvb_usb_device_properties a800_properties;
static int a800_probe(struct usb_interface *intf, static int a800_probe(struct usb_interface *intf,
const struct usb_device_id *id) const struct usb_device_id *id)
...@@ -104,35 +105,27 @@ static struct usb_device_id a800_table [] = { ...@@ -104,35 +105,27 @@ static struct usb_device_id a800_table [] = {
}; };
MODULE_DEVICE_TABLE (usb, a800_table); MODULE_DEVICE_TABLE (usb, a800_table);
static struct dvb_usb_properties a800_properties = { static struct dvb_usb_device_properties a800_properties = {
.caps = DVB_USB_HAS_PID_FILTER | DVB_USB_PID_FILTER_CAN_BE_TURNED_OFF | DVB_USB_IS_AN_I2C_ADAPTER, .caps = DVB_USB_IS_AN_I2C_ADAPTER,
.pid_filter_count = 32,
.usb_ctrl = CYPRESS_FX2, .usb_ctrl = CYPRESS_FX2,
.firmware = "dvb-usb-avertv-a800-02.fw", .firmware = "dvb-usb-avertv-a800-02.fw",
.size_of_priv = sizeof(struct dibusb_state), .num_adapters = 1,
.adapter = {
{
.caps = DVB_USB_ADAP_HAS_PID_FILTER | DVB_USB_ADAP_PID_FILTER_CAN_BE_TURNED_OFF,
.pid_filter_count = 32,
.streaming_ctrl = dibusb2_0_streaming_ctrl, .streaming_ctrl = dibusb2_0_streaming_ctrl,
.pid_filter = dibusb_pid_filter, .pid_filter = dibusb_pid_filter,
.pid_filter_ctrl = dibusb_pid_filter_ctrl, .pid_filter_ctrl = dibusb_pid_filter_ctrl,
.power_ctrl = a800_power_ctrl,
.frontend_attach = dibusb_dib3000mc_frontend_attach, .frontend_attach = dibusb_dib3000mc_frontend_attach,
.tuner_attach = dibusb_dib3000mc_tuner_attach, .tuner_attach = dibusb_dib3000mc_tuner_attach,
.identify_state = a800_identify_state,
.rc_interval = DEFAULT_RC_INTERVAL,
.rc_key_map = a800_rc_keys,
.rc_key_map_size = ARRAY_SIZE(a800_rc_keys),
.rc_query = a800_rc_query,
.i2c_algo = &dibusb_i2c_algo,
.generic_bulk_ctrl_endpoint = 0x01,
/* parameter for the MPEG2-data transfer */ /* parameter for the MPEG2-data transfer */
.urb = { .stream = {
.type = DVB_USB_BULK, .type = USB_BULK,
.count = 7, .count = 7,
.endpoint = 0x06, .endpoint = 0x06,
.u = { .u = {
...@@ -142,6 +135,21 @@ static struct dvb_usb_properties a800_properties = { ...@@ -142,6 +135,21 @@ static struct dvb_usb_properties a800_properties = {
} }
}, },
.size_of_priv = sizeof(struct dibusb_state),
},
},
.power_ctrl = a800_power_ctrl,
.identify_state = a800_identify_state,
.rc_interval = DEFAULT_RC_INTERVAL,
.rc_key_map = a800_rc_keys,
.rc_key_map_size = ARRAY_SIZE(a800_rc_keys),
.rc_query = a800_rc_query,
.i2c_algo = &dibusb_i2c_algo,
.generic_bulk_ctrl_endpoint = 0x01,
.num_device_descs = 1, .num_device_descs = 1,
.devices = { .devices = {
{ "AVerMedia AverTV DVB-T USB 2.0 (A800)", { "AVerMedia AverTV DVB-T USB 2.0 (A800)",
......
drivers/media/dvb/dvb-usb/cxusb.c
View file @ 4d43e13f
This diff is collapsed.
drivers/media/dvb/dvb-usb/dibusb-common.c
View file @ 4d43e13f
...@@ -18,12 +18,12 @@ MODULE_LICENSE("GPL"); ...@@ -18,12 +18,12 @@ MODULE_LICENSE("GPL");
#define deb_info(args...) dprintk(debug,0x01,args) #define deb_info(args...) dprintk(debug,0x01,args)
/* common stuff used by the different dibusb modules */ /* common stuff used by the different dibusb modules */
int dibusb_streaming_ctrl(struct dvb_usb_device *d, int onoff) int dibusb_streaming_ctrl(struct dvb_usb_adapter *adap, int onoff)
{ {
if (d->priv != NULL) { if (adap->priv != NULL) {
struct dibusb_state *st = d->priv; struct dibusb_state *st = adap->priv;
if (st->ops.fifo_ctrl != NULL) if (st->ops.fifo_ctrl != NULL)
if (st->ops.fifo_ctrl(d->fe,onoff)) { if (st->ops.fifo_ctrl(adap->fe,onoff)) {
err("error while controlling the fifo of the demod."); err("error while controlling the fifo of the demod.");
return -ENODEV; return -ENODEV;
} }
...@@ -32,23 +32,23 @@ int dibusb_streaming_ctrl(struct dvb_usb_device *d, int onoff) ...@@ -32,23 +32,23 @@ int dibusb_streaming_ctrl(struct dvb_usb_device *d, int onoff)
} }
EXPORT_SYMBOL(dibusb_streaming_ctrl); EXPORT_SYMBOL(dibusb_streaming_ctrl);
int dibusb_pid_filter(struct dvb_usb_device *d, int index, u16 pid, int onoff) int dibusb_pid_filter(struct dvb_usb_adapter *adap, int index, u16 pid, int onoff)
{ {
if (d->priv != NULL) { if (adap->priv != NULL) {
struct dibusb_state *st = d->priv; struct dibusb_state *st = adap->priv;
if (st->ops.pid_ctrl != NULL) if (st->ops.pid_ctrl != NULL)
st->ops.pid_ctrl(d->fe,index,pid,onoff); st->ops.pid_ctrl(adap->fe,index,pid,onoff);
} }
return 0; return 0;
} }
EXPORT_SYMBOL(dibusb_pid_filter); EXPORT_SYMBOL(dibusb_pid_filter);
int dibusb_pid_filter_ctrl(struct dvb_usb_device *d, int onoff) int dibusb_pid_filter_ctrl(struct dvb_usb_adapter *adap, int onoff)
{ {
if (d->priv != NULL) { if (adap->priv != NULL) {
struct dibusb_state *st = d->priv; struct dibusb_state *st = adap->priv;
if (st->ops.pid_parse != NULL) if (st->ops.pid_parse != NULL)
if (st->ops.pid_parse(d->fe,onoff) < 0) if (st->ops.pid_parse(adap->fe,onoff) < 0)
err("could not handle pid_parser"); err("could not handle pid_parser");
} }
return 0; return 0;
...@@ -68,24 +68,24 @@ int dibusb_power_ctrl(struct dvb_usb_device *d, int onoff) ...@@ -68,24 +68,24 @@ int dibusb_power_ctrl(struct dvb_usb_device *d, int onoff)
} }
EXPORT_SYMBOL(dibusb_power_ctrl); EXPORT_SYMBOL(dibusb_power_ctrl);
int dibusb2_0_streaming_ctrl(struct dvb_usb_device *d, int onoff) int dibusb2_0_streaming_ctrl(struct dvb_usb_adapter *adap, int onoff)
{ {
u8 b[3] = { 0 }; u8 b[3] = { 0 };
int ret; int ret;
if ((ret = dibusb_streaming_ctrl(d,onoff)) < 0) if ((ret = dibusb_streaming_ctrl(adap,onoff)) < 0)
return ret; return ret;
if (onoff) { if (onoff) {
b[0] = DIBUSB_REQ_SET_STREAMING_MODE; b[0] = DIBUSB_REQ_SET_STREAMING_MODE;
b[1] = 0x00; b[1] = 0x00;
if ((ret = dvb_usb_generic_write(d,b,2)) < 0) if ((ret = dvb_usb_generic_write(adap->dev,b,2)) < 0)
return ret; return ret;
} }
b[0] = DIBUSB_REQ_SET_IOCTL; b[0] = DIBUSB_REQ_SET_IOCTL;
b[1] = onoff ? DIBUSB_IOCTL_CMD_ENABLE_STREAM : DIBUSB_IOCTL_CMD_DISABLE_STREAM; b[1] = onoff ? DIBUSB_IOCTL_CMD_ENABLE_STREAM : DIBUSB_IOCTL_CMD_DISABLE_STREAM;
return dvb_usb_generic_write(d,b,3); return dvb_usb_generic_write(adap->dev,b,3);
} }
EXPORT_SYMBOL(dibusb2_0_streaming_ctrl); EXPORT_SYMBOL(dibusb2_0_streaming_ctrl);
...@@ -228,12 +228,12 @@ static struct dib3000mc_config mod3000p_dib3000p_config = { ...@@ -228,12 +228,12 @@ static struct dib3000mc_config mod3000p_dib3000p_config = {
.output_mpeg2_in_188_bytes = 1, .output_mpeg2_in_188_bytes = 1,
}; };
int dibusb_dib3000mc_frontend_attach(struct dvb_usb_device *d) int dibusb_dib3000mc_frontend_attach(struct dvb_usb_adapter *adap)
{ {
if (dib3000mc_attach(&d->i2c_adap, 1, DEFAULT_DIB3000P_I2C_ADDRESS, 0, &mod3000p_dib3000p_config, &d->fe) == 0 || if (dib3000mc_attach(&adap->dev->i2c_adap, 1, DEFAULT_DIB3000P_I2C_ADDRESS, 0, &mod3000p_dib3000p_config, &adap->fe) == 0 ||
dib3000mc_attach(&d->i2c_adap, 1, DEFAULT_DIB3000MC_I2C_ADDRESS, 0, &mod3000p_dib3000p_config, &d->fe) == 0) { dib3000mc_attach(&adap->dev->i2c_adap, 1, DEFAULT_DIB3000MC_I2C_ADDRESS, 0, &mod3000p_dib3000p_config, &adap->fe) == 0) {
if (d->priv != NULL) { if (adap->priv != NULL) {
struct dibusb_state *st = d->priv; struct dibusb_state *st = adap->priv;
st->ops.pid_parse = dib3000mc_pid_parse; st->ops.pid_parse = dib3000mc_pid_parse;
st->ops.pid_ctrl = dib3000mc_pid_control; st->ops.pid_ctrl = dib3000mc_pid_control;
} }
...@@ -247,20 +247,20 @@ static struct mt2060_config stk3000p_mt2060_config = { ...@@ -247,20 +247,20 @@ static struct mt2060_config stk3000p_mt2060_config = {
0x60 0x60
}; };
int dibusb_dib3000mc_tuner_attach (struct dvb_usb_device *d) int dibusb_dib3000mc_tuner_attach (struct dvb_usb_adapter *adap)
{ {
struct dibusb_state *st = d->priv; struct dibusb_state *st = adap->priv;
int ret; int ret;
u8 a,b; u8 a,b;
u16 if1 = 1220; u16 if1 = 1220;
struct i2c_adapter *tun_i2c; struct i2c_adapter *tun_i2c;
// First IF calibration for Liteon Sticks // First IF calibration for Liteon Sticks
if (d->udev->descriptor.idVendor == USB_VID_LITEON && if (adap->dev->udev->descriptor.idVendor == USB_VID_LITEON &&
d->udev->descriptor.idProduct == USB_PID_LITEON_DVB_T_WARM) { adap->dev->udev->descriptor.idProduct == USB_PID_LITEON_DVB_T_WARM) {
dibusb_read_eeprom_byte(d,0x7E,&a); dibusb_read_eeprom_byte(adap->dev,0x7E,&a);
dibusb_read_eeprom_byte(d,0x7F,&b); dibusb_read_eeprom_byte(adap->dev,0x7F,&b);
if (a == 0x00) if (a == 0x00)
if1 += b; if1 += b;
...@@ -269,14 +269,14 @@ int dibusb_dib3000mc_tuner_attach (struct dvb_usb_device *d) ...@@ -269,14 +269,14 @@ int dibusb_dib3000mc_tuner_attach (struct dvb_usb_device *d)
else else
warn("LITE-ON DVB-T: Strange IF1 calibration :%2X %2X\n", a, b); warn("LITE-ON DVB-T: Strange IF1 calibration :%2X %2X\n", a, b);
} else if (d->udev->descriptor.idVendor == USB_VID_DIBCOM && } else if (adap->dev->udev->descriptor.idVendor == USB_VID_DIBCOM &&
d->udev->descriptor.idProduct == USB_PID_DIBCOM_MOD3001_WARM) { adap->dev->udev->descriptor.idProduct == USB_PID_DIBCOM_MOD3001_WARM) {
u8 desc; u8 desc;
dibusb_read_eeprom_byte(d, 7, &desc); dibusb_read_eeprom_byte(adap->dev, 7, &desc);
if (desc == 2) { if (desc == 2) {
a = 127; a = 127;
do { do {
dibusb_read_eeprom_byte(d, a, &desc); dibusb_read_eeprom_byte(adap->dev, a, &desc);
a--; a--;
} while (a > 7 && (desc == 0xff || desc == 0x00)); } while (a > 7 && (desc == 0xff || desc == 0x00));
if (desc & 0x80) if (desc & 0x80)
...@@ -286,15 +286,15 @@ int dibusb_dib3000mc_tuner_attach (struct dvb_usb_device *d) ...@@ -286,15 +286,15 @@ int dibusb_dib3000mc_tuner_attach (struct dvb_usb_device *d)
} }
} }
tun_i2c = dib3000mc_get_tuner_i2c_master(d->fe, 1); tun_i2c = dib3000mc_get_tuner_i2c_master(adap->fe, 1);
if ((ret = mt2060_attach(d->fe, tun_i2c, &stk3000p_mt2060_config, if1)) != 0) { if ((ret = mt2060_attach(adap->fe, tun_i2c, &stk3000p_mt2060_config, if1)) != 0) {
/* not found - use panasonic pll parameters */ /* not found - use panasonic pll parameters */
if (dvb_pll_attach(d->fe, 0x60, tun_i2c, &dvb_pll_env57h1xd5) == NULL) if (dvb_pll_attach(adap->fe, 0x60, tun_i2c, &dvb_pll_env57h1xd5) == NULL)
return -ENOMEM; return -ENOMEM;
} else { } else {
st->mt2060_present = 1; st->mt2060_present = 1;
/* set the correct parameters for the dib3000p */ /* set the correct parameters for the dib3000p */
dib3000mc_set_config(d->fe, &stk3000p_dib3000p_config); dib3000mc_set_config(adap->fe, &stk3000p_dib3000p_config);
} }
return 0; return 0;
} }
......
drivers/media/dvb/dvb-usb/dibusb-mb.c
View file @ 4d43e13f
This diff is collapsed.
drivers/media/dvb/dvb-usb/dibusb-mc.c
View file @ 4d43e13f
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
#include "dibusb.h" #include "dibusb.h"
/* USB Driver stuff */ /* USB Driver stuff */
static struct dvb_usb_properties dibusb_mc_properties; static struct dvb_usb_device_properties dibusb_mc_properties;
static int dibusb_mc_probe(struct usb_interface *intf, static int dibusb_mc_probe(struct usb_interface *intf,
const struct usb_device_id *id) const struct usb_device_id *id)
...@@ -43,33 +43,27 @@ static struct usb_device_id dibusb_dib3000mc_table [] = { ...@@ -43,33 +43,27 @@ static struct usb_device_id dibusb_dib3000mc_table [] = {
}; };
MODULE_DEVICE_TABLE (usb, dibusb_dib3000mc_table); MODULE_DEVICE_TABLE (usb, dibusb_dib3000mc_table);
static struct dvb_usb_properties dibusb_mc_properties = { static struct dvb_usb_device_properties dibusb_mc_properties = {
.caps = DVB_USB_HAS_PID_FILTER | DVB_USB_PID_FILTER_CAN_BE_TURNED_OFF | DVB_USB_IS_AN_I2C_ADAPTER, .caps = DVB_USB_IS_AN_I2C_ADAPTER,
.pid_filter_count = 32,
.usb_ctrl = CYPRESS_FX2, .usb_ctrl = CYPRESS_FX2,
.firmware = "dvb-usb-dibusb-6.0.0.8.fw", .firmware = "dvb-usb-dibusb-6.0.0.8.fw",
.size_of_priv = sizeof(struct dibusb_state),
.num_adapters = 1,
.adapter = {
{
.caps = DVB_USB_ADAP_HAS_PID_FILTER | DVB_USB_ADAP_PID_FILTER_CAN_BE_TURNED_OFF,
.pid_filter_count = 32,
.streaming_ctrl = dibusb2_0_streaming_ctrl, .streaming_ctrl = dibusb2_0_streaming_ctrl,
.pid_filter = dibusb_pid_filter, .pid_filter = dibusb_pid_filter,
.pid_filter_ctrl = dibusb_pid_filter_ctrl, .pid_filter_ctrl = dibusb_pid_filter_ctrl,
.power_ctrl = dibusb2_0_power_ctrl,
.frontend_attach = dibusb_dib3000mc_frontend_attach, .frontend_attach = dibusb_dib3000mc_frontend_attach,
.tuner_attach = dibusb_dib3000mc_tuner_attach, .tuner_attach = dibusb_dib3000mc_tuner_attach,
.rc_interval = DEFAULT_RC_INTERVAL,
.rc_key_map = dibusb_rc_keys,
.rc_key_map_size = 111, /* FIXME */
.rc_query = dibusb_rc_query,
.i2c_algo = &dibusb_i2c_algo,
.generic_bulk_ctrl_endpoint = 0x01,
/* parameter for the MPEG2-data transfer */ /* parameter for the MPEG2-data transfer */
.urb = { .stream = {
.type = DVB_USB_BULK, .type = USB_BULK,
.count = 7, .count = 7,
.endpoint = 0x06, .endpoint = 0x06,
.u = { .u = {
...@@ -78,6 +72,19 @@ static struct dvb_usb_properties dibusb_mc_properties = { ...@@ -78,6 +72,19 @@ static struct dvb_usb_properties dibusb_mc_properties = {
} }
} }
}, },
.size_of_priv = sizeof(struct dibusb_state),
}
},
.power_ctrl = dibusb2_0_power_ctrl,
.rc_interval = DEFAULT_RC_INTERVAL,
.rc_key_map = dibusb_rc_keys,
.rc_key_map_size = 111, /* FIXME */
.rc_query = dibusb_rc_query,
.i2c_algo = &dibusb_i2c_algo,
.generic_bulk_ctrl_endpoint = 0x01,
.num_device_descs = 7, .num_device_descs = 7,
.devices = { .devices = {
......
drivers/media/dvb/dvb-usb/dibusb.h
View file @ 4d43e13f
...@@ -107,14 +107,15 @@ struct dibusb_state { ...@@ -107,14 +107,15 @@ struct dibusb_state {
extern struct i2c_algorithm dibusb_i2c_algo; extern struct i2c_algorithm dibusb_i2c_algo;
extern int dibusb_dib3000mc_frontend_attach(struct dvb_usb_device *); extern int dibusb_dib3000mc_frontend_attach(struct dvb_usb_adapter *);
extern int dibusb_dib3000mc_tuner_attach (struct dvb_usb_device *); extern int dibusb_dib3000mc_tuner_attach (struct dvb_usb_adapter *);
extern int dibusb_streaming_ctrl(struct dvb_usb_adapter *, int);
extern int dibusb_pid_filter(struct dvb_usb_adapter *, int, u16, int);
extern int dibusb_pid_filter_ctrl(struct dvb_usb_adapter *, int);
extern int dibusb2_0_streaming_ctrl(struct dvb_usb_adapter *, int);
extern int dibusb_streaming_ctrl(struct dvb_usb_device *, int);
extern int dibusb_pid_filter(struct dvb_usb_device *, int, u16, int);
extern int dibusb_pid_filter_ctrl(struct dvb_usb_device *, int);
extern int dibusb_power_ctrl(struct dvb_usb_device *, int); extern int dibusb_power_ctrl(struct dvb_usb_device *, int);
extern int dibusb2_0_streaming_ctrl(struct dvb_usb_device *, int);
extern int dibusb2_0_power_ctrl(struct dvb_usb_device *, int); extern int dibusb2_0_power_ctrl(struct dvb_usb_device *, int);
#define DEFAULT_RC_INTERVAL 150 #define DEFAULT_RC_INTERVAL 150
......
drivers/media/dvb/dvb-usb/digitv.c
View file @ 4d43e13f
...@@ -83,7 +83,7 @@ static struct i2c_algorithm digitv_i2c_algo = { ...@@ -83,7 +83,7 @@ static struct i2c_algorithm digitv_i2c_algo = {
/* Callbacks for DVB USB */ /* Callbacks for DVB USB */
static int digitv_identify_state (struct usb_device *udev, struct static int digitv_identify_state (struct usb_device *udev, struct
dvb_usb_properties *props, struct dvb_usb_device_description **desc, dvb_usb_device_properties *props, struct dvb_usb_device_description **desc,
int *cold) int *cold)
{ {
*cold = udev->descriptor.iManufacturer == 0 && udev->descriptor.iProduct == 0; *cold = udev->descriptor.iManufacturer == 0 && udev->descriptor.iProduct == 0;
...@@ -116,33 +116,33 @@ static struct mt352_config digitv_mt352_config = { ...@@ -116,33 +116,33 @@ static struct mt352_config digitv_mt352_config = {
static int digitv_nxt6000_tuner_set_params(struct dvb_frontend *fe, struct dvb_frontend_parameters *fep) static int digitv_nxt6000_tuner_set_params(struct dvb_frontend *fe, struct dvb_frontend_parameters *fep)
{ {
struct dvb_usb_device *d = fe->dvb->priv; struct dvb_usb_adapter *adap = fe->dvb->priv;
u8 b[5]; u8 b[5];
dvb_usb_tuner_calc_regs(fe,fep,b, 5); dvb_usb_tuner_calc_regs(fe,fep,b, 5);
return digitv_ctrl_msg(d,USB_WRITE_TUNER,0,&b[1],4,NULL,0); return digitv_ctrl_msg(adap->dev, USB_WRITE_TUNER, 0, &b[1], 4, NULL, 0);
} }
static struct nxt6000_config digitv_nxt6000_config = { static struct nxt6000_config digitv_nxt6000_config = {
.clock_inversion = 1, .clock_inversion = 1,
}; };
static int digitv_frontend_attach(struct dvb_usb_device *d) static int digitv_frontend_attach(struct dvb_usb_adapter *adap)
{ {
if ((d->fe = dvb_attach(mt352_attach, &digitv_mt352_config, &d->i2c_adap)) != NULL) { if ((adap->fe = dvb_attach(mt352_attach, &digitv_mt352_config, &adap->dev->i2c_adap)) != NULL) {
d->fe->ops.tuner_ops.calc_regs = dvb_usb_tuner_calc_regs; adap->fe->ops.tuner_ops.calc_regs = dvb_usb_tuner_calc_regs;
return 0; return 0;
} }
if ((d->fe = dvb_attach(nxt6000_attach, &digitv_nxt6000_config, &d->i2c_adap)) != NULL) { if ((adap->fe = dvb_attach(nxt6000_attach, &digitv_nxt6000_config, &adap->dev->i2c_adap)) != NULL) {
d->fe->ops.tuner_ops.set_params = digitv_nxt6000_tuner_set_params; adap->fe->ops.tuner_ops.set_params = digitv_nxt6000_tuner_set_params;
return 0; return 0;
} }
return -EIO; return -EIO;
} }
static int digitv_tuner_attach(struct dvb_usb_device *d) static int digitv_tuner_attach(struct dvb_usb_adapter *adap)
{ {
d->pll_addr = 0x60; adap->pll_addr = 0x60;
d->pll_desc = &dvb_pll_tded4; adap->pll_desc = &dvb_pll_tded4;
return 0; return 0;
} }
...@@ -238,7 +238,7 @@ static int digitv_rc_query(struct dvb_usb_device *d, u32 *event, int *state) ...@@ -238,7 +238,7 @@ static int digitv_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
} }
/* DVB USB Driver stuff */ /* DVB USB Driver stuff */
static struct dvb_usb_properties digitv_properties; static struct dvb_usb_device_properties digitv_properties;
static int digitv_probe(struct usb_interface *intf, static int digitv_probe(struct usb_interface *intf,
const struct usb_device_id *id) const struct usb_device_id *id)
...@@ -265,30 +265,21 @@ static struct usb_device_id digitv_table [] = { ...@@ -265,30 +265,21 @@ static struct usb_device_id digitv_table [] = {
}; };
MODULE_DEVICE_TABLE (usb, digitv_table); MODULE_DEVICE_TABLE (usb, digitv_table);
static struct dvb_usb_properties digitv_properties = { static struct dvb_usb_device_properties digitv_properties = {
.caps = DVB_USB_IS_AN_I2C_ADAPTER, .caps = DVB_USB_IS_AN_I2C_ADAPTER,
.usb_ctrl = CYPRESS_FX2, .usb_ctrl = CYPRESS_FX2,
.firmware = "dvb-usb-digitv-02.fw", .firmware = "dvb-usb-digitv-02.fw",
.size_of_priv = 0, .num_adapters = 1,
.adapter = {
{
.frontend_attach = digitv_frontend_attach, .frontend_attach = digitv_frontend_attach,
.tuner_attach = digitv_tuner_attach, .tuner_attach = digitv_tuner_attach,
.rc_interval = 1000,
.rc_key_map = digitv_rc_keys,
.rc_key_map_size = ARRAY_SIZE(digitv_rc_keys),
.rc_query = digitv_rc_query,
.identify_state = digitv_identify_state,
.i2c_algo = &digitv_i2c_algo,
.generic_bulk_ctrl_endpoint = 0x01,
/* parameter for the MPEG2-data transfer */ /* parameter for the MPEG2-data transfer */
.urb = { .stream = {
.type = DVB_USB_BULK, .type = USB_BULK,
.count = 7, .count = 7,
.endpoint = 0x02, .endpoint = 0x02,
.u = { .u = {
...@@ -297,6 +288,18 @@ static struct dvb_usb_properties digitv_properties = { ...@@ -297,6 +288,18 @@ static struct dvb_usb_properties digitv_properties = {
} }
} }
}, },
}
},
.identify_state = digitv_identify_state,
.rc_interval = 1000,
.rc_key_map = digitv_rc_keys,
.rc_key_map_size = ARRAY_SIZE(digitv_rc_keys),
.rc_query = digitv_rc_query,
.i2c_algo = &digitv_i2c_algo,
.generic_bulk_ctrl_endpoint = 0x01,
.num_device_descs = 1, .num_device_descs = 1,
.devices = { .devices = {
......
drivers/media/dvb/dvb-usb/dtt200u.c
View file @ 4d43e13f
...@@ -28,19 +28,19 @@ static int dtt200u_power_ctrl(struct dvb_usb_device *d, int onoff) ...@@ -28,19 +28,19 @@ static int dtt200u_power_ctrl(struct dvb_usb_device *d, int onoff)
return 0; return 0;
} }
static int dtt200u_streaming_ctrl(struct dvb_usb_device *d, int onoff) static int dtt200u_streaming_ctrl(struct dvb_usb_adapter *adap, int onoff)
{ {
u8 b_streaming[2] = { SET_STREAMING, onoff }; u8 b_streaming[2] = { SET_STREAMING, onoff };
u8 b_rst_pid = RESET_PID_FILTER; u8 b_rst_pid = RESET_PID_FILTER;
dvb_usb_generic_write(d,b_streaming,2); dvb_usb_generic_write(adap->dev, b_streaming, 2);
if (onoff == 0) if (onoff == 0)
dvb_usb_generic_write(d,&b_rst_pid,1); dvb_usb_generic_write(adap->dev, &b_rst_pid, 1);
return 0; return 0;
} }
static int dtt200u_pid_filter(struct dvb_usb_device *d, int index, u16 pid, int onoff) static int dtt200u_pid_filter(struct dvb_usb_adapter *adap, int index, u16 pid, int onoff)
{ {
u8 b_pid[4]; u8 b_pid[4];
pid = onoff ? pid : 0; pid = onoff ? pid : 0;
...@@ -50,7 +50,7 @@ static int dtt200u_pid_filter(struct dvb_usb_device *d, int index, u16 pid, int ...@@ -50,7 +50,7 @@ static int dtt200u_pid_filter(struct dvb_usb_device *d, int index, u16 pid, int
b_pid[2] = pid & 0xff; b_pid[2] = pid & 0xff;
b_pid[3] = (pid >> 8) & 0x1f; b_pid[3] = (pid >> 8) & 0x1f;
return dvb_usb_generic_write(d,b_pid,4); return dvb_usb_generic_write(adap->dev, b_pid, 4);
} }
/* remote control */ /* remote control */
...@@ -86,16 +86,16 @@ static int dtt200u_rc_query(struct dvb_usb_device *d, u32 *event, int *state) ...@@ -86,16 +86,16 @@ static int dtt200u_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
return 0; return 0;
} }
static int dtt200u_frontend_attach(struct dvb_usb_device *d) static int dtt200u_frontend_attach(struct dvb_usb_adapter *adap)
{ {
d->fe = dtt200u_fe_attach(d); adap->fe = dtt200u_fe_attach(adap);
return 0; return 0;
} }
static struct dvb_usb_properties dtt200u_properties; static struct dvb_usb_device_properties dtt200u_properties;
static struct dvb_usb_properties wt220u_fc_properties; static struct dvb_usb_device_properties wt220u_fc_properties;
static struct dvb_usb_properties wt220u_properties; static struct dvb_usb_device_properties wt220u_properties;
static struct dvb_usb_properties wt220u_zl0353_properties; static struct dvb_usb_device_properties wt220u_zl0353_properties;
static int dtt200u_usb_probe(struct usb_interface *intf, static int dtt200u_usb_probe(struct usb_interface *intf,
const struct usb_device_id *id) const struct usb_device_id *id)
...@@ -123,28 +123,22 @@ static struct usb_device_id dtt200u_usb_table [] = { ...@@ -123,28 +123,22 @@ static struct usb_device_id dtt200u_usb_table [] = {
}; };
MODULE_DEVICE_TABLE(usb, dtt200u_usb_table); MODULE_DEVICE_TABLE(usb, dtt200u_usb_table);
static struct dvb_usb_properties dtt200u_properties = { static struct dvb_usb_device_properties dtt200u_properties = {
.caps = DVB_USB_HAS_PID_FILTER | DVB_USB_NEED_PID_FILTERING,
.pid_filter_count = 15,
.usb_ctrl = CYPRESS_FX2, .usb_ctrl = CYPRESS_FX2,
.firmware = "dvb-usb-dtt200u-01.fw", .firmware = "dvb-usb-dtt200u-01.fw",
.power_ctrl = dtt200u_power_ctrl, .num_adapters = 1,
.adapter = {
{
.caps = DVB_USB_ADAP_HAS_PID_FILTER | DVB_USB_ADAP_NEED_PID_FILTERING,
.pid_filter_count = 15,
.streaming_ctrl = dtt200u_streaming_ctrl, .streaming_ctrl = dtt200u_streaming_ctrl,
.pid_filter = dtt200u_pid_filter, .pid_filter = dtt200u_pid_filter,
.frontend_attach = dtt200u_frontend_attach, .frontend_attach = dtt200u_frontend_attach,
.rc_interval = 300,
.rc_key_map = dtt200u_rc_keys,
.rc_key_map_size = ARRAY_SIZE(dtt200u_rc_keys),
.rc_query = dtt200u_rc_query,
.generic_bulk_ctrl_endpoint = 0x01,
/* parameter for the MPEG2-data transfer */ /* parameter for the MPEG2-data transfer */
.urb = { .stream = {
.type = DVB_USB_BULK, .type = USB_BULK,
.count = 7, .count = 7,
.endpoint = 0x02, .endpoint = 0x02,
.u = { .u = {
...@@ -153,6 +147,16 @@ static struct dvb_usb_properties dtt200u_properties = { ...@@ -153,6 +147,16 @@ static struct dvb_usb_properties dtt200u_properties = {
} }
} }
}, },
}
},
.power_ctrl = dtt200u_power_ctrl,
.rc_interval = 300,
.rc_key_map = dtt200u_rc_keys,
.rc_key_map_size = ARRAY_SIZE(dtt200u_rc_keys),
.rc_query = dtt200u_rc_query,
.generic_bulk_ctrl_endpoint = 0x01,
.num_device_descs = 1, .num_device_descs = 1,
.devices = { .devices = {
...@@ -164,28 +168,22 @@ static struct dvb_usb_properties dtt200u_properties = { ...@@ -164,28 +168,22 @@ static struct dvb_usb_properties dtt200u_properties = {
} }
}; };
static struct dvb_usb_properties wt220u_properties = { static struct dvb_usb_device_properties wt220u_properties = {
.caps = DVB_USB_HAS_PID_FILTER | DVB_USB_NEED_PID_FILTERING,
.pid_filter_count = 15,
.usb_ctrl = CYPRESS_FX2, .usb_ctrl = CYPRESS_FX2,
.firmware = "dvb-usb-wt220u-02.fw", .firmware = "dvb-usb-wt220u-02.fw",
.power_ctrl = dtt200u_power_ctrl, .num_adapters = 1,
.adapter = {
{
.caps = DVB_USB_ADAP_HAS_PID_FILTER | DVB_USB_ADAP_NEED_PID_FILTERING,
.pid_filter_count = 15,
.streaming_ctrl = dtt200u_streaming_ctrl, .streaming_ctrl = dtt200u_streaming_ctrl,
.pid_filter = dtt200u_pid_filter, .pid_filter = dtt200u_pid_filter,
.frontend_attach = dtt200u_frontend_attach, .frontend_attach = dtt200u_frontend_attach,
.rc_interval = 300,
.rc_key_map = dtt200u_rc_keys,
.rc_key_map_size = ARRAY_SIZE(dtt200u_rc_keys),
.rc_query = dtt200u_rc_query,
.generic_bulk_ctrl_endpoint = 0x01,
/* parameter for the MPEG2-data transfer */ /* parameter for the MPEG2-data transfer */
.urb = { .stream = {
.type = DVB_USB_BULK, .type = USB_BULK,
.count = 7, .count = 7,
.endpoint = 0x02, .endpoint = 0x02,
.u = { .u = {
...@@ -194,6 +192,16 @@ static struct dvb_usb_properties wt220u_properties = { ...@@ -194,6 +192,16 @@ static struct dvb_usb_properties wt220u_properties = {
} }
} }
}, },
}
},
.power_ctrl = dtt200u_power_ctrl,
.rc_interval = 300,
.rc_key_map = dtt200u_rc_keys,
.rc_key_map_size = ARRAY_SIZE(dtt200u_rc_keys),
.rc_query = dtt200u_rc_query,
.generic_bulk_ctrl_endpoint = 0x01,
.num_device_descs = 1, .num_device_descs = 1,
.devices = { .devices = {
...@@ -205,36 +213,40 @@ static struct dvb_usb_properties wt220u_properties = { ...@@ -205,36 +213,40 @@ static struct dvb_usb_properties wt220u_properties = {
} }
}; };
static struct dvb_usb_properties wt220u_fc_properties = { static struct dvb_usb_device_properties wt220u_fc_properties = {
.caps = DVB_USB_HAS_PID_FILTER | DVB_USB_NEED_PID_FILTERING,
.pid_filter_count = 15,
.usb_ctrl = CYPRESS_FX2, .usb_ctrl = CYPRESS_FX2,
.firmware = "dvb-usb-wt220u-fc03.fw", .firmware = "dvb-usb-wt220u-fc03.fw",
.power_ctrl = dtt200u_power_ctrl, .num_adapters = 1,
.adapter = {
{
.caps = DVB_USB_ADAP_HAS_PID_FILTER | DVB_USB_ADAP_NEED_PID_FILTERING,
.pid_filter_count = 15,
.streaming_ctrl = dtt200u_streaming_ctrl, .streaming_ctrl = dtt200u_streaming_ctrl,
.pid_filter = dtt200u_pid_filter, .pid_filter = dtt200u_pid_filter,
.frontend_attach = dtt200u_frontend_attach, .frontend_attach = dtt200u_frontend_attach,
.rc_interval = 300,
.rc_key_map = dtt200u_rc_keys,
.rc_key_map_size = ARRAY_SIZE(dtt200u_rc_keys),
.rc_query = dtt200u_rc_query,
.generic_bulk_ctrl_endpoint = 0x01,
/* parameter for the MPEG2-data transfer */ /* parameter for the MPEG2-data transfer */
.urb = { .stream = {
.type = DVB_USB_BULK, .type = USB_BULK,
.count = 7, .count = 7,
.endpoint = 0x86, .endpoint = 0x06,
.u = { .u = {
.bulk = { .bulk = {
.buffersize = 4096, .buffersize = 4096,
} }
} }
}, },
}
},
.power_ctrl = dtt200u_power_ctrl,
.rc_interval = 300,
.rc_key_map = dtt200u_rc_keys,
.rc_key_map_size = ARRAY_SIZE(dtt200u_rc_keys),
.rc_query = dtt200u_rc_query,
.generic_bulk_ctrl_endpoint = 0x01,
.num_device_descs = 1, .num_device_descs = 1,
.devices = { .devices = {
...@@ -246,28 +258,22 @@ static struct dvb_usb_properties wt220u_fc_properties = { ...@@ -246,28 +258,22 @@ static struct dvb_usb_properties wt220u_fc_properties = {
} }
}; };
static struct dvb_usb_properties wt220u_zl0353_properties = { static struct dvb_usb_device_properties wt220u_zl0353_properties = {
.caps = DVB_USB_HAS_PID_FILTER | DVB_USB_NEED_PID_FILTERING,
.pid_filter_count = 15,
.usb_ctrl = CYPRESS_FX2, .usb_ctrl = CYPRESS_FX2,
.firmware = "dvb-usb-wt220u-zl0353-01.fw", .firmware = "dvb-usb-wt220u-zl0353-01.fw",
.power_ctrl = dtt200u_power_ctrl, .num_adapters = 1,
.adapter = {
{
.caps = DVB_USB_ADAP_HAS_PID_FILTER | DVB_USB_ADAP_NEED_PID_FILTERING,
.pid_filter_count = 15,
.streaming_ctrl = dtt200u_streaming_ctrl, .streaming_ctrl = dtt200u_streaming_ctrl,
.pid_filter = dtt200u_pid_filter, .pid_filter = dtt200u_pid_filter,
.frontend_attach = dtt200u_frontend_attach, .frontend_attach = dtt200u_frontend_attach,
.rc_interval = 300,
.rc_key_map = dtt200u_rc_keys,
.rc_key_map_size = ARRAY_SIZE(dtt200u_rc_keys),
.rc_query = dtt200u_rc_query,
.generic_bulk_ctrl_endpoint = 0x01,
/* parameter for the MPEG2-data transfer */ /* parameter for the MPEG2-data transfer */
.urb = { .stream = {
.type = DVB_USB_BULK, .type = USB_BULK,
.count = 7, .count = 7,
.endpoint = 0x02, .endpoint = 0x02,
.u = { .u = {
...@@ -276,6 +282,16 @@ static struct dvb_usb_properties wt220u_zl0353_properties = { ...@@ -276,6 +282,16 @@ static struct dvb_usb_properties wt220u_zl0353_properties = {
} }
} }
}, },
}
},
.power_ctrl = dtt200u_power_ctrl,
.rc_interval = 300,
.rc_key_map = dtt200u_rc_keys,
.rc_key_map_size = ARRAY_SIZE(dtt200u_rc_keys),
.rc_query = dtt200u_rc_query,
.generic_bulk_ctrl_endpoint = 0x01,
.num_device_descs = 1, .num_device_descs = 1,
.devices = { .devices = {
......
drivers/media/dvb/dvb-usb/dvb-usb-common.h
View file @ 4d43e13f
...@@ -14,31 +14,36 @@ ...@@ -14,31 +14,36 @@
extern int dvb_usb_debug; extern int dvb_usb_debug;
extern int dvb_usb_disable_rc_polling; extern int dvb_usb_disable_rc_polling;
#define deb_info(args...) dprintk(dvb_usb_debug,0x01,args) #define deb_info(args...) dprintk(dvb_usb_debug,0x001,args)
#define deb_xfer(args...) dprintk(dvb_usb_debug,0x02,args) #define deb_xfer(args...) dprintk(dvb_usb_debug,0x002,args)
#define deb_pll(args...) dprintk(dvb_usb_debug,0x04,args) #define deb_pll(args...) dprintk(dvb_usb_debug,0x004,args)
#define deb_ts(args...) dprintk(dvb_usb_debug,0x08,args) #define deb_ts(args...) dprintk(dvb_usb_debug,0x008,args)
#define deb_err(args...) dprintk(dvb_usb_debug,0x10,args) #define deb_err(args...) dprintk(dvb_usb_debug,0x010,args)
#define deb_rc(args...) dprintk(dvb_usb_debug,0x20,args) #define deb_rc(args...) dprintk(dvb_usb_debug,0x020,args)
#define deb_fw(args...) dprintk(dvb_usb_debug,0x40,args) #define deb_fw(args...) dprintk(dvb_usb_debug,0x040,args)
#define deb_mem(args...) dprintk(dvb_usb_debug,0x80,args) #define deb_mem(args...) dprintk(dvb_usb_debug,0x080,args)
#define deb_uxfer(args...) dprintk(dvb_usb_debug,0x100,args)
/* commonly used methods */ /* commonly used methods */
extern int dvb_usb_download_firmware(struct usb_device *, struct dvb_usb_properties *); extern int dvb_usb_download_firmware(struct usb_device *, struct dvb_usb_device_properties *);
extern int dvb_usb_urb_submit(struct dvb_usb_device *); extern int dvb_usb_device_power_ctrl(struct dvb_usb_device *d, int onoff);
extern int dvb_usb_urb_kill(struct dvb_usb_device *);
extern int dvb_usb_urb_init(struct dvb_usb_device *); extern int usb_urb_init(struct usb_data_stream *stream, struct usb_data_stream_properties *props);
extern int dvb_usb_urb_exit(struct dvb_usb_device *); extern int usb_urb_exit(struct usb_data_stream *stream);
extern int usb_urb_submit(struct usb_data_stream *stream);
extern int usb_urb_kill(struct usb_data_stream *stream);
extern int dvb_usb_adapter_stream_init(struct dvb_usb_adapter *adap);
extern int dvb_usb_adapter_stream_exit(struct dvb_usb_adapter *adap);
extern int dvb_usb_i2c_init(struct dvb_usb_device *); extern int dvb_usb_i2c_init(struct dvb_usb_device *);
extern int dvb_usb_i2c_exit(struct dvb_usb_device *); extern int dvb_usb_i2c_exit(struct dvb_usb_device *);
extern int dvb_usb_dvb_init(struct dvb_usb_device *); extern int dvb_usb_adapter_dvb_init(struct dvb_usb_adapter *adap);
extern int dvb_usb_dvb_exit(struct dvb_usb_device *); extern int dvb_usb_adapter_dvb_exit(struct dvb_usb_adapter *adap);
extern int dvb_usb_adapter_frontend_init(struct dvb_usb_adapter *adap);
extern int dvb_usb_fe_init(struct dvb_usb_device *); extern int dvb_usb_adapter_frontend_exit(struct dvb_usb_adapter *adap);
extern int dvb_usb_fe_exit(struct dvb_usb_device *);
extern int dvb_usb_remote_init(struct dvb_usb_device *); extern int dvb_usb_remote_init(struct dvb_usb_device *);
extern int dvb_usb_remote_exit(struct dvb_usb_device *); extern int dvb_usb_remote_exit(struct dvb_usb_device *);
......
drivers/media/dvb/dvb-usb/dvb-usb-dvb.c
View file @ 4d43e13f
/* dvb-usb-dvb.c is part of the DVB USB library. /* dvb-usb-dvb.c is part of the DVB USB library.
* *
* Copyright (C) 2004-5 Patrick Boettcher (patrick.boettcher@desy.de) * Copyright (C) 2004-6 Patrick Boettcher (patrick.boettcher@desy.de)
* see dvb-usb-init.c for copyright information. * see dvb-usb-init.c for copyright information.
* *
* This file contains functions for initializing and handling the * This file contains functions for initializing and handling the
...@@ -8,55 +8,55 @@ ...@@ -8,55 +8,55 @@
*/ */
#include "dvb-usb-common.h" #include "dvb-usb-common.h"
/* does the complete input transfer handling */
static int dvb_usb_ctrl_feed(struct dvb_demux_feed *dvbdmxfeed, int onoff) static int dvb_usb_ctrl_feed(struct dvb_demux_feed *dvbdmxfeed, int onoff)
{ {
struct dvb_usb_device *d = dvbdmxfeed->demux->priv; struct dvb_usb_adapter *adap = dvbdmxfeed->demux->priv;
int newfeedcount,ret; int newfeedcount,ret;
if (d == NULL) if (adap == NULL)
return -ENODEV; return -ENODEV;
newfeedcount = d->feedcount + (onoff ? 1 : -1); newfeedcount = adap->feedcount + (onoff ? 1 : -1);
/* /* stop feed before setting a new pid if there will be no pid anymore */
* stop feed before setting a new pid if there will be no pid anymore
*/
if (newfeedcount == 0) { if (newfeedcount == 0) {
deb_ts("stop feeding\n"); deb_ts("stop feeding\n");
dvb_usb_urb_kill(d); usb_urb_kill(&adap->stream);
if (d->props.streaming_ctrl != NULL) if (adap->props.streaming_ctrl != NULL)
if ((ret = d->props.streaming_ctrl(d,0))) if ((ret = adap->props.streaming_ctrl(adap,0)))
err("error while stopping stream."); err("error while stopping stream.");
} }
d->feedcount = newfeedcount; adap->feedcount = newfeedcount;
/* activate the pid on the device specific pid_filter */ /* activate the pid on the device specific pid_filter */
deb_ts("setting pid: %5d %04x at index %d '%s'\n",dvbdmxfeed->pid,dvbdmxfeed->pid,dvbdmxfeed->index,onoff ? "on" : "off"); deb_ts("setting pid (%s): %5d %04x at index %d '%s'\n",adap->pid_filtering ?
if (d->props.caps & DVB_USB_HAS_PID_FILTER && "yes" : "no", dvbdmxfeed->pid,dvbdmxfeed->pid,dvbdmxfeed->index,onoff ?
d->pid_filtering && "on" : "off");
d->props.pid_filter != NULL) if (adap->props.caps & DVB_USB_ADAP_HAS_PID_FILTER &&
d->props.pid_filter(d,dvbdmxfeed->index,dvbdmxfeed->pid,onoff); adap->pid_filtering &&
adap->props.pid_filter != NULL)
adap->props.pid_filter(adap, dvbdmxfeed->index, dvbdmxfeed->pid,onoff);
/* start the feed if this was the first feed and there is still a feed /* start the feed if this was the first feed and there is still a feed
* for reception. * for reception.
*/ */
if (d->feedcount == onoff && d->feedcount > 0) { if (adap->feedcount == onoff && adap->feedcount > 0) {
deb_ts("submitting all URBs\n"); deb_ts("submitting all URBs\n");
dvb_usb_urb_submit(d); usb_urb_submit(&adap->stream);
deb_ts("controlling pid parser\n"); deb_ts("controlling pid parser\n");
if (d->props.caps & DVB_USB_HAS_PID_FILTER && if (adap->props.caps & DVB_USB_ADAP_HAS_PID_FILTER &&
d->props.caps & DVB_USB_PID_FILTER_CAN_BE_TURNED_OFF && adap->props.caps & DVB_USB_ADAP_PID_FILTER_CAN_BE_TURNED_OFF &&
d->props.pid_filter_ctrl != NULL) adap->props.pid_filter_ctrl != NULL)
if (d->props.pid_filter_ctrl(d,d->pid_filtering) < 0) if (adap->props.pid_filter_ctrl(adap,adap->pid_filtering) < 0)
err("could not handle pid_parser"); err("could not handle pid_parser");
deb_ts("start feeding\n"); deb_ts("start feeding\n");
if (d->props.streaming_ctrl != NULL) if (adap->props.streaming_ctrl != NULL)
if (d->props.streaming_ctrl(d,1)) { if (adap->props.streaming_ctrl(adap,1)) {
err("error while enabling fifo."); err("error while enabling fifo.");
return -ENODEV; return -ENODEV;
} }
...@@ -77,134 +77,130 @@ static int dvb_usb_stop_feed(struct dvb_demux_feed *dvbdmxfeed) ...@@ -77,134 +77,130 @@ static int dvb_usb_stop_feed(struct dvb_demux_feed *dvbdmxfeed)
return dvb_usb_ctrl_feed(dvbdmxfeed,0); return dvb_usb_ctrl_feed(dvbdmxfeed,0);
} }
int dvb_usb_dvb_init(struct dvb_usb_device *d) int dvb_usb_adapter_dvb_init(struct dvb_usb_adapter *adap)
{ {
int ret; int ret;
if ((ret = dvb_register_adapter(&d->dvb_adap, d->desc->name, if ((ret = dvb_register_adapter(&adap->dvb_adap, adap->dev->desc->name,
d->owner, &d->udev->dev)) < 0) { adap->dev->owner, &adap->dev->udev->dev)) < 0) {
deb_info("dvb_register_adapter failed: error %d", ret); deb_info("dvb_register_adapter failed: error %d", ret);
goto err; goto err;
} }
d->dvb_adap.priv = d; adap->dvb_adap.priv = adap;
if (d->props.read_mac_address) { if (adap->dev->props.read_mac_address) {
if (d->props.read_mac_address(d,d->dvb_adap.proposed_mac) == 0) if (adap->dev->props.read_mac_address(adap->dev,adap->dvb_adap.proposed_mac) == 0)
info("MAC address: %02x:%02x:%02x:%02x:%02x:%02x",d->dvb_adap.proposed_mac[0], info("MAC address: %02x:%02x:%02x:%02x:%02x:%02x",adap->dvb_adap.proposed_mac[0],
d->dvb_adap.proposed_mac[1],d->dvb_adap.proposed_mac[2], adap->dvb_adap.proposed_mac[1], adap->dvb_adap.proposed_mac[2],
d->dvb_adap.proposed_mac[3],d->dvb_adap.proposed_mac[4], adap->dvb_adap.proposed_mac[3], adap->dvb_adap.proposed_mac[4],
d->dvb_adap.proposed_mac[5]); adap->dvb_adap.proposed_mac[5]);
else else
err("MAC address reading failed."); err("MAC address reading failed.");
} }
d->demux.dmx.capabilities = DMX_TS_FILTERING | DMX_SECTION_FILTERING; adap->demux.dmx.capabilities = DMX_TS_FILTERING | DMX_SECTION_FILTERING;
d->demux.priv = d; adap->demux.priv = adap;
d->demux.feednum = d->demux.filternum = d->max_feed_count; adap->demux.feednum = adap->demux.filternum = adap->max_feed_count;
d->demux.start_feed = dvb_usb_start_feed; adap->demux.start_feed = dvb_usb_start_feed;
d->demux.stop_feed = dvb_usb_stop_feed; adap->demux.stop_feed = dvb_usb_stop_feed;
d->demux.write_to_decoder = NULL; adap->demux.write_to_decoder = NULL;
if ((ret = dvb_dmx_init(&d->demux)) < 0) { if ((ret = dvb_dmx_init(&adap->demux)) < 0) {
err("dvb_dmx_init failed: error %d",ret); err("dvb_dmx_init failed: error %d",ret);
goto err_dmx; goto err_dmx;
} }
d->dmxdev.filternum = d->demux.filternum; adap->dmxdev.filternum = adap->demux.filternum;
d->dmxdev.demux = &d->demux.dmx; adap->dmxdev.demux = &adap->demux.dmx;
d->dmxdev.capabilities = 0; adap->dmxdev.capabilities = 0;
if ((ret = dvb_dmxdev_init(&d->dmxdev, &d->dvb_adap)) < 0) { if ((ret = dvb_dmxdev_init(&adap->dmxdev, &adap->dvb_adap)) < 0) {
err("dvb_dmxdev_init failed: error %d",ret); err("dvb_dmxdev_init failed: error %d",ret);
goto err_dmx_dev; goto err_dmx_dev;
} }
dvb_net_init(&d->dvb_adap, &d->dvb_net, &d->demux.dmx); dvb_net_init(&adap->dvb_adap, &adap->dvb_net, &adap->demux.dmx);
d->state |= DVB_USB_STATE_DVB; adap->state |= DVB_USB_ADAP_STATE_DVB;
return 0; return 0;
err_dmx_dev: err_dmx_dev:
dvb_dmx_release(&d->demux); dvb_dmx_release(&adap->demux);
err_dmx: err_dmx:
dvb_unregister_adapter(&d->dvb_adap); dvb_unregister_adapter(&adap->dvb_adap);
err: err:
return ret; return ret;
} }
int dvb_usb_dvb_exit(struct dvb_usb_device *d) int dvb_usb_adapter_dvb_exit(struct dvb_usb_adapter *adap)
{ {
if (d->state & DVB_USB_STATE_DVB) { if (adap->state & DVB_USB_ADAP_STATE_DVB) {
deb_info("unregistering DVB part\n"); deb_info("unregistering DVB part\n");
dvb_net_release(&d->dvb_net); dvb_net_release(&adap->dvb_net);
d->demux.dmx.close(&d->demux.dmx); adap->demux.dmx.close(&adap->demux.dmx);
dvb_dmxdev_release(&d->dmxdev); dvb_dmxdev_release(&adap->dmxdev);
dvb_dmx_release(&d->demux); dvb_dmx_release(&adap->demux);
dvb_unregister_adapter(&d->dvb_adap); dvb_unregister_adapter(&adap->dvb_adap);
d->state &= ~DVB_USB_STATE_DVB; adap->state &= ~DVB_USB_ADAP_STATE_DVB;
} }
return 0; return 0;
} }
static int dvb_usb_fe_wakeup(struct dvb_frontend *fe) static int dvb_usb_fe_wakeup(struct dvb_frontend *fe)
{ {
struct dvb_usb_device *d = fe->dvb->priv; struct dvb_usb_adapter *adap = fe->dvb->priv;
if (d->props.power_ctrl) dvb_usb_device_power_ctrl(adap->dev, 1);
d->props.power_ctrl(d,1);
if (d->fe_init) if (adap->fe_init)
d->fe_init(fe); adap->fe_init(fe);
return 0; return 0;
} }
static int dvb_usb_fe_sleep(struct dvb_frontend *fe) static int dvb_usb_fe_sleep(struct dvb_frontend *fe)
{ {
struct dvb_usb_device *d = fe->dvb->priv; struct dvb_usb_adapter *adap = fe->dvb->priv;
if (d->fe_sleep) if (adap->fe_sleep)
d->fe_sleep(fe); adap->fe_sleep(fe);
if (d->props.power_ctrl) return dvb_usb_device_power_ctrl(adap->dev, 0);
d->props.power_ctrl(d,0);
return 0;
} }
int dvb_usb_fe_init(struct dvb_usb_device* d) int dvb_usb_adapter_frontend_init(struct dvb_usb_adapter *adap)
{ {
if (d->props.frontend_attach == NULL) { if (adap->props.frontend_attach == NULL) {
err("strange: '%s' doesn't want to attach a frontend.",d->desc->name); err("strange: '%s' #%d doesn't want to attach a frontend.",adap->dev->desc->name, adap->id);
return 0; return 0;
} }
/* re-assign sleep and wakeup functions */ /* re-assign sleep and wakeup functions */
if (d->props.frontend_attach(d) == 0 && d->fe != NULL) { if (adap->props.frontend_attach(adap) == 0 && adap->fe != NULL) {
d->fe_init = d->fe->ops.init; d->fe->ops.init = dvb_usb_fe_wakeup; adap->fe_init = adap->fe->ops.init; adap->fe->ops.init = dvb_usb_fe_wakeup;
d->fe_sleep = d->fe->ops.sleep; d->fe->ops.sleep = dvb_usb_fe_sleep; adap->fe_sleep = adap->fe->ops.sleep; adap->fe->ops.sleep = dvb_usb_fe_sleep;
if (dvb_register_frontend(&d->dvb_adap, d->fe)) { if (dvb_register_frontend(&adap->dvb_adap, adap->fe)) {
err("Frontend registration failed."); err("Frontend registration failed.");
dvb_frontend_detach(d->fe); dvb_frontend_detach(adap->fe);
d->fe = NULL; adap->fe = NULL;
return -ENODEV; return -ENODEV;
} }
/* only attach the tuner if the demod is there */ /* only attach the tuner if the demod is there */
if (d->props.tuner_attach != NULL) if (adap->props.tuner_attach != NULL)
d->props.tuner_attach(d); adap->props.tuner_attach(adap);
} else } else
err("no frontend was attached by '%s'",d->desc->name); err("no frontend was attached by '%s'",adap->dev->desc->name);
return 0; return 0;
} }
int dvb_usb_fe_exit(struct dvb_usb_device *d) int dvb_usb_adapter_frontend_exit(struct dvb_usb_adapter *adap)
{ {
if (d->fe != NULL) { if (adap->fe != NULL) {
dvb_unregister_frontend(d->fe); dvb_unregister_frontend(adap->fe);
dvb_frontend_detach(d->fe); dvb_frontend_detach(adap->fe);
} }
return 0; return 0;
} }
drivers/media/dvb/dvb-usb/dvb-usb-firmware.c
View file @ 4d43e13f
/* dvb-usb-firmware.c is part of the DVB USB library. /* dvb-usb-firmware.c is part of the DVB USB library.
* *
* Copyright (C) 2004-5 Patrick Boettcher (patrick.boettcher@desy.de) * Copyright (C) 2004-6 Patrick Boettcher (patrick.boettcher@desy.de)
* see dvb-usb-init.c for copyright information. * see dvb-usb-init.c for copyright information.
* *
* This file contains functions for downloading the firmware to Cypress FX 1 and 2 based devices. * This file contains functions for downloading the firmware to Cypress FX 1 and 2 based devices.
...@@ -78,7 +78,7 @@ int usb_cypress_load_firmware(struct usb_device *udev, const struct firmware *fw ...@@ -78,7 +78,7 @@ int usb_cypress_load_firmware(struct usb_device *udev, const struct firmware *fw
} }
EXPORT_SYMBOL(usb_cypress_load_firmware); EXPORT_SYMBOL(usb_cypress_load_firmware);
int dvb_usb_download_firmware(struct usb_device *udev, struct dvb_usb_properties *props) int dvb_usb_download_firmware(struct usb_device *udev, struct dvb_usb_device_properties *props)
{ {
int ret; int ret;
const struct firmware *fw = NULL; const struct firmware *fw = NULL;
......
drivers/media/dvb/dvb-usb/dvb-usb-i2c.c
View file @ 4d43e13f
/* dvb-usb-i2c.c is part of the DVB USB library. /* dvb-usb-i2c.c is part of the DVB USB library.
* *
* Copyright (C) 2004-5 Patrick Boettcher (patrick.boettcher@desy.de) * Copyright (C) 2004-6 Patrick Boettcher (patrick.boettcher@desy.de)
* see dvb-usb-init.c for copyright information. * see dvb-usb-init.c for copyright information.
* *
* This file contains functions for (de-)initializing an I2C adapter. * This file contains functions for (de-)initializing an I2C adapter.
...@@ -48,48 +48,48 @@ int dvb_usb_i2c_exit(struct dvb_usb_device *d) ...@@ -48,48 +48,48 @@ int dvb_usb_i2c_exit(struct dvb_usb_device *d)
int dvb_usb_tuner_init_i2c(struct dvb_frontend *fe) int dvb_usb_tuner_init_i2c(struct dvb_frontend *fe)
{ {
struct dvb_usb_device *d = fe->dvb->priv; struct dvb_usb_adapter *adap = fe->dvb->priv;
struct i2c_msg msg = { .addr = d->pll_addr, .flags = 0, .buf = d->pll_init, .len = 4 }; struct i2c_msg msg = { .addr = adap->pll_addr, .flags = 0, .buf = adap->pll_init, .len = 4 };
int ret = 0; int ret = 0;
/* if pll_desc is not used */ /* if pll_desc is not used */
if (d->pll_desc == NULL) if (adap->pll_desc == NULL)
return 0; return 0;
if (d->tuner_pass_ctrl) if (adap->tuner_pass_ctrl)
d->tuner_pass_ctrl(fe,1,d->pll_addr); adap->tuner_pass_ctrl(fe, 1, adap->pll_addr);
deb_pll("pll init: %x\n",d->pll_addr); deb_pll("pll init: %x\n",adap->pll_addr);
deb_pll("pll-buf: %x %x %x %x\n",d->pll_init[0],d->pll_init[1], deb_pll("pll-buf: %x %x %x %x\n",adap->pll_init[0], adap->pll_init[1],
d->pll_init[2],d->pll_init[3]); adap->pll_init[2], adap->pll_init[3]);
if (fe->ops.i2c_gate_ctrl) if (fe->ops.i2c_gate_ctrl)
fe->ops.i2c_gate_ctrl(fe, 1); fe->ops.i2c_gate_ctrl(fe, 1);
if (i2c_transfer (&d->i2c_adap, &msg, 1) != 1) { if (i2c_transfer (&adap->dev->i2c_adap, &msg, 1) != 1) {
err("tuner i2c write failed for pll_init."); err("tuner i2c write failed for pll_init.");
ret = -EREMOTEIO; ret = -EREMOTEIO;
} }
msleep(1); msleep(1);
if (d->tuner_pass_ctrl) if (adap->tuner_pass_ctrl)
d->tuner_pass_ctrl(fe,0,d->pll_addr); adap->tuner_pass_ctrl(fe,0,adap->pll_addr);
return ret; return ret;
} }
EXPORT_SYMBOL(dvb_usb_tuner_init_i2c); EXPORT_SYMBOL(dvb_usb_tuner_init_i2c);
int dvb_usb_tuner_calc_regs(struct dvb_frontend *fe, struct dvb_frontend_parameters *fep, u8 *b, int buf_len) int dvb_usb_tuner_calc_regs(struct dvb_frontend *fe, struct dvb_frontend_parameters *fep, u8 *b, int buf_len)
{ {
struct dvb_usb_device *d = fe->dvb->priv; struct dvb_usb_adapter *adap = fe->dvb->priv;
if (buf_len != 5) if (buf_len != 5)
return -EINVAL; return -EINVAL;
if (d->pll_desc == NULL) if (adap->pll_desc == NULL)
return 0; return 0;
deb_pll("pll addr: %x, freq: %d %p\n",d->pll_addr,fep->frequency,d->pll_desc); deb_pll("pll addr: %x, freq: %d %p\n",adap->pll_addr, fep->frequency, adap->pll_desc);
b[0] = d->pll_addr; b[0] = adap->pll_addr;
dvb_pll_configure(d->pll_desc,&b[1],fep->frequency,fep->u.ofdm.bandwidth); dvb_pll_configure(adap->pll_desc, &b[1], fep->frequency, fep->u.ofdm.bandwidth);
deb_pll("pll-buf: %x %x %x %x %x\n",b[0],b[1],b[2],b[3],b[4]); deb_pll("pll-buf: %x %x %x %x %x\n",b[0],b[1],b[2],b[3],b[4]);
...@@ -99,26 +99,27 @@ EXPORT_SYMBOL(dvb_usb_tuner_calc_regs); ...@@ -99,26 +99,27 @@ EXPORT_SYMBOL(dvb_usb_tuner_calc_regs);
int dvb_usb_tuner_set_params_i2c(struct dvb_frontend *fe, struct dvb_frontend_parameters *fep) int dvb_usb_tuner_set_params_i2c(struct dvb_frontend *fe, struct dvb_frontend_parameters *fep)
{ {
struct dvb_usb_device *d = fe->dvb->priv; struct dvb_usb_adapter *adap = fe->dvb->priv;
int ret = 0; int ret = 0;
u8 b[5]; u8 b[5];
struct i2c_msg msg = { .addr = d->pll_addr, .flags = 0, .buf = &b[1], .len = 4 }; struct i2c_msg msg = { .addr = adap->pll_addr, .flags = 0, .buf = &b[1], .len = 4 };
dvb_usb_tuner_calc_regs(fe,fep,b,5); dvb_usb_tuner_calc_regs(fe,fep,b,5);
if (d->tuner_pass_ctrl) if (adap->tuner_pass_ctrl)
d->tuner_pass_ctrl(fe,1,d->pll_addr); adap->tuner_pass_ctrl(fe, 1, adap->pll_addr);
if (fe->ops.i2c_gate_ctrl) if (fe->ops.i2c_gate_ctrl)
fe->ops.i2c_gate_ctrl(fe, 1); fe->ops.i2c_gate_ctrl(fe, 1);
if (i2c_transfer (&d->i2c_adap, &msg, 1) != 1) {
if (i2c_transfer(&adap->dev->i2c_adap, &msg, 1) != 1) {
err("tuner i2c write failed for pll_set."); err("tuner i2c write failed for pll_set.");
ret = -EREMOTEIO; ret = -EREMOTEIO;
} }
msleep(1); msleep(1);
if (d->tuner_pass_ctrl) if (adap->tuner_pass_ctrl)
d->tuner_pass_ctrl(fe,0,d->pll_addr); adap->tuner_pass_ctrl(fe, 0, adap->pll_addr);
return ret; return ret;
} }
......
drivers/media/dvb/dvb-usb/dvb-usb-init.c
View file @ 4d43e13f
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* *
* dvb-usb-init.c * dvb-usb-init.c
* *
* Copyright (C) 2004-5 Patrick Boettcher (patrick.boettcher@desy.de) * Copyright (C) 2004-6 Patrick Boettcher (patrick.boettcher@desy.de)
* *
* This program is free software; you can redistribute it and/or modify it * This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free * under the terms of the GNU General Public License as published by the Free
...@@ -16,21 +16,105 @@ ...@@ -16,21 +16,105 @@
/* debug */ /* debug */
int dvb_usb_debug; int dvb_usb_debug;
module_param_named(debug,dvb_usb_debug, int, 0644); module_param_named(debug,dvb_usb_debug, int, 0644);
MODULE_PARM_DESC(debug, "set debugging level (1=info,xfer=2,pll=4,ts=8,err=16,rc=32,fw=64 (or-able))." DVB_USB_DEBUG_STATUS); MODULE_PARM_DESC(debug, "set debugging level (1=info,xfer=2,pll=4,ts=8,err=16,rc=32,fw=64,mem=128,uxfer=256 (or-able))." DVB_USB_DEBUG_STATUS);
int dvb_usb_disable_rc_polling; int dvb_usb_disable_rc_polling;
module_param_named(disable_rc_polling, dvb_usb_disable_rc_polling, int, 0644); module_param_named(disable_rc_polling, dvb_usb_disable_rc_polling, int, 0644);
MODULE_PARM_DESC(disable_rc_polling, "disable remote control polling (default: 0)."); MODULE_PARM_DESC(disable_rc_polling, "disable remote control polling (default: 0).");
static int dvb_usb_force_pid_filter_usage;
module_param_named(force_pid_filter_usage, dvb_usb_force_pid_filter_usage, int, 0444);
MODULE_PARM_DESC(disable_rc_polling, "force all dvb-usb-devices to use a PID filter, if any (default: 0).");
static int dvb_usb_adapter_init(struct dvb_usb_device *d)
{
struct dvb_usb_adapter *adap;
int ret,n;
for (n = 0; n < d->props.num_adapters; n++) {
adap = &d->adapter[n];
adap->dev = d;
adap->id = n;
memcpy(&adap->props, &d->props.adapter[n], sizeof(struct dvb_usb_adapter_properties));
/* speed - when running at FULL speed we need a HW PID filter */
if (d->udev->speed == USB_SPEED_FULL && !(adap->props.caps & DVB_USB_ADAP_HAS_PID_FILTER)) {
err("This USB2.0 device cannot be run on a USB1.1 port. (it lacks a hardware PID filter)");
return -ENODEV;
}
if ((d->udev->speed == USB_SPEED_FULL && adap->props.caps & DVB_USB_ADAP_HAS_PID_FILTER) ||
(adap->props.caps & DVB_USB_ADAP_NEED_PID_FILTERING)) {
info("will use the device's hardware PID filter (table count: %d).",adap->props.pid_filter_count);
adap->pid_filtering = 1;
adap->max_feed_count = adap->props.pid_filter_count;
} else {
info("will pass the complete MPEG2 transport stream to the software demuxer.");
adap->pid_filtering = 0;
adap->max_feed_count = 255;
}
if (!adap->pid_filtering &&
dvb_usb_force_pid_filter_usage &&
adap->props.caps & DVB_USB_ADAP_HAS_PID_FILTER) {
info("pid filter enabled by module option.");
adap->pid_filtering = 1;
adap->max_feed_count = adap->props.pid_filter_count;
}
if (adap->props.size_of_priv > 0) {
adap->priv = kzalloc(adap->props.size_of_priv,GFP_KERNEL);
if (adap->priv == NULL) {
err("no memory for priv for adapter %d.",n);
return -ENOMEM;
}
}
if ((ret = dvb_usb_adapter_stream_init(adap)) ||
(ret = dvb_usb_adapter_dvb_init(adap)) ||
(ret = dvb_usb_adapter_frontend_init(adap))) {
return ret;
}
d->num_adapters_initialized++;
d->state |= DVB_USB_STATE_DVB;
}
/*
* when reloading the driver w/o replugging the device
* sometimes a timeout occures, this helps
*/
if (d->props.generic_bulk_ctrl_endpoint != 0) {
usb_clear_halt(d->udev,usb_sndbulkpipe(d->udev,d->props.generic_bulk_ctrl_endpoint));
usb_clear_halt(d->udev,usb_rcvbulkpipe(d->udev,d->props.generic_bulk_ctrl_endpoint));
}
return 0;
}
static int dvb_usb_adapter_exit(struct dvb_usb_device *d)
{
int n;
for (n = 0; n < d->num_adapters_initialized; n++) {
dvb_usb_adapter_frontend_exit(&d->adapter[n]);
dvb_usb_adapter_dvb_exit(&d->adapter[n]);
dvb_usb_adapter_stream_exit(&d->adapter[n]);
kfree(d->adapter[n].priv);
}
d->num_adapters_initialized = 0;
d->state &= ~DVB_USB_STATE_DVB;
return 0;
}
/* general initialization functions */ /* general initialization functions */
static int dvb_usb_exit(struct dvb_usb_device *d) static int dvb_usb_exit(struct dvb_usb_device *d)
{ {
deb_info("state before exiting everything: %x\n",d->state); deb_info("state before exiting everything: %x\n",d->state);
dvb_usb_remote_exit(d); dvb_usb_remote_exit(d);
dvb_usb_fe_exit(d); dvb_usb_adapter_exit(d);
dvb_usb_i2c_exit(d); dvb_usb_i2c_exit(d);
dvb_usb_dvb_exit(d);
dvb_usb_urb_exit(d);
deb_info("state should be zero now: %x\n",d->state); deb_info("state should be zero now: %x\n",d->state);
d->state = DVB_USB_STATE_INIT; d->state = DVB_USB_STATE_INIT;
kfree(d->priv); kfree(d->priv);
...@@ -47,32 +131,19 @@ static int dvb_usb_init(struct dvb_usb_device *d) ...@@ -47,32 +131,19 @@ static int dvb_usb_init(struct dvb_usb_device *d)
d->state = DVB_USB_STATE_INIT; d->state = DVB_USB_STATE_INIT;
/* check the capabilities and set appropriate variables */ if (d->props.size_of_priv > 0) {
d->priv = kzalloc(d->props.size_of_priv,GFP_KERNEL);
/* speed - when running at FULL speed we need a HW PID filter */ if (d->priv == NULL) {
if (d->udev->speed == USB_SPEED_FULL && !(d->props.caps & DVB_USB_HAS_PID_FILTER)) { err("no memory for priv in 'struct dvb_usb_device'");
err("This USB2.0 device cannot be run on a USB1.1 port. (it lacks a hardware PID filter)"); return -ENOMEM;
return -ENODEV;
} }
if ((d->udev->speed == USB_SPEED_FULL && d->props.caps & DVB_USB_HAS_PID_FILTER) ||
(d->props.caps & DVB_USB_NEED_PID_FILTERING)) {
info("will use the device's hardware PID filter (table count: %d).",d->props.pid_filter_count);
d->pid_filtering = 1;
d->max_feed_count = d->props.pid_filter_count;
} else {
info("will pass the complete MPEG2 transport stream to the software demuxer.");
d->pid_filtering = 0;
d->max_feed_count = 255;
} }
if (d->props.power_ctrl) /* check the capabilities and set appropriate variables */
d->props.power_ctrl(d,1); dvb_usb_device_power_ctrl(d, 1);
if ((ret = dvb_usb_urb_init(d)) || if ((ret = dvb_usb_i2c_init(d)) ||
(ret = dvb_usb_dvb_init(d)) || (ret = dvb_usb_adapter_init(d))) {
(ret = dvb_usb_i2c_init(d)) ||
(ret = dvb_usb_fe_init(d))) {
dvb_usb_exit(d); dvb_usb_exit(d);
return ret; return ret;
} }
...@@ -80,14 +151,13 @@ static int dvb_usb_init(struct dvb_usb_device *d) ...@@ -80,14 +151,13 @@ static int dvb_usb_init(struct dvb_usb_device *d)
if ((ret = dvb_usb_remote_init(d))) if ((ret = dvb_usb_remote_init(d)))
err("could not initialize remote control."); err("could not initialize remote control.");
if (d->props.power_ctrl) dvb_usb_device_power_ctrl(d, 0);
d->props.power_ctrl(d,0);
return 0; return 0;
} }
/* determine the name and the state of the just found USB device */ /* determine the name and the state of the just found USB device */
static struct dvb_usb_device_description * dvb_usb_find_device(struct usb_device *udev,struct dvb_usb_properties *props, int *cold) static struct dvb_usb_device_description * dvb_usb_find_device(struct usb_device *udev,struct dvb_usb_device_properties *props, int *cold)
{ {
int i,j; int i,j;
struct dvb_usb_device_description *desc = NULL; struct dvb_usb_device_description *desc = NULL;
...@@ -125,11 +195,20 @@ static struct dvb_usb_device_description * dvb_usb_find_device(struct usb_device ...@@ -125,11 +195,20 @@ static struct dvb_usb_device_description * dvb_usb_find_device(struct usb_device
return desc; return desc;
} }
int dvb_usb_device_power_ctrl(struct dvb_usb_device *d, int onoff)
{
if (d->powered == !onoff) {
d->powered = onoff;
if (d->props.power_ctrl)
return d->props.power_ctrl(d, onoff);
}
return 0;
}
/* /*
* USB * USB
*/ */
int dvb_usb_device_init(struct usb_interface *intf, struct dvb_usb_device_properties
int dvb_usb_device_init(struct usb_interface *intf, struct dvb_usb_properties
*props, struct module *owner,struct dvb_usb_device **du) *props, struct module *owner,struct dvb_usb_device **du)
{ {
struct usb_device *udev = interface_to_usbdev(intf); struct usb_device *udev = interface_to_usbdev(intf);
...@@ -161,19 +240,10 @@ int dvb_usb_device_init(struct usb_interface *intf, struct dvb_usb_properties ...@@ -161,19 +240,10 @@ int dvb_usb_device_init(struct usb_interface *intf, struct dvb_usb_properties
} }
d->udev = udev; d->udev = udev;
memcpy(&d->props,props,sizeof(struct dvb_usb_properties)); memcpy(&d->props,props,sizeof(struct dvb_usb_device_properties));
d->desc = desc; d->desc = desc;
d->owner = owner; d->owner = owner;
if (d->props.size_of_priv > 0) {
d->priv = kzalloc(d->props.size_of_priv,GFP_KERNEL);
if (d->priv == NULL) {
err("no memory for priv in 'struct dvb_usb_device'");
kfree(d);
return -ENOMEM;
}
}
usb_set_intfdata(intf, d); usb_set_intfdata(intf, d);
if (du != NULL) if (du != NULL)
...@@ -204,7 +274,7 @@ void dvb_usb_device_exit(struct usb_interface *intf) ...@@ -204,7 +274,7 @@ void dvb_usb_device_exit(struct usb_interface *intf)
} }
EXPORT_SYMBOL(dvb_usb_device_exit); EXPORT_SYMBOL(dvb_usb_device_exit);
MODULE_VERSION("0.3"); MODULE_VERSION("1.0");
MODULE_AUTHOR("Patrick Boettcher <patrick.boettcher@desy.de>"); MODULE_AUTHOR("Patrick Boettcher <patrick.boettcher@desy.de>");
MODULE_DESCRIPTION("A library module containing commonly used USB and DVB function USB DVB devices"); MODULE_DESCRIPTION("A library module containing commonly used USB and DVB function USB DVB devices");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
drivers/media/dvb/dvb-usb/dvb-usb-remote.c
View file @ 4d43e13f
/* dvb-usb-remote.c is part of the DVB USB library. /* dvb-usb-remote.c is part of the DVB USB library.
* *
* Copyright (C) 2004-5 Patrick Boettcher (patrick.boettcher@desy.de) * Copyright (C) 2004-6 Patrick Boettcher (patrick.boettcher@desy.de)
* see dvb-usb-init.c for copyright information. * see dvb-usb-init.c for copyright information.
* *
* This file contains functions for initializing the the input-device and for handling remote-control-queries. * This file contains functions for initializing the the input-device and for handling remote-control-queries.
......
drivers/media/dvb/dvb-usb/dvb-usb-urb.c
View file @ 4d43e13f
/* dvb-usb-urb.c is part of the DVB USB library. /* dvb-usb-urb.c is part of the DVB USB library.
* *
* Copyright (C) 2004-5 Patrick Boettcher (patrick.boettcher@desy.de) * Copyright (C) 2004-6 Patrick Boettcher (patrick.boettcher@desy.de)
* see dvb-usb-init.c for copyright information. * see dvb-usb-init.c for copyright information.
* *
* This file contains functions for initializing and handling the * This file keeps functions for initializing and handling the
* USB and URB stuff. * USB and URB stuff.
*/ */
#include "dvb-usb-common.h" #include "dvb-usb-common.h"
...@@ -64,260 +64,22 @@ int dvb_usb_generic_write(struct dvb_usb_device *d, u8 *buf, u16 len) ...@@ -64,260 +64,22 @@ int dvb_usb_generic_write(struct dvb_usb_device *d, u8 *buf, u16 len)
} }
EXPORT_SYMBOL(dvb_usb_generic_write); EXPORT_SYMBOL(dvb_usb_generic_write);
static void dvb_usb_data_complete(struct usb_data_stream *stream, u8 *buffer, size_t length)
/* URB stuff for streaming */
static void dvb_usb_urb_complete(struct urb *urb, struct pt_regs *ptregs)
{
struct dvb_usb_device *d = urb->context;
int ptype = usb_pipetype(urb->pipe);
int i;
u8 *b;
deb_ts("'%s' urb completed. feedcount: %d, status: %d, length: %d/%d, pack_num: %d, errors: %d\n",
ptype == PIPE_ISOCHRONOUS ? "isoc" : "bulk", d->feedcount,
urb->status,urb->actual_length,urb->transfer_buffer_length,
urb->number_of_packets,urb->error_count);
switch (urb->status) {
case 0: /* success */
break;
case -ECONNRESET: /* kill */
case -ENOENT:
case -ESHUTDOWN:
return;
default: /* error */
deb_ts("urb completition error %d.", urb->status);
break;
}
if (d->feedcount > 0) {
if (d->state & DVB_USB_STATE_DVB) {
switch (ptype) {
case PIPE_ISOCHRONOUS:
b = (u8 *) urb->transfer_buffer;
for (i = 0; i < urb->number_of_packets; i++) {
if (urb->iso_frame_desc[i].status != 0)
deb_ts("iso frame descriptor has an error: %d\n",urb->iso_frame_desc[i].status);
else if (urb->iso_frame_desc[i].actual_length > 0) {
dvb_dmx_swfilter(&d->demux,b + urb->iso_frame_desc[i].offset,
urb->iso_frame_desc[i].actual_length);
}
urb->iso_frame_desc[i].status = 0;
urb->iso_frame_desc[i].actual_length = 0;
}
debug_dump(b,20,deb_ts);
break;
case PIPE_BULK:
if (urb->actual_length > 0)
dvb_dmx_swfilter(&d->demux, (u8 *) urb->transfer_buffer,urb->actual_length);
break;
default:
err("unkown endpoint type in completition handler.");
return;
}
}
}
usb_submit_urb(urb,GFP_ATOMIC);
}
int dvb_usb_urb_kill(struct dvb_usb_device *d)
{
int i;
for (i = 0; i < d->urbs_submitted; i++) {
deb_ts("killing URB no. %d.\n",i);
/* stop the URB */
usb_kill_urb(d->urb_list[i]);
}
d->urbs_submitted = 0;
return 0;
}
int dvb_usb_urb_submit(struct dvb_usb_device *d)
{
int i,ret;
for (i = 0; i < d->urbs_initialized; i++) {
deb_ts("submitting URB no. %d\n",i);
if ((ret = usb_submit_urb(d->urb_list[i],GFP_ATOMIC))) {
err("could not submit URB no. %d - get them all back",i);
dvb_usb_urb_kill(d);
return ret;
}
d->urbs_submitted++;
}
return 0;
}
static int dvb_usb_free_stream_buffers(struct dvb_usb_device *d)
{
if (d->state & DVB_USB_STATE_URB_BUF) {
while (d->buf_num) {
d->buf_num--;
deb_mem("freeing buffer %d\n",d->buf_num);
usb_buffer_free(d->udev, d->buf_size,
d->buf_list[d->buf_num], d->dma_addr[d->buf_num]);
}
kfree(d->buf_list);
kfree(d->dma_addr);
}
d->state &= ~DVB_USB_STATE_URB_BUF;
return 0;
}
static int dvb_usb_allocate_stream_buffers(struct dvb_usb_device *d, int num, unsigned long size)
{
d->buf_num = 0;
d->buf_size = size;
deb_mem("all in all I will use %lu bytes for streaming\n",num*size);
if ((d->buf_list = kcalloc(num, sizeof(u8 *), GFP_ATOMIC)) == NULL)
return -ENOMEM;
if ((d->dma_addr = kcalloc(num, sizeof(dma_addr_t), GFP_ATOMIC)) == NULL) {
kfree(d->buf_list);
return -ENOMEM;
}
d->state |= DVB_USB_STATE_URB_BUF;
for (d->buf_num = 0; d->buf_num < num; d->buf_num++) {
deb_mem("allocating buffer %d\n",d->buf_num);
if (( d->buf_list[d->buf_num] =
usb_buffer_alloc(d->udev, size, SLAB_ATOMIC,
&d->dma_addr[d->buf_num]) ) == NULL) {
deb_mem("not enough memory for urb-buffer allocation.\n");
dvb_usb_free_stream_buffers(d);
return -ENOMEM;
}
deb_mem("buffer %d: %p (dma: %llu)\n",
d->buf_num, d->buf_list[d->buf_num],
(unsigned long long)d->dma_addr[d->buf_num]);
memset(d->buf_list[d->buf_num],0,size);
}
deb_mem("allocation successful\n");
return 0;
}
static int dvb_usb_bulk_urb_init(struct dvb_usb_device *d)
{ {
int i; struct dvb_usb_adapter *adap = stream->user_priv;
if (adap->feedcount > 0 && adap->state & DVB_USB_ADAP_STATE_DVB)
if ((i = dvb_usb_allocate_stream_buffers(d,d->props.urb.count, dvb_dmx_swfilter(&adap->demux, buffer, length);
d->props.urb.u.bulk.buffersize)) < 0)
return i;
/* allocate the URBs */
for (i = 0; i < d->props.urb.count; i++) {
if ((d->urb_list[i] = usb_alloc_urb(0,GFP_ATOMIC)) == NULL)
return -ENOMEM;
usb_fill_bulk_urb( d->urb_list[i], d->udev,
usb_rcvbulkpipe(d->udev,d->props.urb.endpoint),
d->buf_list[i],
d->props.urb.u.bulk.buffersize,
dvb_usb_urb_complete, d);
d->urb_list[i]->transfer_flags = 0;
d->urbs_initialized++;
}
return 0;
} }
static int dvb_usb_isoc_urb_init(struct dvb_usb_device *d) int dvb_usb_adapter_stream_init(struct dvb_usb_adapter *adap)
{ {
int i,j; adap->stream.udev = adap->dev->udev;
adap->stream.complete = dvb_usb_data_complete;
if ((i = dvb_usb_allocate_stream_buffers(d,d->props.urb.count, adap->stream.user_priv = adap;
d->props.urb.u.isoc.framesize*d->props.urb.u.isoc.framesperurb)) < 0) return usb_urb_init(&adap->stream, &adap->props.stream);
return i;
/* allocate the URBs */
for (i = 0; i < d->props.urb.count; i++) {
struct urb *urb;
int frame_offset = 0;
if ((d->urb_list[i] =
usb_alloc_urb(d->props.urb.u.isoc.framesperurb,GFP_ATOMIC)) == NULL)
return -ENOMEM;
urb = d->urb_list[i];
urb->dev = d->udev;
urb->context = d;
urb->complete = dvb_usb_urb_complete;
urb->pipe = usb_rcvisocpipe(d->udev,d->props.urb.endpoint);
urb->transfer_flags = URB_ISO_ASAP | URB_NO_TRANSFER_DMA_MAP;
urb->interval = d->props.urb.u.isoc.interval;
urb->number_of_packets = d->props.urb.u.isoc.framesperurb;
urb->transfer_buffer_length = d->buf_size;
urb->transfer_buffer = d->buf_list[i];
urb->transfer_dma = d->dma_addr[i];
for (j = 0; j < d->props.urb.u.isoc.framesperurb; j++) {
urb->iso_frame_desc[j].offset = frame_offset;
urb->iso_frame_desc[j].length = d->props.urb.u.isoc.framesize;
frame_offset += d->props.urb.u.isoc.framesize;
}
d->urbs_initialized++;
}
return 0;
}
int dvb_usb_urb_init(struct dvb_usb_device *d)
{
/*
* when reloading the driver w/o replugging the device
* sometimes a timeout occures, this helps
*/
if (d->props.generic_bulk_ctrl_endpoint != 0) {
usb_clear_halt(d->udev,usb_sndbulkpipe(d->udev,d->props.generic_bulk_ctrl_endpoint));
usb_clear_halt(d->udev,usb_rcvbulkpipe(d->udev,d->props.generic_bulk_ctrl_endpoint));
}
usb_clear_halt(d->udev,usb_rcvbulkpipe(d->udev,d->props.urb.endpoint));
/* allocate the array for the data transfer URBs */
d->urb_list = kzalloc(d->props.urb.count * sizeof(struct urb *),GFP_KERNEL);
if (d->urb_list == NULL)
return -ENOMEM;
d->state |= DVB_USB_STATE_URB_LIST;
switch (d->props.urb.type) {
case DVB_USB_BULK:
return dvb_usb_bulk_urb_init(d);
case DVB_USB_ISOC:
return dvb_usb_isoc_urb_init(d);
default:
err("unkown URB-type for data transfer.");
return -EINVAL;
}
} }
int dvb_usb_urb_exit(struct dvb_usb_device *d) int dvb_usb_adapter_stream_exit(struct dvb_usb_adapter *adap)
{ {
int i; return usb_urb_exit(&adap->stream);
dvb_usb_urb_kill(d);
if (d->state & DVB_USB_STATE_URB_LIST) {
for (i = 0; i < d->urbs_initialized; i++) {
if (d->urb_list[i] != NULL) {
deb_mem("freeing URB no. %d.\n",i);
/* free the URBs */
usb_free_urb(d->urb_list[i]);
}
}
d->urbs_initialized = 0;
/* free the urb array */
kfree(d->urb_list);
d->state &= ~DVB_USB_STATE_URB_LIST;
}
dvb_usb_free_stream_buffers(d);
return 0;
} }
drivers/media/dvb/dvb-usb/dvb-usb.h
View file @ 4d43e13f
This diff is collapsed.
drivers/media/dvb/dvb-usb/gp8psk.c
View file @ 4d43e13f
...@@ -161,19 +161,18 @@ static int gp8psk_power_ctrl(struct dvb_usb_device *d, int onoff) ...@@ -161,19 +161,18 @@ static int gp8psk_power_ctrl(struct dvb_usb_device *d, int onoff)
} }
static int gp8psk_streaming_ctrl(struct dvb_usb_device *d, int onoff) static int gp8psk_streaming_ctrl(struct dvb_usb_adapter *adap, int onoff)
{ {
return gp8psk_usb_out_op(d, ARM_TRANSFER, onoff, 0 , NULL, 0); return gp8psk_usb_out_op(adap->dev, ARM_TRANSFER, onoff, 0 , NULL, 0);
} }
static int gp8psk_frontend_attach(struct dvb_usb_device *d) static int gp8psk_frontend_attach(struct dvb_usb_adapter *adap)
{ {
d->fe = gp8psk_fe_attach(d); adap->fe = gp8psk_fe_attach(adap->dev);
return 0; return 0;
} }
static struct dvb_usb_properties gp8psk_properties; static struct dvb_usb_device_properties gp8psk_properties;
static int gp8psk_usb_probe(struct usb_interface *intf, static int gp8psk_usb_probe(struct usb_interface *intf,
const struct usb_device_id *id) const struct usb_device_id *id)
...@@ -188,20 +187,18 @@ static struct usb_device_id gp8psk_usb_table [] = { ...@@ -188,20 +187,18 @@ static struct usb_device_id gp8psk_usb_table [] = {
}; };
MODULE_DEVICE_TABLE(usb, gp8psk_usb_table); MODULE_DEVICE_TABLE(usb, gp8psk_usb_table);
static struct dvb_usb_properties gp8psk_properties = { static struct dvb_usb_device_properties gp8psk_properties = {
.caps = 0,
.usb_ctrl = CYPRESS_FX2, .usb_ctrl = CYPRESS_FX2,
.firmware = "dvb-usb-gp8psk-01.fw", .firmware = "dvb-usb-gp8psk-01.fw",
.num_adapters = 1,
.adapter = {
{
.streaming_ctrl = gp8psk_streaming_ctrl, .streaming_ctrl = gp8psk_streaming_ctrl,
.power_ctrl = gp8psk_power_ctrl,
.frontend_attach = gp8psk_frontend_attach, .frontend_attach = gp8psk_frontend_attach,
.generic_bulk_ctrl_endpoint = 0x01,
/* parameter for the MPEG2-data transfer */ /* parameter for the MPEG2-data transfer */
.urb = { .stream = {
.type = DVB_USB_BULK, .type = USB_BULK,
.count = 7, .count = 7,
.endpoint = 0x82, .endpoint = 0x82,
.u = { .u = {
...@@ -210,6 +207,11 @@ static struct dvb_usb_properties gp8psk_properties = { ...@@ -210,6 +207,11 @@ static struct dvb_usb_properties gp8psk_properties = {
} }
} }
}, },
}
},
.power_ctrl = gp8psk_power_ctrl,
.generic_bulk_ctrl_endpoint = 0x01,
.num_device_descs = 1, .num_device_descs = 1,
.devices = { .devices = {
......
drivers/media/dvb/dvb-usb/nova-t-usb2.c
View file @ 4d43e13f
...@@ -135,7 +135,7 @@ static int nova_t_read_mac_address (struct dvb_usb_device *d, u8 mac[6]) ...@@ -135,7 +135,7 @@ static int nova_t_read_mac_address (struct dvb_usb_device *d, u8 mac[6])
} }
/* USB Driver stuff */ /* USB Driver stuff */
static struct dvb_usb_properties nova_t_properties; static struct dvb_usb_device_properties nova_t_properties;
static int nova_t_probe(struct usb_interface *intf, static int nova_t_probe(struct usb_interface *intf,
const struct usb_device_id *id) const struct usb_device_id *id)
...@@ -151,34 +151,27 @@ static struct usb_device_id nova_t_table [] = { ...@@ -151,34 +151,27 @@ static struct usb_device_id nova_t_table [] = {
}; };
MODULE_DEVICE_TABLE(usb, nova_t_table); MODULE_DEVICE_TABLE(usb, nova_t_table);
static struct dvb_usb_properties nova_t_properties = { static struct dvb_usb_device_properties nova_t_properties = {
.caps = DVB_USB_HAS_PID_FILTER | DVB_USB_PID_FILTER_CAN_BE_TURNED_OFF | DVB_USB_IS_AN_I2C_ADAPTER, .caps = DVB_USB_IS_AN_I2C_ADAPTER,
.pid_filter_count = 32,
.usb_ctrl = CYPRESS_FX2, .usb_ctrl = CYPRESS_FX2,
.firmware = "dvb-usb-nova-t-usb2-02.fw", .firmware = "dvb-usb-nova-t-usb2-02.fw",
.size_of_priv = sizeof(struct dibusb_state), .num_adapters = 1,
.adapter = {
{
.caps = DVB_USB_ADAP_HAS_PID_FILTER | DVB_USB_ADAP_PID_FILTER_CAN_BE_TURNED_OFF,
.pid_filter_count = 32,
.streaming_ctrl = dibusb2_0_streaming_ctrl, .streaming_ctrl = dibusb2_0_streaming_ctrl,
.pid_filter = dibusb_pid_filter, .pid_filter = dibusb_pid_filter,
.pid_filter_ctrl = dibusb_pid_filter_ctrl, .pid_filter_ctrl = dibusb_pid_filter_ctrl,
.power_ctrl = dibusb2_0_power_ctrl,
.frontend_attach = dibusb_dib3000mc_frontend_attach, .frontend_attach = dibusb_dib3000mc_frontend_attach,
.tuner_attach = dibusb_dib3000mc_tuner_attach, .tuner_attach = dibusb_dib3000mc_tuner_attach,
.read_mac_address = nova_t_read_mac_address,
.rc_interval = 100,
.rc_key_map = haupp_rc_keys,
.rc_key_map_size = ARRAY_SIZE(haupp_rc_keys),
.rc_query = nova_t_rc_query,
.i2c_algo = &dibusb_i2c_algo,
.generic_bulk_ctrl_endpoint = 0x01,
/* parameter for the MPEG2-data transfer */ /* parameter for the MPEG2-data transfer */
.urb = { .stream = {
.type = DVB_USB_BULK, .type = USB_BULK,
.count = 7, .count = 7,
.endpoint = 0x06, .endpoint = 0x06,
.u = { .u = {
...@@ -188,6 +181,22 @@ static struct dvb_usb_properties nova_t_properties = { ...@@ -188,6 +181,22 @@ static struct dvb_usb_properties nova_t_properties = {
} }
}, },
.size_of_priv = sizeof(struct dibusb_state),
}
},
.power_ctrl = dibusb2_0_power_ctrl,
.read_mac_address = nova_t_read_mac_address,
.rc_interval = 100,
.rc_key_map = haupp_rc_keys,
.rc_key_map_size = ARRAY_SIZE(haupp_rc_keys),
.rc_query = nova_t_rc_query,
.i2c_algo = &dibusb_i2c_algo,
.generic_bulk_ctrl_endpoint = 0x01,
.num_device_descs = 1, .num_device_descs = 1,
.devices = { .devices = {
{ "Hauppauge WinTV-NOVA-T usb2", { "Hauppauge WinTV-NOVA-T usb2",
......
drivers/media/dvb/dvb-usb/umt-010.c
View file @ 4d43e13f
...@@ -50,7 +50,7 @@ static int umt_mt352_demod_init(struct dvb_frontend *fe) ...@@ -50,7 +50,7 @@ static int umt_mt352_demod_init(struct dvb_frontend *fe)
return 0; return 0;
} }
static int umt_mt352_frontend_attach(struct dvb_usb_device *d) static int umt_mt352_frontend_attach(struct dvb_usb_adapter *adap)
{ {
struct mt352_config umt_config; struct mt352_config umt_config;
...@@ -58,21 +58,21 @@ static int umt_mt352_frontend_attach(struct dvb_usb_device *d) ...@@ -58,21 +58,21 @@ static int umt_mt352_frontend_attach(struct dvb_usb_device *d)
umt_config.demod_init = umt_mt352_demod_init; umt_config.demod_init = umt_mt352_demod_init;
umt_config.demod_address = 0xf; umt_config.demod_address = 0xf;
d->fe = dvb_attach(mt352_attach, &umt_config, &d->i2c_adap); adap->fe = dvb_attach(mt352_attach, &umt_config, &adap->dev->i2c_adap);
return 0; return 0;
} }
static int umt_tuner_attach (struct dvb_usb_device *d) static int umt_tuner_attach (struct dvb_usb_adapter *adap)
{ {
d->pll_addr = 0x61; adap->pll_addr = 0x61;
d->pll_desc = &dvb_pll_tua6034; adap->pll_desc = &dvb_pll_tua6034;
d->fe->ops.tuner_ops.calc_regs = dvb_usb_tuner_calc_regs; adap->fe->ops.tuner_ops.calc_regs = dvb_usb_tuner_calc_regs;
return 0; return 0;
} }
/* USB Driver stuff */ /* USB Driver stuff */
static struct dvb_usb_properties umt_properties; static struct dvb_usb_device_properties umt_properties;
static int umt_probe(struct usb_interface *intf, static int umt_probe(struct usb_interface *intf,
const struct usb_device_id *id) const struct usb_device_id *id)
...@@ -90,25 +90,22 @@ static struct usb_device_id umt_table [] = { ...@@ -90,25 +90,22 @@ static struct usb_device_id umt_table [] = {
}; };
MODULE_DEVICE_TABLE (usb, umt_table); MODULE_DEVICE_TABLE (usb, umt_table);
static struct dvb_usb_properties umt_properties = { static struct dvb_usb_device_properties umt_properties = {
.caps = DVB_USB_IS_AN_I2C_ADAPTER, .caps = DVB_USB_IS_AN_I2C_ADAPTER,
.usb_ctrl = CYPRESS_FX2, .usb_ctrl = CYPRESS_FX2,
.firmware = "dvb-usb-umt-010-02.fw", .firmware = "dvb-usb-umt-010-02.fw",
.size_of_priv = sizeof(struct dibusb_state), .num_adapters = 1,
.adapter = {
{
.streaming_ctrl = dibusb2_0_streaming_ctrl, .streaming_ctrl = dibusb2_0_streaming_ctrl,
.power_ctrl = dibusb_power_ctrl,
.frontend_attach = umt_mt352_frontend_attach, .frontend_attach = umt_mt352_frontend_attach,
.tuner_attach = umt_tuner_attach, .tuner_attach = umt_tuner_attach,
.i2c_algo = &dibusb_i2c_algo,
.generic_bulk_ctrl_endpoint = 0x01,
/* parameter for the MPEG2-data transfer */ /* parameter for the MPEG2-data transfer */
.urb = { .stream = {
.type = DVB_USB_BULK, .type = USB_BULK,
.count = 20, .count = 20,
.endpoint = 0x06, .endpoint = 0x06,
.u = { .u = {
...@@ -118,6 +115,15 @@ static struct dvb_usb_properties umt_properties = { ...@@ -118,6 +115,15 @@ static struct dvb_usb_properties umt_properties = {
} }
}, },
.size_of_priv = sizeof(struct dibusb_state),
}
},
.power_ctrl = dibusb_power_ctrl,
.i2c_algo = &dibusb_i2c_algo,
.generic_bulk_ctrl_endpoint = 0x01,
.num_device_descs = 1, .num_device_descs = 1,
.devices = { .devices = {
{ "Hanftek UMT-010 DVB-T USB2.0", { "Hanftek UMT-010 DVB-T USB2.0",
......
drivers/media/dvb/dvb-usb/vp702x.c
View file @ 4d43e13f
...@@ -108,9 +108,9 @@ static int vp702x_usb_inout_cmd(struct dvb_usb_device *d, u8 cmd, u8 *o, ...@@ -108,9 +108,9 @@ static int vp702x_usb_inout_cmd(struct dvb_usb_device *d, u8 cmd, u8 *o,
return ret; return ret;
} }
static int vp702x_pid_filter(struct dvb_usb_device *d, int index, u16 pid, int onoff) static int vp702x_pid_filter(struct dvb_usb_adapter *adap, int index, u16 pid, int onoff)
{ {
struct vp702x_state *st = d->priv; struct vp702x_state *st = adap->priv;
u8 buf[9]; u8 buf[9];
if (onoff) { if (onoff) {
...@@ -122,7 +122,7 @@ static int vp702x_pid_filter(struct dvb_usb_device *d, int index, u16 pid, int o ...@@ -122,7 +122,7 @@ static int vp702x_pid_filter(struct dvb_usb_device *d, int index, u16 pid, int o
st->pid_table[index*2] = st->pid_table[index*2+1] = 0; st->pid_table[index*2] = st->pid_table[index*2+1] = 0;
} }
return vp702x_usb_inout_cmd(d,SET_PID_FILTER,st->pid_table,17,buf,9,10); return vp702x_usb_inout_cmd(adap->dev,SET_PID_FILTER,st->pid_table,17,buf,9,10);
} }
static int vp702x_power_ctrl(struct dvb_usb_device *d, int onoff) static int vp702x_power_ctrl(struct dvb_usb_device *d, int onoff)
...@@ -175,21 +175,21 @@ static int vp702x_read_mac_addr(struct dvb_usb_device *d,u8 mac[6]) ...@@ -175,21 +175,21 @@ static int vp702x_read_mac_addr(struct dvb_usb_device *d,u8 mac[6])
return 0; return 0;
} }
static int vp702x_frontend_attach(struct dvb_usb_device *d) static int vp702x_frontend_attach(struct dvb_usb_adapter *adap)
{ {
u8 buf[9] = { 0 }; u8 buf[9] = { 0 };
if (vp702x_usb_inout_cmd(d, GET_SYSTEM_STRING, NULL, 0, buf, 9, 10)) if (vp702x_usb_inout_cmd(adap->dev, GET_SYSTEM_STRING, NULL, 0, buf, 9, 10))
return -EIO; return -EIO;
buf[8] = '\0'; buf[8] = '\0';
info("system string: %s",&buf[1]); info("system string: %s",&buf[1]);
d->fe = vp702x_fe_attach(d); adap->fe = vp702x_fe_attach(adap->dev);
return 0; return 0;
} }
static struct dvb_usb_properties vp702x_properties; static struct dvb_usb_device_properties vp702x_properties;
static int vp702x_usb_probe(struct usb_interface *intf, static int vp702x_usb_probe(struct usb_interface *intf,
const struct usb_device_id *id) const struct usb_device_id *id)
...@@ -211,28 +211,21 @@ static struct usb_device_id vp702x_usb_table [] = { ...@@ -211,28 +211,21 @@ static struct usb_device_id vp702x_usb_table [] = {
}; };
MODULE_DEVICE_TABLE(usb, vp702x_usb_table); MODULE_DEVICE_TABLE(usb, vp702x_usb_table);
static struct dvb_usb_properties vp702x_properties = { static struct dvb_usb_device_properties vp702x_properties = {
.caps = DVB_USB_HAS_PID_FILTER | DVB_USB_NEED_PID_FILTERING,
.pid_filter_count = 8, /* !!! */
.usb_ctrl = CYPRESS_FX2, .usb_ctrl = CYPRESS_FX2,
.firmware = "dvb-usb-vp702x-01.fw", .firmware = "dvb-usb-vp702x-01.fw",
.num_adapters = 1,
.adapter = {
{
.caps = DVB_USB_ADAP_HAS_PID_FILTER | DVB_USB_ADAP_NEED_PID_FILTERING,
.pid_filter_count = 8, /* !!! */
.pid_filter = vp702x_pid_filter, .pid_filter = vp702x_pid_filter,
.power_ctrl = vp702x_power_ctrl,
.frontend_attach = vp702x_frontend_attach, .frontend_attach = vp702x_frontend_attach,
.read_mac_address = vp702x_read_mac_addr,
.rc_key_map = vp702x_rc_keys,
.rc_key_map_size = ARRAY_SIZE(vp702x_rc_keys),
.rc_interval = 400,
.rc_query = vp702x_rc_query,
.size_of_priv = sizeof(struct vp702x_state),
/* parameter for the MPEG2-data transfer */ /* parameter for the MPEG2-data transfer */
.urb = { .stream = {
.type = DVB_USB_BULK, .type = USB_BULK,
.count = 7, .count = 7,
.endpoint = 0x02, .endpoint = 0x02,
.u = { .u = {
...@@ -241,6 +234,16 @@ static struct dvb_usb_properties vp702x_properties = { ...@@ -241,6 +234,16 @@ static struct dvb_usb_properties vp702x_properties = {
} }
} }
}, },
.size_of_priv = sizeof(struct vp702x_state),
},
},
.power_ctrl = vp702x_power_ctrl,
.read_mac_address = vp702x_read_mac_addr,
.rc_key_map = vp702x_rc_keys,
.rc_key_map_size = ARRAY_SIZE(vp702x_rc_keys),
.rc_interval = 400,
.rc_query = vp702x_rc_query,
.num_device_descs = 2, .num_device_descs = 2,
.devices = { .devices = {
......
drivers/media/dvb/dvb-usb/vp7045.c
View file @ 4d43e13f
...@@ -169,31 +169,31 @@ static int vp7045_read_mac_addr(struct dvb_usb_device *d,u8 mac[6]) ...@@ -169,31 +169,31 @@ static int vp7045_read_mac_addr(struct dvb_usb_device *d,u8 mac[6])
return vp7045_read_eeprom(d,mac, 6, MAC_0_ADDR); return vp7045_read_eeprom(d,mac, 6, MAC_0_ADDR);
} }
static int vp7045_frontend_attach(struct dvb_usb_device *d) static int vp7045_frontend_attach(struct dvb_usb_adapter *adap)
{ {
u8 buf[255] = { 0 }; u8 buf[255] = { 0 };
vp7045_usb_op(d,VENDOR_STRING_READ,NULL,0,buf,20,0); vp7045_usb_op(adap->dev,VENDOR_STRING_READ,NULL,0,buf,20,0);
buf[10] = '\0'; buf[10] = '\0';
deb_info("firmware says: %s ",buf); deb_info("firmware says: %s ",buf);
vp7045_usb_op(d,PRODUCT_STRING_READ,NULL,0,buf,20,0); vp7045_usb_op(adap->dev,PRODUCT_STRING_READ,NULL,0,buf,20,0);
buf[10] = '\0'; buf[10] = '\0';
deb_info("%s ",buf); deb_info("%s ",buf);
vp7045_usb_op(d,FW_VERSION_READ,NULL,0,buf,20,0); vp7045_usb_op(adap->dev,FW_VERSION_READ,NULL,0,buf,20,0);
buf[10] = '\0'; buf[10] = '\0';
deb_info("v%s\n",buf); deb_info("v%s\n",buf);
/* Dump the EEPROM */ /* Dump the EEPROM */
/* vp7045_read_eeprom(d,buf, 255, FX2_ID_ADDR); */ /* vp7045_read_eeprom(d,buf, 255, FX2_ID_ADDR); */
d->fe = vp7045_fe_attach(d); adap->fe = vp7045_fe_attach(adap->dev);
return 0; return 0;
} }
static struct dvb_usb_properties vp7045_properties; static struct dvb_usb_device_properties vp7045_properties;
static int vp7045_usb_probe(struct usb_interface *intf, static int vp7045_usb_probe(struct usb_interface *intf,
const struct usb_device_id *id) const struct usb_device_id *id)
...@@ -210,24 +210,17 @@ static struct usb_device_id vp7045_usb_table [] = { ...@@ -210,24 +210,17 @@ static struct usb_device_id vp7045_usb_table [] = {
}; };
MODULE_DEVICE_TABLE(usb, vp7045_usb_table); MODULE_DEVICE_TABLE(usb, vp7045_usb_table);
static struct dvb_usb_properties vp7045_properties = { static struct dvb_usb_device_properties vp7045_properties = {
.caps = 0,
.usb_ctrl = CYPRESS_FX2, .usb_ctrl = CYPRESS_FX2,
.firmware = "dvb-usb-vp7045-01.fw", .firmware = "dvb-usb-vp7045-01.fw",
.power_ctrl = vp7045_power_ctrl, .num_adapters = 1,
.adapter = {
{
.frontend_attach = vp7045_frontend_attach, .frontend_attach = vp7045_frontend_attach,
.read_mac_address = vp7045_read_mac_addr,
.rc_interval = 400,
.rc_key_map = vp7045_rc_keys,
.rc_key_map_size = ARRAY_SIZE(vp7045_rc_keys),
.rc_query = vp7045_rc_query,
/* parameter for the MPEG2-data transfer */ /* parameter for the MPEG2-data transfer */
.urb = { .stream = {
.type = DVB_USB_BULK, .type = USB_BULK,
.count = 7, .count = 7,
.endpoint = 0x02, .endpoint = 0x02,
.u = { .u = {
...@@ -236,6 +229,15 @@ static struct dvb_usb_properties vp7045_properties = { ...@@ -236,6 +229,15 @@ static struct dvb_usb_properties vp7045_properties = {
} }
} }
}, },
}
},
.power_ctrl = vp7045_power_ctrl,
.read_mac_address = vp7045_read_mac_addr,
.rc_interval = 400,
.rc_key_map = vp7045_rc_keys,
.rc_key_map_size = ARRAY_SIZE(vp7045_rc_keys),
.rc_query = vp7045_rc_query,
.num_device_descs = 2, .num_device_descs = 2,
.devices = { .devices = {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7