Improve tcal9539 support

- Fix various bugs
- Add helper to synchronize shadow registers from hardware
- Add method to read out in/out mode
- get_pin() now also works for output pins

Author: andoma

include/mios/io.h

@@ -121,7 +121,7 @@ typedef struct gpio_vtable {
 
   error_t (*conf_output)(struct indirect_gpio *ig, unsigned int line,
                          gpio_output_type_t type, gpio_output_speed_t speed,
-                         gpio_pull_t pull);
+                         gpio_pull_t pull, int initial_value);
 
   // Read a single GPIO pin (one bit)
   error_t (*set_pin)(struct indirect_gpio *ig, unsigned int line, int on);
@@ -133,8 +133,52 @@ typedef struct gpio_vtable {
   error_t (*get_port)(struct indirect_gpio *ig, unsigned int port,
                       uint32_t *pins);
 
+  // Return 1 if port is input, 0 if output
+  int (*get_mode)(struct indirect_gpio *ig, unsigned int line);
+
+  error_t (*refresh_shadow)(struct indirect_gpio *ig);
+
 } gpio_vtable_t;
 
 typedef struct indirect_gpio {
   const gpio_vtable_t *vtable;
 } indirect_gpio_t;
+
+static inline error_t
+indirect_gpio_conf_input(indirect_gpio_t *ig, unsigned int line,
+                         gpio_pull_t pull)
+{
+  return ig->vtable->conf_input(ig, line, pull);
+}
+
+static inline error_t
+indirect_gpio_conf_output(indirect_gpio_t *ig, unsigned int line,
+                          gpio_output_type_t type, gpio_output_speed_t speed,
+                          gpio_pull_t pull, int initial_value)
+{
+  return ig->vtable->conf_output(ig, line, type, speed, pull, initial_value);
+}
+
+static inline error_t
+indirect_gpio_set_pin(indirect_gpio_t *ig, unsigned int line, int on)
+{
+  return ig->vtable->set_pin(ig, line, on);
+}
+
+static inline error_t
+indirect_gpio_get_pin(indirect_gpio_t *ig, unsigned int line, int *status)
+{
+  return ig->vtable->get_pin(ig, line, status);
+}
+
+static inline int
+indirect_gpio_get_mode(indirect_gpio_t *ig, unsigned int line)
+{
+  return ig->vtable->get_mode(ig, line);
+}
+
+static inline error_t
+indirect_gpio_refresh_shadow(indirect_gpio_t *ig)
+{
+  return ig->vtable->refresh_shadow(ig);
+}

src/drivers/tcal9539.c

