aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2009-05-25 14:26:59 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-06-16 17:21:15 -0400
commit9035f2e27a99a7ea702973ab4fd47c0dd94a8c6e (patch)
treec8c1b670993f4e66d266388006795f2cbfc8b6e4 /drivers
parentd0848eb2864c0f1ef52d586cd33c68a103b0a2ac (diff)
V4L/DVB (11872): gspca - spca561: Rename the 'White Balance' control to 'Hue'.
Binary files /home/v4l/tokernel/oldtree/Documentation/video4linux/v4lgrab.o and /home/v4l/tokernel/linux/Documentation/video4linux/v4lgrab.o differ Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Jean-Francois Moine <moinejf@free.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/video/gspca/spca561.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/drivers/media/video/gspca/spca561.c b/drivers/media/video/gspca/spca561.c
index 6648ce7e96ef..27e82b35f3e7 100644
--- a/drivers/media/video/gspca/spca561.c
+++ b/drivers/media/video/gspca/spca561.c
@@ -48,9 +48,9 @@ struct sd {
48#define BRIGHTNESS_MAX 0x3f 48#define BRIGHTNESS_MAX 0x3f
49 49
50 __u8 white; 50 __u8 white;
51#define WHITE_MIN 1 51#define HUE_MIN 1
52#define WHITE_DEF 0x40 52#define HUE_DEF 0x40
53#define WHITE_MAX 0x7f 53#define HUE_MAX 0x7f
54 54
55 __u8 autogain; 55 __u8 autogain;
56#define AUTOGAIN_MIN 0 56#define AUTOGAIN_MIN 0
@@ -461,7 +461,7 @@ static int sd_config(struct gspca_dev *gspca_dev,
461 } 461 }
462 sd->brightness = BRIGHTNESS_DEF; 462 sd->brightness = BRIGHTNESS_DEF;
463 sd->contrast = CONTRAST_DEF; 463 sd->contrast = CONTRAST_DEF;
464 sd->white = WHITE_DEF; 464 sd->white = HUE_DEF;
465 sd->exposure = EXPOSURE_DEF; 465 sd->exposure = EXPOSURE_DEF;
466 sd->autogain = AUTOGAIN_DEF; 466 sd->autogain = AUTOGAIN_DEF;
467 sd->gain = GAIN_DEF; 467 sd->gain = GAIN_DEF;
@@ -929,13 +929,13 @@ static int sd_getgain(struct gspca_dev *gspca_dev, __s32 *val)
929static struct ctrl sd_ctrls_12a[] = { 929static struct ctrl sd_ctrls_12a[] = {
930 { 930 {
931 { 931 {
932 .id = V4L2_CID_DO_WHITE_BALANCE, 932 .id = V4L2_CID_HUE,
933 .type = V4L2_CTRL_TYPE_INTEGER, 933 .type = V4L2_CTRL_TYPE_INTEGER,
934 .name = "White Balance", 934 .name = "Hue",
935 .minimum = WHITE_MIN, 935 .minimum = HUE_MIN,
936 .maximum = WHITE_MAX, 936 .maximum = HUE_MAX,
937 .step = 1, 937 .step = 1,
938 .default_value = WHITE_DEF, 938 .default_value = HUE_DEF,
939 }, 939 },
940 .set = sd_setwhite, 940 .set = sd_setwhite,
941 .get = sd_getwhite, 941 .get = sd_getwhite,
@@ -971,13 +971,13 @@ static struct ctrl sd_ctrls_12a[] = {
971static struct ctrl sd_ctrls_72a[] = { 971static struct ctrl sd_ctrls_72a[] = {
972 { 972 {
973 { 973 {
974 .id = V4L2_CID_DO_WHITE_BALANCE, 974 .id = V4L2_CID_HUE,
975 .type = V4L2_CTRL_TYPE_INTEGER, 975 .type = V4L2_CTRL_TYPE_INTEGER,
976 .name = "White Balance", 976 .name = "Hue",
977 .minimum = WHITE_MIN, 977 .minimum = HUE_MIN,
978 .maximum = WHITE_MAX, 978 .maximum = HUE_MAX,
979 .step = 1, 979 .step = 1,
980 .default_value = WHITE_DEF, 980 .default_value = HUE_DEF,
981 }, 981 },
982 .set = sd_setwhite, 982 .set = sd_setwhite,
983 .get = sd_getwhite, 983 .get = sd_getwhite,