patch-2.4.19 linux-2.4.19/drivers/media/video/meye.h
Next file: linux-2.4.19/drivers/media/video/msp3400.c
Previous file: linux-2.4.19/drivers/media/video/meye.c
Back to the patch index
Back to the overall index
- Lines: 27
- Date:
Fri Aug 2 17:39:44 2002
- Orig file:
linux-2.4.18/drivers/media/video/meye.h
- Orig date:
Sat Jul 28 12:35:55 2001
diff -urN linux-2.4.18/drivers/media/video/meye.h linux-2.4.19/drivers/media/video/meye.h
@@ -29,7 +29,7 @@
#define _MEYE_PRIV_H_
#define MEYE_DRIVER_MAJORVERSION 1
-#define MEYE_DRIVER_MINORVERSION 1
+#define MEYE_DRIVER_MINORVERSION 4
/****************************************************************************/
/* Motion JPEG chip registers */
@@ -292,15 +292,14 @@
u8 mchip_fnum; /* current mchip frame number */
unsigned char *mchip_mmregs; /* mchip: memory mapped registers */
- unsigned char *mchip_fbuffer; /* mchip: framebuffer */
- u32 mchip_ptaddr; /* mchip: pointer to framebuffer */
+ u8 *mchip_ptable[MCHIP_NB_PAGES+1];/* mchip: ptable + ptable toc */
+ dma_addr_t mchip_dmahandle; /* mchip: dma handle to ptable toc */
unsigned char *grab_fbuffer; /* capture framebuffer */
/* list of buffers */
struct meye_grab_buffer grab_buffer[MEYE_MAX_BUFNBRS];
/* other */
- unsigned int open_count; /* open() count */
struct semaphore lock; /* semaphore for open/mmap... */
struct meye_queue grabq; /* queue for buffers to be grabbed */
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)