Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 19231
b: refs/heads/master
c: 532a3de
h: refs/heads/master
i:
  19229: c166a6e
  19227: cc69ac4
  19223: 187e491
  19215: f992de3
  19199: bca27f5
v: v3
  • Loading branch information
Adrian Bunk authored and Greg Kroah-Hartman committed Feb 1, 2006
1 parent 38528ab commit 8536c2b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 195 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 7f2c01ab8ad50c74d174acdd814ddb53383bee93
refs/heads/master: 532a3de17038ea3bf75814778a6c4a25d01eab74
196 changes: 2 additions & 194 deletions trunk/drivers/usb/media/ov511.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -204,22 +204,10 @@ MODULE_LICENSE("GPL");

static struct usb_driver ov511_driver;

static struct ov51x_decomp_ops *ov511_decomp_ops;
static struct ov51x_decomp_ops *ov511_mmx_decomp_ops;
static struct ov51x_decomp_ops *ov518_decomp_ops;
static struct ov51x_decomp_ops *ov518_mmx_decomp_ops;

/* Number of times to retry a failed I2C transaction. Increase this if you
* are getting "Failed to read sensor ID..." */
static const int i2c_detect_tries = 5;

/* MMX support is present in kernel and CPU. Checked upon decomp module load. */
#if defined(__i386__) || defined(__x86_64__)
#define ov51x_mmx_available (cpu_has_mmx)
#else
#define ov51x_mmx_available (0)
#endif

