The image quality default values will be used in at least two different places
and by using #defines we make sure that they are always consistent.

Signed-off-by: Frank Schäfer <fschaefer....@googlemail.com>
---
 drivers/media/usb/em28xx/em28xx-core.c |   12 ++++++------
 drivers/media/usb/em28xx/em28xx-reg.h  |   23 +++++++++++++++++------
 2 Dateien geändert, 23 Zeilen hinzugefügt(+), 12 Zeilen entfernt(-)

diff --git a/drivers/media/usb/em28xx/em28xx-core.c 
b/drivers/media/usb/em28xx/em28xx-core.c
index 26d2499..b2dcb3d 100644
--- a/drivers/media/usb/em28xx/em28xx-core.c
+++ b/drivers/media/usb/em28xx/em28xx-core.c
@@ -607,12 +607,12 @@ EXPORT_SYMBOL_GPL(em28xx_audio_setup);
 
 int em28xx_colorlevels_set_default(struct em28xx *dev)
 {
-       em28xx_write_reg(dev, EM28XX_R20_YGAIN, 0x10);  /* contrast */
-       em28xx_write_reg(dev, EM28XX_R21_YOFFSET, 0x00);        /* brightness */
-       em28xx_write_reg(dev, EM28XX_R22_UVGAIN, 0x10); /* saturation */
-       em28xx_write_reg(dev, EM28XX_R23_UOFFSET, 0x00);
-       em28xx_write_reg(dev, EM28XX_R24_VOFFSET, 0x00);
-       em28xx_write_reg(dev, EM28XX_R25_SHARPNESS, 0x00);
+       em28xx_write_reg(dev, EM28XX_R20_YGAIN, CONTRAST_DEFAULT);
+       em28xx_write_reg(dev, EM28XX_R21_YOFFSET, BRIGHTNESS_DEFAULT);
+       em28xx_write_reg(dev, EM28XX_R22_UVGAIN, SATURATION_DEFAULT);
+       em28xx_write_reg(dev, EM28XX_R23_UOFFSET, BLUE_BALANCE_DEFAULT);
+       em28xx_write_reg(dev, EM28XX_R24_VOFFSET, RED_BALANCE_DEFAULT);
+       em28xx_write_reg(dev, EM28XX_R25_SHARPNESS, SHARPNESS_DEFAULT);
 
        em28xx_write_reg(dev, EM28XX_R14_GAMMA, 0x20);
        em28xx_write_reg(dev, EM28XX_R15_RGAIN, 0x20);
diff --git a/drivers/media/usb/em28xx/em28xx-reg.h 
b/drivers/media/usb/em28xx/em28xx-reg.h
index 0a3cb04..1e369ba 100644
--- a/drivers/media/usb/em28xx/em28xx-reg.h
+++ b/drivers/media/usb/em28xx/em28xx-reg.h
@@ -120,12 +120,23 @@
 #define EM28XX_R1E_CWIDTH      0x1e
 #define EM28XX_R1F_CHEIGHT     0x1f
 
-#define EM28XX_R20_YGAIN       0x20
-#define EM28XX_R21_YOFFSET     0x21
-#define EM28XX_R22_UVGAIN      0x22
-#define EM28XX_R23_UOFFSET     0x23
-#define EM28XX_R24_VOFFSET     0x24
-#define EM28XX_R25_SHARPNESS   0x25
+#define EM28XX_R20_YGAIN       0x20 /* contrast [0:4]   */
+#define          CONTRAST_DEFAULT      0x10
+
+#define EM28XX_R21_YOFFSET     0x21 /* brightness       */     /* signed */
+#define   BRIGHTNESS_DEFAULT   0x00
+
+#define EM28XX_R22_UVGAIN      0x22 /* saturation [0:4] */
+#define   SATURATION_DEFAULT   0x10
+
+#define EM28XX_R23_UOFFSET     0x23 /* blue balance     */     /* signed */
+#define   BLUE_BALANCE_DEFAULT 0x00
+
+#define EM28XX_R24_VOFFSET     0x24 /* red balance      */     /* signed */
+#define   RED_BALANCE_DEFAULT  0x00
+
+#define EM28XX_R25_SHARPNESS   0x25 /* sharpness [0:4]  */
+#define   SHARPNESS_DEFAULT    0x00
 
 #define EM28XX_R26_COMPR       0x26
 #define EM28XX_R27_OUTFMT      0x27
-- 
1.7.10.4

--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to