[I2C] Remove redundant boolean master member

Available in i2c_t structure field isMaster

Signed-off-by: Frederic.Pillon <[email protected]>

Author: fpistm

cores/arduino/stm32/twi.c

@@ -79,7 +79,7 @@ static I2C_HandleTypeDef *i2c_handles[I2C_NUM];
   */
 void i2c_init(i2c_t *obj)
 {
-  i2c_custom_init(obj, I2C_100KHz, I2C_ADDRESSINGMODE_7BIT, 0x33, 1);
+  i2c_custom_init(obj, I2C_100KHz, I2C_ADDRESSINGMODE_7BIT, 0x33);
 }
 
 /**
@@ -88,10 +88,9 @@ void i2c_init(i2c_t *obj)
   * @param  timing : one of the i2c_timing_e
   * @param  addressingMode : I2C_ADDRESSINGMODE_7BIT or I2C_ADDRESSINGMODE_10BIT
   * @param  ownAddress : device address
-  * @param  master : set to 1 to choose the master mode
   * @retval none
   */
-void i2c_custom_init(i2c_t *obj, i2c_timing_e timing, uint32_t addressingMode, uint32_t ownAddress, uint8_t master)
+void i2c_custom_init(i2c_t *obj, i2c_timing_e timing, uint32_t addressingMode, uint32_t ownAddress)
 {
   if (obj == NULL) {
     return;
@@ -211,7 +210,6 @@ void i2c_custom_init(i2c_t *obj, i2c_timing_e timing, uint32_t addressingMode, u
     Error_Handler();
   }
 
-  obj->isMaster = master;
   /* Initialize default values */
   obj->slaveRxNbData = 0;
   obj->slaveMode = SLAVE_MODE_LISTEN;

cores/arduino/stm32/twi.h

@@ -153,7 +153,7 @@ typedef enum {
 /* Exported functions ------------------------------------------------------- */
 void i2c_init(i2c_t *obj);
 void i2c_custom_init(i2c_t *obj, i2c_timing_e timing, uint32_t addressingMode,
-                     uint32_t ownAddress, uint8_t master);
+                     uint32_t ownAddress);
 void i2c_deinit(i2c_t *obj);
 void i2c_setTiming(i2c_t *obj, uint32_t frequency);
 i2c_status_e i2c_master_write(i2c_t *obj, uint8_t dev_address, uint8_t *data, uint16_t size);

libraries/Wire/src/Wire.cpp

@@ -78,15 +78,11 @@ void TwoWire::begin(uint8_t address)
 
   ownAddress = address << 1;
 
-  if (address == MASTER_ADDRESS) {
-    master = true;
-  } else {
-    master = false;
-  }
+  _i2c.isMaster = (address == MASTER_ADDRESS) ? 1 : 0;
 
-  i2c_custom_init(&_i2c, I2C_100KHz, I2C_ADDRESSINGMODE_7BIT, ownAddress, master);
+  i2c_custom_init(&_i2c, I2C_100KHz, I2C_ADDRESSINGMODE_7BIT, ownAddress);
 
-  if (master == false) {
+  if (_i2c.isMaster == 0) {
     // i2c_attachSlaveTxEvent(&_i2c, reinterpret_cast<void(*)(i2c_t*)>(&TwoWire::onRequestService));
     // i2c_attachSlaveRxEvent(&_i2c, reinterpret_cast<void(*)(i2c_t*, uint8_t*, int)>(&TwoWire::onReceiveService));
 
@@ -119,7 +115,7 @@ void TwoWire::setClock(uint32_t frequency)
 uint8_t TwoWire::requestFrom(uint8_t address, uint8_t quantity, uint32_t iaddress, uint8_t isize, uint8_t sendStop)
 {
   UNUSED(sendStop);
-  if (master == true) {
+  if (_i2c.isMaster == 1) {
     allocateRxBuffer(quantity);
     // error if no memory block available to allocate the buffer
     if (rxBuffer == nullptr) {
@@ -216,7 +212,7 @@ uint8_t TwoWire::endTransmission(uint8_t sendStop)
   UNUSED(sendStop);
   int8_t ret = 4;
 
-  if (master == true) {
+  if (_i2c.isMaster == 1) {
     // transmit buffer (blocking)
     switch (i2c_master_write(&_i2c, txAddress, txBuffer, txBufferLength)) {
       case I2C_OK :

libraries/Wire/src/Wire.h

@@ -49,7 +49,6 @@ class TwoWire : public Stream {
     static uint8_t transmitting;
 
     uint8_t ownAddress;
-    bool master;
     i2c_t _i2c;
 
     static void (*user_onRequest)(void);