Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 124500
b: refs/heads/master
c: f1c6171
h: refs/heads/master
v: v3
  • Loading branch information
Erik Andrén authored and Mauro Carvalho Chehab committed Dec 30, 2008
1 parent b68b689 commit 1e591f1
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 37 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 4f93c450e8320d906ae50c75f2c8696516b5ccf3
refs/heads/master: f1c6171c4b7b2882a67db6a24c8699fa0efab42f
33 changes: 0 additions & 33 deletions trunk/drivers/media/video/gspca/m5602/m5602_mt9m111.c
Original file line number Diff line number Diff line change
Expand Up @@ -233,39 +233,6 @@ int mt9m111_set_gain(struct gspca_dev *gspca_dev, __s32 val)
return err;
}

int mt9m111_read_sensor(struct sd *sd, const u8 address,
u8 *i2c_data, const u8 len) {
int err, i;

do {
err = m5602_read_bridge(sd, M5602_XB_I2C_STATUS, i2c_data);
} while ((*i2c_data & I2C_BUSY) && !err);
if (err < 0)
goto out;

err = m5602_write_bridge(sd, M5602_XB_I2C_DEV_ADDR,
sd->sensor->i2c_slave_id);
if (err < 0)
goto out;

err = m5602_write_bridge(sd, M5602_XB_I2C_REG_ADDR, address);
if (err < 0)
goto out;

err = m5602_write_bridge(sd, M5602_XB_I2C_CTRL, 0x1a);
if (err < 0)
goto out;

for (i = 0; i < len && !err; i++) {
err = m5602_read_bridge(sd, M5602_XB_I2C_DATA, &(i2c_data[i]));

PDEBUG(D_CONF, "Reading sensor register "
"0x%x contains 0x%x ", address, *i2c_data);
}
out:
return err;
}

static void mt9m111_dump_registers(struct sd *sd)
{
u8 address, value[2] = {0x00, 0x00};
Expand Down
3 changes: 0 additions & 3 deletions trunk/drivers/media/video/gspca/m5602/m5602_mt9m111.h
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,6 @@ int mt9m111_probe(struct sd *sd);
int mt9m111_init(struct sd *sd);
int mt9m111_power_down(struct sd *sd);

int mt9m111_read_sensor(struct sd *sd, const u8 address,
u8 *i2c_data, const u8 len);

int mt9m111_set_vflip(struct gspca_dev *gspca_dev, __s32 val);
int mt9m111_get_vflip(struct gspca_dev *gspca_dev, __s32 *val);
int mt9m111_get_hflip(struct gspca_dev *gspca_dev, __s32 *val);
Expand Down

0 comments on commit 1e591f1

Please sign in to comment.