diff options
| author | Oliver Schinagl <oliver@schinagl.nl> | 2012-02-21 16:09:31 (GMT) |
|---|---|---|
| committer | Oliver Schinagl <oliver@schinagl.nl> | 2012-02-21 16:09:31 (GMT) |
| commit | fc6c0fc3df42cfad3fe07aa20d06085d4026f0c0 (patch) | |
| tree | a9b6f0fe95a34dfb9c50fb178f345dc11c36cb72 | |
| parent | d4d33edc348288ac00daf5fea7f1b7b291f2a3c9 (diff) | |
| download | AF903x_SRC-fc6c0fc3df42cfad3fe07aa20d06085d4026f0c0.zip AF903x_SRC-fc6c0fc3df42cfad3fe07aa20d06085d4026f0c0.tar.gz AF903x_SRC-fc6c0fc3df42cfad3fe07aa20d06085d4026f0c0.tar.bz2 | |
Updated to 3.2.1 and removed dupe
Thanks to Jozef Gercak <gercakj@gmail.com>
| -rw-r--r-- | src/af903x-devices.c | 44 |
1 files changed, 13 insertions, 31 deletions
diff --git a/src/af903x-devices.c b/src/af903x-devices.c index 8e82aaa..e7ecfd4 100644 --- a/src/af903x-devices.c +++ b/src/af903x-devices.c @@ -75,14 +75,14 @@ static int af903x_identify_state(struct usb_device *udev, struct dvb_usb_device_ static int af903x_frontend_attach(struct dvb_usb_adapter *adap) { deb_data("- Enter %s Function - chip=%d\n", __FUNCTION__, adap->id); - adap->fe = af903x_attach(1); - return adap->fe == NULL ? -ENODEV : 0; + adap->fe_adap[0].fe = af903x_attach(1); + return adap->fe_adap[0].fe == NULL ? -ENODEV : 0; } static int af903x_tuner_attach(struct dvb_usb_adapter *adap) { deb_data("- Enter %s Function - chip=%d\n",__FUNCTION__, adap->id); - tuner_attach(adap->fe); + tuner_attach(adap->fe_adap[0].fe); return 0; } @@ -116,17 +116,17 @@ struct dvb_usb_device_properties af903x_properties[] = { .no_reconnect = 1, .power_ctrl = af903x_powerctrl, .identify_state = af903x_identify_state, - .num_adapters = 2, + .num_adapters = 1, .adapter = { { - .caps = DVB_USB_ADAP_HAS_PID_FILTER | DVB_USB_ADAP_PID_FILTER_CAN_BE_TURNED_OFF, - .pid_filter_count = 32, - .pid_filter = af903x_pid_filter, - .pid_filter_ctrl = af903x_pid_filter_ctrl, - .frontend_attach = af903x_frontend_attach, - .tuner_attach = af903x_tuner_attach, - .streaming_ctrl = af903x_streaming_ctrl, - .stream = { + .fe[0].caps = DVB_USB_ADAP_HAS_PID_FILTER | DVB_USB_ADAP_PID_FILTER_CAN_BE_TURNED_OFF, + .fe[0].pid_filter_count = 32, + .fe[0].pid_filter = af903x_pid_filter, + .fe[0].pid_filter_ctrl = af903x_pid_filter_ctrl, + .fe[0].frontend_attach = af903x_frontend_attach, + .fe[0].tuner_attach = af903x_tuner_attach, + .fe[0].streaming_ctrl = af903x_streaming_ctrl, + .fe[0].stream = { .type = USB_BULK, .count = 4, .endpoint = 0x84, @@ -136,25 +136,7 @@ struct dvb_usb_device_properties af903x_properties[] = { } } } - }, { - .caps = DVB_USB_ADAP_HAS_PID_FILTER | DVB_USB_ADAP_PID_FILTER_CAN_BE_TURNED_OFF, - .pid_filter_count = 32, - .pid_filter = af903x_pid_filter, - .pid_filter_ctrl = af903x_pid_filter_ctrl, - .frontend_attach = af903x_frontend_attach, - .tuner_attach = af903x_tuner_attach, - .streaming_ctrl = af903x_streaming_ctrl, - .stream = { - .type = USB_BULK, - .count = 4, - .endpoint = 0x85, - .u = { - .bulk = { - .buffersize = 65424, - } - } - } - }, + } }, .num_device_descs = 2, .devices = { |