Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-02 09:38:37 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Remove I2C slave methods from I2C master interface; rename i2c_dev_s to i2c_master_s.

Browse Source
This commit is contained in:
Gregory Nutt
2016-01-30 08:36:47 -06:00
parent ceb415204e
commit 3a781a2d3f
59 changed files with 171 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/video/ov2640.c
+11 -11
View File
@@ -286,16 +286,16 @@ struct ovr2640_reg_s
/* OV2640 register operations */
static int ov2640_putreg(FAR struct i2c_dev_s *i2c, uint8_t regaddr,
static int ov2640_putreg(FAR struct i2c_master_s *i2c, uint8_t regaddr,
uint8_t regval);
static uint8_t ov2640_getreg(FAR struct i2c_dev_s *i2c, uint8_t regaddr);
static int ov2640_putreglist(FAR struct i2c_dev_s *i2c,
static uint8_t ov2640_getreg(FAR struct i2c_master_s *i2c, uint8_t regaddr);
static int ov2640_putreglist(FAR struct i2c_master_s *i2c,
FAR const struct ovr2640_reg_s *reglist, size_t nentries);
/* Initialization */
static int ovr2640_chipid(FAR struct i2c_dev_s *i2c);
static int ov2640_reset(FAR struct i2c_dev_s *i2c);
static int ovr2640_chipid(FAR struct i2c_master_s *i2c);
static int ov2640_reset(FAR struct i2c_master_s *i2c);
/****************************************************************************
* Private Data
@@ -687,7 +687,7 @@ static const struct ovr2640_reg_s g_ov2640_jpeg_uxga_resolution[] =
*
****************************************************************************/
static int ov2640_putreg(FAR struct i2c_dev_s *i2c, uint8_t regaddr,
static int ov2640_putreg(FAR struct i2c_master_s *i2c, uint8_t regaddr,
uint8_t regval)
{
uint8_t buffer[2];
@@ -731,7 +731,7 @@ static int ov2640_putreg(FAR struct i2c_dev_s *i2c, uint8_t regaddr,
*
****************************************************************************/
static uint8_t ov2640_getreg(FAR struct i2c_dev_s *i2c, uint8_t regaddr)
static uint8_t ov2640_getreg(FAR struct i2c_master_s *i2c, uint8_t regaddr)
{
uint8_t regval;
int ret;
@@ -780,7 +780,7 @@ static uint8_t ov2640_getreg(FAR struct i2c_dev_s *i2c, uint8_t regaddr)
*
****************************************************************************/
static int ov2640_putreglist(FAR struct i2c_dev_s *i2c,
static int ov2640_putreglist(FAR struct i2c_master_s *i2c,
FAR const struct ovr2640_reg_s *reglist,
size_t nentries)
{
@@ -815,7 +815,7 @@ static int ov2640_putreglist(FAR struct i2c_dev_s *i2c,
*
****************************************************************************/
static int ovr2640_chipid(FAR struct i2c_dev_s *i2c)
static int ovr2640_chipid(FAR struct i2c_master_s *i2c)
{
uint8_t pidl;
uint8_t pidh;
@@ -870,7 +870,7 @@ static int ovr2640_chipid(FAR struct i2c_dev_s *i2c)
*
****************************************************************************/
static int ov2640_reset(FAR struct i2c_dev_s *i2c)
static int ov2640_reset(FAR struct i2c_master_s *i2c)
{
int ret;
@@ -903,7 +903,7 @@ static int ov2640_reset(FAR struct i2c_dev_s *i2c)
*
****************************************************************************/
int ov2640_initialize(FAR struct i2c_dev_s *i2c)
int ov2640_initialize(FAR struct i2c_master_s *i2c)
{
int ret;