From 26cf5a35a9bed7a057de1c2eca8a391e9f4c5bdb Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Thu, 12 Mar 2015 12:27:06 -0600 Subject: [PATCH] SAMV71-XULT: Enable I2C and the I2C tool in the NSH configuration --- arch/arm/src/sama5/sam_twi.c | 6 +++--- arch/arm/src/samv7/sam_twihs.c | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/arch/arm/src/sama5/sam_twi.c b/arch/arm/src/sama5/sam_twi.c index b53746c09e2..ed0ad86460b 100644 --- a/arch/arm/src/sama5/sam_twi.c +++ b/arch/arm/src/sama5/sam_twi.c @@ -253,7 +253,7 @@ static int twi_transfer(FAR struct i2c_dev_s *dev, #ifdef CONFIG_I2C_SLAVE static int twi_setownaddress(FAR struct i2c_dev_s *dev, int addr, int nbits); static int twi_registercallback(FAR struct i2c_dev_s *dev, - int (*callback)(void)); + int (*callback)(FAR void *arg), FAR void *arg); #endif /* Initialization */ @@ -1118,8 +1118,8 @@ static int twi_setownaddress(FAR struct i2c_dev_s *dev, int addr, int nbits) *******************************************************************************/ #ifdef CONFIG_I2C_SLAVE -static int twi_registercallback(FAR struct i2c_dev_s *dev, - int (*callback)(void)) +static int twi_registercallback((FAR struct i2c_dev_s *dev, + int (*callback)(FAR void *arg), FAR void *arg) { #error Not implemented return -ENOSYS; diff --git a/arch/arm/src/samv7/sam_twihs.c b/arch/arm/src/samv7/sam_twihs.c index 344f6ac1549..3f53c2f352b 100644 --- a/arch/arm/src/samv7/sam_twihs.c +++ b/arch/arm/src/samv7/sam_twihs.c @@ -246,8 +246,8 @@ static int twi_transfer(FAR struct i2c_dev_s *dev, #endif #ifdef CONFIG_I2C_SLAVE static int twi_setownaddress(FAR struct i2c_dev_s *dev, int addr, int nbits); -static int twi_registercallback(FAR struct i2c_dev_s *dev, - int (*callback)(void)); +static int twi_registercallback((FAR struct i2c_dev_s *dev, + int (*callback)(FAR void *arg), FAR void *arg); #endif /* Initialization */ @@ -1090,8 +1090,8 @@ static int twi_setownaddress(FAR struct i2c_dev_s *dev, int addr, int nbits) *******************************************************************************/ #ifdef CONFIG_I2C_SLAVE -static int twi_registercallback(FAR struct i2c_dev_s *dev, - int (*callback)(void)) +static int twi_registercallback((FAR struct i2c_dev_s *dev, + int (*callback)(FAR void *arg), FAR void *arg) { #error Not implemented return -ENOSYS;