Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 174051
b: refs/heads/master
c: 23a9827
h: refs/heads/master
i:
  174049: 9d1d691
  174047: da4c662
v: v3
  • Loading branch information
Jean-Francois Moine authored and Mauro Carvalho Chehab committed Dec 5, 2009
1 parent 1c12662 commit 9a60b27
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 141 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 1408b8472910e894b290205b4baed5b14b8f45af
refs/heads/master: 23a98274cc348880ecb6803307c254448084953a
174 changes: 34 additions & 140 deletions trunk/drivers/media/video/gspca/sonixj.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -464,6 +464,8 @@ static const u8 hv7131r_sensor_init[][8] = {
{0xa1, 0x11, 0x21, 0xd0, 0x00, 0x00, 0x00, 0x10},
{0xa1, 0x11, 0x22, 0x00, 0x00, 0x00, 0x00, 0x10},
{0xa1, 0x11, 0x23, 0x10, 0x00, 0x00, 0x00, 0x10},
{0xa1, 0x11, 0x01, 0x18, 0x00, 0x00, 0x00, 0x10},
/* set sensor clock */
{}
};
static const u8 mi0360_sensor_init[][8] = {
Expand Down Expand Up @@ -545,7 +547,7 @@ static const u8 mo4000_sensor_init[][8] = {
};
static const u8 mt9v111_sensor_init[][8] = {
{0xb1, 0x5c, 0x0d, 0x00, 0x01, 0x00, 0x00, 0x10}, /* reset? */
/* delay 20 ms */
{0xdd, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, /* delay 20ms */
{0xb1, 0x5c, 0x0d, 0x00, 0x00, 0x00, 0x00, 0x10},
{0xb1, 0x5c, 0x01, 0x00, 0x01, 0x00, 0x00, 0x10}, /* IFP select */
{0xb1, 0x5c, 0x08, 0x04, 0x80, 0x00, 0x00, 0x10}, /* output fmt ctrl */
Expand Down Expand Up @@ -622,10 +624,10 @@ static const u8 om6802_sensor_init[][8] = {
static const u8 ov7630_sensor_init[][8] = {
{0xa1, 0x21, 0x76, 0x01, 0x00, 0x00, 0x00, 0x10},
{0xa1, 0x21, 0x12, 0xc8, 0x00, 0x00, 0x00, 0x10},
/* win: delay 20ms */
{0xdd, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, /* delay 20ms */
{0xa1, 0x21, 0x12, 0x48, 0x00, 0x00, 0x00, 0x10},
{0xa1, 0x21, 0x12, 0xc8, 0x00, 0x00, 0x00, 0x10},
/* win: delay 20ms */
{0xdd, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, /* delay 20ms */
{0xa1, 0x21, 0x12, 0x48, 0x00, 0x00, 0x00, 0x10},
/* win: i2c_r from 00 to 80 */
{0xd1, 0x21, 0x03, 0x80, 0x10, 0x20, 0x80, 0x10},
Expand Down Expand Up @@ -677,6 +679,7 @@ static const u8 ov7630_sensor_init[][8] = {
static const u8 ov7648_sensor_init[][8] = {
{0xa1, 0x21, 0x76, 0x00, 0x00, 0x00, 0x00, 0x10},
{0xa1, 0x21, 0x12, 0x80, 0x00, 0x00, 0x00, 0x10}, /* reset */
{0xdd, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, /* delay 20ms */
{0xa1, 0x21, 0x12, 0x00, 0x00, 0x00, 0x00, 0x10},
{0xd1, 0x21, 0x03, 0xa4, 0x30, 0x88, 0x00, 0x10},
{0xb1, 0x21, 0x11, 0x80, 0x08, 0x00, 0x00, 0x10},
Expand Down Expand Up @@ -723,7 +726,7 @@ static const u8 ov7648_sensor_init[][8] = {

static const u8 ov7660_sensor_init[][8] = {
{0xa1, 0x21, 0x12, 0x80, 0x00, 0x00, 0x00, 0x10}, /* reset SCCB */
/* (delay 20ms) */
{0xdd, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, /* delay 20ms */
{0xa1, 0x21, 0x12, 0x05, 0x00, 0x00, 0x00, 0x10},
/* Outformat = rawRGB */
{0xa1, 0x21, 0x13, 0xb8, 0x00, 0x00, 0x00, 0x10}, /* init COM8 */
Expand Down Expand Up @@ -894,6 +897,18 @@ static const u8 sp80708_sensor_init[][8] = {
{}
};

static const u8 (*sensor_init[9])[8] = {
hv7131r_sensor_init, /* HV7131R 0 */
mi0360_sensor_init, /* MI0360 1 */
mo4000_sensor_init, /* MO4000 2 */
mt9v111_sensor_init, /* MT9V111 3 */
om6802_sensor_init, /* OM6802 4 */
ov7630_sensor_init, /* OV7630 5 */
ov7648_sensor_init, /* OV7648 6 */
ov7660_sensor_init, /* OV7660 7 */
sp80708_sensor_init, /* SP80708 8 */
};

/* read <len> bytes to gspca_dev->usb_buf */
static void reg_r(struct gspca_dev *gspca_dev,
u16 value, int len)
Expand Down Expand Up @@ -1014,6 +1029,18 @@ static void i2c_r5(struct gspca_dev *gspca_dev, u8 reg)
reg_r(gspca_dev, 0x0a, 5);
}

static void i2c_w_seq(struct gspca_dev *gspca_dev,
const u8 (*data)[8])
{
while ((*data)[0] != 0) {
if ((*data)[0] != 0xdd)
i2c_w8(gspca_dev, *data);
else
msleep((*data)[1]);
data++;
}
}

static void hv7131r_probe(struct gspca_dev *gspca_dev)
{
i2c_w1(gspca_dev, 0x02, 0); /* sensor wakeup */
Expand Down Expand Up @@ -1164,129 +1191,6 @@ static void configure_gpio(struct gspca_dev *gspca_dev,
}
}

static void hv7131R_InitSensor(struct gspca_dev *gspca_dev)
{
int i = 0;
static const u8 SetSensorClk[] = /* 0x08 Mclk */
{ 0xa1, 0x11, 0x01, 0x18, 0x00, 0x00, 0x00, 0x10 };

while (hv7131r_sensor_init[i][0]) {
i2c_w8(gspca_dev, hv7131r_sensor_init[i]);
i++;
}
i2c_w8(gspca_dev, SetSensorClk);
}

static void mi0360_InitSensor(struct gspca_dev *gspca_dev)
{
int i = 0;

while (mi0360_sensor_init[i][0]) {
i2c_w8(gspca_dev, mi0360_sensor_init[i]);
i++;
}
}

static void mo4000_InitSensor(struct gspca_dev *gspca_dev)
{
int i = 0;

while (mo4000_sensor_init[i][0]) {
i2c_w8(gspca_dev, mo4000_sensor_init[i]);
i++;
}
}

static void mt9v111_InitSensor(struct gspca_dev *gspca_dev)
{
int i = 0;

i2c_w8(gspca_dev, mt9v111_sensor_init[i]);
i++;
msleep(20);
while (mt9v111_sensor_init[i][0]) {
i2c_w8(gspca_dev, mt9v111_sensor_init[i]);
i++;
}
}

static void om6802_InitSensor(struct gspca_dev *gspca_dev)
{
int i = 0;

while (om6802_sensor_init[i][0]) {
i2c_w8(gspca_dev, om6802_sensor_init[i]);
i++;
}
}

static void ov7630_InitSensor(struct gspca_dev *gspca_dev)
{
int i = 0;

i2c_w8(gspca_dev, ov7630_sensor_init[i]); /* 76 01 */
i++;
i2c_w8(gspca_dev, ov7630_sensor_init[i]); /* 12 c8 (RGB+SRST) */
i++;
msleep(20);
i2c_w8(gspca_dev, ov7630_sensor_init[i]); /* 12 48 */
i++;
i2c_w8(gspca_dev, ov7630_sensor_init[i]); /* 12 c8 */
i++;
msleep(20);
i2c_w8(gspca_dev, ov7630_sensor_init[i]); /* 12 48 */
i++;
/*jfm:win i2c_r from 00 to 80*/

while (ov7630_sensor_init[i][0]) {
i2c_w8(gspca_dev, ov7630_sensor_init[i]);
i++;
}
}

static void ov7648_InitSensor(struct gspca_dev *gspca_dev)
{
int i = 0;

i2c_w8(gspca_dev, ov7648_sensor_init[i]);
i++;
/* win: dble reset */
i2c_w8(gspca_dev, ov7648_sensor_init[i]); /* reset */
i++;
msleep(20);
/* win: i2c reg read 00..7f */
while (ov7648_sensor_init[i][0]) {
i2c_w8(gspca_dev, ov7648_sensor_init[i]);
i++;
}
}

static void ov7660_InitSensor(struct gspca_dev *gspca_dev)
{
int i = 0;

i2c_w8(gspca_dev, ov7660_sensor_init[i]); /* reset SCCB */
i++;
msleep(20);
while (ov7660_sensor_init[i][0]) {
i2c_w8(gspca_dev, ov7660_sensor_init[i]);
i++;
}
}

static void sp80708_InitSensor(struct gspca_dev *gspca_dev)
{
int i = 0;

i2c_w8(gspca_dev, sp80708_sensor_init[i]); /* reset SCCB */
i++;
msleep(20);
while (sp80708_sensor_init[i][0]) {
i2c_w8(gspca_dev, sp80708_sensor_init[i]);
i++;
}
}

/* this function is called at probe time */
static int sd_config(struct gspca_dev *gspca_dev,
const struct usb_device_id *id)
Expand Down Expand Up @@ -1801,21 +1705,17 @@ static int sd_start(struct gspca_dev *gspca_dev)
break;
}

/* initialize the sensor */
i2c_w_seq(gspca_dev, sensor_init[sd->sensor]);

mode = gspca_dev->cam.cam_mode[(int) gspca_dev->curr_mode].priv;
if (mode)
reg1 = 0x46; /* 320x240: clk 48Mhz, video trf enable */
else
reg1 = 0x06; /* 640x480: clk 24Mhz, video trf enable */
reg17 = 0x61; /* 0x:20: enable sensor clock */
switch (sd->sensor) {
case SENSOR_HV7131R:
hv7131R_InitSensor(gspca_dev);
break;
case SENSOR_MI0360:
mi0360_InitSensor(gspca_dev);
break;
case SENSOR_MO4000:
mo4000_InitSensor(gspca_dev);
if (mode) {
/* reg1 = 0x46; * 320 clk 48Mhz 60fp/s */
reg1 = 0x06; /* clk 24Mz */
Expand All @@ -1825,7 +1725,6 @@ static int sd_start(struct gspca_dev *gspca_dev)
}
break;
case SENSOR_MT9V111:
mt9v111_InitSensor(gspca_dev);
if (mode) {
reg1 = 0x04; /* 320 clk 48Mhz */
} else {
Expand All @@ -1834,22 +1733,18 @@ static int sd_start(struct gspca_dev *gspca_dev)
}
break;
case SENSOR_OM6802:
om6802_InitSensor(gspca_dev);
reg17 = 0x64; /* 640 MCKSIZE */
break;
case SENSOR_OV7630:
ov7630_InitSensor(gspca_dev);
setvflip(sd);
reg17 = 0xe2;
reg1 = 0x44;
break;
case SENSOR_OV7648:
ov7648_InitSensor(gspca_dev);
reg17 = 0x21;
/* reg1 = 0x42; * 42 - 46? */
break;
case SENSOR_OV7660:
ov7660_InitSensor(gspca_dev);
if (sd->bridge == BRIDGE_SN9C120) {
if (mode) { /* 320x240 - 160x120 */
reg17 = 0xa2;
Expand All @@ -1863,7 +1758,6 @@ static int sd_start(struct gspca_dev *gspca_dev)
break;
default:
/* case SENSOR_SP80708: */
sp80708_InitSensor(gspca_dev);
if (mode) {
/*?? reg1 = 0x04; * 320 clk 48Mhz */
} else {
Expand Down

0 comments on commit 9a60b27

Please sign in to comment.