aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalph Metzler <rjkm@metzlerbros.de>2011-01-10 09:36:17 (GMT)
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-01-17 15:45:36 (GMT)
commit612453d15027bff7e602bc647b0447d4677286a9 (patch)
tree8c7e06f65c4f9d81b0d8d8bc2b47f7d4059553c7
parent8ab0a246021ff82d0b7d1c678cb2396e8af4e6d1 (diff)
[media] ngene: Add net device
Add dvb net device. Note that the physical address must be setup manually. Signed-off-by: Ralph Metzler <rjkm@metzlerbros.de> Signed-off-by: Oliver Endriss <o.endriss@gmx.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/dvb/ngene/ngene-core.c3
-rw-r--r--drivers/media/dvb/ngene/ngene.h2
2 files changed, 5 insertions, 0 deletions
diff --git a/drivers/media/dvb/ngene/ngene-core.c b/drivers/media/dvb/ngene/ngene-core.c
index 422f83b..6a097e4 100644
--- a/drivers/media/dvb/ngene/ngene-core.c
+++ b/drivers/media/dvb/ngene/ngene-core.c
@@ -1451,6 +1451,7 @@ static void release_channel(struct ngene_channel *chan)
dvb_frontend_detach(chan->fe);
chan->fe = NULL;
}
+ dvb_net_release(&chan->dvbnet);
dvbdemux->dmx.close(&dvbdemux->dmx);
dvbdemux->dmx.remove_frontend(&dvbdemux->dmx,
&chan->hw_frontend);
@@ -1504,6 +1505,8 @@ static int init_channel(struct ngene_channel *chan)
ret = my_dvb_dmxdev_ts_card_init(&chan->dmxdev, &chan->demux,
&chan->hw_frontend,
&chan->mem_frontend, adapter);
+ ret = dvb_net_init(adapter, &chan->dvbnet, &chan->demux.dmx);
+
if (dev->ci.en && (io&NGENE_IO_TSOUT)) {
dvb_ca_en50221_init(adapter, dev->ci.en, 0, 1);
set_transfer(chan, 1);
diff --git a/drivers/media/dvb/ngene/ngene.h b/drivers/media/dvb/ngene/ngene.h
index c1bb810..5894abd 100644
--- a/drivers/media/dvb/ngene/ngene.h
+++ b/drivers/media/dvb/ngene/ngene.h
@@ -39,6 +39,7 @@
#include "dvb_ca_en50221.h"
#include "dvb_frontend.h"
#include "dvb_ringbuffer.h"
+#include "dvb_net.h"
#include "cxd2099.h"
#define DEVICE_NAME "ngene"
@@ -642,6 +643,7 @@ struct ngene_channel {
struct dvb_frontend *fe;
struct dmxdev dmxdev;
struct dvb_demux demux;
+ struct dvb_net dvbnet;
struct dmx_frontend hw_frontend;
struct dmx_frontend mem_frontend;
int users;

Privacy Policy