fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / drivers / media / video / zoran.h

diff --git a/drivers/media/video/zoran.h b/drivers/media/video/zoran.h
index 8656d58..8fb4a34 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>
@@ -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_INPUT       8
+#define BUZ_MAX_INPUT       16
 
 #if VIDEO_MAX_FRAME <= 32
 #   define   V4L_MAX_FRAME   32
@@ -191,6 +191,9 @@ enum card_type {
        /* Iomega */
        BUZ,
 
+       /* AverMedia */
+       AVS6EYES,
+
        /* total number of cards */
        NUM_CARDS
 };
@@ -264,7 +267,7 @@ struct zoran_v4l_settings {
 };
 
 /* whoops, this one is undeclared if !v4l2 */
-#ifndef HAVE_V4L2
+#ifndef CONFIG_VIDEO_V4L2
 struct v4l2_jpegcompression {
        int quality;
        int APPn;
@@ -379,6 +382,9 @@ struct card_info {
        /* is the /GWS line conected? */
        u8 gws_not_connected;
 
+       /* avs6eyes mux setting */
+       u8 input_mux;
+
        void (*init) (struct zoran * zr);
 };
 
@@ -395,7 +401,7 @@ struct zoran {
        struct videocodec *codec;       /* video codec */
        struct videocodec *vfe; /* video front end */
 
-       struct semaphore resource_lock; /* prevent evil stuff */
+       struct mutex resource_lock;     /* prevent evil stuff */
 
        u8 initialized;         /* flag if zoran has been correctly initalized */
        int user;               /* number of current users */
@@ -407,7 +413,7 @@ struct zoran {
        struct pci_dev *pci_dev;        /* PCI device */
        unsigned char revision; /* revision of zr36057 */
        unsigned int zr36057_adr;       /* bus address of IO mem returned by PCI BIOS */
-       unsigned char *zr36057_mem;     /* pointer to mapped IO memory */
+       unsigned char __iomem *zr36057_mem;/* pointer to mapped IO memory */
 
        spinlock_t spinlock;    /* Spinlock */
 
@@ -499,10 +505,10 @@ struct zoran {
   of _ALPHA_BUZ in the Makefile.*/
 
 #ifdef _ALPHA_BUZ
-#define btwrite(dat,adr)    writel((dat),(char *) (zr->zr36057_adr+(adr)))
+#define btwrite(dat,adr)    writel((dat), zr->zr36057_adr+(adr))
 #define btread(adr)         readl(zr->zr36057_adr+(adr))
 #else
-#define btwrite(dat,adr)    writel((dat), (char *) (zr->zr36057_mem+(adr)))
+#define btwrite(dat,adr)    writel((dat), zr->zr36057_mem+(adr))
 #define btread(adr)         readl(zr->zr36057_mem+(adr))
 #endif