From 07a9af07fe3da98017456324b708f88af2f3c879 Mon Sep 17 00:00:00 2001
From: Mihai Tudor Panu <mihai.tudor.panu@intel.com>
Date: Tue, 4 Sep 2018 06:31:26 -0700
Subject: [PATCH] upm-c: remove uint8_t limit from pin/bus variables in structs

This removes unnecessary uint8 types from C driver structs that prevented some sensors from being initialized when connected to a MRAA subplatform.

Signed-off-by: Mihai Tudor Panu <mihai.tudor.panu@intel.com>
---
 src/ad8232/ad8232.c       | 10 +++-------
 src/ad8232/ad8232.h       |  3 ---
 src/button/button.c       |  4 +---
 src/button/button.h       |  1 -
 src/collision/collision.c |  3 +--
 src/collision/collision.h |  1 -
 src/m24lr64e/m24lr64e.h   |  4 ++--
 src/mq303a/mq303a.c       |  6 ++----
 src/mq303a/mq303a.h       |  2 --
 src/ttp223/ttp223.c       |  4 +---
 src/ttp223/ttp223.h       |  1 -
 11 files changed, 10 insertions(+), 29 deletions(-)

diff --git a/src/ad8232/ad8232.c b/src/ad8232/ad8232.c
index 02a4fb16..84537211 100644
--- a/src/ad8232/ad8232.c
+++ b/src/ad8232/ad8232.c
@@ -35,13 +35,9 @@ ad8232_context ad8232_init(int lo_plus, int lo_minus, int output,
         return NULL;
     }
 
