Merge with Linux 2.3.38.

1 files changed, 211 insertions, 0 deletions

diff --git a/drivers/usb/ov511.h b/drivers/usb/ov511.h
new file mode 100644
index 000000000..4dc7074bb
--- /dev/null
+++ b/drivers/usb/ov511.h
@@ -0,0 +1,211 @@
+#ifndef __LINUX_OV511_H
+#define __LINUX_OV511_H
+
+//#include <linux/list.h>
+
+#define OV511_DEBUG	/* Turn on debug messages */
+
+#ifdef OV511_DEBUG
+#  define PDEBUG(fmt, args...) printk("ov511: " fmt, ## args)
+#else
+#  define PDEBUG(fmt, args...) /* Nothing */
+#endif
+
+/* Camera interface register numbers */
+#define OV511_REG_CAMERA_DELAY_MODE			0x10
+#define OV511_REG_CAMERA_EDGE_MODE			0x11
+#define OV511_REG_CAMERA_CLAMPED_PIXEL_NUM	0x12
+#define OV511_REG_CAMERA_CLAMPED_LINE_NUM	0x13
+#define OV511_REG_CAMERA_PIXEL_DIVISOR		0x14
+#define OV511_REG_CAMERA_LINE_DIVISOR		0x15
+#define OV511_REG_CAMERA_DATA_INPUT_SELECT	0x16
+#define OV511_REG_CAMERA_RESERVED_LINE_MODE	0x17
+#define OV511_REG_CAMERA_BITMASK			0x18
+
+/* Snapshot mode camera interface register numbers */
+#define OV511_REG_SNAP_CAPTURED_FRAME		0x19
+#define OV511_REG_SNAP_CLAMPED_PIXEL_NUM	0x1A
+#define OV511_REG_SNAP_CLAMPED_LINE_NUM		0x1B
+#define OV511_REG_SNAP_PIXEL_DIVISOR		0x1C
+#define OV511_REG_SNAP_LINE_DIVISOR			0x1D
+#define OV511_REG_SNAP_DATA_INPUT_SELECT	0x1E
+#define OV511_REG_SNAP_BITMASK				0x1F
+
+/* DRAM register numbers */
+#define OV511_REG_DRAM_ENABLE_FLOW_CONTROL	0x20
+#define OV511_REG_DRAM_READ_CYCLE_PREDICT	0x21
+#define OV511_REG_DRAM_MANUAL_READ_CYCLE	0x22
+#define OV511_REG_DRAM_REFRESH_COUNTER		0x23
+
+/* ISO FIFO register numbers */
+#define OV511_REG_FIFO_PACKET_SIZE			0x30
+#define OV511_REG_FIFO_BITMASK				0x31
+
+/* PIO register numbers */
+#define OV511_REG_PIO_BITMASK				0x38
+#define OV511_REG_PIO_DATA_PORT				0x39
+#define OV511_REG_PIO_BIST					0x3E
+
+/* I2C register numbers */
+#define OV511_REG_I2C_CONTROL				0x40
+#define OV511_REG_I2C_SLAVE_ID_WRITE		0x41
+#define OV511_REG_I2C_SUB_ADDRESS_3_BYTE	0x42
+#define OV511_REG_I2C_SUB_ADDRESS_2_BYTE	0x43
+#define OV511_REG_I2C_SLAVE_ID_READ			0x44
+#define OV511_REG_I2C_DATA_PORT				0x45
+#define OV511_REG_I2C_CLOCK_PRESCALER		0x46
+#define OV511_REG_I2C_TIME_OUT_COUNTER		0x47
+
+/* I2C snapshot register numbers */
+#define OV511_REG_I2C_SNAP_SUB_ADDRESS		0x48
+#define OV511_REG_I2C_SNAP_DATA_PORT		0x49
+
+/* System control register numbers */
+#define OV511_REG_SYSTEM_RESET				0x50
+#define 	OV511_RESET_UDC				0x01
+#define 	OV511_RESET_I2C				0x02
+#define 	OV511_RESET_FIFO			0x04
+#define 	OV511_RESET_OMNICE			0x08
+#define 	OV511_RESET_DRAM_INTF		0x10
+#define 	OV511_RESET_CAMERA_INTF		0x20
+#define		OV511_RESET_OV511			0x40
+#define		OV511_RESET_NOREGS			0x3F	/* All but OV511 & regs */
+#define 	OV511_RESET_ALL				0x7F
+#define OV511_REG_SYSTEM_CLOCK_DIVISOR		0x51
+#define OV511_REG_SYSTEM_SNAPSHOT			0x52
+#define OV511_REG_SYSTEM_INIT         		0x53
+#define OV511_REG_SYSTEM_USER_DEFINED		0x5E
+#define OV511_REG_SYSTEM_CUSTOM_ID			0x5F
+
+/* OmniCE register numbers */
+#define OV511_OMNICE_PREDICATION_HORIZ_Y	0x70
+#define OV511_OMNICE_PREDICATION_HORIZ_UV	0x71
+#define OV511_OMNICE_PREDICATION_VERT_Y		0x72
+#define OV511_OMNICE_PREDICATION_VERT_UV	0x73
+#define OV511_OMNICE_QUANTIZATION_HORIZ_Y	0x74
+#define OV511_OMNICE_QUANTIZATION_HORIZ_UV	0x75
+#define OV511_OMNICE_QUANTIZATION_VERT_Y	0x76
+#define OV511_OMNICE_QUANTIZATION_VERT_UV	0x77
+#define OV511_OMNICE_ENABLE					0x78
+#define OV511_OMNICE_LUT_ENABLE				0x79		
+#define OV511_OMNICE_Y_LUT_BEGIN			0x80
+#define OV511_OMNICE_Y_LUT_END				0x9F
+#define OV511_OMNICE_UV_LUT_BEGIN			0xA0
+#define OV511_OMNICE_UV_LUT_END				0xBF
+
+/* Alternate numbers for various max packet sizes */
+#define OV511_ALTERNATE_SIZE_992	0
+#define OV511_ALTERNATE_SIZE_993	1
+#define OV511_ALTERNATE_SIZE_768	2
+#define OV511_ALTERNATE_SIZE_769	3
+#define OV511_ALTERNATE_SIZE_512	4
+#define OV511_ALTERNATE_SIZE_513	5
+#define OV511_ALTERNATE_SIZE_257	6
+#define OV511_ALTERNATE_SIZE_0		7
+
+
+#define STREAM_BUF_SIZE	(PAGE_SIZE * 4)
+
+#define SCRATCH_BUF_SIZE (STREAM_BUF_SIZE * 2)
+
+#define FRAMES_PER_DESC		10  /* FIXME - What should this be? */
+#define FRAME_SIZE_PER_DESC	512	/* FIXME - Shouldn't be hardcoded */
+
+// FIXME - should this be 0x81 (endpoint address) or 0x01 (endpoint number)?
+#define OV511_ENDPOINT_ADDRESS 0x81 /* Address of isoc endpoint */
+
+// CAMERA SPECIFIC
+// FIXME - these can vary between specific models
+#define OV7610_I2C_WRITE_ID 0x42
+#define OV7610_I2C_READ_ID  0x43
+#define OV511_I2C_CLOCK_PRESCALER 0x03
+
+/* Prototypes */
+int usb_ov511_reg_read(struct usb_device *dev, unsigned char reg);
+int usb_ov511_reg_write(struct usb_device *dev, unsigned char reg, unsigned char value);
+
+
+enum {
+	STATE_SCANNING,		/* Scanning for start */
+	STATE_HEADER,		/* Parsing header */
+	STATE_LINES,		/* Parsing lines */
+};
+
+struct ov511_frame_header {
+	// FIXME - nothing here yet
+};
+
+struct usb_device;
+
+struct ov511_sbuf {
+	char *data;
+	urb_t *urb;
+};
+
+enum {
+	FRAME_UNUSED,		/* Unused (no MCAPTURE) */
+	FRAME_READY,		/* Ready to start grabbing */
+	FRAME_GRABBING,		/* In the process of being grabbed into */
+	FRAME_DONE,			/* Finished grabbing, but not been synced yet */
+	FRAME_ERROR,		/* Something bad happened while processing */
+};
+
+struct ov511_frame {
+	char *data;		/* Frame buffer */
+
+	struct ov511_frame_header header;	/* Header from stream */
+
+	int width;		/* Width application is expecting */
+	int height;		/* Height */
+
+	int hdrwidth;		/* Width the frame actually is */
+	int hdrheight;		/* Height */
+
+	volatile int grabstate;	/* State of grabbing */
+	int scanstate;		/* State of scanning */
+
+	int curline;		/* Line of frame we're working on */
+	int curpix;
+
+	long scanlength;	/* uncompressed, raw data length of frame */
+	long bytes_read;	/* amount of scanlength that has been read from *data */
+
+	wait_queue_head_t wq;	/* Processes waiting */
+};
+
+#define OV511_NUMFRAMES	2
+#define OV511_NUMSBUF	2
+
+struct usb_ov511 {
+	struct video_device vdev;
+	
+	/* Device structure */
+	struct usb_device *dev;
+
+	unsigned char customid; /* Type of camera */
+
+	unsigned char iface;
+	
+	struct semaphore lock;
+	int user;			/* user count for exclusive use */
+
+	int streaming;		/* Are we streaming Isochronous? */
+	int grabbing;		/* Are we grabbing? */
+
+	int compress;		/* Should the next frame be compressed? */
+
+	char *fbuf;			/* Videodev buffer area */
+
+	int curframe;		/* Current receiving sbuf */
+	struct ov511_frame frame[OV511_NUMFRAMES];	
+
+	int cursbuf;		/* Current receiving sbuf */
+	struct ov511_sbuf sbuf[OV511_NUMSBUF];
+
+	/* Scratch space from the Isochronous pipe */
+	unsigned char scratch[SCRATCH_BUF_SIZE];
+	int scratchlen;
+};
+
+#endif
+