Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 76719
b: refs/heads/master
c: c6243d9
h: refs/heads/master
i:
  76717: 27587c1
  76715: 14fa55c
  76711: 5d49d1d
  76703: 4a40dbd
v: v3
  • Loading branch information
Thierry MERLE authored and Mauro Carvalho Chehab committed Jan 25, 2008
1 parent d20b202 commit 4af0acd
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: eeec4b3853a8af0cd2b42af24b9e8fd0e0ef1f8a
refs/heads/master: c6243d9c3de82e46467c88898db45ca14b6843a0
19 changes: 19 additions & 0 deletions trunk/drivers/media/video/usbvision/usbvision-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,15 @@ static int SwitchSVideoInput = 0; // To help people with Black and White outpu
module_param(SwitchSVideoInput, int, 0444);
MODULE_PARM_DESC(SwitchSVideoInput, " Set the S-Video input. Some cables and input device are wired differently. Default: 0 (Off)");

static unsigned int adjust_X_Offset = -1;
module_param(adjust_X_Offset, int, 0644);
MODULE_PARM_DESC(adjust_X_Offset, "adjust X offset display [core]");

static unsigned int adjust_Y_Offset = -1;
module_param(adjust_Y_Offset, int, 0644);
MODULE_PARM_DESC(adjust_Y_Offset, "adjust Y offset display [core]");


#define ENABLE_HEXDUMP 0 /* Enable if you need it */


Expand Down Expand Up @@ -2097,11 +2106,21 @@ int usbvision_set_input(struct usb_usbvision *usbvision)
value[5]=(usbvision_device_data[usbvision->DevModel].X_Offset & 0x0300) >> 8;
}

if (adjust_X_Offset != -1) {
value[4] = adjust_X_Offset & 0xff;
value[5] = (adjust_X_Offset & 0x0300) >> 8;
}

if (usbvision_device_data[usbvision->DevModel].Y_Offset >= 0) {
value[6]=usbvision_device_data[usbvision->DevModel].Y_Offset & 0xff;
value[7]=(usbvision_device_data[usbvision->DevModel].Y_Offset & 0x0300) >> 8;
}

if (adjust_Y_Offset != -1) {
value[6] = adjust_Y_Offset & 0xff;
value[7] = (adjust_Y_Offset & 0x0300) >> 8;
}

rc = usb_control_msg(usbvision->dev, usb_sndctrlpipe(usbvision->dev, 1),
USBVISION_OP_CODE, /* USBVISION specific code */
USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_ENDPOINT, 0,
Expand Down

0 comments on commit 4af0acd

Please sign in to comment.