-    dev->gpio_lo_plus_pin = lo_plus;
-    dev->gpio_lo_minus_pin = lo_minus;
-    dev->aio_pin = output;
-
-    dev->aio = mraa_aio_init(dev->aio_pin);
-    dev->gpio_lo_plus = mraa_gpio_init(dev->gpio_lo_plus_pin);
-    dev->gpio_lo_minus = mraa_gpio_init(dev->gpio_lo_minus_pin);
+    dev->aio = mraa_aio_init(output);
+    dev->gpio_lo_plus = mraa_gpio_init(lo_plus);
+    dev->gpio_lo_minus = mraa_gpio_init(lo_minus);
 
     if (dev->aio == NULL || dev->gpio_lo_minus == NULL ||
         dev->gpio_lo_plus == NULL){
diff --git a/src/ad8232/ad8232.h b/src/ad8232/ad8232.h
index 05041cd2..fad0236b 100644
--- a/src/ad8232/ad8232.h
+++ b/src/ad8232/ad8232.h
@@ -51,9 +51,6 @@ typedef struct _ad8232_context {
     mraa_aio_context        aio;
     mraa_gpio_context       gpio_lo_plus;
     mraa_gpio_context       gpio_lo_minus;
-    uint8_t                 aio_pin;
-    uint8_t                 gpio_lo_plus_pin;
-    uint8_t                 gpio_lo_minus_pin;
     int                     a_res;
 } *ad8232_context;
 
diff --git a/src/button/button.c b/src/button/button.c
index 9f109efe..530190fd 100644
--- a/src/button/button.c
+++ b/src/button/button.c
@@ -42,9 +42,7 @@ button_context button_init(int pin){
         return NULL;
     }
 
-    dev->gpio_pin = pin;
-
-    dev->gpio = mraa_gpio_init(dev->gpio_pin);
+    dev->gpio = mraa_gpio_init(pin);
     mraa_gpio_dir(dev->gpio, MRAA_GPIO_IN);
     dev->isr_installed = false;
 
diff --git a/src/button/button.h b/src/button/button.h
index 79f40496..9a9ac012 100644
--- a/src/button/button.h
+++ b/src/button/button.h
@@ -61,7 +61,6 @@
 
 typedef struct _button_context {
     mraa_gpio_context    gpio;
-    uint8_t              gpio_pin;
     bool                 isr_installed;
 } *button_context;
 
diff --git a/src/collision/collision.c b/src/collision/collision.c
index fe79175e..3896e3ec 100644
--- a/src/collision/collision.c
+++ b/src/collision/collision.c
@@ -39,8 +39,7 @@ collision_context collision_init(int pin) {
     if (!dev)
       return NULL;
 
-    dev->gpio_pin = pin;
-    dev->gpio = mraa_gpio_init(dev->gpio_pin);
+    dev->gpio = mraa_gpio_init(pin);
 
     if(mraa_gpio_dir(dev->gpio, MRAA_GPIO_IN) != MRAA_SUCCESS)
       {
diff --git a/src/collision/collision.h b/src/collision/collision.h
index 595e2eb6..42ac154c 100644
--- a/src/collision/collision.h
+++ b/src/collision/collision.h
@@ -45,7 +45,6 @@
  */
 typedef struct _collision_context {
     mraa_gpio_context        gpio;
-    uint8_t                  gpio_pin;
 } *collision_context;
 
 /**
diff --git a/src/m24lr64e/m24lr64e.h b/src/m24lr64e/m24lr64e.h
index 37de44ad..a177ee86 100644
--- a/src/m24lr64e/m24lr64e.h
+++ b/src/m24lr64e/m24lr64e.h
@@ -113,9 +113,9 @@ typedef enum {
  */
 typedef struct _m24lr64e_context {
     mraa_i2c_context            i2c;
-    uint8_t                     bus;
+    int                         bus;
     uint8_t                     address;
-    m24lr64e_access_mode    mode;
+    m24lr64e_access_mode        mode;
 } *m24lr64e_context;
 
 /**
diff --git a/src/mq303a/mq303a.c b/src/mq303a/mq303a.c
index f75cfee1..2bfe6cd3 100644
--- a/src/mq303a/mq303a.c
+++ b/src/mq303a/mq303a.c
@@ -41,10 +41,8 @@ mq303a_context mq303a_init(int pin, int heater_pin) {
     if (!dev)
       return NULL;
 
-    dev->aio_pin = pin;
-    dev->gpio_pin = heater_pin;
-    dev->aio = mraa_aio_init(dev->aio_pin);
-    dev->gpio = mraa_gpio_init(dev->gpio_pin);
+    dev->aio = mraa_aio_init(pin);
+    dev->gpio = mraa_gpio_init(heater_pin);
 
     if(mraa_gpio_dir(dev->gpio, MRAA_GPIO_OUT) != MRAA_SUCCESS)
       {
diff --git a/src/mq303a/mq303a.h b/src/mq303a/mq303a.h
index 3054ad28..fedaa146 100644
--- a/src/mq303a/mq303a.h
+++ b/src/mq303a/mq303a.h
@@ -43,8 +43,6 @@
 typedef struct _mq303a_context {
     mraa_gpio_context       gpio;
     mraa_aio_context        aio;
-    uint8_t                 gpio_pin;
-    uint8_t                 aio_pin;
 } *mq303a_context;
 
 /**
diff --git a/src/ttp223/ttp223.c b/src/ttp223/ttp223.c
index bc59b196..60761dea 100644
--- a/src/ttp223/ttp223.c
+++ b/src/ttp223/ttp223.c
@@ -42,9 +42,7 @@ ttp223_context ttp223_init(int pin) {
         return NULL;
     }
 
-    dev->gpio_pin = pin;
-
-    dev->gpio = mraa_gpio_init(dev->gpio_pin);
+    dev->gpio = mraa_gpio_init(pin);
     mraa_gpio_dir(dev->gpio, MRAA_GPIO_IN);
     dev->isr_installed = false;
 
diff --git a/src/ttp223/ttp223.h b/src/ttp223/ttp223.h
index d465bc1e..c82b0c8b 100644
--- a/src/ttp223/ttp223.h
+++ b/src/ttp223/ttp223.h
@@ -46,7 +46,6 @@
  */
 typedef struct _ttp223_context {
     mraa_gpio_context       gpio;
-    uint8_t                 gpio_pin;
     bool                    isr_installed;
 } *ttp223_context;