patch-2.4.0-test9 linux/drivers/usb/ov511.h

• Lines: 46
• Date: Tue Sep 19 11:37:59 2000
• Orig file: v2.4.0-test8/linux/drivers/usb/ov511.h
• Orig date: Tue Jul 11 10:46:38 2000

diff -u --recursive --new-file v2.4.0-test8/linux/drivers/usb/ov511.h linux/drivers/usb/ov511.h
@@ -183,6 +183,9 @@
 // FIXME - these can vary between specific models
 #define OV7610_I2C_WRITE_ID 0x42
 #define OV7610_I2C_READ_ID  0x43
+#define OV6xx0_I2C_WRITE_ID 0xC0
+#define OV6xx0_I2C_READ_ID  0xC1
+
 #define OV511_I2C_CLOCK_PRESCALER 0x03
 
 /* Prototypes */
@@ -203,6 +206,7 @@
 	SEN_OV7610,
 	SEN_OV7620,
 	SEN_OV7620AE,
+	SEN_OV6620,
 };
 
 enum {
@@ -254,7 +258,7 @@
 	int hdrheight;		/* Height */
 
 	int sub_flag;		/* Sub-capture mode for this frame? */
-	int format;		/* Format for this frame */
+	unsigned int format;	/* Format for this frame */
 	int segsize;		/* How big is each segment from the camera? */
 
 	volatile int grabstate;	/* State of grabbing */
@@ -285,6 +289,10 @@
 	int desc;
 	unsigned char iface;
 
+	/* Determined by sensor type */
+	int maxwidth;
+	int maxheight;
+
 	int brightness;
 	int colour;
 	int contrast;
@@ -356,7 +364,6 @@
 	u8 lndv;		/* line divisor */
 	u8 m420;
 	u8 common_A;
-	u8 common_C;
 	u8 common_L;
 };