Skip to content

Commit

Permalink
[PATCH] v4l: include saa6588 compiler option and files / fixes commen…
Browse files Browse the repository at this point in the history
…ts on tuner.h

- Include saa6588 compiler option and files.
- Fix comment on tuner.h
- linux/utsname.h replaced by linux/version.h to compile on vanilla 2.6.13

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
Mauro Carvalho Chehab authored and Linus Torvalds committed Sep 9, 2005
1 parent 67e49a1 commit 10b89ee
Show file tree
Hide file tree
Showing 8 changed files with 600 additions and 4 deletions.
12 changes: 12 additions & 0 deletions drivers/media/video/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,18 @@ config VIDEO_BT848
To compile this driver as a module, choose M here: the
module will be called bttv.

config VIDEO_SAA6588
tristate "SAA6588 Radio Chip RDS decoder support on BT848 cards"
depends on VIDEO_DEV && I2C && VIDEO_BT848

help
Support for Radio Data System (RDS) decoder. This allows seeing
radio station identification transmitted using this standard.
Currentlly, it works only with bt8x8 chips.

To compile this driver as a module, choose M here: the
module will be called saa6588.

config VIDEO_PMS
tristate "Mediavision Pro Movie Studio Video For Linux"
depends on VIDEO_DEV && ISA
Expand Down
2 changes: 2 additions & 0 deletions drivers/media/video/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
bttv-objs := bttv-driver.o bttv-cards.o bttv-if.o \
bttv-risc.o bttv-vbi.o bttv-i2c.o bttv-gpio.o
zoran-objs := zr36120.o zr36120_i2c.o zr36120_mem.o
rds-objs := saa6588.o
zr36067-objs := zoran_procfs.o zoran_device.o \
zoran_driver.o zoran_card.o
tuner-objs := tuner-core.o tuner-simple.o mt20xx.o tda8290.o tea5767.o
Expand All @@ -15,6 +16,7 @@ obj-$(CONFIG_VIDEO_BT848) += bttv.o msp3400.o tvaudio.o \
obj-$(CONFIG_SOUND_TVMIXER) += tvmixer.o

obj-$(CONFIG_VIDEO_ZR36120) += zoran.o
obj-$(CONFIG_VIDEO_SAA6588) += rds.o
obj-$(CONFIG_VIDEO_SAA5246A) += saa5246a.o
obj-$(CONFIG_VIDEO_SAA5249) += saa5249.o
obj-$(CONFIG_VIDEO_CQCAM) += c-qcam.o
Expand Down
2 changes: 1 addition & 1 deletion drivers/media/video/bttvp.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#ifndef _BTTVP_H_
#define _BTTVP_H_

#include <linux/utsname.h>
#include <linux/version.h>
#define BTTV_VERSION_CODE KERNEL_VERSION(0,9,16)

#include <linux/types.h>
Expand Down
2 changes: 1 addition & 1 deletion drivers/media/video/cx88/cx88.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
#include "btcx-risc.h"
#include "cx88-reg.h"

#include <linux/utsname.h>
#include <linux/version.h>
#define CX88_VERSION_CODE KERNEL_VERSION(0,0,5)

#ifndef TRUE
Expand Down
48 changes: 48 additions & 0 deletions drivers/media/video/rds.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
/*
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 *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




Loading

0 comments on commit 10b89ee

Please sign in to comment.