1 files changed, 83 insertions, 87 deletions

diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-dvb.c b/drivers/media/dvb/dvb-usb/dvb-usb-dvb.c
index fe6208ada9037..4561a672da924 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-dvb.c
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-dvb.c
@@ -1,6 +1,6 @@
 /* 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.
  *
  * This file contains functions for initializing and handling the
@@ -8,55 +8,55 @@
  */
 #include "dvb-usb-common.h"
 
+/* does the complete input transfer handling */
 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;
 
-	if (d == NULL)
+	if (adap == NULL)
 		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) {
 		deb_ts("stop feeding\n");
-		dvb_usb_urb_kill(d);
+		usb_urb_kill(&adap->stream);
 
-		if (d->props.streaming_ctrl != NULL)
-			if ((ret = d->props.streaming_ctrl(d,0)))
+		if (adap->props.streaming_ctrl != NULL)
+			if ((ret = adap->props.streaming_ctrl(adap,0)))
 				err("error while stopping stream.");
-
 	}
 
-	d->feedcount = newfeedcount;
+	adap->feedcount = newfeedcount;
 
 	/* 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");
-	if (d->props.caps & DVB_USB_HAS_PID_FILTER &&
-		d->pid_filtering &&
-		d->props.pid_filter != NULL)
-		d->props.pid_filter(d,dvbdmxfeed->index,dvbdmxfeed->pid,onoff);
+	deb_ts("setting pid (%s): %5d %04x at index %d '%s'\n",adap->pid_filtering ?
+		"yes" : "no", dvbdmxfeed->pid,dvbdmxfeed->pid,dvbdmxfeed->index,onoff ?
+		"on" : "off");
+	if (adap->props.caps & DVB_USB_ADAP_HAS_PID_FILTER &&
+		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
 	 * for reception.
 	 */
