From 4af0acd985fa62cb4c5fdf0b3b7561101d92c708 Mon Sep 17 00:00:00 2001 From: Thierry MERLE Date: Wed, 9 Jan 2008 17:34:53 -0300 Subject: [PATCH] --- yaml --- r: 76719 b: refs/heads/master c: c6243d9c3de82e46467c88898db45ca14b6843a0 h: refs/heads/master i: 76717: 27587c12d62ec27bde3f0ad82265202ea4595d5b 76715: 14fa55cd4aaf83e2c60d0713237cd01eba57d6f8 76711: 5d49d1d4c748610819818eaf3b4b0c169079b970 76703: 4a40dbd42e3d827aa3d32bf0d114e1ee5e21f2b2 v: v3 --- [refs] | 2 +- .../media/video/usbvision/usbvision-core.c | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 33fe9937a56a..d43837709182 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: eeec4b3853a8af0cd2b42af24b9e8fd0e0ef1f8a +refs/heads/master: c6243d9c3de82e46467c88898db45ca14b6843a0 diff --git a/trunk/drivers/media/video/usbvision/usbvision-core.c b/trunk/drivers/media/video/usbvision/usbvision-core.c index 9e404b87d000..1e52a0387aa5 100644 --- a/trunk/drivers/media/video/usbvision/usbvision-core.c +++ b/trunk/drivers/media/video/usbvision/usbvision-core.c @@ -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 */ @@ -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,