ft4222: fixed pca9555 expander detection

Signed-off-by: Mihai Tudor Panu <[email protected]> Signed-off-by: Brendan Le Foll <[email protected]>
8devices · May 4, 2016 · a702cdf · a702cdf
1 parent 800c89b
commit a702cdf
Showing 1 changed file with 14 additions and 11 deletions.
diff --git a/src/usb/ftdi_ft4222.c b/src/usb/ftdi_ft4222.c
@@ -335,19 +335,22 @@ mraa_ftdi_ft4222_detect_io_expander()
     if (mraa_ftdi_ft4222_i2c_read_internal(ftHandleI2c, PCA9672_ADDR, &data, 1) == 1) {
         gpio_expander_chip = IO_EXP_PCA9672;
         return PCA9672_PINS;
-    } else if (mraa_ftdi_ft4222_i2c_read_internal(ftHandleI2c, PCA9555_ADDR, &data, 1) == 1) {
-        gpio_expander_chip = IO_EXP_PCA9555;
-        uint8_t reg = PCA9555_OUTPUT_REG;
-        mraa_ftdi_ft4222_i2c_write_internal(ftHandleI2c, PCA9555_ADDR, &reg, 1);
-        mraa_ftdi_ft4222_i2c_read_internal(ftHandleI2c, PCA9555_ADDR, (uint8_t*)&pca9555OutputValue, 2);
-        reg = PCA9555_DIRECTION_REG;
-        mraa_ftdi_ft4222_i2c_write_internal(ftHandleI2c, PCA9555_ADDR, &reg, 1);
-        mraa_ftdi_ft4222_i2c_read_internal(ftHandleI2c, PCA9555_ADDR, (uint8_t*)&pca9555DirectionValue, 2);
-        return PCA9555_PINS;
     } else {
-        gpio_expander_chip = IO_EXP_NONE;
-        return 0;
+        uint8_t reg = PCA9555_INPUT_REG;
+        mraa_ftdi_ft4222_i2c_write_internal(ftHandleI2c, PCA9555_ADDR, &reg, 1);
+        if (mraa_ftdi_ft4222_i2c_read_internal(ftHandleI2c, PCA9555_ADDR, &data, 1) == 1) {
+            gpio_expander_chip = IO_EXP_PCA9555;
+            reg = PCA9555_OUTPUT_REG;
+            mraa_ftdi_ft4222_i2c_write_internal(ftHandleI2c, PCA9555_ADDR, &reg, 1);
+            mraa_ftdi_ft4222_i2c_read_internal(ftHandleI2c, PCA9555_ADDR, (uint8_t*)&pca9555OutputValue, 2);
+            reg = PCA9555_DIRECTION_REG;
+            mraa_ftdi_ft4222_i2c_write_internal(ftHandleI2c, PCA9555_ADDR, &reg, 1);
+            mraa_ftdi_ft4222_i2c_read_internal(ftHandleI2c, PCA9555_ADDR, (uint8_t*)&pca9555DirectionValue, 2);
+            return PCA9555_PINS;
+        }
     }
+    gpio_expander_chip = IO_EXP_NONE;
+    return 0;
 }