patch-2.4.21 linux-2.4.21/drivers/usb/ov511.h
Next file: linux-2.4.21/drivers/usb/pegasus.c
Previous file: linux-2.4.21/drivers/usb/ov511.c
Back to the patch index
Back to the overall index
- Lines: 64
- Date:
2003-06-13 07:51:36.000000000 -0700
- Orig file:
linux-2.4.20/drivers/usb/ov511.h
- Orig date:
2002-11-28 15:53:14.000000000 -0800
diff -urN linux-2.4.20/drivers/usb/ov511.h linux-2.4.21/drivers/usb/ov511.h
@@ -253,6 +253,9 @@
/* Control transfers use up to 4 bytes */
#define OV511_CBUF_SIZE 4
+/* Size of usb_make_path() buffer */
+#define OV511_USB_PATH_LEN 64
+
/* Bridge types */
enum {
BRG_UNKNOWN,
@@ -286,21 +289,6 @@
SEN_SAA7111A,
};
-// Not implemented yet
-#if 0
-/* Sensor classes */
-enum {
- SCL_UNKNOWN,
- SCL_OV7610, /* 7610, 76BE, 7620AE (for now) */
- SCL_OV7620,
- SCL_OV6620,
- SCL_OV6630, /* 6630, 6630AE, 6630AF */
- SCL_OV8600,
- SCL_KS0127, /* SEN_KS0127, SEN_KS0127B */
- SCL_SAA7111A,
-};
-#endif
-
enum {
STATE_SCANNING, /* Scanning for start */
STATE_HEADER, /* Parsing header */
@@ -311,7 +299,6 @@
enum {
BUF_NOT_ALLOCATED,
BUF_ALLOCATED,
- BUF_PEND_DEALLOC, /* ov511->buf_timer is set */
};
/* --------- Definition of ioctl interface --------- */
@@ -466,6 +453,7 @@
int customid;
char *desc;
unsigned char iface;
+ char usb_path[OV511_USB_PATH_LEN];
/* Determined by sensor type */
int maxwidth;
@@ -521,7 +509,6 @@
int bridge; /* Type of bridge (BRG_*) */
int bclass; /* Class of bridge (BCL_*) */
int sensor; /* Type of image sensor chip (SEN_*) */
- int sclass; /* Type of image sensor chip (SCL_*) */
int packet_size; /* Frame size per isoc desc */
int packet_numbering; /* Is ISO frame numbering enabled? */
@@ -537,7 +524,6 @@
/* Framebuffer/sbuf management */
int buf_state;
struct semaphore buf_lock;
- struct timer_list buf_timer;
struct ov51x_decomp_ops *decomp_ops;
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)