git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
drivers
/
media
/
video
/
saa7134
/
saa7134.h
diff --git
a/drivers/media/video/saa7134/saa7134.h
b/drivers/media/video/saa7134/saa7134.h
index
353af3a
..
2a4de51
100644
(file)
--- a/
drivers/media/video/saa7134/saa7134.h
+++ b/
drivers/media/video/saa7134/saa7134.h
@@
-29,11
+29,11
@@
#include <linux/input.h>
#include <linux/notifier.h>
#include <linux/delay.h>
#include <linux/input.h>
#include <linux/notifier.h>
#include <linux/delay.h>
-#include <linux/mutex.h>
#include <asm/io.h>
#include <media/tuner.h>
#include <asm/io.h>
#include <media/tuner.h>
+#include <media/audiochip.h>
#include <media/ir-common.h>
#include <media/ir-kbd-i2c.h>
#include <media/video-buf.h>
#include <media/ir-common.h>
#include <media/ir-kbd-i2c.h>
#include <media/video-buf.h>
@@
-60,7
+60,6
@@
enum saa7134_tvaudio_mode {
TVAUDIO_FM_K_STEREO = 4,
TVAUDIO_NICAM_AM = 5,
TVAUDIO_NICAM_FM = 6,
TVAUDIO_FM_K_STEREO = 4,
TVAUDIO_NICAM_AM = 5,
TVAUDIO_NICAM_FM = 6,
- TVAUDIO_AM_MONO = 7
};
enum saa7134_audio_in {
};
enum saa7134_audio_in {
@@
-370,7
+369,7
@@
struct saa7134_fh {
/* dmasound dsp status */
struct saa7134_dmasound {
/* dmasound dsp status */
struct saa7134_dmasound {
- struct
mutex
lock;
+ struct
semaphore
lock;
int minor_mixer;
int minor_dsp;
unsigned int users_dsp;
int minor_mixer;
int minor_dsp;
unsigned int users_dsp;
@@
-397,7
+396,7
@@
struct saa7134_dmasound {
unsigned int read_offset;
unsigned int read_count;
void * priv_data;
unsigned int read_offset;
unsigned int read_count;
void * priv_data;
- s
truct snd_pcm_substream
*substream;
+ s
nd_pcm_substream_t
*substream;
};
/* IR input */
};
/* IR input */
@@
-434,7
+433,7
@@
struct saa7134_mpeg_ops {
/* global device status */
struct saa7134_dev {
struct list_head devlist;
/* global device status */
struct saa7134_dev {
struct list_head devlist;
- struct
mutex
lock;
+ struct
semaphore
lock;
spinlock_t slock;
#ifdef VIDIOC_G_PRIORITY
struct v4l2_prio_state prio;
spinlock_t slock;
#ifdef VIDIOC_G_PRIORITY
struct v4l2_prio_state prio;
@@
-557,7
+556,6
@@
struct saa7134_dev {
/* saa7134-core.c */
extern struct list_head saa7134_devlist;
/* saa7134-core.c */
extern struct list_head saa7134_devlist;
-extern int saa7134_no_overlay;
void saa7134_track_gpio(struct saa7134_dev *dev, char *msg);
void saa7134_track_gpio(struct saa7134_dev *dev, char *msg);
@@
-579,12
+577,12
@@
void saa7134_buffer_finish(struct saa7134_dev *dev, struct saa7134_dmaqueue *q,
unsigned int state);
void saa7134_buffer_next(struct saa7134_dev *dev, struct saa7134_dmaqueue *q);
void saa7134_buffer_timeout(unsigned long data);
unsigned int state);
void saa7134_buffer_next(struct saa7134_dev *dev, struct saa7134_dmaqueue *q);
void saa7134_buffer_timeout(unsigned long data);
-void saa7134_dma_free(struct
videobuf_queue *q
,struct saa7134_buf *buf);
+void saa7134_dma_free(struct
saa7134_dev *dev
,struct saa7134_buf *buf);
int saa7134_set_dmabits(struct saa7134_dev *dev);
int saa7134_set_dmabits(struct saa7134_dev *dev);
-extern int (*dmasound_init)(struct saa7134_dev *dev);
-extern int (*dmasound_exit)(struct saa7134_dev *dev);
+extern int (*
saa7134_
dmasound_init)(struct saa7134_dev *dev);
+extern int (*
saa7134_
dmasound_exit)(struct saa7134_dev *dev);
/* ----------------------------------------------------------- */
/* ----------------------------------------------------------- */