Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fa3fcceb authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

V4L/DVB (3546): Fix Compilation after moving bttv code 



- Missing a Makefile for bt8xx
- rds.h were at wrong directory, since it is a global header for an internal
  interface
- tda7432 and tda9875 were dependent from bttv.h
- bttv.h were holding i2c addresses

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent c72602b8

drivers/media/video/bt8xx/Makefile

0 → 100644
+12 −0
Original line number Original line Diff line number Diff line 
#

# Makefile for the video capture/playback device drivers.

#



bttv-objs      :=      bttv-driver.o bttv-cards.o bttv-if.o \

		       bttv-risc.o bttv-vbi.o bttv-i2c.o bttv-gpio.o \

		       bttv-input.o



obj-$(CONFIG_VIDEO_BT848) += bttv.o



EXTRA_CFLAGS += -I$(src)/..

EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/dvb-core

drivers/media/video/bt8xx/bttv-driver.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -42,7 +42,7 @@ 
#include <asm/io.h>

#include <asm/io.h>

#include <asm/byteorder.h>

#include <asm/byteorder.h>





#include "rds.h"

#include <media/rds.h>









unsigned int bttv_num;			/* number of Bt848s in use */

unsigned int bttv_num;			/* number of Bt848s in use */

drivers/media/video/bt8xx/bttv.h

+1 −19
Original line number Original line Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <linux/i2c.h>

#include <linux/i2c.h>

#include <media/ir-common.h>

#include <media/ir-common.h>

#include <media/ir-kbd-i2c.h>

#include <media/ir-kbd-i2c.h>

#include <media/i2c-addr.h>





/* ---------------------------------------------------------- */

/* ---------------------------------------------------------- */

/* exported by bttv-cards.c                                   */

/* exported by bttv-cards.c                                   */
@@ -168,25 +169,6 @@ 
#define BTTV_BOARD_HAUPPAUGE_IMPACTVCB     0x8f

#define BTTV_BOARD_HAUPPAUGE_IMPACTVCB     0x8f

#define BTTV_BOARD_MACHTV_MAGICTV          0x90

#define BTTV_BOARD_MACHTV_MAGICTV          0x90





/* i2c address list */

#define I2C_TSA5522        0xc2

#define I2C_TDA7432        0x8a

#define I2C_BT832_ALT1	   0x88

#define I2C_BT832_ALT2	   0x8a // alternate setting

#define I2C_TDA8425        0x82

#define I2C_TDA9840        0x84

#define I2C_TDA9850        0xb6 /* also used by 9855,9873 */

#define I2C_TDA9874        0xb0 /* also used by 9875 */

#define I2C_TDA9875        0xb0

#define I2C_HAUPEE         0xa0

#define I2C_STBEE          0xae

#define I2C_VHX            0xc0

#define I2C_MSP3400        0x80

#define I2C_MSP3400_ALT    0x88

#define I2C_TEA6300        0x80 /* also used by 6320 */

#define I2C_DPL3518	   0x84

#define I2C_TDA9887	   0x86



/* more card-specific defines */

/* more card-specific defines */

#define PT2254_L_CHANNEL 0x10

#define PT2254_L_CHANNEL 0x10

#define PT2254_R_CHANNEL 0x08

#define PT2254_R_CHANNEL 0x08

drivers/media/video/saa6588.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -32,7 +32,7 @@ 
#include <asm/uaccess.h>

#include <asm/uaccess.h>









#include "rds.h"

#include <media/rds.h>





/* Addresses to scan */

/* Addresses to scan */

static unsigned short normal_i2c[] = {

static unsigned short normal_i2c[] = {

drivers/media/video/saa7134/saa7134-core.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -960,7 +960,7 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev, 
	if (saa7134_no_overlay <= 0) {

	if (saa7134_no_overlay <= 0) {

		saa7134_video_template.type |= VID_TYPE_OVERLAY;

		saa7134_video_template.type |= VID_TYPE_OVERLAY;

	} else {

	} else {

		printk("bttv: Overlay support disabled.\n");

		printk("%s: Overlay support disabled.\n",dev->name);

	}

	}

	dev->video_dev = vdev_init(dev,&saa7134_video_template,"video");

	dev->video_dev = vdev_init(dev,&saa7134_video_template,"video");

	err = video_register_device(dev->video_dev,VFL_TYPE_GRABBER,

	err = video_register_device(dev->video_dev,VFL_TYPE_GRABBER,