static struct usb_device_id device_table [] = {
{ USB_DEVICE(VEND_OMNIVISION, PROD_OV511) },
{ USB_DEVICE(VEND_OMNIVISION, PROD_OV511PLUS) },
Expand Down Expand Up @@ -3012,93 +3000,18 @@ yuv420raw_to_yuv420p(struct ov511_frame *frame,
*
**********************************************************************/

/* Chooses a decompression module, locks it, and sets ov->decomp_ops
* accordingly. Returns -ENXIO if decompressor is not available, otherwise
* returns 0 if no other error.
*/
static int
request_decompressor(struct usb_ov511 *ov)
{
if (!ov)
return -ENODEV;

if (ov->decomp_ops) {
err("ERROR: Decompressor already requested!");
return -EINVAL;
}

lock_kernel();

/* Try to get MMX, and fall back on no-MMX if necessary */
if (ov->bclass == BCL_OV511) {
if (ov511_mmx_decomp_ops) {
PDEBUG(3, "Using OV511 MMX decompressor");
ov->decomp_ops = ov511_mmx_decomp_ops;
} else if (ov511_decomp_ops) {
PDEBUG(3, "Using OV511 decompressor");
ov->decomp_ops = ov511_decomp_ops;
} else {
err("No decompressor available");
}
} else if (ov->bclass == BCL_OV518) {
if (ov518_mmx_decomp_ops) {
PDEBUG(3, "Using OV518 MMX decompressor");
ov->decomp_ops = ov518_mmx_decomp_ops;
} else if (ov518_decomp_ops) {
PDEBUG(3, "Using OV518 decompressor");
ov->decomp_ops = ov518_decomp_ops;
} else {
err("No decompressor available");
}
if (ov->bclass == BCL_OV511 || ov->bclass == BCL_OV518) {
err("No decompressor available");
} else {
err("Unknown bridge");
}

if (!ov->decomp_ops)
goto nosys;

if (!ov->decomp_ops->owner) {
ov->decomp_ops = NULL;
goto nosys;
}

if (!try_module_get(ov->decomp_ops->owner))
goto nosys;

unlock_kernel();
return 0;

nosys:
unlock_kernel();
return -ENOSYS;
}

/* Unlocks decompression module and nulls ov->decomp_ops. Safe to call even
* if ov->decomp_ops is NULL.
*/
static void
release_decompressor(struct usb_ov511 *ov)
{
int released = 0; /* Did we actually do anything? */

if (!ov)
return;

lock_kernel();

if (ov->decomp_ops) {
module_put(ov->decomp_ops->owner);
released = 1;
}

ov->decomp_ops = NULL;

unlock_kernel();

if (released)
PDEBUG(3, "Decompressor released");
}

static void
decompress(struct usb_ov511 *ov, struct ov511_frame *frame,
unsigned char *pIn0, unsigned char *pOut0)
Expand All @@ -3107,31 +3020,6 @@ decompress(struct usb_ov511 *ov, struct ov511_frame *frame,
if (request_decompressor(ov))
return;

PDEBUG(4, "Decompressing %d bytes", frame->bytes_recvd);

if (frame->format == VIDEO_PALETTE_GREY
&& ov->decomp_ops->decomp_400) {
int ret = ov->decomp_ops->decomp_400(
pIn0,
pOut0,
frame->compbuf,
frame->rawwidth,
frame->rawheight,
frame->bytes_recvd);
PDEBUG(4, "DEBUG: decomp_400 returned %d", ret);
} else if (frame->format != VIDEO_PALETTE_GREY
&& ov->decomp_ops->decomp_420) {
int ret = ov->decomp_ops->decomp_420(
pIn0,
pOut0,
frame->compbuf,
frame->rawwidth,
frame->rawheight,
frame->bytes_recvd);
PDEBUG(4, "DEBUG: decomp_420 returned %d", ret);
} else {
err("Decompressor does not support this format");
}
}

/**********************************************************************
Expand Down Expand Up @@ -4087,8 +3975,6 @@ ov51x_v4l1_close(struct inode *inode, struct file *file)
ov->user--;
ov51x_stop_isoc(ov);

release_decompressor(ov);

if (ov->led_policy == LED_AUTO)
ov51x_led_control(ov, 0);

Expand Down Expand Up @@ -6021,82 +5907,6 @@ static struct usb_driver ov511_driver = {
*
***************************************************************************/

/* Returns 0 for success */
int
ov511_register_decomp_module(int ver, struct ov51x_decomp_ops *ops, int ov518,
int mmx)
{
if (ver != DECOMP_INTERFACE_VER) {
err("Decompression module has incompatible");
err("interface version %d", ver);
err("Interface version %d is required", DECOMP_INTERFACE_VER);
return -EINVAL;
}

if (!ops)
return -EFAULT;

if (mmx && !ov51x_mmx_available) {
err("MMX not available on this system or kernel");
return -EINVAL;
}

lock_kernel();

if (ov518) {
if (mmx) {
if (ov518_mmx_decomp_ops)
goto err_in_use;
else
ov518_mmx_decomp_ops = ops;
} else {
if (ov518_decomp_ops)
goto err_in_use;
else
ov518_decomp_ops = ops;
}
} else {
if (mmx) {
if (ov511_mmx_decomp_ops)
goto err_in_use;
else
ov511_mmx_decomp_ops = ops;
} else {
if (ov511_decomp_ops)
goto err_in_use;
else
ov511_decomp_ops = ops;
}
}

unlock_kernel();
return 0;

err_in_use:
unlock_kernel();
return -EBUSY;
}

void
ov511_deregister_decomp_module(int ov518, int mmx)
{
lock_kernel();

if (ov518) {
if (mmx)
ov518_mmx_decomp_ops = NULL;
else
ov518_decomp_ops = NULL;
} else {
if (mmx)
ov511_mmx_decomp_ops = NULL;
else
ov511_decomp_ops = NULL;
}

unlock_kernel();
}

static int __init
usb_ov511_init(void)
{
Expand All @@ -6123,5 +5933,3 @@ usb_ov511_exit(void)
module_init(usb_ov511_init);
module_exit(usb_ov511_exit);

EXPORT_SYMBOL(ov511_register_decomp_module);
EXPORT_SYMBOL(ov511_deregister_decomp_module);

0 comments on commit 8536c2b

Please sign in to comment.