Commit 6400a8c5 authored by Antti Palosaari's avatar Antti Palosaari Committed by Mauro Carvalho Chehab
Browse files

[media] dvb_usb_v2: change USB stream config logic 



Initial / default USB stream configuration is now set always as a
dvb_usb_device_properties. Dynamic configuration is done top of
that if callback .get_usb_stream_config() exists. Default values
are set when callback is called so callback needs only change
values that are different than default.

In addition of that define two macros DVB_USB_STREAM_BULK() and
DVB_USB_STREAM_ISOC() for filling struct usb_data_stream_properties

Signed-off-by: default avatarAntti Palosaari <crope@iki.fi>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 12077a3a

drivers/media/dvb/dvb-usb/dvb_usb_common.h

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ extern int dvb_usbv2_disable_rc_polling; 
extern int dvb_usbv2_device_power_ctrl(struct dvb_usb_device *d, int onoff);



extern int usb_urb_initv2(struct usb_data_stream *stream,

		struct usb_data_stream_properties *props);

		const struct usb_data_stream_properties *props);

extern int usb_urb_exitv2(struct usb_data_stream *stream);

extern int usb_urb_submitv2(struct usb_data_stream *stream,

		struct usb_data_stream_properties *props);

drivers/media/dvb/dvb-usb/dvb_usb_dvb.c

+6 −15
Original line number Diff line number Diff line
@@ -34,31 +34,20 @@ static void dvb_usb_data_complete_raw(struct usb_data_stream *stream, 


int dvb_usbv2_adapter_stream_init(struct dvb_usb_adapter *adap)

{

	int ret;

	struct usb_data_stream_properties stream_props;

	pr_debug("%s: adap=%d\n", __func__, adap->id);



	adap->stream.udev = adap->dev->udev;

	adap->stream.user_priv = adap;



	/* resolve USB stream configuration for buffer alloc */

	if (adap->dev->props->get_usb_stream_config) {

		ret = adap->dev->props->get_usb_stream_config(NULL,

				&stream_props);

		if (ret < 0)

			return ret;

	} else {

		stream_props = adap->props->stream;

	}



	/* FIXME: can be removed as set later in anyway */

	adap->stream.complete = dvb_usb_data_complete;



	return usb_urb_initv2(&adap->stream, &stream_props);

	return usb_urb_initv2(&adap->stream, &adap->props->stream);

}



int dvb_usbv2_adapter_stream_exit(struct dvb_usb_adapter *adap)

{

	pr_debug("%s: adap=%d\n", __func__, adap->id);

	usb_urb_exitv2(&adap->stream);



	return 0;

}
@@ -133,6 +122,8 @@ static int dvb_usb_ctrl_feed(struct dvb_demux_feed *dvbdmxfeed, int onoff) 


		/* resolve USB stream configuration */

		if (adap->dev->props->get_usb_stream_config) {

			memcpy(&stream_props, &adap->props->stream,

				sizeof(struct usb_data_stream_properties));

			ret = adap->dev->props->get_usb_stream_config(

					adap->fe[adap->active_fe],

					&stream_props);

drivers/media/dvb/dvb-usb/usb_urb.c

+1 −1
Original line number Diff line number Diff line
@@ -306,7 +306,7 @@ int usb_urb_reconfig(struct usb_data_stream *stream, 
}



int usb_urb_initv2(struct usb_data_stream *stream,

		struct usb_data_stream_properties *props)

		const struct usb_data_stream_properties *props)

{

	int ret;