commit f02ad804e4d9b4efb86138b5c795808d5f57d2c7
parent 3d2f3cb7db6e88db34f0ea5ce24537e3c9390bea
Author: alex <alex@022568fa-442e-4ef8-a3e8-54dcafdb011a>
Date: Fri, 18 Jan 2008 23:15:00 +0000
* Enable VFlip by default on for 1837 devices - camera is installedvwrong way around?
git-svn-id: http://svn.mediati.org/svn/r5u870/trunk@48 022568fa-442e-4ef8-a3e8-54dcafdb011a
Diffstat:
| M | r5u870.c | | | 37 | ++++++++++++++++++++++++++++++++++++- |
1 file changed, 36 insertions(+), 1 deletion(-)
diff --git a/r5u870.c b/r5u870.c
@@ -847,6 +847,7 @@ enum {
R5U870_WDM_CTRL_GAIN,
R5U870_WDM_CTRL_POWERLINE,
R5U870_WDM_CTRL_VFLIP,
+ R5U870_WDM_CTRL_VFLIP_DEFAULTON,
R5U870_WDM_CTRL_HFLIP,
R5U870_WDM_CTRL_PRIVACY,
R5U870_WDM_CTRL_NIGHTMODE,
@@ -1134,6 +1135,19 @@ static struct r5u870_ctrl r5u870_wdm_ctrls[] = {
.set_fn = r5u870_set_ctrl_wdm },
.reg = R5U870_REG_VFLIP_EX,
},
+ [R5U870_WDM_CTRL_VFLIP_DEFAULTON] = {
+ .base = { .uc_v4l = { .id = V4L2_CID_VFLIP,
+ .type = V4L2_CTRL_TYPE_BOOLEAN,
+ .name = "V-Flip",
+ .minimum = 0,
+ .maximum = 1,
+ .step = 1,
+ .default_value = 1,
+ .flags = 0 },
+ .get_fn = r5u870_get_ctrl,
+ .set_fn = r5u870_set_ctrl_wdm },
+ .reg = R5U870_REG_VFLIP_EX,
+ },
[R5U870_WDM_CTRL_HFLIP] = {
.base = { .uc_v4l = { .id = V4L2_CID_HFLIP,
.type = V4L2_CTRL_TYPE_BOOLEAN,
@@ -2643,6 +2657,20 @@ static const int r5u870_1810_1836_ctrls[] = {
R5U870_WDM_CTRL_NIGHTMODE,
R5U870_WDM_CTRL_LAST,
};
+static const int r5u870_1810_1837_ctrls[] = {
+ R5U870_WDM_CTRL_WB_AUTO,
+ R5U870_WDM_CTRL_WB_RED,
+ R5U870_WDM_CTRL_WB_BLUE,
+ R5U870_WDM_CTRL_AUTO_EXPOSURE,
+ R5U870_WDM_CTRL_EXPOSURE,
+ R5U870_WDM_CTRL_AUTO_GAIN,
+ R5U870_WDM_CTRL_GAIN,
+ R5U870_WDM_CTRL_VFLIP_DEFAULTON,
+ R5U870_WDM_CTRL_HFLIP,
+ R5U870_WDM_CTRL_PRIVACY,
+ R5U870_WDM_CTRL_NIGHTMODE,
+ R5U870_WDM_CTRL_LAST,
+};
static const int r5u870_1810_183a_ctrls[] = {
R5U870_WDM_CTRL_WB_RED,
R5U870_WDM_CTRL_WB_GREEN,
@@ -2799,6 +2827,13 @@ static const struct r5u870_model r5u870_models[] = {
.rm_wdm_ctrlids = r5u870_1810_1836_ctrls,
.rm_uvc = 1,
},
+ [R5U870_DI_VGP_VCC4_VFLIP] = {
+ .rm_name = "Sony VGP-VCC4",
+ .rm_ucode_file = "r5u870_1836.fw",
+ .rm_ucode_version = 0x0115,
+ .rm_wdm_ctrlids = r5u870_1810_1837_ctrls,
+ .rm_uvc = 1,
+ },
[R5U870_DI_VGP_VCC6] = {
.rm_name = "Sony VGP-VCC6",
.rm_ucode_file = "r5u870_1839.fw",
@@ -2926,7 +2961,7 @@ static const struct usb_device_id id_table[] = {
{ R5U870_DEVICE_UVC(0x05CA, 0x1810, R5U870_DI_HP_PAVWC_UVC) },
{ R5U870_DEVICE_UVC(0x05CA, 0x1835, R5U870_DI_VGP_VCC5) },
{ R5U870_DEVICE_UVC(0x05CA, 0x1836, R5U870_DI_VGP_VCC4) },
- { R5U870_DEVICE_UVC(0x05CA, 0x1837, R5U870_DI_VGP_VCC4) },
+ { R5U870_DEVICE_UVC(0x05CA, 0x1837, R5U870_DI_VGP_VCC4_VFLIP) },
/* 0x1838 does not appear to have ever been released */
{ R5U870_DEVICE_UVC(0x05CA, 0x1839, R5U870_DI_VGP_VCC6) },
{ R5U870_DEVICE_UVC(0x05CA, 0x183a, R5U870_DI_VGP_VCC7) },
