evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[media] Make DVB NET configurable in the kernel

Browse source 
Signed-off-by: Hans Petter Selasky <hselasky@c2i.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Hans Petter Selasky 2011-05-23 09:43:35 -03:00 • committed by Mauro Carvalho Chehab
parent 4522e825db
commit a34ff6cdbb
3 changed files with 40 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
drivers/media/Kconfig
View file

@ -68,7 +68,6 @@ config VIDEO_V4L2_SUBDEV_API
config DVB_CORE config DVB_CORE
tristate "DVB for Linux" tristate "DVB for Linux"
depends on NET && INET
select CRC32 select CRC32
help help
DVB core utility functions for device handling, software fallbacks etc. DVB core utility functions for device handling, software fallbacks etc.
@ -85,6 +84,17 @@ config DVB_CORE
If unsure say N. If unsure say N.
config DVB_NET
bool "DVB Network Support"
default (NET && INET)
depends on NET && INET
help
The DVB network support in the DVB core can
optionally be disabled if this
option is set to N.
If unsure say Y.
config VIDEO_MEDIA config VIDEO_MEDIA
tristate tristate
default (DVB_CORE && (VIDEO_DEV = n)) || (VIDEO_DEV && (DVB_CORE = n)) || (DVB_CORE && VIDEO_DEV) default (DVB_CORE && (VIDEO_DEV = n)) || (VIDEO_DEV && (DVB_CORE = n)) || (DVB_CORE && VIDEO_DEV)

4
drivers/media/dvb/dvb-core/Makefile
View file

@ -2,8 +2,10 @@
# Makefile for the kernel DVB device drivers. # Makefile for the kernel DVB device drivers.
# #
dvb-net-$(CONFIG_DVB_NET) := dvb_net.o
dvb-core-objs := dvbdev.o dmxdev.o dvb_demux.o dvb_filter.o \ dvb-core-objs := dvbdev.o dmxdev.o dvb_demux.o dvb_filter.o \
dvb_ca_en50221.o dvb_frontend.o \ dvb_ca_en50221.o dvb_frontend.o \
dvb_net.o dvb_ringbuffer.o dvb_math.o $(dvb-net-y) dvb_ringbuffer.o dvb_math.o
obj-$(CONFIG_DVB_CORE) += dvb-core.o obj-$(CONFIG_DVB_CORE) += dvb-core.o

26
drivers/media/dvb/dvb-core/dvb_net.h
View file

@ -32,6 +32,8 @@
#define DVB_NET_DEVICES_MAX 10 #define DVB_NET_DEVICES_MAX 10
#ifdef CONFIG_DVB_NET
struct dvb_net { struct dvb_net {
struct dvb_device *dvbdev; struct dvb_device *dvbdev;
struct net_device *device[DVB_NET_DEVICES_MAX]; struct net_device *device[DVB_NET_DEVICES_MAX];
@ -45,3 +47,27 @@ void dvb_net_release(struct dvb_net *);
int dvb_net_init(struct dvb_adapter *, struct dvb_net *, struct dmx_demux *); int dvb_net_init(struct dvb_adapter *, struct dvb_net *, struct dmx_demux *);
#endif #endif
#ifndef CONFIG_DVB_NET
struct dvb_dev_stub;
struct dvb_net {
struct dvb_dev_stub *dvbdev;
};
static inline void dvb_net_release(struct dvb_net *dvbnet)
{
dvbnet->dvbdev = 0;
}
static inline int dvb_net_init(struct dvb_adapter *adap,
struct dvb_net *dvbnet, struct dmx_demux *dmx)
{
dvbnet->dvbdev = (void *)1;
return 0;
}
#endif
#endif