ports: analog: Improve portability for BUSIO.I2C

Use register wrapper macros to improve portability for I2C.

This includes macros for the CTRL, STATUS, INTFL0, and FIFO registers.
Additionally, some field values for MST_MODE, BUSY, ACK, and NACK are used.

Signed-off-by: Brandon-Hurst <brandon.hurst97@gmail.com>

Author: Brandon-Hurst

ports/analog/common-hal/busio/I2C.c

@@ -124,7 +124,7 @@ bool common_hal_busio_i2c_probe(busio_i2c_obj_t *self, uint8_t addr) {
     bool ret = 0;
 
     // If not in Master mode, error out (can happen in some error conditions)
-    if (!(self->i2c_regs->ctrl & MXC_F_I2C_CTRL_MST_MODE)) {
+    if (!(I2C_CTRL_REG(self->i2c_regs) & I2C_F_CTRL_MST_MODE)) {
         return false;
     }
 
@@ -135,29 +135,29 @@ bool common_hal_busio_i2c_probe(busio_i2c_obj_t *self, uint8_t addr) {
 
     // Pre-load target address into transmit FIFO
     addr = (addr << 1);
-    self->i2c_regs->fifo = addr;
+    I2C_FIFO_REG(self->i2c_regs) = addr;
 
     // Set start bit & wait for it to clear
     MXC_I2C_Start(self->i2c_regs);
 
     // wait for ACK/NACK
-    while (!(self->i2c_regs->intfl0 & MXC_F_I2C_INTFL0_ADDR_ACK) &&
-           !(self->i2c_regs->intfl0 & MXC_F_I2C_INTFL0_ADDR_NACK_ERR)) {
+    while (!(I2C_INTFL0_REG(self->i2c_regs) & I2C_F_INTFL0_ADDR_ACK) &&
+           !(I2C_INTFL0_REG(self->i2c_regs) & I2C_F_INTFL0_ADDR_NACK_ERR)) {
     }
 
     // Save interrupt flags for ACK/NACK checking
-    int_fl0 = self->i2c_regs->intfl0;
+    int_fl0 = I2C_INTFL0_REG(self->i2c_regs);
 
     // Set / Wait for stop
     MXC_I2C_Stop(self->i2c_regs);
 
     // Wait for controller not busy, then clear flags
-    while (self->i2c_regs->status & MXC_F_I2C_STATUS_BUSY) {
+    while (I2C_STATUS_REG(self->i2c_regs) & I2C_F_STATUS_BUSY) {
         ;
     }
     MXC_I2C_ClearFlags(self->i2c_regs, 0xFFFFFF, 0xFFFFFF);
 
-    if (int_fl0 & MXC_F_I2C_INTFL0_ADDR_ACK) {
+    if (int_fl0 & I2C_F_INTFL0_ADDR_ACK) {
         ret = true;
     } else {
         ret = false;
@@ -168,7 +168,7 @@ bool common_hal_busio_i2c_probe(busio_i2c_obj_t *self, uint8_t addr) {
 // Lock I2C bus
 bool common_hal_busio_i2c_try_lock(busio_i2c_obj_t *self) {
 
-    if (self->i2c_regs->status & MXC_F_I2C_STATUS_BUSY) {
+    if (I2C_STATUS_REG(self->i2c_regs) & I2C_F_STATUS_BUSY) {
         return false;
     } else {
         self->has_lock = true;

ports/analog/peripherals/max32650/max32_i2c.h

@@ -13,4 +13,15 @@
 
 #define NUM_I2C 2
 
+// I2C register compatibility macros for MAX32650
+#define I2C_CTRL_REG(i2c)               ((i2c)->ctrl0)
+#define I2C_STATUS_REG(i2c)             ((i2c)->stat)
+#define I2C_INTFL0_REG(i2c)             ((i2c)->int_fl0)
+#define I2C_FIFO_REG(i2c)               ((i2c)->fifo)
+
+#define I2C_F_CTRL_MST_MODE             MXC_F_I2C_CTRL0_MST
+#define I2C_F_STATUS_BUSY               MXC_F_I2C_STAT_BUSY
+#define I2C_F_INTFL0_ADDR_ACK           MXC_F_I2C_INT_FL0_ADRACKI
+#define I2C_F_INTFL0_ADDR_NACK_ERR      MXC_F_I2C_INT_FL0_ADRERI
+
 int pinsToI2c(const mcu_pin_obj_t *sda, const mcu_pin_obj_t *scl);

ports/analog/peripherals/max32665/max32_i2c.h

@@ -13,4 +13,15 @@
 
 #define NUM_I2C 3
 
+// I2C register compatibility macros for MAX32665
+#define I2C_CTRL_REG(i2c)               ((i2c)->ctrl)
+#define I2C_STATUS_REG(i2c)             ((i2c)->status)
+#define I2C_INTFL0_REG(i2c)             ((i2c)->int_fl0)
+#define I2C_FIFO_REG(i2c)               ((i2c)->fifo)
+
+#define I2C_F_CTRL_MST_MODE             MXC_F_I2C_CTRL_MST
+#define I2C_F_STATUS_BUSY               MXC_F_I2C_STATUS_BUS
+#define I2C_F_INTFL0_ADDR_ACK           MXC_F_I2C_INT_FL0_ADDR_ACK
+#define I2C_F_INTFL0_ADDR_NACK_ERR      MXC_F_I2C_INT_FL0_ADDR_NACK_ER
+
 int pinsToI2c(const mcu_pin_obj_t *sda, const mcu_pin_obj_t *scl);

ports/analog/peripherals/max32690/max32_i2c.h

@@ -13,4 +13,15 @@
 
 #define NUM_I2C 3
 
+// I2C register compatibility macros for MAX32690
+#define I2C_CTRL_REG(i2c)               ((i2c)->ctrl)
+#define I2C_STATUS_REG(i2c)             ((i2c)->status)
+#define I2C_INTFL0_REG(i2c)             ((i2c)->intfl0)
+#define I2C_FIFO_REG(i2c)               ((i2c)->fifo)
+
+#define I2C_F_CTRL_MST_MODE             MXC_F_I2C_CTRL_MST_MODE
+#define I2C_F_STATUS_BUSY               MXC_F_I2C_STATUS_BUSY
+#define I2C_F_INTFL0_ADDR_ACK           MXC_F_I2C_INTFL0_ADDR_ACK
+#define I2C_F_INTFL0_ADDR_NACK_ERR      MXC_F_I2C_INTFL0_ADDR_NACK_ERR
+
 int pinsToI2c(const mcu_pin_obj_t *sda, const mcu_pin_obj_t *scl);