feat(PeriphDrivers,CMSIS): Add support for multiple I2C target addresses

Libraries/CMSIS/Device/Maxim/MAX32660/Include/max32660.h

@@ -261,6 +261,7 @@ typedef enum {
 /*                                                                        I2C */
 #define MXC_I2C_INSTANCES (2)
 #define MXC_I2C_FIFO_DEPTH (8)
+#define MXC_I2C_NUM_TARGET_ADDR (4)
 
 #define MXC_BASE_I2C0 ((uint32_t)0x4001D000UL)
 #define MXC_I2C0 ((mxc_i2c_regs_t *)MXC_BASE_I2C0)

Libraries/CMSIS/Device/Maxim/MAX32670/Include/max32670.h

@@ -371,6 +371,7 @@ typedef enum {
 /*                                                                        I2C */
 #define MXC_I2C_INSTANCES (3)
 #define MXC_I2C_FIFO_DEPTH (8)
+#define MXC_I2C_NUM_TARGET_ADDR (4)
 
 #define MXC_BASE_I2C0 ((uint32_t)0x4001D000UL)
 #define MXC_I2C0 ((mxc_i2c_regs_t *)MXC_BASE_I2C0)

Libraries/CMSIS/Device/Maxim/MAX32675/Include/max32675.h

@@ -370,6 +370,7 @@ typedef enum {
 /*                                                                        I2C */
 #define MXC_I2C_INSTANCES (3)
 #define MXC_I2C_FIFO_DEPTH (8)
+#define MXC_I2C_NUM_TARGET_ADDR (4)
 
 #define MXC_BASE_I2C0 ((uint32_t)0x4001D000UL)
 #define MXC_I2C0 ((mxc_i2c_regs_t *)MXC_BASE_I2C0)

Libraries/PeriphDrivers/Include/MAX32672/i2c.h

@@ -189,7 +189,10 @@ typedef int (*mxc_i2c_slave_handler_t)(mxc_i2c_regs_t *i2c, mxc_i2c_slave_event_
  * @param   masterMode  Whether to put the device in master or slave mode. Use
  *                      non-zero
  *                      for master mode, and zero for slave mode.
- * @param   slaveAddr   7-bit or 10-bit address to use when in slave mode.
+ * @param   slaveAddr   7-bit or 10-bit address to use when in slave mode. By 
+ *                      default this value will be set to slave index 0. Use
+ *                      MXC_I2C_SetSlaveAddr() to set additional slave addresses
+ *                      if needed.
  *                      This parameter is ignored when masterMode is non-zero.
  *
  * @return  Success/Fail, see \ref MXC_Error_Codes for a list of return codes.
@@ -198,8 +201,6 @@ int MXC_I2C_Init(mxc_i2c_regs_t *i2c, int masterMode, unsigned int slaveAddr);
 
 /**
  * @brief   Initialize and enable I2C peripheral.
- * @note    Set idx to 0, multiple I2C instances acting as slaves is not yet
- *          supported.
  *
  * @param   i2c         Pointer to I2C registers (selects the I2C block used.)
  * @param   slaveAddr   7-bit or 10-bit address to use when in slave mode.

Libraries/PeriphDrivers/Include/MAX32672/mxc_sys.h

@@ -284,6 +284,13 @@ static inline int MXC_SYS_In_Crit_Section(void)
  */
 int MXC_SYS_GetUSN(uint8_t *usn, uint8_t *checksum);
 
+/**
+ * @brief Gets design revision of the chip.
+ * 
+ * @return Design revision.
+ */
+int MXC_SYS_GetRevision(void);
+
 /**
  * @brief Determines if the selected peripheral clock is enabled.
  * @param clock   Enumeration for desired clock.

Libraries/PeriphDrivers/Source/I2C/i2c_ai87.c

@@ -78,6 +78,11 @@ int MXC_I2C_Init(mxc_i2c_regs_t *i2c, int masterMode, unsigned int slaveAddr)
 
 int MXC_I2C_SetSlaveAddr(mxc_i2c_regs_t *i2c, unsigned int slaveAddr, int idx)
 {
+    if (idx != 0) {
+        // MAX78002 does not support multiple slave addresses
+        return E_NOT_SUPPORTED;
+    }
+
     return MXC_I2C_RevA_SetSlaveAddr((mxc_i2c_reva_regs_t *)i2c, slaveAddr, idx);
 }
 

Libraries/PeriphDrivers/Source/I2C/i2c_es17.c

@@ -48,7 +48,8 @@
 #define MXC_I2C_FASTPLUS_SPEED 1000000
 
 /* **** Variable Declaration **** */
-uint32_t interruptCheck = MXC_F_I2C_INT0_RDAMI | MXC_F_I2C_INT0_WRAMI | MXC_F_I2C_INT0_DNRERI;
+uint32_t interruptCheck = MXC_F_I2C_INT0_RDAMI | MXC_F_I2C_INT0_WRAMI | MXC_F_I2C_INT0_AMI |
+                          MXC_F_I2C_INT0_DNRERI;
 
 /* **** Function Prototypes **** */
 

Libraries/PeriphDrivers/Source/I2C/i2c_me10.c

@@ -53,6 +53,7 @@
 #define MXC_I2C_MAX_ADDR_WIDTH 0x7F
 #define MXC_I2C_STD_MODE 100000
 #define MXC_I2C_FAST_SPEED 400000
+#define MXC_I2C_FASTPLUS_SPEED 1000000
 
 /* **** Variable Declaration **** */
 
@@ -125,7 +126,7 @@ int MXC_I2C_Shutdown(mxc_i2c_regs_t *i2c)
 /* ************************************************************************** */
 int MXC_I2C_SetFrequency(mxc_i2c_regs_t *i2c, unsigned int hz)
 {
-    if (hz > MXC_I2C_FAST_SPEED) {
+    if (hz > MXC_I2C_FASTPLUS_SPEED) {
         return E_NOT_SUPPORTED;
     }
 

Libraries/PeriphDrivers/Source/I2C/i2c_me11.c

@@ -45,6 +45,9 @@
 #include "i2c.h"
 #include "i2c_reva.h"
 
+/* **** Definitions **** */
+#define MXC_I2C_MAX_ADDR_WIDTH 0x7F
+
 /* **** Variable Declaration **** */
 uint32_t interruptCheck = MXC_F_I2C_INTFL0_AMI | MXC_F_I2C_INTFL0_DNRERI;
 
@@ -80,8 +83,7 @@ int MXC_I2C_SetSlaveAddr(mxc_i2c_regs_t *i2c, unsigned int slaveAddr, int idx)
         return E_NULL_PTR;
     }
 
-    if (idx != 0) {
-        // Multiple slaves are not supported yet
+    if (idx >= MXC_I2C_NUM_TARGET_ADDR) {
         return E_NOT_SUPPORTED;
     }
 
@@ -90,14 +92,22 @@ int MXC_I2C_SetSlaveAddr(mxc_i2c_regs_t *i2c, unsigned int slaveAddr, int idx)
         return E_BAD_PARAM;
     }
 
-    i2c->sladdr = 0;
+    // Set the slave address to operate on
+    MXC_SETFIELD(i2c->sladdr, MXC_F_I2C_SLADDR_SLAIDX, (idx << MXC_F_I2C_SLADDR_SLAIDX_POS));
 
-    if (slaveAddr > MXC_I2C_REVA_MAX_ADDR_WIDTH) {
+    if (slaveAddr > MXC_I2C_MAX_ADDR_WIDTH) {
         // Set for 10bit addressing mode
-        i2c->sladdr = MXC_F_I2C_SLADDR_EA;
+        i2c->sladdr |= MXC_F_I2C_SLADDR_EA;
+    } else {
+        // Clear for 7bit addressing mode
+        i2c->sladdr &= ~MXC_F_I2C_SLADDR_EA;
     }
 
-    i2c->sladdr |= slaveAddr;
+    // Set the slave address
+    MXC_SETFIELD(i2c->sladdr, MXC_F_I2C_SLADDR_SLA, (slaveAddr << MXC_F_I2C_SLADDR_SLA_POS));
+
+    // Enable the slave address
+    i2c->sladdr &= ~MXC_F_I2C_SLADDR_SLADIS;
 
     return E_NO_ERROR;
 }

Libraries/PeriphDrivers/Source/I2C/i2c_me12.c

@@ -117,11 +117,6 @@ int MXC_I2C_Reset(mxc_i2c_regs_t *i2c)
 
 int MXC_I2C_SetFrequency(mxc_i2c_regs_t *i2c, unsigned int hz)
 {
-    // ME17 doesn't support high speed more
-    if (hz > MXC_I2C_FASTPLUS_SPEED) {
-        return E_NOT_SUPPORTED;
-    }
-
     return MXC_I2C_RevA_SetFrequency((mxc_i2c_reva_regs_t *)i2c, hz);
 }
 

Libraries/PeriphDrivers/Source/I2C/i2c_me13.c

@@ -49,7 +49,7 @@
 
 /* **** Variable Declaration **** */
 uint32_t interruptCheck = MXC_F_I2C_INT_FL0_RD_ADDR_MATCH | MXC_F_I2C_INT_FL0_WR_ADDR_MATCH |
-                          MXC_F_I2C_INT_FL0_DO_NOT_RESP_ER;
+                          MXC_F_I2C_INT_FL0_ADDR_MATCH | MXC_F_I2C_INT_FL0_DO_NOT_RESP_ER;
 
 /* **** Function Prototypes **** */
 
@@ -82,6 +82,11 @@ int MXC_I2C_Init(mxc_i2c_regs_t *i2c, int masterMode, unsigned int slaveAddr)
 
 int MXC_I2C_SetSlaveAddr(mxc_i2c_regs_t *i2c, unsigned int slaveAddr, int idx)
 {
+    if ((MXC_SYS_GetRev() & 0xF0) == 0xA0 && idx != 0) {
+        // MAX32570 Rev. A only supports one slave address
+        return E_NOT_SUPPORTED;
+    }
+
     return MXC_I2C_RevA_SetSlaveAddr((mxc_i2c_reva_regs_t *)i2c, slaveAddr, idx);
 }
 

Libraries/PeriphDrivers/Source/I2C/i2c_me14.c

@@ -47,7 +47,7 @@
 
 /* **** Variable Declaration **** */
 uint32_t interruptCheck = MXC_F_I2C_INT_FL0_RD_ADDR_MATCH | MXC_F_I2C_INT_FL0_WR_ADDR_MATCH |
-                          MXC_F_I2C_INT_FL0_DO_NOT_RESP_ER;
+                          MXC_F_I2C_INT_FL0_ADDR_MATCH | MXC_F_I2C_INT_FL0_DO_NOT_RESP_ER;
 
 /* **** Function Prototypes **** */
 
@@ -80,6 +80,11 @@ int MXC_I2C_Init(mxc_i2c_regs_t *i2c, int masterMode, unsigned int slaveAddr)
 
 int MXC_I2C_SetSlaveAddr(mxc_i2c_regs_t *i2c, unsigned int slaveAddr, int idx)
 {
+    if (idx != 0) {
+        // MAX32665 only supports one slave address
+        return E_NOT_SUPPORTED;
+    }
+
     return MXC_I2C_RevA_SetSlaveAddr((mxc_i2c_reva_regs_t *)i2c, slaveAddr, idx);
 }
 

Libraries/PeriphDrivers/Source/I2C/i2c_me15.c

@@ -45,6 +45,9 @@
 #include "i2c.h"
 #include "i2c_reva.h"
 
+/* **** Definitions **** */
+#define MXC_I2C_MAX_ADDR_WIDTH 0x7F
+
 /* **** Variable Declaration **** */
 uint32_t interruptCheck = MXC_F_I2C_INTFL0_ADDR_MATCH | MXC_F_I2C_INTFL0_DNR_ERR;
 
@@ -85,8 +88,7 @@ int MXC_I2C_SetSlaveAddr(mxc_i2c_regs_t *i2c, unsigned int slaveAddr, int idx)
         return E_NULL_PTR;
     }
 
-    if (idx != 0) {
-        // Multiple slaves are not supported yet
+    if (idx >= MXC_I2C_NUM_TARGET_ADDR) {
         return E_NOT_SUPPORTED;
     }
 
@@ -95,14 +97,22 @@ int MXC_I2C_SetSlaveAddr(mxc_i2c_regs_t *i2c, unsigned int slaveAddr, int idx)
         return E_BAD_PARAM;
     }
 
-    i2c->slave = 0;
+    // Set the slave address to operate on
+    MXC_SETFIELD(i2c->slave, MXC_F_I2C_SLAVE_IDX, (idx << MXC_F_I2C_SLAVE_IDX_POS));
 
-    if (slaveAddr > MXC_I2C_REVA_MAX_ADDR_WIDTH) {
+    if (slaveAddr > MXC_I2C_MAX_ADDR_WIDTH) {
         // Set for 10bit addressing mode
-        i2c->slave = MXC_F_I2C_SLAVE_EXT_ADDR_EN;
+        i2c->slave |= MXC_F_I2C_SLAVE_EXT_ADDR_EN;
+    } else {
+        // Clear for 7bit addressing mode
+        i2c->slave &= ~MXC_F_I2C_SLAVE_EXT_ADDR_EN;
     }
 
-    i2c->slave |= slaveAddr;
+    // Set the slave address
+    MXC_SETFIELD(i2c->slave, MXC_F_I2C_SLAVE_ADDR, (slaveAddr << MXC_F_I2C_SLAVE_ADDR_POS));
+
+    // Enable the slave address
+    i2c->slave &= ~MXC_F_I2C_SLAVE_DIS;
 
     return E_NO_ERROR;
 }

Libraries/PeriphDrivers/Source/I2C/i2c_me16.c

@@ -78,7 +78,37 @@ int MXC_I2C_Init(mxc_i2c_regs_t *i2c, int masterMode, unsigned int slaveAddr)
 
 int MXC_I2C_SetSlaveAddr(mxc_i2c_regs_t *i2c, unsigned int slaveAddr, int idx)
 {
-    return MXC_I2C_RevA_SetSlaveAddr(i2c, slaveAddr, idx);
+    if (i2c == NULL) {
+        return E_NULL_PTR;
+    }
+
+    if (idx >= MXC_I2C_NUM_TARGET_ADDR) {
+        return E_NOT_SUPPORTED;
+    }
+
+    if (slaveAddr > MXC_F_I2C_SLAVE_ADDR) {
+        // Only support addresses up to 10 bits
+        return E_BAD_PARAM;
+    }
+
+    // Set the slave address to operate on
+    MXC_SETFIELD(i2c->slave, MXC_F_I2C_SLAVE_IDX, (idx << MXC_F_I2C_SLAVE_IDX_POS));
+
+    if (slaveAddr > MXC_I2C_MAX_ADDR_WIDTH) {
+        // Set for 10bit addressing mode
+        i2c->slave |= MXC_F_I2C_SLAVE_EXT_ADDR_EN;
+    } else {
+        // Clear for 7bit addressing mode
+        i2c->slave &= ~MXC_F_I2C_SLAVE_EXT_ADDR_EN;
+    }
+
+    // Set the slave address
+    MXC_SETFIELD(i2c->slave, MXC_F_I2C_SLAVE_ADDR, (slaveAddr << MXC_F_I2C_SLAVE_ADDR_POS));
+
+    // Enable the slave address
+    i2c->slave &= ~MXC_F_I2C_SLAVE_DIS;
+
+    return E_NO_ERROR;
 }
 
 int MXC_I2C_Shutdown(mxc_i2c_regs_t *i2c)

Libraries/PeriphDrivers/Source/I2C/i2c_me17.c

@@ -78,6 +78,11 @@ int MXC_I2C_Init(mxc_i2c_regs_t *i2c, int masterMode, unsigned int slaveAddr)
 
 int MXC_I2C_SetSlaveAddr(mxc_i2c_regs_t *i2c, unsigned int slaveAddr, int idx)
 {
+    if (idx != 0) {
+        // MAX32655 only supports one slave device
+        return E_NOT_SUPPORTED;
+    }
+
     return MXC_I2C_RevA_SetSlaveAddr((mxc_i2c_reva_regs_t *)i2c, slaveAddr, idx);
 }
 

Libraries/PeriphDrivers/Source/I2C/i2c_me18.c

@@ -78,6 +78,11 @@ int MXC_I2C_Init(mxc_i2c_regs_t *i2c, int masterMode, unsigned int slaveAddr)
 
 int MXC_I2C_SetSlaveAddr(mxc_i2c_regs_t *i2c, unsigned int slaveAddr, int idx)
 {
+    if (idx != 0) {
+        // MAX32690 does not support multiple slave addresses
+        return E_NOT_SUPPORTED;
+    }
+
     return MXC_I2C_RevA_SetSlaveAddr((mxc_i2c_reva_regs_t *)i2c, slaveAddr, idx);
 }