You've already forked linux-apfs
mirror of
https://github.com/linux-apfs/linux-apfs.git
synced 2026-05-01 15:00:59 -07:00
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: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
Mauro Carvalho Chehab
@@ -0,0 +1,12 @@
|
||||
#
|
||||
# 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
|
||||
@@ -42,7 +42,7 @@
|
||||
#include <asm/io.h>
|
||||
#include <asm/byteorder.h>
|
||||
|
||||
#include "rds.h"
|
||||
#include <media/rds.h>
|
||||
|
||||
|
||||
unsigned int bttv_num; /* number of Bt848s in use */
|
||||
|
||||
@@ -18,6 +18,7 @@
|
||||
#include <linux/i2c.h>
|
||||
#include <media/ir-common.h>
|
||||
#include <media/ir-kbd-i2c.h>
|
||||
#include <media/i2c-addr.h>
|
||||
|
||||
/* ---------------------------------------------------------- */
|
||||
/* exported by bttv-cards.c */
|
||||
@@ -168,25 +169,6 @@
|
||||
#define BTTV_BOARD_HAUPPAUGE_IMPACTVCB 0x8f
|
||||
#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 */
|
||||
#define PT2254_L_CHANNEL 0x10
|
||||
#define PT2254_R_CHANNEL 0x08
|
||||
|
||||
@@ -1,48 +0,0 @@
|
||||
/*
|
||||
|
||||
Types and defines needed for RDS. This is included by
|
||||
saa6588.c and every driver (e.g. bttv-driver.c) that wants
|
||||
to use the saa6588 module.
|
||||
|
||||
Instead of having a seperate rds.h, I'd prefer to include
|
||||
this stuff in one of the already existing files like tuner.h
|
||||
|
||||
(c) 2005 by Hans J. Koch
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
|
||||
*/
|
||||
|
||||
#ifndef _RDS_H
|
||||
#define _RDS_H
|
||||
|
||||
struct rds_command {
|
||||
unsigned int block_count;
|
||||
int result;
|
||||
unsigned char __user *buffer;
|
||||
struct file *instance;
|
||||
poll_table *event_list;
|
||||
};
|
||||
|
||||
#define RDS_CMD_OPEN _IOW('R',1,int)
|
||||
#define RDS_CMD_CLOSE _IOW('R',2,int)
|
||||
#define RDS_CMD_READ _IOR('R',3,int)
|
||||
#define RDS_CMD_POLL _IOR('R',4,int)
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -32,7 +32,7 @@
|
||||
#include <asm/uaccess.h>
|
||||
|
||||
|
||||
#include "rds.h"
|
||||
#include <media/rds.h>
|
||||
|
||||
/* Addresses to scan */
|
||||
static unsigned short normal_i2c[] = {
|
||||
|
||||
@@ -960,7 +960,7 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev,
|
||||
if (saa7134_no_overlay <= 0) {
|
||||
saa7134_video_template.type |= VID_TYPE_OVERLAY;
|
||||
} 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");
|
||||
err = video_register_device(dev->video_dev,VFL_TYPE_GRABBER,
|
||||
|
||||
@@ -48,9 +48,9 @@
|
||||
#include <linux/i2c.h>
|
||||
#include <linux/i2c-algo-bit.h>
|
||||
|
||||
#include "bttv.h"
|
||||
#include <media/audiochip.h>
|
||||
#include <media/v4l2-common.h>
|
||||
#include <media/i2c-addr.h>
|
||||
|
||||
#ifndef VIDEO_AUDIO_BALANCE
|
||||
# define VIDEO_AUDIO_BALANCE 32
|
||||
|
||||
@@ -30,14 +30,14 @@
|
||||
#include <linux/i2c-algo-bit.h>
|
||||
#include <linux/init.h>
|
||||
|
||||
#include "bttv.h"
|
||||
#include <media/audiochip.h>
|
||||
|
||||
#include <media/i2c-addr.h>
|
||||
|
||||
static int debug; /* insmod parameter */
|
||||
module_param(debug, int, S_IRUGO | S_IWUSR);
|
||||
MODULE_LICENSE("GPL");
|
||||
|
||||
|
||||
/* Addresses to scan */
|
||||
static unsigned short normal_i2c[] = {
|
||||
I2C_TDA9875 >> 1,
|
||||
|
||||
Reference in New Issue
Block a user