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
/
zoran.h
diff --git
a/drivers/media/video/zoran.h
b/drivers/media/video/zoran.h
index
8fb4a34
..
9fe6ad3
100644
(file)
--- a/
drivers/media/video/zoran.h
+++ b/
drivers/media/video/zoran.h
@@
-1,4
+1,4
@@
-/*
+/*
* zoran - Iomega Buz driver
*
* Copyright (C) 1999 Rainer Johanni <Rainer@Johanni.de>
* zoran - Iomega Buz driver
*
* Copyright (C) 1999 Rainer Johanni <Rainer@Johanni.de>
@@
-159,7
+159,7
@@
Private IOCTL to set up for displaying MJPEG
#define BUZ_MAX_FRAME 256 /* Must be a power of 2 */
#define BUZ_MASK_FRAME 255 /* Must be BUZ_MAX_FRAME-1 */
#define BUZ_MAX_FRAME 256 /* Must be a power of 2 */
#define BUZ_MASK_FRAME 255 /* Must be BUZ_MAX_FRAME-1 */
-#define BUZ_MAX_INPUT
16
+#define BUZ_MAX_INPUT
8
#if VIDEO_MAX_FRAME <= 32
# define V4L_MAX_FRAME 32
#if VIDEO_MAX_FRAME <= 32
# define V4L_MAX_FRAME 32
@@
-191,9
+191,6
@@
enum card_type {
/* Iomega */
BUZ,
/* Iomega */
BUZ,
- /* AverMedia */
- AVS6EYES,
-
/* total number of cards */
NUM_CARDS
};
/* total number of cards */
NUM_CARDS
};
@@
-267,7
+264,7
@@
struct zoran_v4l_settings {
};
/* whoops, this one is undeclared if !v4l2 */
};
/* whoops, this one is undeclared if !v4l2 */
-#ifndef
CONFIG_VIDEO
_V4L2
+#ifndef
HAVE
_V4L2
struct v4l2_jpegcompression {
int quality;
int APPn;
struct v4l2_jpegcompression {
int quality;
int APPn;
@@
-382,9
+379,6
@@
struct card_info {
/* is the /GWS line conected? */
u8 gws_not_connected;
/* is the /GWS line conected? */
u8 gws_not_connected;
- /* avs6eyes mux setting */
- u8 input_mux;
-
void (*init) (struct zoran * zr);
};
void (*init) (struct zoran * zr);
};
@@
-401,7
+395,7
@@
struct zoran {
struct videocodec *codec; /* video codec */
struct videocodec *vfe; /* video front end */
struct videocodec *codec; /* video codec */
struct videocodec *vfe; /* video front end */
- struct
mutex resource_lock;
/* prevent evil stuff */
+ struct
semaphore resource_lock;
/* prevent evil stuff */
u8 initialized; /* flag if zoran has been correctly initalized */
int user; /* number of current users */
u8 initialized; /* flag if zoran has been correctly initalized */
int user; /* number of current users */