-	if (d->feedcount == onoff && d->feedcount > 0) {
+	if (adap->feedcount == onoff && adap->feedcount > 0) {
 		deb_ts("submitting all URBs\n");
-		dvb_usb_urb_submit(d);
+		usb_urb_submit(&adap->stream);
 
 		deb_ts("controlling pid parser\n");
-		if (d->props.caps & DVB_USB_HAS_PID_FILTER &&
-			d->props.caps & DVB_USB_PID_FILTER_CAN_BE_TURNED_OFF &&
-			d->props.pid_filter_ctrl != NULL)
-			if (d->props.pid_filter_ctrl(d,d->pid_filtering) < 0)
+		if (adap->props.caps & DVB_USB_ADAP_HAS_PID_FILTER &&
+			adap->props.caps & DVB_USB_ADAP_PID_FILTER_CAN_BE_TURNED_OFF &&
+			adap->props.pid_filter_ctrl != NULL)
+			if (adap->props.pid_filter_ctrl(adap,adap->pid_filtering) < 0)
 				err("could not handle pid_parser");
 
 		deb_ts("start feeding\n");
-		if (d->props.streaming_ctrl != NULL)
-			if (d->props.streaming_ctrl(d,1)) {
+		if (adap->props.streaming_ctrl != NULL)
+			if (adap->props.streaming_ctrl(adap,1)) {
 				err("error while enabling fifo.");
 				return -ENODEV;
 			}
@@ -77,134 +77,130 @@ static int dvb_usb_stop_feed(struct dvb_demux_feed *dvbdmxfeed)
 	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;
 
-	if ((ret = dvb_register_adapter(&d->dvb_adap, d->desc->name,
-			d->owner, &d->udev->dev)) < 0) {
+	if ((ret = dvb_register_adapter(&adap->dvb_adap, adap->dev->desc->name,
+			adap->dev->owner, &adap->dev->udev->dev)) < 0) {
 		deb_info("dvb_register_adapter failed: error %d", ret);
 		goto err;
 	}
-	d->dvb_adap.priv = d;
-
-	if (d->props.read_mac_address) {
-		if (d->props.read_mac_address(d,d->dvb_adap.proposed_mac) == 0)
-			info("MAC address: %02x:%02x:%02x:%02x:%02x:%02x",d->dvb_adap.proposed_mac[0],
-					d->dvb_adap.proposed_mac[1],d->dvb_adap.proposed_mac[2],
-					d->dvb_adap.proposed_mac[3],d->dvb_adap.proposed_mac[4],
-					d->dvb_adap.proposed_mac[5]);
+	adap->dvb_adap.priv = adap;
+
+	if (adap->dev->props.read_mac_address) {
+		if (adap->dev->props.read_mac_address(adap->dev,adap->dvb_adap.proposed_mac) == 0)
+			info("MAC address: %02x:%02x:%02x:%02x:%02x:%02x",adap->dvb_adap.proposed_mac[0],
+					adap->dvb_adap.proposed_mac[1], adap->dvb_adap.proposed_mac[2],
+					adap->dvb_adap.proposed_mac[3], adap->dvb_adap.proposed_mac[4],
+					adap->dvb_adap.proposed_mac[5]);
 		else
 			err("MAC address reading failed.");
 	}
 
 
-	d->demux.dmx.capabilities = DMX_TS_FILTERING | DMX_SECTION_FILTERING;
-	d->demux.priv = d;
+	adap->demux.dmx.capabilities = DMX_TS_FILTERING | DMX_SECTION_FILTERING;
+	adap->demux.priv             = adap;
 
-	d->demux.feednum = d->demux.filternum = d->max_feed_count;
-	d->demux.start_feed = dvb_usb_start_feed;
-	d->demux.stop_feed  = dvb_usb_stop_feed;
-	d->demux.write_to_decoder = NULL;
-	if ((ret = dvb_dmx_init(&d->demux)) < 0) {
+	adap->demux.feednum          = adap->demux.filternum = adap->max_feed_count;
+	adap->demux.start_feed       = dvb_usb_start_feed;
+	adap->demux.stop_feed        = dvb_usb_stop_feed;
+	adap->demux.write_to_decoder = NULL;
+	if ((ret = dvb_dmx_init(&adap->demux)) < 0) {
 		err("dvb_dmx_init failed: error %d",ret);
 		goto err_dmx;
 	}
 
-	d->dmxdev.filternum = d->demux.filternum;
-	d->dmxdev.demux = &d->demux.dmx;
-	d->dmxdev.capabilities = 0;
-	if ((ret = dvb_dmxdev_init(&d->dmxdev, &d->dvb_adap)) < 0) {
+	adap->dmxdev.filternum       = adap->demux.filternum;
+	adap->dmxdev.demux           = &adap->demux.dmx;
+	adap->dmxdev.capabilities    = 0;
+	if ((ret = dvb_dmxdev_init(&adap->dmxdev, &adap->dvb_adap)) < 0) {
 		err("dvb_dmxdev_init failed: error %d",ret);
 		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;
 
 err_dmx_dev:
-	dvb_dmx_release(&d->demux);
+	dvb_dmx_release(&adap->demux);
 err_dmx:
-	dvb_unregister_adapter(&d->dvb_adap);
+	dvb_unregister_adapter(&adap->dvb_adap);
 err:
 	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");
-		dvb_net_release(&d->dvb_net);
-		d->demux.dmx.close(&d->demux.dmx);
-		dvb_dmxdev_release(&d->dmxdev);
-		dvb_dmx_release(&d->demux);
-		dvb_unregister_adapter(&d->dvb_adap);
-		d->state &= ~DVB_USB_STATE_DVB;
+		dvb_net_release(&adap->dvb_net);
+		adap->demux.dmx.close(&adap->demux.dmx);
+		dvb_dmxdev_release(&adap->dmxdev);
+		dvb_dmx_release(&adap->demux);
+		dvb_unregister_adapter(&adap->dvb_adap);
+		adap->state &= ~DVB_USB_ADAP_STATE_DVB;
 	}
 	return 0;
 }
 
 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)
-		d->props.power_ctrl(d,1);
+	dvb_usb_device_power_ctrl(adap->dev, 1);
 
-	if (d->fe_init)
-		d->fe_init(fe);
+	if (adap->fe_init)
+		adap->fe_init(fe);
 
 	return 0;
 }
 
 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)
-		d->fe_sleep(fe);
+	if (adap->fe_sleep)
+		adap->fe_sleep(fe);
 
-	if (d->props.power_ctrl)
-		d->props.power_ctrl(d,0);
-
-	return 0;
+	return dvb_usb_device_power_ctrl(adap->dev, 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) {
-		err("strange: '%s' doesn't want to attach a frontend.",d->desc->name);
+	if (adap->props.frontend_attach == NULL) {
+		err("strange: '%s' #%d doesn't want to attach a frontend.",adap->dev->desc->name, adap->id);
 		return 0;
 	}
 
 	/* re-assign sleep and wakeup functions */
-	if (d->props.frontend_attach(d) == 0 && d->fe != NULL) {
-		d->fe_init = d->fe->ops.init;   d->fe->ops.init  = dvb_usb_fe_wakeup;
-		d->fe_sleep = d->fe->ops.sleep; d->fe->ops.sleep = dvb_usb_fe_sleep;
+	if (adap->props.frontend_attach(adap) == 0 && adap->fe != NULL) {
+		adap->fe_init  = adap->fe->ops.init;  adap->fe->ops.init  = dvb_usb_fe_wakeup;
+		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.");
-			dvb_frontend_detach(d->fe);
-			d->fe = NULL;
+			dvb_frontend_detach(adap->fe);
+			adap->fe = NULL;
 			return -ENODEV;
 		}
 
 		/* only attach the tuner if the demod is there */
-		if (d->props.tuner_attach != NULL)
-			d->props.tuner_attach(d);
+		if (adap->props.tuner_attach != NULL)
+			adap->props.tuner_attach(adap);
 	} else
-		err("no frontend was attached by '%s'",d->desc->name);
+		err("no frontend was attached by '%s'",adap->dev->desc->name);
 
 	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) {
-		dvb_unregister_frontend(d->fe);
-		dvb_frontend_detach(d->fe);
+	if (adap->fe != NULL) {
+		dvb_unregister_frontend(adap->fe);
+		dvb_frontend_detach(adap->fe);
 	}
 	return 0;
 }