mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-30 22:26:55 +00:00
Code Issues Releases Wiki Activity

V4L/DVB: ngene: Driver compiles now

Browse source 
Remove LNBH21 routines, disable code which broke compilation.

Signed-off-by: Oliver Endriss <o.endriss@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Oliver Endriss 2009-12-19 04:54:44 -03:00 committed by Mauro Carvalho Chehab
parent dae52d009f
commit 83f3c7157e
6 changed files with 35 additions and 1430 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/media/dvb/Kconfig
View file

@ -76,6 +76,10 @@ comment "Supported Mantis Adapters"
depends on DVB_CORE && PCI && I2C
source "drivers/media/dvb/mantis/Kconfig"
comment "Supported nGene Adapters"
depends on DVB_CORE && PCI && I2C
source "drivers/media/dvb/ngene/Kconfig"
comment "Supported DVB Frontends"
depends on DVB_CORE
source "drivers/media/dvb/frontends/Kconfig"

3
drivers/media/dvb/Makefile
View file

@ -14,6 +14,7 @@ obj-y := dvb-core/ \
siano/ \
dm1105/ \
pt1/ \
mantis/
mantis/ \
ngene/
obj-$(CONFIG_DVB_FIREDTV) += firewire/

9
drivers/media/dvb/ngene/Kconfig Normal file
View file

@ -0,0 +1,9 @@
config DVB_NGENE
tristate "Micronas nGene support"
depends on DVB_CORE && PCI && I2C
select DVB_LNBP21 if !DVB_FE_CUSTOMISE
select DVB_STV6110x if !DVB_FE_CUSTOMISE
select DVB_STV090x if !DVB_FE_CUSTOMISE
---help---
Support for Micronas PCI express cards with nGene bridge.

11
drivers/media/dvb/ngene/Makefile Normal file
View file

@ -0,0 +1,11 @@
#
# Makefile for the nGene device driver
#
ngene-objs := ngene-core.o
obj-$(CONFIG_DVB_NGENE) += ngene.o
EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core/
EXTRA_CFLAGS += -Idrivers/media/dvb/frontends/

1409
drivers/media/dvb/ngene/ngene-core.c
View file

File diff suppressed because it is too large Load diff

29
drivers/media/dvb/ngene/ngene.h
View file

@ -25,8 +25,6 @@
#define _NGENE_H_
#define ONE_ADAPTER
#define NGENE_COMMAND_API
/*#define NGENE_V4L*/
#include <linux/types.h>
#include <linux/sched.h>
@ -34,35 +32,14 @@
#include <linux/i2c.h>
#include <asm/dma.h>
#include <asm/scatterlist.h>
#include <sound/driver.h>
#include <sound/core.h>
#include <sound/initval.h>
#include <sound/control.h>
#include <sound/pcm.h>
#include <sound/pcm_params.h>
#include <linux/dvb/frontend.h>
#include <linux/dvb/ca.h>
#include <linux/dvb/video.h>
#include <linux/dvb/audio.h>
#include "dmxdev.h"
#include "dvbdev.h"
#include "dvb_demux.h"
#include "dvb_frontend.h"
#include "dvb_ringbuffer.h"
#include "drxd.h"
#include "drxh.h"
#include "xc3028.h"
#include "stb0899.h"
#include "stv0900.h"
#include "mt2060.h"
#ifdef NGENE_V4L
#include <media/v4l2-dev.h>
#include <media/videobuf-core.h>
#include <linux/videodev.h>
#endif
#define NGENE_VID 0x18c3
#define NGENE_PID 0x0720
@ -675,9 +652,6 @@ struct ngene_channel {
#ifndef ONE_ADAPTER
struct dvb_adapter dvb_adapter;
#endif
struct dvb_device *command_dev;
struct dvb_device *audio_dev;
struct dvb_device *video_dev;
struct tasklet_struct demux_tasklet;
struct SBufferHeader *nextBuffer;
@ -715,7 +689,6 @@ struct ngene_channel {
struct mychip *mychip;
struct snd_card *soundcard;
u8 *evenbuffer;
u8 *soundbuffer;
u8 dma_on;
int soundstreamon;
int audiomute;
@ -887,8 +860,6 @@ struct ngene_info {
u8 lnb[4];
int i2c_access;
u8 ntsc;
u8 exp;
u8 exp_init;
u8 tsf[4];
u8 i2s[4];