[media] dvb-usb: move it to drivers/media/usb/dvb-usb

As media/dvb will be removed, move it to a proper place.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 0 insertions, 288 deletions

diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-dvb.c b/drivers/media/dvb/dvb-usb/dvb-usb-dvb.c
deleted file mode 100644
index 719413b15f20..000000000000
--- a/drivers/media/dvb/dvb-usb/dvb-usb-dvb.c
+++ /dev/null
@@ -1,288 +0,0 @@
-/* dvb-usb-dvb.c is part of the DVB USB library.
- *
- * 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
- * linux-dvb API.
- */
-#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_adapter *adap = dvbdmxfeed->demux->priv;
-        int newfeedcount, ret;
-
-        if (adap == NULL)
-                return -ENODEV;
-
-        if ((adap->active_fe < 0) ||
-            (adap->active_fe >= adap->num_frontends_initialized)) {
-                return -EINVAL;
-        }
-
-        newfeedcount = adap->feedcount + (onoff ? 1 : -1);
-
-        /* stop feed before setting a new pid if there will be no pid anymore */
-        if (newfeedcount == 0) {
-                deb_ts("stop feeding\n");
-                usb_urb_kill(&adap->fe_adap[adap->active_fe].stream);
-
-                if (adap->props.fe[adap->active_fe].streaming_ctrl != NULL) {
-                        ret = adap->props.fe[adap->active_fe].streaming_ctrl(adap, 0);
-                        if (ret < 0) {
-                                err("error while stopping stream.");
-                                return ret;
-                        }
-                }
-        }
-
-        adap->feedcount = newfeedcount;
-
-        /* activate the pid on the device specific pid_filter */
-        deb_ts("setting pid (%s): %5d %04x at index %d '%s'\n",
-                adap->fe_adap[adap->active_fe].pid_filtering ?
-                "yes" : "no", dvbdmxfeed->pid, dvbdmxfeed->pid,
-                dvbdmxfeed->index, onoff ? "on" : "off");
-        if (adap->props.fe[adap->active_fe].caps & DVB_USB_ADAP_HAS_PID_FILTER &&
-                adap->fe_adap[adap->active_fe].pid_filtering &&
-                adap->props.fe[adap->active_fe].pid_filter != NULL)
-                adap->props.fe[adap->active_fe].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 (adap->feedcount == onoff && adap->feedcount > 0) {
-                deb_ts("submitting all URBs\n");
-                usb_urb_submit(&adap->fe_adap[adap->active_fe].stream);
-
-                deb_ts("controlling pid parser\n");
-                if (adap->props.fe[adap->active_fe].caps & DVB_USB_ADAP_HAS_PID_FILTER &&
-                        adap->props.fe[adap->active_fe].caps &
-                        DVB_USB_ADAP_PID_FILTER_CAN_BE_TURNED_OFF &&
-                        adap->props.fe[adap->active_fe].pid_filter_ctrl != NULL) {
-                        ret = adap->props.fe[adap->active_fe].pid_filter_ctrl(adap,
-                                adap->fe_adap[adap->active_fe].pid_filtering);
-                        if (ret < 0) {
-                                err("could not handle pid_parser");
-                                return ret;
-                        }
-                }
-                deb_ts("start feeding\n");
-                if (adap->props.fe[adap->active_fe].streaming_ctrl != NULL) {
-                        ret = adap->props.fe[adap->active_fe].streaming_ctrl(adap, 1);
-                        if (ret < 0) {
-                                err("error while enabling fifo.");
-                                return ret;
-                        }
-                }
-
-        }
-        return 0;
-}
-
-static int dvb_usb_start_feed(struct dvb_demux_feed *dvbdmxfeed)
-{
-        deb_ts("start pid: 0x%04x, feedtype: %d\n", dvbdmxfeed->pid,dvbdmxfeed->type);
-        return dvb_usb_ctrl_feed(dvbdmxfeed,1);
-}
-
-static int dvb_usb_stop_feed(struct dvb_demux_feed *dvbdmxfeed)
-{
-        deb_ts("stop pid: 0x%04x, feedtype: %d\n", dvbdmxfeed->pid, dvbdmxfeed->type);
-        return dvb_usb_ctrl_feed(dvbdmxfeed,0);
-}
-
-int dvb_usb_adapter_dvb_init(struct dvb_usb_adapter *adap, short *adapter_nums)
-{
-        int i;
-        int ret = dvb_register_adapter(&adap->dvb_adap, adap->dev->desc->name,
-                                       adap->dev->owner, &adap->dev->udev->dev,
-                                       adapter_nums);
-
-        if (ret < 0) {
-                deb_info("dvb_register_adapter failed: error %d", ret);
-                goto err;
-        }
-        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: %pM",adap->dvb_adap.proposed_mac);
-                else
-                        err("MAC address reading failed.");
-        }
-
-
-        adap->demux.dmx.capabilities = DMX_TS_FILTERING | DMX_SECTION_FILTERING;
-        adap->demux.priv             = adap;
-
-        adap->demux.filternum        = 0;
-        for (i = 0; i < adap->props.num_frontends; i++) {
-                if (adap->demux.filternum < adap->fe_adap[i].max_feed_count)
-                        adap->demux.filternum = adap->fe_adap[i].max_feed_count;
-        }
-        adap->demux.feednum          = adap->demux.filternum;
-        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;
-        }
-
-        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;
-        }
-
-        if ((ret = dvb_net_init(&adap->dvb_adap, &adap->dvb_net,
-                                                &adap->demux.dmx)) < 0) {
-                err("dvb_net_init failed: error %d",ret);
-                goto err_net_init;
-        }
-
-        adap->state |= DVB_USB_ADAP_STATE_DVB;
-        return 0;
-
-err_net_init:
-        dvb_dmxdev_release(&adap->dmxdev);
-err_dmx_dev:
-        dvb_dmx_release(&adap->demux);
-err_dmx:
-        dvb_unregister_adapter(&adap->dvb_adap);
-err:
-        return ret;
-}
-
-int dvb_usb_adapter_dvb_exit(struct dvb_usb_adapter *adap)
-{
-        if (adap->state & DVB_USB_ADAP_STATE_DVB) {
-                deb_info("unregistering DVB part\n");
-                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_set_active_fe(struct dvb_frontend *fe, int onoff)
-{
-        struct dvb_usb_adapter *adap = fe->dvb->priv;
-
-        int ret = (adap->props.frontend_ctrl) ?
-                adap->props.frontend_ctrl(fe, onoff) : 0;
-
-        if (ret < 0) {
-                err("frontend_ctrl request failed");
-                return ret;
-        }
-        if (onoff)
-                adap->active_fe = fe->id;
-
-        return 0;
-}
-
-static int dvb_usb_fe_wakeup(struct dvb_frontend *fe)
-{
-        struct dvb_usb_adapter *adap = fe->dvb->priv;
-
-        dvb_usb_device_power_ctrl(adap->dev, 1);
-
-        dvb_usb_set_active_fe(fe, 1);
-
-        if (adap->fe_adap[fe->id].fe_init)
-                adap->fe_adap[fe->id].fe_init(fe);
-
-        return 0;
-}
-
-static int dvb_usb_fe_sleep(struct dvb_frontend *fe)
-{
-        struct dvb_usb_adapter *adap = fe->dvb->priv;
-
-        if (adap->fe_adap[fe->id].fe_sleep)
-                adap->fe_adap[fe->id].fe_sleep(fe);
-
-        dvb_usb_set_active_fe(fe, 0);
-
-        return dvb_usb_device_power_ctrl(adap->dev, 0);
-}
-
-int dvb_usb_adapter_frontend_init(struct dvb_usb_adapter *adap)
-{
-        int ret, i;
-
-        /* register all given adapter frontends */
-        for (i = 0; i < adap->props.num_frontends; i++) {
-
-                if (adap->props.fe[i].frontend_attach == NULL) {
-                        err("strange: '%s' #%d,%d "
-                            "doesn't want to attach a frontend.",
-                            adap->dev->desc->name, adap->id, i);
-
-                        return 0;
-                }
-
-                ret = adap->props.fe[i].frontend_attach(adap);
-                if (ret || adap->fe_adap[i].fe == NULL) {
-                        /* only print error when there is no FE at all */
-                        if (i == 0)
-                                err("no frontend was attached by '%s'",
-                                        adap->dev->desc->name);
-
-                        return 0;
-                }
-
-                adap->fe_adap[i].fe->id = i;
-
-                /* re-assign sleep and wakeup functions */
-                adap->fe_adap[i].fe_init = adap->fe_adap[i].fe->ops.init;
-                adap->fe_adap[i].fe->ops.init  = dvb_usb_fe_wakeup;
-                adap->fe_adap[i].fe_sleep = adap->fe_adap[i].fe->ops.sleep;
-                adap->fe_adap[i].fe->ops.sleep = dvb_usb_fe_sleep;
-
-                if (dvb_register_frontend(&adap->dvb_adap, adap->fe_adap[i].fe)) {
-                        err("Frontend %d registration failed.", i);
-                        dvb_frontend_detach(adap->fe_adap[i].fe);
-                        adap->fe_adap[i].fe = NULL;
-                        /* In error case, do not try register more FEs,
-                         * still leaving already registered FEs alive. */
-                        if (i == 0)
-                                return -ENODEV;
-                        else
-                                return 0;
-                }
-
-                /* only attach the tuner if the demod is there */
-                if (adap->props.fe[i].tuner_attach != NULL)
-                        adap->props.fe[i].tuner_attach(adap);
-
-                adap->num_frontends_initialized++;
-        }
-
-        return 0;
-}
-
-int dvb_usb_adapter_frontend_exit(struct dvb_usb_adapter *adap)
-{
-        int i = adap->num_frontends_initialized - 1;
-
-        /* unregister all given adapter frontends */
-        for (; i >= 0; i--) {
-                if (adap->fe_adap[i].fe != NULL) {
-                        dvb_unregister_frontend(adap->fe_adap[i].fe);
-                        dvb_frontend_detach(adap->fe_adap[i].fe);
-                }
-        }
-        adap->num_frontends_initialized = 0;
-
-        return 0;
-}