mirror of
https://github.com/apache/nuttx.git
synced 2026-06-06 16:50:55 +08:00
Remove I2C slave methods from I2C master interface; rename i2c_dev_s to i2c_master_s.
This commit is contained in:
+2
-2
@@ -165,7 +165,7 @@ struct mxt_dev_s
|
||||
* lower half configuration data.
|
||||
*/
|
||||
|
||||
FAR struct i2c_dev_s *i2c;
|
||||
FAR struct i2c_master_s *i2c;
|
||||
FAR const struct mxt_lower_s *lower;
|
||||
|
||||
/* This is the allocated array of object information */
|
||||
@@ -1850,7 +1850,7 @@ errout_with_objtab:
|
||||
*
|
||||
****************************************************************************/
|
||||
|
||||
int mxt_register(FAR struct i2c_dev_s *i2c,
|
||||
int mxt_register(FAR struct i2c_master_s *i2c,
|
||||
FAR const struct mxt_lower_s * const lower, int minor)
|
||||
{
|
||||
FAR struct mxt_dev_s *priv;
|
||||
|
||||
@@ -138,7 +138,7 @@ struct stmpe811_dev_s
|
||||
#ifdef CONFIG_STMPE811_SPI
|
||||
FAR struct spi_dev_s *spi; /* Saved SPI driver instance */
|
||||
#else
|
||||
FAR struct i2c_dev_s *i2c; /* Saved I2C driver instance */
|
||||
FAR struct i2c_master_s *i2c; /* Saved I2C driver instance */
|
||||
#endif
|
||||
|
||||
uint8_t inuse; /* STMPE811 pins in use */
|
||||
|
||||
@@ -287,7 +287,7 @@ static void stmpe811_reset(FAR struct stmpe811_dev_s *priv)
|
||||
STMPE811_HANDLE stmpe811_instantiate(FAR struct spi_dev_s *dev,
|
||||
FAR struct stmpe811_config_s *config)
|
||||
#else
|
||||
STMPE811_HANDLE stmpe811_instantiate(FAR struct i2c_dev_s *dev,
|
||||
STMPE811_HANDLE stmpe811_instantiate(FAR struct i2c_master_s *dev,
|
||||
FAR struct stmpe811_config_s *config)
|
||||
#endif
|
||||
{
|
||||
|
||||
@@ -165,7 +165,7 @@ struct tsc2007_dev_s
|
||||
sem_t waitsem; /* Used to wait for the availability of data */
|
||||
|
||||
FAR struct tsc2007_config_s *config; /* Board configuration data */
|
||||
FAR struct i2c_dev_s *i2c; /* Saved I2C driver instance */
|
||||
FAR struct i2c_master_s *i2c; /* Saved I2C driver instance */
|
||||
struct work_s work; /* Supports the interrupt handling "bottom half" */
|
||||
struct tsc2007_sample_s sample; /* Last sampled touch point data */
|
||||
|
||||
@@ -1210,7 +1210,7 @@ errout:
|
||||
*
|
||||
****************************************************************************/
|
||||
|
||||
int tsc2007_register(FAR struct i2c_dev_s *dev,
|
||||
int tsc2007_register(FAR struct i2c_master_s *dev,
|
||||
FAR struct tsc2007_config_s *config, int minor)
|
||||
{
|
||||
FAR struct tsc2007_dev_s *priv;
|
||||
|
||||
Reference in New Issue
Block a user