V4L/DVB (11525): gspca - m5602-mt9m111: Add blue balance ctrl (74b123cf) · Commits · 戴 / test

drivers/media/video/gspca/m5602/m5602_mt9m111.c

+47 −1

Original line number	Diff line number	Diff line
		@@ -30,6 +30,8 @@ static int mt9m111_get_auto_white_balance(struct gspca_dev *gspca_dev,
		__s32 *val);
		static int mt9m111_get_green_balance(struct gspca_dev gspca_dev, __s32 val);
		static int mt9m111_set_green_balance(struct gspca_dev *gspca_dev, __s32 val);
		static int mt9m111_get_blue_balance(struct gspca_dev gspca_dev, __s32 val);
		static int mt9m111_set_blue_balance(struct gspca_dev *gspca_dev, __s32 val);

		static struct v4l2_pix_format mt9m111_modes[] = {
		{
		@@ -117,7 +119,21 @@ const static struct ctrl mt9m111_ctrls[] = {
		.set = mt9m111_set_green_balance,
		.get = mt9m111_get_green_balance
		},

		#define BLUE_BALANCE_IDX 5
		{
		{
		.id = V4L2_CID_BLUE_BALANCE,
		.type = V4L2_CTRL_TYPE_INTEGER,
		.name = "blue balance",
		.minimum = 0x00,
		.maximum = 0x7ff,
		.step = 0x1,
		.default_value = MT9M111_BLUE_GAIN_DEFAULT,
		.flags = V4L2_CTRL_FLAG_SLIDER
		},
		.set = mt9m111_set_blue_balance,
		.get = mt9m111_get_blue_balance
		},
		};

		static void mt9m111_dump_registers(struct sd *sd);
		@@ -219,6 +235,11 @@ int mt9m111_init(struct sd *sd)
		if (err < 0)
		return err;

		err = mt9m111_set_blue_balance(&sd->gspca_dev,
		sensor_settings[BLUE_BALANCE_IDX]);
		if (err < 0)
		return err;

		return mt9m111_set_gain(&sd->gspca_dev, sensor_settings[GAIN_IDX]);
		}

		@@ -415,6 +436,31 @@ static int mt9m111_get_green_balance(struct gspca_dev gspca_dev, __s32 val)
		return 0;
		}

		static int mt9m111_set_blue_balance(struct gspca_dev *gspca_dev, __s32 val)
		{
		u8 data[2];
		struct sd sd = (struct sd ) gspca_dev;
		s32 *sensor_settings = sd->sensor_priv;

		sensor_settings[BLUE_BALANCE_IDX] = val;
		data[0] = (val & 0xff);
		data[1] = (val & 0xff00) >> 8;

		PDEBUG(D_V4L2, "Set blue balance %d", val);

		return m5602_write_sensor(sd, MT9M111_SC_BLUE_GAIN,
		data, 2);
		}

		static int mt9m111_get_blue_balance(struct gspca_dev gspca_dev, __s32 val)
		{
		struct sd sd = (struct sd ) gspca_dev;
		s32 *sensor_settings = sd->sensor_priv;

		*val = sensor_settings[BLUE_BALANCE_IDX];
		PDEBUG(D_V4L2, "Read blue balance %d", *val);
		return 0;
		}

		static void mt9m111_dump_registers(struct sd *sd)
		{

drivers/media/video/gspca/m5602/m5602_mt9m111.h

+5 −2

Original line number	Diff line number	Diff line
		@@ -94,6 +94,7 @@
		#define INITIAL_MAX_GAIN 64
		#define DEFAULT_GAIN 283
		#define MT9M111_GREEN_GAIN_DEFAULT 0x20
		#define MT9M111_BLUE_GAIN_DEFAULT 0x20

		/*****************************************************************************/

		@@ -183,8 +184,10 @@ static const unsigned char init_mt9m111[][4] =
		{SENSOR, MT9M111_CP_OPERATING_MODE_CTL, 0x00,
		MT9M111_CP_OPERATING_MODE_CTL},
		{SENSOR, MT9M111_CP_LENS_CORRECTION_1, 0x04, 0x2a},
		{SENSOR, MT9M111_CP_DEFECT_CORR_CONTEXT_A, 0x00, MT9M111_2D_DEFECT_CORRECTION_ENABLE},
		{SENSOR, MT9M111_CP_DEFECT_CORR_CONTEXT_B, 0x00, MT9M111_2D_DEFECT_CORRECTION_ENABLE},
		{SENSOR, MT9M111_CP_DEFECT_CORR_CONTEXT_A, 0x00,
		MT9M111_2D_DEFECT_CORRECTION_ENABLE},
		{SENSOR, MT9M111_CP_DEFECT_CORR_CONTEXT_B, 0x00,
		MT9M111_2D_DEFECT_CORRECTION_ENABLE},
		{SENSOR, MT9M111_CP_LUMA_OFFSET, 0x00, 0x00},
		{SENSOR, MT9M111_CP_LUMA_CLIP, 0xff, 0x00},
		{SENSOR, MT9M111_CP_OUTPUT_FORMAT_CTL2_CONTEXT_A, 0x14, 0x00},

Admin message