patch-2.4.19 linux-2.4.19/drivers/media/video/w9966.c
Next file: linux-2.4.19/drivers/media/video/zr36067.c
Previous file: linux-2.4.19/drivers/media/video/vino.c
Back to the patch index
Back to the overall index
- Lines: 1434
- Date:
Fri Aug 2 17:39:44 2002
- Orig file:
linux-2.4.18/drivers/media/video/w9966.c
- Orig date:
Fri Dec 21 09:41:54 2001
diff -urN linux-2.4.18/drivers/media/video/w9966.c linux-2.4.19/drivers/media/video/w9966.c
@@ -19,18 +19,25 @@
*/
/*
Supported devices:
- * Lifeview FlyCam Supra (using the Philips saa7111a chip)
+ * Lifeview Flycam Supra (Philips saa7111a chip)
+
+ * Mikrotek Eyestar2 (Sanyo lc99053 chip)
+ Very rudimentary support, total lack of ccd-control chip settings.
+ Only green video data and no image properties (brightness, etc..)
+ If anyone can parse the Japanese data-sheet for the Sanyo lc99053
+ chip, feel free to help.
+ <http://service.semic.sanyo.co.jp/semi/ds_pdf_j/LC99053.pdf>
+ Thanks to Steven Griffiths <steve@sgriff.com> and
+ James Murray <jsm@jsm-net.demon.co.uk> for testing.
Todo:
- * Add a working EPP mode
- * Support other ccd-control chips than the saa7111
- (what combinations exists?)
+ * Add a working EPP mode (Is this a parport or a w9966 issue?)
* Add proper probing. IEEE1284 probing of w9966 chips haven't
worked since parport drivers changed in 2.4.x.
- * Probe for onboard SRAM, port directions etc. (if possible)
+ * Probe for onboard SRAM, port directions etc. (possible?)
Changes:
-
+
Alan Cox: Removed RGB mode for kernel merge, added THIS_MODULE
and owner support for newer module locks
*/
@@ -43,112 +50,155 @@
#include <linux/types.h>
#include <linux/slab.h>
-//#define DEBUG // Undef me for production
+//#define DEBUG // Define for debug output.
#ifdef DEBUG
-#define DPRINTF(x, a...) printk(KERN_DEBUG "W9966: "__FUNCTION__ "(): "x, ##a)
+# define DPRINTF(f, a...) \
+ do { \
+ printk ("%s%s, %d (DEBUG) %s(): ", \
+ KERN_DEBUG, __FILE__, __LINE__, __func__); \
+ printk (f, ##a); \
+ } while (0)
+# define DASSERT(x) \
+ do { \
+ if (!x) \
+ DPRINTF("Assertion failed at line %d.\n", __LINE__); \
+ } while (0)
#else
-#define DPRINTF(x...)
+# define DPRINTF(f, a...) do {} while(0)
+# define DASSERT(f, a...) do {} while(0)
#endif
/*
* Defines, simple typedefs etc.
*/
-#define W9966_DRIVERNAME "W9966CF Webcam"
+#define W9966_DRIVERNAME "w9966cf"
#define W9966_MAXCAMS 4 // Maximum number of cameras
-#define W9966_RBUFFER 2048 // Read buffer (must be an even number)
-#define W9966_SRAMSIZE 131072 // 128kb
-#define W9966_SRAMID 0x02 // check w9966cf.pdf
-
-// Empirically determined window limits
-#define W9966_WND_MIN_X 16
-#define W9966_WND_MIN_Y 14
-#define W9966_WND_MAX_X 705
-#define W9966_WND_MAX_Y 253
-#define W9966_WND_MAX_W (W9966_WND_MAX_X - W9966_WND_MIN_X)
-#define W9966_WND_MAX_H (W9966_WND_MAX_Y - W9966_WND_MIN_Y)
+#define W9966_RBUFFER 8096 // Read buffer (must be an even number)
+
+#define W9966_WND_MIN_W 2
+#define W9966_WND_MIN_H 1
// Keep track of our current state
-#define W9966_STATE_PDEV 0x01
-#define W9966_STATE_CLAIMED 0x02
-#define W9966_STATE_VDEV 0x04
+#define W9966_STATE_PDEV 0x01 // pdev registered
+#define W9966_STATE_CLAIMED 0x02 // pdev claimed
+#define W9966_STATE_VDEV 0x04 // vdev registered
+#define W9966_STATE_BUFFER 0x08 // buffer allocated
+#define W9966_STATE_DETECTED 0x10 // model identified
+
+#define W9966_SAA7111_ID 0x24 // I2C device id
-#define W9966_I2C_W_ID 0x48
-#define W9966_I2C_R_ID 0x49
+#define W9966_I2C_UDELAY 5
+#define W9966_I2C_TIMEOUT 100
#define W9966_I2C_R_DATA 0x08
#define W9966_I2C_R_CLOCK 0x04
#define W9966_I2C_W_DATA 0x02
#define W9966_I2C_W_CLOCK 0x01
+#define MAX(a, b) ((a > b) ? a : b)
+#define MIN(a, b) ((a > b) ? b : a)
+
struct w9966_dev {
- u8 dev_state;
- u8 i2c_state;
- int ppmode;
- struct parport* pport;
- struct pardevice* pdev;
struct video_device vdev;
+ struct parport* pport;
+ struct pardevice* pdev;
+ int ppmode;
+
+ u8* buffer;
+ u8 dev_state;
+ u8 i2c_state;
u16 width;
u16 height;
+
+ // Image properties
u8 brightness;
s8 contrast;
s8 color;
s8 hue;
- u8* buffer;
+
+ // Model specific:
+ const char* name;
+ u32 sramsize;
+ u8 sramid; // reg 0x0c, bank layout
+ u8 cmask; // reg 0x01, for polarity
+ u16 min_x, max_x; // Capture window limits
+ u16 min_y, max_y;
+ int (*image)(struct w9966_dev* cam);
};
/*
- * Module specific properties
+ * Module properties
*/
MODULE_AUTHOR("Jakob Kemi <jakob.kemi@telia.com>");
-MODULE_DESCRIPTION("Winbond w9966cf WebCam driver (FlyCam Supra and others)");
+MODULE_DESCRIPTION("Winbond w9966cf webcam driver (Flycam Supra and others)");
MODULE_LICENSE("GPL");
-static const char* pardev[] = {[0 ... W9966_MAXCAMS] = "auto"};
+static const char* pardev[] = {[0 ... W9966_MAXCAMS-1] = "auto"};
MODULE_PARM(pardev, "0-" __MODULE_STRING(W9966_MAXCAMS) "s");
MODULE_PARM_DESC(pardev,"\n\
<auto|name|none[,...]> Where to find cameras.\n\
- auto = probe all parports for camera\n\
+ auto = probe all parports for camera (default)\n\
name = name of parport (eg parport0)\n\
- none = don't search for this camera\n\
-You can specify all cameras this way, for example:
+ none = don't use this camera\n\
+You can specify all cameras this way, for example:\n\
pardev=parport2,auto,none,parport0 would search for cam1 on parport2, search\n\
for cam2 on all parports, skip cam3 and search for cam4 on parport0");
-static int parmode = 0;
+static int parmode = 1;
MODULE_PARM(parmode, "i");
-MODULE_PARM_DESC(parmode, "\n<0|1|2> transfer mode (0=auto, 1=ecp, 2=epp)");
+MODULE_PARM_DESC(parmode, "\n<0|1|2|3> transfer mode (0=auto, 1=ecp(default), 2=epp, 3=forced hw-ecp)");
-static int video_nr = -1;
-MODULE_PARM(video_nr, "i");
+static int video_nr[] = {[0 ... W9966_MAXCAMS-1] = -1};
+MODULE_PARM(video_nr, "0-" __MODULE_STRING(W9966_MAXCAMS) "i");
+MODULE_PARM_DESC(video_nr,"\n\
+<-1|n[,...]> Specify V4L minor mode number.\n\
+ -1 = use next available (default)\n\
+ n = use minor number n (integer >= 0)\n\
+You can specify all cameras this way, for example:\n\
+ video_nr=-1,2,-1 would assign minor number 2 for cam2 and use auto for cam1,\n\
+ cam3 and cam4");
/*
* Private data
*/
-static struct w9966_dev w9966_cams[W9966_MAXCAMS];
+static struct w9966_dev* w9966_cams;
/*
- * Private function declares
+ * Private function declarations
*/
-static inline void w9966_setState(struct w9966_dev* cam, int mask, int val);
-static inline int w9966_getState(struct w9966_dev* cam, int mask, int val);
-static inline void w9966_pdev_claim(struct w9966_dev *vdev);
+static inline void w9966_flag_set(struct w9966_dev* cam, int flag) {
+ cam->dev_state |= flag;}
+
+static inline void w9966_flag_clear(struct w9966_dev* cam, int flag) {
+ cam->dev_state &= ~flag;}
+
+static inline int w9966_flag_test(struct w9966_dev* cam, int flag) {
+ return (cam->dev_state & flag);}
+
+static inline int w9966_pdev_claim(struct w9966_dev *vdev);
static inline void w9966_pdev_release(struct w9966_dev *vdev);
-static int w9966_rReg(struct w9966_dev* cam, int reg);
-static int w9966_wReg(struct w9966_dev* cam, int reg, int data);
-static int w9966_rReg_i2c(struct w9966_dev* cam, int reg);
-static int w9966_wReg_i2c(struct w9966_dev* cam, int reg, int data);
-static int w9966_findlen(int near, int size, int maxlen);
-static int w9966_calcscale(int size, int min, int max, int* beg, int* end, unsigned char* factor);
-static int w9966_setup(struct w9966_dev* cam, int x1, int y1, int x2, int y2, int w, int h);
+static int w9966_rreg(struct w9966_dev* cam, int reg);
+static int w9966_wreg(struct w9966_dev* cam, int reg, int data);
-static int w9966_init(struct w9966_dev* cam, struct parport* port);
+static int w9966_init(struct w9966_dev* cam, struct parport* port, int vidnr);
static void w9966_term(struct w9966_dev* cam);
+static int w9966_setup(struct w9966_dev* cam);
+static int w9966_findlen(int near, int size, int maxlen);
+static int w9966_calcscale(int size, int min, int max,
+ int* beg, int* end, u8* factor);
+static int w9966_window(struct w9966_dev* cam, int x1, int y1,
+ int x2, int y2, int w, int h);
+
+static int w9966_saa7111_init(struct w9966_dev* cam);
+static int w9966_saa7111_image(struct w9966_dev* cam);
+static int w9966_lc99053_init(struct w9966_dev* cam);
+static int w9966_lc99053_image(struct w9966_dev* cam);
static inline void w9966_i2c_setsda(struct w9966_dev* cam, int state);
static inline int w9966_i2c_setscl(struct w9966_dev* cam, int state);
@@ -156,116 +206,104 @@
static inline int w9966_i2c_getscl(struct w9966_dev* cam);
static int w9966_i2c_wbyte(struct w9966_dev* cam, int data);
static int w9966_i2c_rbyte(struct w9966_dev* cam);
+static int w9966_i2c_rreg(struct w9966_dev* cam, int device, int reg);
+static int w9966_i2c_wreg(struct w9966_dev* cam, int device, int reg, int data);
static int w9966_v4l_open(struct video_device *vdev, int mode);
static void w9966_v4l_close(struct video_device *vdev);
-static int w9966_v4l_ioctl(struct video_device *vdev, unsigned int cmd, void *arg);
-static long w9966_v4l_read(struct video_device *vdev, char *buf, unsigned long count, int noblock);
+static int w9966_v4l_ioctl(struct video_device *vdev,
+ unsigned int cmd, void *arg);
+static long w9966_v4l_read(struct video_device *vdev,
+ char *buf, unsigned long count, int noblock);
/*
- * Private function defines
+ * Private function definitions
*/
-
-// Set camera phase flags, so we know what to uninit when terminating
-static inline void w9966_setState(struct w9966_dev* cam, int mask, int val)
-{
- cam->dev_state = (cam->dev_state & ~mask) ^ val;
-}
-
-// Get camera phase flags
-static inline int w9966_getState(struct w9966_dev* cam, int mask, int val)
-{
- return ((cam->dev_state & mask) == val);
-}
-
// Claim parport for ourself
-static inline void w9966_pdev_claim(struct w9966_dev* cam)
+// 1 on success, else 0
+static inline int w9966_pdev_claim(struct w9966_dev* cam)
{
- if (w9966_getState(cam, W9966_STATE_CLAIMED, W9966_STATE_CLAIMED))
- return;
- parport_claim_or_block(cam->pdev);
- w9966_setState(cam, W9966_STATE_CLAIMED, W9966_STATE_CLAIMED);
+ if (w9966_flag_test(cam, W9966_STATE_CLAIMED))
+ return 1;
+ if (parport_claim_or_block(cam->pdev) < 0)
+ return 0;
+ w9966_flag_set(cam, W9966_STATE_CLAIMED);
+ return 1;
}
// Release parport for others to use
static inline void w9966_pdev_release(struct w9966_dev* cam)
{
- if (w9966_getState(cam, W9966_STATE_CLAIMED, 0))
+ if (!w9966_flag_test(cam, W9966_STATE_CLAIMED))
return;
parport_release(cam->pdev);
- w9966_setState(cam, W9966_STATE_CLAIMED, 0);
+ w9966_flag_clear(cam, W9966_STATE_CLAIMED);
}
-
-// Read register from W9966 interface-chip
+
+// Read register from w9966 interface-chip
// Expects a claimed pdev
// -1 on error, else register data (byte)
-static int w9966_rReg(struct w9966_dev* cam, int reg)
+static int w9966_rreg(struct w9966_dev* cam, int reg)
{
// ECP, read, regtransfer, REG, REG, REG, REG, REG
- const unsigned char addr = 0x80 | (reg & 0x1f);
- unsigned char val;
-
- if (parport_negotiate(cam->pport, cam->ppmode | IEEE1284_ADDR) != 0)
- return -1;
- if (parport_write(cam->pport, &addr, 1) != 1)
- return -1;
- if (parport_negotiate(cam->pport, cam->ppmode | IEEE1284_DATA) != 0)
- return -1;
- if (parport_read(cam->pport, &val, 1) != 1)
+ const u8 addr = 0x80 | (reg & 0x1f);
+ u8 val;
+
+ if (parport_negotiate(cam->pport, cam->ppmode | IEEE1284_ADDR) != 0 ||
+ parport_write(cam->pport, &addr, 1) != 1 ||
+ parport_negotiate(cam->pport, cam->ppmode | IEEE1284_DATA) != 0 ||
+ parport_read(cam->pport, &val, 1) != 1)
return -1;
return val;
}
-// Write register to W9966 interface-chip
+// Write register to w9966 interface-chip
// Expects a claimed pdev
-// -1 on error
-static int w9966_wReg(struct w9966_dev* cam, int reg, int data)
+// 1 on success, else 0
+static int w9966_wreg(struct w9966_dev* cam, int reg, int data)
{
// ECP, write, regtransfer, REG, REG, REG, REG, REG
- const unsigned char addr = 0xc0 | (reg & 0x1f);
- const unsigned char val = data;
-
- if (parport_negotiate(cam->pport, cam->ppmode | IEEE1284_ADDR) != 0)
- return -1;
- if (parport_write(cam->pport, &addr, 1) != 1)
- return -1;
- if (parport_negotiate(cam->pport, cam->ppmode | IEEE1284_DATA) != 0)
- return -1;
- if (parport_write(cam->pport, &val, 1) != 1)
- return -1;
+ const u8 addr = 0xc0 | (reg & 0x1f);
+ const u8 val = data;
- return 0;
+ if (parport_negotiate(cam->pport, cam->ppmode | IEEE1284_ADDR) != 0 ||
+ parport_write(cam->pport, &addr, 1) != 1 ||
+ parport_negotiate(cam->pport, cam->ppmode | IEEE1284_DATA) != 0 ||
+ parport_write(cam->pport, &val, 1) != 1)
+ return 0;
+
+ return 1;
}
// Initialize camera device. Setup all internal flags, set a
// default video mode, setup ccd-chip, register v4l device etc..
// Also used for 'probing' of hardware.
-// -1 on error
-static int w9966_init(struct w9966_dev* cam, struct parport* port)
+// 1 on success, else 0
+static int w9966_init(struct w9966_dev* cam, struct parport* port, int vidnr)
{
if (cam->dev_state != 0)
- return -1;
-
+ return 0;
+
cam->pport = port;
cam->brightness = 128;
cam->contrast = 64;
cam->color = 64;
cam->hue = 0;
-// Select requested transfer mode
+ // Select requested transfer mode
switch(parmode)
{
default: // Auto-detect (priority: hw-ecp, hw-epp, sw-ecp)
case 0:
if (port->modes & PARPORT_MODE_ECP)
cam->ppmode = IEEE1284_MODE_ECP;
-/* else if (port->modes & PARPORT_MODE_EPP)
- cam->ppmode = IEEE1284_MODE_EPP;*/
+ else if (port->modes & PARPORT_MODE_EPP)
+ cam->ppmode = IEEE1284_MODE_EPP;
else
cam->ppmode = IEEE1284_MODE_ECPSWE;
- break;
+ break;
case 1: // hw- or sw-ecp
if (port->modes & PARPORT_MODE_ECP)
cam->ppmode = IEEE1284_MODE_ECP;
@@ -278,27 +316,55 @@
else
cam->ppmode = IEEE1284_MODE_EPPSWE;
break;
+ case 3: // hw-ecp
+ cam->ppmode = IEEE1284_MODE_ECP;
+ break;
}
-
-// Tell the parport driver that we exists
- cam->pdev = parport_register_device(port, "w9966", NULL, NULL, NULL, 0, NULL);
+
+ // Tell the parport driver that we exists
+ cam->pdev = parport_register_device(
+ port, W9966_DRIVERNAME, NULL, NULL, NULL, 0, NULL);
+
if (cam->pdev == NULL) {
- DPRINTF("parport_register_device() failed\n");
- return -1;
+ DPRINTF("parport_register_device() failed.\n");
+ return 0;
}
- w9966_setState(cam, W9966_STATE_PDEV, W9966_STATE_PDEV);
+ w9966_flag_set(cam, W9966_STATE_PDEV);
- w9966_pdev_claim(cam);
-
-// Setup a default capture mode
- if (w9966_setup(cam, 0, 0, 1023, 1023, 200, 160) != 0) {
+ // Claim parport
+ if (!w9966_pdev_claim(cam)) {
+ DPRINTF("w9966_pdev_claim() failed.\n");
+ return 0;
+ }
+
+ // Perform initial w9966 setup
+ if (!w9966_setup(cam)) {
DPRINTF("w9966_setup() failed.\n");
- return -1;
+ return 0;
+ }
+
+ // Detect model
+ if (!w9966_saa7111_init(cam)) {
+ DPRINTF("w9966_saa7111_init() failed.\n");
+ return 0;
+ }
+ if (!w9966_lc99053_init(cam)) {
+ DPRINTF("w9966_lc99053_init() failed.\n");
+ return 0;
+ }
+ if (!w9966_flag_test(cam, W9966_STATE_DETECTED)) {
+ DPRINTF("Camera model not identified.\n");
+ return 0;
}
+ // Setup w9966 with a default capture mode (QCIF res.)
+ if (!w9966_window(cam, 0, 0, 1023, 1023, 176, 144)) {
+ DPRINTF("w9966_window() failed.\n");
+ return 0;
+ }
w9966_pdev_release(cam);
-// Fill in the video_device struct and register us to v4l
+ // Fill in the video_device struct and register us to v4l
memset(&cam->vdev, 0, sizeof(struct video_device));
strcpy(cam->vdev.name, W9966_DRIVERNAME);
cam->vdev.type = VID_TYPE_CAPTURE | VID_TYPE_SCALES;
@@ -310,51 +376,73 @@
cam->vdev.priv = (void*)cam;
cam->vdev.owner = THIS_MODULE;
- if (video_register_device(&cam->vdev, VFL_TYPE_GRABBER, video_nr) == -1)
- return -1;
-
- w9966_setState(cam, W9966_STATE_VDEV, W9966_STATE_VDEV);
-
- cam->buffer = NULL;
-
+ if (video_register_device(&cam->vdev, VFL_TYPE_GRABBER, vidnr) == -1) {
+ DPRINTF("video_register_device() failed (minor: %d).\n", vidnr);
+ return 0;
+ }
+ w9966_flag_set(cam, W9966_STATE_VDEV);
+
// All ok
- printk(
- "w9966cf: Found and initialized a webcam on %s.\n",
- cam->pport->name
- );
- return 0;
+ printk("w9966: Found and initialized %s on %s.\n",
+ cam->name, cam->pport->name);
+ return 1;
}
-
// Terminate everything gracefully
static void w9966_term(struct w9966_dev* cam)
{
-// Delete allocated buffer if needed
- if (cam->buffer != NULL) {
+ // Delete allocated buffer
+ if (w9966_flag_test(cam, W9966_STATE_BUFFER))
kfree(cam->buffer);
- cam->buffer = NULL;
- }
-// Unregister from v4l
- if (w9966_getState(cam, W9966_STATE_VDEV, W9966_STATE_VDEV)) {
+ // Unregister from v4l
+ if (w9966_flag_test(cam, W9966_STATE_VDEV))
video_unregister_device(&cam->vdev);
- w9966_setState(cam, W9966_STATE_VDEV, 0);
- }
-// Terminate from IEEE1284 mode and release pdev block
- if (w9966_getState(cam, W9966_STATE_PDEV, W9966_STATE_PDEV)) {
- w9966_pdev_claim(cam);
- parport_negotiate(cam->pport, IEEE1284_MODE_COMPAT);
- w9966_pdev_release(cam);
- }
+ // Terminate from IEEE1284 mode and unregister from parport
+ if (w9966_flag_test(cam, W9966_STATE_PDEV)) {
+ if (w9966_pdev_claim(cam))
+ parport_negotiate(cam->pport, IEEE1284_MODE_COMPAT);
-// Unregister from parport
- if (w9966_getState(cam, W9966_STATE_PDEV, W9966_STATE_PDEV)) {
+ w9966_pdev_release(cam);
parport_unregister_device(cam->pdev);
- w9966_setState(cam, W9966_STATE_PDEV, 0);
}
+
+ cam->dev_state = 0x00;
}
+// Do initial setup for the w9966 chip, init i2c bus, etc.
+// this is generic for all models
+// expects a claimed pdev
+// 1 on success, else 0
+static int w9966_setup(struct w9966_dev* cam)
+{
+ const u8 i2c = cam->i2c_state = W9966_I2C_W_DATA | W9966_I2C_W_CLOCK;
+ const u8 regs[] = {
+ 0x40, // 0x13 - VEE control (raw 4:2:2)
+ 0x00, 0x00, 0x00, // 0x14 - 0x16
+ 0x00, // 0x17 - ???
+ i2c, // 0x18 - Serial bus
+ 0xff, // 0x19 - I/O port direction control
+ 0xff, // 0x1a - I/O port data register
+ 0x10 // 0x1b - ???
+ };
+ int i;
+
+ DASSERT(w9966_flag_test(cam, W9966_STATE_CLAIMED));
+
+ // Reset (ECP-fifo & serial-bus)
+ if (!w9966_wreg(cam, 0x00, 0x03) ||
+ !w9966_wreg(cam, 0x00, 0x00))
+ return 0;
+
+ // Write regs to w9966cf chip
+ for (i = 0x13; i < 0x1c; i++)
+ if (!w9966_wreg(cam, i, regs[i-0x13]))
+ return 0;
+
+ return 1;
+}
// Find a good length for capture window (used both for W and H)
// A bit ugly but pretty functional. The capture length
@@ -365,7 +453,7 @@
int besterr = abs(near - bestlen);
int len;
- for(len = size+1;len < maxlen;len++)
+ for(len = size+1; len < maxlen; len++)
{
int err;
if ( ((64*size) %len) != 0)
@@ -376,7 +464,7 @@
// Only continue as long as we keep getting better values
if (err > besterr)
break;
-
+
besterr = err;
bestlen = len;
}
@@ -384,19 +472,19 @@
return bestlen;
}
-// Modify capture window (if necessary)
+// Modify capture window (if necessary)
// and calculate downscaling
-// Return -1 on error
-static int w9966_calcscale(int size, int min, int max, int* beg, int* end, unsigned char* factor)
+// 1 on success, else 0
+static int w9966_calcscale(int size, int min, int max, int* beg, int* end, u8* factor)
{
- int maxlen = max - min;
- int len = *end - *beg + 1;
- int newlen = w9966_findlen(len, size, maxlen);
- int err = newlen - len;
+ const int maxlen = max - min;
+ const int len = *end - *beg + 1;
+ const int newlen = w9966_findlen(len, size, maxlen);
+ const int err = newlen - len;
// Check for bad format
if (newlen > maxlen || newlen < size)
- return -1;
+ return 0;
// Set factor (6 bit fixed)
*factor = (64*size) / newlen;
@@ -419,62 +507,49 @@
*end -= *end - max;
}
- return 0;
+ return 1;
}
-// Setup the cameras capture window etc.
-// Expects a claimed pdev
-// return -1 on error
-static int w9966_setup(struct w9966_dev* cam, int x1, int y1, int x2, int y2, int w, int h)
+// Setup the w9966 capture window and also set SRAM settings
+// expects a claimed pdev and detected camera model
+// 1 on success, else 0
+static int w9966_window(struct w9966_dev* cam, int x1, int y1, int x2, int y2, int w, int h)
{
- unsigned int i;
unsigned int enh_s, enh_e;
u8 scale_x, scale_y;
- u8 regs[0x1c];
- u8 saa7111_regs[] = {
- 0x21, 0x00, 0xd8, 0x23, 0x00, 0x80, 0x80, 0x00,
- 0x88, 0x10, 0x80, 0x40, 0x40, 0x00, 0x01, 0x00,
- 0x48, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x71, 0xe7, 0x00, 0x00, 0xc0
- };
-
-
- if (w*h*2 > W9966_SRAMSIZE)
- {
- DPRINTF("capture window exceeds SRAM size!.\n");
- w = 200; h = 160; // Pick default values
- }
+ u8 regs[0x13];
+ int i;
+ // Modify width and height to match capture window and SRAM
+ w = MAX(W9966_WND_MIN_W, w);
+ h = MAX(W9966_WND_MIN_H, h);
+ w = MIN(cam->max_x - cam->min_x, w);
+ h = MIN(cam->max_y - cam->min_y, h);
w &= ~0x1;
- if (w < 2) w = 2;
- if (h < 1) h = 1;
- if (w > W9966_WND_MAX_W) w = W9966_WND_MAX_W;
- if (h > W9966_WND_MAX_H) h = W9966_WND_MAX_H;
+ if (w*h*2 > cam->sramsize)
+ h = cam->sramsize / (w*2);
cam->width = w;
cam->height = h;
- enh_s = 0;
+ enh_s = 0;
enh_e = w*h*2;
-
-// Modify capture window if necessary and calculate downscaling
- if (
- w9966_calcscale(w, W9966_WND_MIN_X, W9966_WND_MAX_X, &x1, &x2, &scale_x) != 0 ||
- w9966_calcscale(h, W9966_WND_MIN_Y, W9966_WND_MAX_Y, &y1, &y2, &scale_y) != 0
- ) return -1;
-
- DPRINTF(
- "%dx%d, x: %d<->%d, y: %d<->%d, sx: %d/64, sy: %d/64.\n",
- w, h, x1, x2, y1, y2, scale_x&~0x80, scale_y&~0x80
- );
-
-// Setup registers
+
+ // Calculate downscaling
+ if (!w9966_calcscale(w, cam->min_x, cam->max_x, &x1, &x2, &scale_x) ||
+ !w9966_calcscale(h, cam->min_y, cam->max_y, &y1, &y2, &scale_y))
+ return 0;
+
+ DPRINTF("%dx%d, x: %d<->%d, y: %d<->%d, sx: %d/64, sy: %d/64.\n",
+ w, h, x1, x2, y1, y2, scale_x&~0x80, scale_y&~0x80);
+
+ // Setup registers
regs[0x00] = 0x00; // Set normal operation
- regs[0x01] = 0x18; // Capture mode
+ regs[0x01] = cam->cmask; // Capture mode
regs[0x02] = scale_y; // V-scaling
regs[0x03] = scale_x; // H-scaling
-
- // Capture window
+
+ // Capture window
regs[0x04] = (x1 & 0x0ff); // X-start (8 low bits)
regs[0x05] = (x1 & 0x300)>>8; // X-start (2 high bits)
regs[0x06] = (y1 & 0x0ff); // Y-start (8 low bits)
@@ -483,8 +558,8 @@
regs[0x09] = (x2 & 0x300)>>8; // X-end (2 high bits)
regs[0x0a] = (y2 & 0x0ff); // Y-end (8 low bits)
- regs[0x0c] = W9966_SRAMID; // SRAM-banks (1x 128kb)
-
+ regs[0x0c] = cam->sramid; // SRAM layout
+
// Enhancement layer
regs[0x0d] = (enh_s& 0x000ff); // Enh. start (0-7)
regs[0x0e] = (enh_s& 0x0ff00)>>8; // Enh. start (8-15)
@@ -493,35 +568,110 @@
regs[0x11] = (enh_e& 0x0ff00)>>8; // Enh. end (8-15)
regs[0x12] = (enh_e& 0x70000)>>16; // Enh. end (16-17/18??)
- // Misc
- regs[0x13] = 0x40; // VEE control (raw 4:2:2)
- regs[0x17] = 0x00; // ???
- regs[0x18] = cam->i2c_state = 0x00; // Serial bus
- regs[0x19] = 0xff; // I/O port direction control
- regs[0x1a] = 0xff; // I/O port data register
- regs[0x1b] = 0x10; // ???
-
- // SAA7111 chip settings
- saa7111_regs[0x0a] = cam->brightness;
- saa7111_regs[0x0b] = cam->contrast;
- saa7111_regs[0x0c] = cam->color;
- saa7111_regs[0x0d] = cam->hue;
+ // Write regs to w9966cf chip
+ for (i = 0x01; i < 0x13; i++)
+ if (!w9966_wreg(cam, i, regs[i]))
+ return 0;
+
+ return 1;
+}
+
+// Detect and initialize saa7111 ccd-controller chip.
+// expects a claimed parport
+// expected to always return 1 unless error is _fatal_
+// 1 on success, else 0
+static int w9966_saa7111_init(struct w9966_dev* cam)
+{
+ // saa7111 regs 0x00 trough 0x12
+ const u8 regs[] = {
+ 0x00, // not written
+ 0x00, 0xd8, 0x23, 0x00, 0x80, 0x80, 0x00, 0x88, 0x10,
+ cam->brightness, // 0x0a
+ cam->contrast, // 0x0b
+ cam->color, // 0x0c
+ cam->hue, // 0x0d
+ 0x01, 0x00, 0x48, 0x0c, 0x00,
+ };
+ int i;
-// Reset (ECP-fifo & serial-bus)
- if (w9966_wReg(cam, 0x00, 0x03) == -1)
- return -1;
+ if (w9966_flag_test(cam, W9966_STATE_DETECTED))
+ return 1;
-// Write regs to w9966cf chip
- for (i = 0; i < 0x1c; i++)
- if (w9966_wReg(cam, i, regs[i]) == -1)
- return -1;
+ // Write regs to saa7111 chip
+ for (i = 1; i < 0x13; i++)
+ if (!w9966_i2c_wreg(cam, W9966_SAA7111_ID, i, regs[i]))
+ return 1;
+
+ // Read back regs
+ for (i = 1; i < 0x13; i++)
+ if (w9966_i2c_rreg(cam, W9966_SAA7111_ID, i) != regs[i])
+ return 1;
+
+ // Fill in model specific data
+ cam->name = "Lifeview Flycam Supra";
+ cam->sramsize = 128 << 10; // 128 kib
+ cam->sramid = 0x02; // see w9966.pdf
+
+ cam->cmask = 0x18; // normal polarity
+ cam->min_x = 16; // empirically determined
+ cam->max_x = 705;
+ cam->min_y = 14;
+ cam->max_y = 253;
+ cam->image = &w9966_saa7111_image;
+
+ DPRINTF("Found and initialized a saa7111 chip.\n");
+ w9966_flag_set(cam, W9966_STATE_DETECTED);
+
+ return 1;
+}
+
+// Setup image properties (brightness, hue, etc.) for the saa7111 chip
+// expects a claimed parport
+// 1 on success, else 0
+static int w9966_saa7111_image(struct w9966_dev* cam)
+{
+ if (!w9966_i2c_wreg(cam, W9966_SAA7111_ID, 0x0a, cam->brightness) ||
+ !w9966_i2c_wreg(cam, W9966_SAA7111_ID, 0x0b, cam->contrast) ||
+ !w9966_i2c_wreg(cam, W9966_SAA7111_ID, 0x0c, cam->color) ||
+ !w9966_i2c_wreg(cam, W9966_SAA7111_ID, 0x0d, cam->hue))
+ return 0;
-// Write regs to saa7111 chip
- for (i = 0; i < 0x20; i++)
- if (w9966_wReg_i2c(cam, i, saa7111_regs[i]) == -1)
- return -1;
+ return 1;
+}
- return 0;
+// Detect and initialize lc99053 ccd-controller chip.
+// expects a claimed parport
+// this is currently a hack, no detection is done, we just assume an Eyestar2
+// 1 on success, else 0
+static int w9966_lc99053_init(struct w9966_dev* cam)
+{
+ if (w9966_flag_test(cam, W9966_STATE_DETECTED))
+ return 1;
+
+ // Fill in model specific data
+ cam->name = "Microtek Eyestar2";
+ cam->sramsize = 128 << 10; // 128 kib
+ cam->sramid = 0x02; // w9966cf.pdf
+
+ cam->cmask = 0x10; // reverse polarity
+ cam->min_x = 16; // empirically determined
+ cam->max_x = 705;
+ cam->min_y = 14;
+ cam->max_y = 253;
+ cam->image = &w9966_lc99053_image;
+
+ DPRINTF("Found and initialized a lc99053 chip.\n");
+ w9966_flag_set(cam, W9966_STATE_DETECTED);
+
+ return 1;
+}
+
+// Setup image properties (brightness, hue, etc.) for the lc99053 chip
+// expects a claimed parport
+// 1 on success, else 0
+static int w9966_lc99053_image(struct w9966_dev* cam)
+{
+ return 1;
}
/*
@@ -536,91 +686,90 @@
cam->i2c_state |= W9966_I2C_W_DATA;
else
cam->i2c_state &= ~W9966_I2C_W_DATA;
-
- w9966_wReg(cam, 0x18, cam->i2c_state);
- udelay(5);
+
+ w9966_wreg(cam, 0x18, cam->i2c_state);
+ udelay(W9966_I2C_UDELAY);
}
// Sets the clock line on the i2c bus.
-// Expects a claimed pdev. -1 on error
+// Expects a claimed pdev.
+// 1 on success, else 0
static inline int w9966_i2c_setscl(struct w9966_dev* cam, int state)
{
- int timeout;
if (state)
cam->i2c_state |= W9966_I2C_W_CLOCK;
else
cam->i2c_state &= ~W9966_I2C_W_CLOCK;
- w9966_wReg(cam, 0x18, cam->i2c_state);
- udelay(5);
-
- // we go to high, we also expect the peripheral to ack.
+ w9966_wreg(cam, 0x18, cam->i2c_state);
+ udelay(W9966_I2C_UDELAY);
+
+ // when we go to high, we also expect the peripheral to ack.
if (state) {
- timeout = jiffies + 100;
+ const int timeout = jiffies + W9966_I2C_TIMEOUT;
while (!w9966_i2c_getscl(cam)) {
- if (jiffies > timeout)
- return -1;
+ if (time_after(jiffies, timeout))
+ return 0;
}
}
- return 0;
+ return 1;
}
// Get peripheral data line
// Expects a claimed pdev.
static inline int w9966_i2c_getsda(struct w9966_dev* cam)
{
- const unsigned char state = w9966_rReg(cam, 0x18);
- return ((state & W9966_I2C_R_DATA) > 0);
+ const u8 pins = w9966_rreg(cam, 0x18);
+ return ((pins & W9966_I2C_R_DATA) > 0);
}
// Get peripheral clock line
// Expects a claimed pdev.
static inline int w9966_i2c_getscl(struct w9966_dev* cam)
{
- const unsigned char state = w9966_rReg(cam, 0x18);
- return ((state & W9966_I2C_R_CLOCK) > 0);
+ const u8 pins = w9966_rreg(cam, 0x18);
+ return ((pins & W9966_I2C_R_CLOCK) > 0);
}
// Write a byte with ack to the i2c bus.
-// Expects a claimed pdev. -1 on error
+// Expects a claimed pdev.
+// 1 on success, else 0
static int w9966_i2c_wbyte(struct w9966_dev* cam, int data)
{
int i;
- for (i = 7; i >= 0; i--)
- {
+ for (i = 7; i >= 0; i--) {
w9966_i2c_setsda(cam, (data >> i) & 0x01);
- if (w9966_i2c_setscl(cam, 1) == -1)
- return -1;
- w9966_i2c_setscl(cam, 0);
+ if (!w9966_i2c_setscl(cam, 1) ||
+ !w9966_i2c_setscl(cam, 0))
+ return 0;
}
-
w9966_i2c_setsda(cam, 1);
-
- if (w9966_i2c_setscl(cam, 1) == -1)
- return -1;
- w9966_i2c_setscl(cam, 0);
-
- return 0;
+
+ if (!w9966_i2c_setscl(cam, 1) ||
+ !w9966_i2c_setscl(cam, 0))
+ return 0;
+
+ return 1;
}
// Read a data byte with ack from the i2c-bus
// Expects a claimed pdev. -1 on error
static int w9966_i2c_rbyte(struct w9966_dev* cam)
{
- unsigned char data = 0x00;
- int i;
-
+ u8 data = 0x00;
+ int i;
+
w9966_i2c_setsda(cam, 1);
for (i = 0; i < 8; i++)
{
- if (w9966_i2c_setscl(cam, 1) == -1)
+ if (!w9966_i2c_setscl(cam, 1))
return -1;
data = data << 1;
if (w9966_i2c_getsda(cam))
data |= 0x01;
-
+
w9966_i2c_setscl(cam, 0);
}
return data;
@@ -628,75 +777,81 @@
// Read a register from the i2c device.
// Expects claimed pdev. -1 on error
-static int w9966_rReg_i2c(struct w9966_dev* cam, int reg)
+static int w9966_i2c_rreg(struct w9966_dev* cam, int device, int reg)
{
int data;
w9966_i2c_setsda(cam, 0);
w9966_i2c_setscl(cam, 0);
- if (
- w9966_i2c_wbyte(cam, W9966_I2C_W_ID) == -1 ||
- w9966_i2c_wbyte(cam, reg) == -1
- )
+ if (!w9966_i2c_wbyte(cam, device << 1) ||
+ !w9966_i2c_wbyte(cam, reg))
return -1;
w9966_i2c_setsda(cam, 1);
- if (w9966_i2c_setscl(cam, 1) == -1)
+ if (!w9966_i2c_setscl(cam, 1))
return -1;
+
w9966_i2c_setsda(cam, 0);
w9966_i2c_setscl(cam, 0);
- if (
- w9966_i2c_wbyte(cam, W9966_I2C_R_ID) == -1 ||
- (data = w9966_i2c_rbyte(cam)) == -1
- )
+ if (!w9966_i2c_wbyte(cam, (device << 1) | 1) ||
+ (data = w9966_i2c_rbyte(cam)) == -1)
return -1;
w9966_i2c_setsda(cam, 0);
-
- if (w9966_i2c_setscl(cam, 1) == -1)
+
+ if (!w9966_i2c_setscl(cam, 1))
return -1;
+
w9966_i2c_setsda(cam, 1);
-
+
return data;
}
-
// Write a register to the i2c device.
-// Expects claimed pdev. -1 on error
-static int w9966_wReg_i2c(struct w9966_dev* cam, int reg, int data)
+// Expects claimed pdev.
+// 1 on success, else 0
+static int w9966_i2c_wreg(struct w9966_dev* cam, int device, int reg, int data)
{
w9966_i2c_setsda(cam, 0);
w9966_i2c_setscl(cam, 0);
- if (
- w9966_i2c_wbyte(cam, W9966_I2C_W_ID) == -1 ||
- w9966_i2c_wbyte(cam, reg) == -1 ||
- w9966_i2c_wbyte(cam, data) == -1
- )
- return -1;
+ if (!w9966_i2c_wbyte(cam, device << 1) ||
+ !w9966_i2c_wbyte(cam, reg) ||
+ !w9966_i2c_wbyte(cam, data))
+ return 0;
w9966_i2c_setsda(cam, 0);
- if (w9966_i2c_setscl(cam, 1) == -1)
- return -1;
-
+ if (!w9966_i2c_setscl(cam, 1))
+ return 0;
+
w9966_i2c_setsda(cam, 1);
- return 0;
+ return 1;
}
/*
- * Video4linux interfacing
+ * Video4linux interface
*/
static int w9966_v4l_open(struct video_device *vdev, int flags)
{
struct w9966_dev *cam = (struct w9966_dev*)vdev->priv;
- cam->buffer = (u8*)kmalloc(W9966_RBUFFER, GFP_KERNEL);
-
- if (cam->buffer == NULL)
+
+ // Claim parport
+ if (!w9966_pdev_claim(cam)) {
+ DPRINTF("Unable to claim parport");
return -EFAULT;
+ }
+
+ // Allocate read buffer
+ cam->buffer = (u8*)kmalloc(W9966_RBUFFER, GFP_KERNEL);
+ if (cam->buffer == NULL) {
+ w9966_pdev_release(cam);
+ return -ENOMEM;
+ }
+ w9966_flag_set(cam, W9966_STATE_BUFFER);
return 0;
}
@@ -704,17 +859,22 @@
static void w9966_v4l_close(struct video_device *vdev)
{
struct w9966_dev *cam = (struct w9966_dev*)vdev->priv;
-
- if (cam->buffer != NULL) {
+
+ // Free read buffer
+ if (w9966_flag_test(cam, W9966_STATE_BUFFER)) {
kfree(cam->buffer);
- cam->buffer = NULL;
+ w9966_flag_clear(cam, W9966_STATE_BUFFER);
}
+
+ // release parport
+ w9966_pdev_release(cam);
}
+// expects a claimed parport
static int w9966_v4l_ioctl(struct video_device *vdev, unsigned int cmd, void *arg)
{
struct w9966_dev *cam = (struct w9966_dev*)vdev->priv;
-
+
switch(cmd)
{
case VIDIOCGCAP:
@@ -723,9 +883,10 @@
W9966_DRIVERNAME, // name
VID_TYPE_CAPTURE | VID_TYPE_SCALES, // type
1, 0, // vid, aud channels
- W9966_WND_MAX_W, // max w
- W9966_WND_MAX_H, // max h
- 2, 1 // min w, min h
+ cam->max_x - cam->min_x,
+ cam->max_y - cam->min_y,
+ W9966_WND_MIN_W,
+ W9966_WND_MIN_H
};
if(copy_to_user(arg, &vcap, sizeof(vcap)) != 0)
@@ -747,10 +908,10 @@
vch.tuners = 0;
vch.type = VIDEO_TYPE_CAMERA;
vch.norm = 0; // ???
-
+
if(copy_to_user(arg, &vch, sizeof(vch)) != 0)
return -EFAULT;
-
+
return 0;
}
case VIDIOCSCHAN:
@@ -758,10 +919,10 @@
struct video_channel vch;
if(copy_from_user(&vch, arg, sizeof(vch) ) != 0)
return -EFAULT;
-
+
if(vch.channel != 0)
return -EINVAL;
-
+
return 0;
}
case VIDIOCGTUNER:
@@ -769,20 +930,20 @@
struct video_tuner vtune;
if(copy_from_user(&vtune, arg, sizeof(vtune)) != 0)
return -EFAULT;
-
+
if(vtune.tuner != 0);
return -EINVAL;
-
+
strcpy(vtune.name, "no tuner");
vtune.rangelow = 0;
vtune.rangehigh = 0;
vtune.flags = VIDEO_TUNER_NORM;
vtune.mode = VIDEO_MODE_AUTO;
vtune.signal = 0xffff;
-
+
if(copy_to_user(arg, &vtune, sizeof(vtune)) != 0)
return -EFAULT;
-
+
return 0;
}
case VIDIOCSTUNER:
@@ -790,13 +951,13 @@
struct video_tuner vtune;
if (copy_from_user(&vtune, arg, sizeof(vtune)) != 0)
return -EFAULT;
-
+
if (vtune.tuner != 0)
return -EINVAL;
-
+
if (vtune.mode != VIDEO_MODE_AUTO)
return -EINVAL;
-
+
return 0;
}
case VIDIOCGPICT:
@@ -820,73 +981,58 @@
struct video_picture vpic;
if(copy_from_user(&vpic, arg, sizeof(vpic)) != 0)
return -EFAULT;
-
+
if (vpic.depth != 16 || vpic.palette != VIDEO_PALETTE_YUV422)
return -EINVAL;
-
+
cam->brightness = vpic.brightness >> 8;
cam->hue = (vpic.hue >> 8) - 128;
cam->color = vpic.colour >> 9;
cam->contrast = vpic.contrast >> 9;
- w9966_pdev_claim(cam);
-
- if (
- w9966_wReg_i2c(cam, 0x0a, cam->brightness) == -1 ||
- w9966_wReg_i2c(cam, 0x0b, cam->contrast) == -1 ||
- w9966_wReg_i2c(cam, 0x0c, cam->color) == -1 ||
- w9966_wReg_i2c(cam, 0x0d, cam->hue) == -1
- ) {
- w9966_pdev_release(cam);
+ if (!cam->image(cam))
return -EFAULT;
- }
-
- w9966_pdev_release(cam);
+
return 0;
}
case VIDIOCSWIN:
{
- int ret;
struct video_window vwin;
-
+
if (copy_from_user(&vwin, arg, sizeof(vwin)) != 0)
- return -EFAULT;
- if (vwin.flags != 0)
- return -EINVAL;
- if (vwin.clipcount != 0)
+ return -EFAULT;
+ if (
+ vwin.flags != 0 ||
+ vwin.clipcount != 0)
return -EINVAL;
- if (vwin.width < 2 || vwin.width > W9966_WND_MAX_W)
- return -EINVAL;
- if (vwin.height < 1 || vwin.height > W9966_WND_MAX_H)
+
+ if (vwin.width > cam->max_x - cam->min_x ||
+ vwin.height > cam->max_y - cam->min_y ||
+ vwin.width < W9966_WND_MIN_W ||
+ vwin.height < W9966_WND_MIN_H)
return -EINVAL;
// Update camera regs
- w9966_pdev_claim(cam);
- ret = w9966_setup(cam, 0, 0, 1023, 1023, vwin.width, vwin.height);
- w9966_pdev_release(cam);
-
- if (ret != 0) {
- DPRINTF("VIDIOCSWIN: w9966_setup() failed.\n");
+ if (!w9966_window(cam, 0, 0, 1023, 1023, vwin.width, vwin.height))
return -EFAULT;
- }
-
+
return 0;
}
case VIDIOCGWIN:
{
struct video_window vwin;
memset(&vwin, 0, sizeof(vwin));
-
+
vwin.width = cam->width;
vwin.height = cam->height;
-
+
if(copy_to_user(arg, &vwin, sizeof(vwin)) != 0)
return -EFAULT;
-
+
return 0;
}
// Unimplemented
- case VIDIOCCAPTURE:
+ case VIDIOCCAPTURE:
case VIDIOCGFBUF:
case VIDIOCSFBUF:
case VIDIOCKEY:
@@ -902,69 +1048,62 @@
}
// Capture data
+// expects a claimed parport and allocated read buffer
static long w9966_v4l_read(struct video_device *vdev, char *buf, unsigned long count, int noblock)
{
struct w9966_dev *cam = (struct w9966_dev *)vdev->priv;
- unsigned char addr = 0xa0; // ECP, read, CCD-transfer, 00000
- unsigned char* dest = (unsigned char*)buf;
+ const u8 addr = 0xa0; // ECP, read, CCD-transfer, 00000
+ u8* dest = (u8*)buf;
unsigned long dleft = count;
-
+
// Why would anyone want more than this??
if (count > cam->width * cam->height * 2)
- return -EINVAL;
-
- w9966_pdev_claim(cam);
- w9966_wReg(cam, 0x00, 0x02); // Reset ECP-FIFO buffer
- w9966_wReg(cam, 0x00, 0x00); // Return to normal operation
- w9966_wReg(cam, 0x01, 0x98); // Enable capture
-
- // write special capture-addr and negotiate into data transfer
- if (
- (parport_negotiate(cam->pport, cam->ppmode|IEEE1284_ADDR) != 0 )||
- (parport_write(cam->pport, &addr, 1) != 1 )||
- (parport_negotiate(cam->pport, cam->ppmode|IEEE1284_DATA) != 0 )
- ) {
- w9966_pdev_release(cam);
+ count = cam->width * cam->height * 2;
+
+ w9966_wreg(cam, 0x00, 0x02); // Reset ECP-FIFO buffer
+ w9966_wreg(cam, 0x00, 0x00); // Return to normal operation
+ w9966_wreg(cam, 0x01, cam->cmask | 0x80); // Enable capture
+
+ // write special capture-addr and negotiate into data transfer
+ if (parport_negotiate(cam->pport, cam->ppmode|IEEE1284_ADDR) != 0 ||
+ parport_write(cam->pport, &addr, 1) != 1 ||
+ parport_negotiate(cam->pport, cam->ppmode|IEEE1284_DATA) != 0) {
+ DPRINTF("Unable to write capture-addr.\n");
return -EFAULT;
}
-
+
while(dleft > 0)
{
- unsigned long tsize = (dleft > W9966_RBUFFER) ? W9966_RBUFFER : dleft;
-
- if (parport_read(cam->pport, cam->buffer, tsize) < tsize) {
- w9966_pdev_release(cam);
+ const size_t tsize = (dleft > W9966_RBUFFER) ? W9966_RBUFFER : dleft;
+
+ if (parport_read(cam->pport, cam->buffer, tsize) < tsize)
return -EFAULT;
- }
- if (copy_to_user(dest, cam->buffer, tsize) != 0) {
- w9966_pdev_release(cam);
+
+ if (copy_to_user(dest, cam->buffer, tsize) != 0)
return -EFAULT;
- }
+
dest += tsize;
dleft -= tsize;
}
-
- w9966_wReg(cam, 0x01, 0x18); // Disable capture
- w9966_pdev_release(cam);
+
+ w9966_wreg(cam, 0x01, cam->cmask); // Disable capture
return count;
}
-
// Called once for every parport on init
static void w9966_attach(struct parport *port)
{
int i;
-
- for (i = 0; i < W9966_MAXCAMS; i++)
- {
- if (strcmp(pardev[i], "none") == 0) // Skip if 'none'
- continue;
- if (w9966_cams[i].dev_state != 0) // Cam is already assigned
+
+ for (i = 0; i < W9966_MAXCAMS; i++) {
+ if (strcmp(pardev[i], "none") == 0 || // Skip if 'none' or if
+ w9966_cams[i].dev_state != 0) // cam already assigned
continue;
+
if (strcmp(pardev[i], "auto") == 0 ||
strcmp(pardev[i], port->name) == 0) {
- if (w9966_init(&w9966_cams[i], port) != 0)
+ if (!w9966_init(&w9966_cams[i], port, video_nr[i]))
w9966_term(&w9966_cams[i]);
break; // return
}
@@ -991,16 +1130,33 @@
// Module entry point
static int __init w9966_mod_init(void)
{
- int i;
+ int i, err;
+
+ w9966_cams = kmalloc(
+ sizeof(struct w9966_dev) * W9966_MAXCAMS, GFP_KERNEL);
+
+ if (!w9966_cams)
+ return -ENOMEM;
+
for (i = 0; i < W9966_MAXCAMS; i++)
w9966_cams[i].dev_state = 0;
- return parport_register_driver(&w9966_ppd);
+ // Register parport driver
+ if ((err = parport_register_driver(&w9966_ppd)) != 0) {
+ kfree(w9966_cams);
+ w9966_cams = 0;
+ return err;
+ }
+
+ return 0;
}
// Module cleanup
static void __exit w9966_mod_term(void)
{
+ if (w9966_cams)
+ kfree(w9966_cams);
+
parport_unregister_driver(&w9966_ppd);
}
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)