@@ -36,7 +36,7 @@ tcal9539_write_shadow(tcal9539_t *tc, unsigned int line,
                       uint16_t shadow, int reg)
 {
   if(line < 8) {
-    return i2c_write_u8(tc->i2c, tc->address, reg, shadow && 0xff);
+    return i2c_write_u8(tc->i2c, tc->address, reg, shadow & 0xff);
   } else {
     return i2c_write_u8(tc->i2c, tc->address, reg + 1, shadow >> 8);
   }
@@ -109,38 +109,44 @@ tcal9539_conf_input(indirect_gpio_t *ig, unsigned int line, gpio_pull_t pull)
 
 
 static error_t
-tcal9539_conf_output(indirect_gpio_t *ig, unsigned int line,
-                     gpio_output_type_t type, gpio_output_speed_t speed,
-                     gpio_pull_t pull)
+tcal9539_set_pin(indirect_gpio_t *ig, unsigned int line, int on)
 {
   tcal9539_t *tc = (tcal9539_t *)ig;
 
   if(line >= 16)
     return ERR_INVALID_ID;
 
-  error_t err = tcal9539_conf_pull(tc, line, pull);
-  if(err)
-    return err;
+  if(on) {
+    return tcal9539_set_bit_in_reg(tc, line, &tc->output, TCAL9539_OUTPUT0);
+  } else {
+    return tcal9539_clr_bit_in_reg(tc, line, &tc->output, TCAL9539_OUTPUT0);
+  }
 
-  return tcal9539_clr_bit_in_reg(tc, line, &tc->direction, TCAL9539_CFG0);
+  return ERR_NOT_IMPLEMENTED;
 }
 
 
 static error_t
-tcal9539_set_pin(indirect_gpio_t *ig, unsigned int line, int on)
+tcal9539_conf_output(indirect_gpio_t *ig, unsigned int line,
+                     gpio_output_type_t type, gpio_output_speed_t speed,
+                     gpio_pull_t pull, int initial_value)
 {
   tcal9539_t *tc = (tcal9539_t *)ig;
 
   if(line >= 16)
     return ERR_INVALID_ID;
 
-  if(on) {
-    return tcal9539_set_bit_in_reg(tc, line, &tc->output, TCAL9539_OUTPUT0);
-  } else {
-    return tcal9539_clr_bit_in_reg(tc, line, &tc->output, TCAL9539_OUTPUT0);
+  error_t err = tcal9539_conf_pull(tc, line, pull);
+  if(err)
+    return err;
+
+  if(initial_value != -1) {
+    err = tcal9539_set_pin(ig, line, initial_value);
+    if(err)
+      return err;
   }
 
-  return ERR_NOT_IMPLEMENTED;
+  return tcal9539_clr_bit_in_reg(tc, line, &tc->direction, TCAL9539_CFG0);
 }
 
 
@@ -152,13 +158,20 @@ tcal9539_get_pin(indirect_gpio_t *ig, unsigned int line, int *status)
   if(line >= 16)
     return ERR_INVALID_ID;
 
-  uint8_t val;
-  error_t err = i2c_read_u8(tc->i2c, tc->address, line >> 3, &val);
-  if(err)
-    return err;
 
-  int bit = line & 0x7;
-  *status = !!(val & (1 << bit));
+  if((1 << line) & tc->direction) {
+
+    uint8_t val;
+    error_t err = i2c_read_u8(tc->i2c, tc->address, line >> 3, &val);
+    if(err)
+      return err;
+
+    int bit = line & 0x7;
+    *status = !!(val & (1 << bit));
+  } else {
+    *status = (tc->output >> line) & 1;
+  }
+
   return 0;
 }
 
@@ -179,13 +192,63 @@ tcal9539_get_port(indirect_gpio_t *ig, unsigned int port, uint32_t *status)
   return 0;
 }
 
+static int
+tcal9539_get_mode(indirect_gpio_t *ig, unsigned int line)
+{
+  tcal9539_t *tc = (tcal9539_t *)ig;
+  return (tc->direction >> line) & 1;
+}
+
+
+
+
+
+static error_t
+tcal9539_read_u16(tcal9539_t *tc, uint8_t reg, uint16_t *value)
+{
+  uint8_t lo, hi;
+  error_t err;
+
+  err = i2c_read_u8(tc->i2c, tc->address, reg, &lo);
+  if(err)
+    return err;
+  err = i2c_read_u8(tc->i2c, tc->address, reg + 1, &hi);
+  if(err)
+    return err;
+
+  *value = ((uint16_t)hi << 8) | lo;
+  return 0;
+}
+
+
+static error_t
+tcal9539_refresh_shadow(indirect_gpio_t *ig)
+{
+  tcal9539_t *tc = (tcal9539_t *)ig;
+  error_t err;
+
+  err = tcal9539_read_u16(tc, TCAL9539_OUTPUT0, &tc->output);
+  if(err)
+    return err;
+  err = tcal9539_read_u16(tc, TCAL9539_CFG0, &tc->direction);
+  if(err)
+    return err;
+  err = tcal9539_read_u16(tc, TCAL9539_PUD0, &tc->pull_direction);
+  if(err)
+    return err;
+
+  return tcal9539_read_u16(tc, TCAL9539_PE0, &tc->pull_enable);
+}
+
 
 static const gpio_vtable_t tcal9539_vtable = {
   .conf_input = tcal9539_conf_input,
   .conf_output = tcal9539_conf_output,
   .set_pin = tcal9539_set_pin,
   .get_pin = tcal9539_get_pin,
   .get_port = tcal9539_get_port,
+  .get_mode = tcal9539_get_mode,
+  .refresh_shadow = tcal9539_refresh_shadow,
 };