From b367a63010ec4030e577213cc0a31396c419390f Mon Sep 17 00:00:00 2001
From: Mihai Tudor Panu <mihai.tudor.panu@intel.com>
Date: Mon, 8 Jan 2018 13:25:55 -0800
Subject: [PATCH] upm: fix pin and bus types to allow subplatform usage in C
 libs

Signed-off-by: Mihai Tudor Panu <mihai.tudor.panu@intel.com>
---
 src/a110x/a110x.c       | 2 +-
 src/a110x/a110x.h       | 4 ++--
 src/abp/abp.c           | 2 +-
 src/abp/abp.h           | 4 ++--
 src/gp2y0a/gp2y0a.c     | 2 +-
 src/gp2y0a/gp2y0a.h     | 4 ++--
 src/lcm1602/lcm1602.c   | 6 +++---
 src/lcm1602/lcm1602.h   | 6 +++---
 src/led/led.c           | 2 +-
 src/led/led.h           | 4 ++--
 src/my9221/my9221.c     | 2 +-
 src/my9221/my9221.h     | 2 +-
 src/rsc/rsc.c           | 2 +-
 src/rsc/rsc.h           | 4 ++--
 src/urm37/urm37.c       | 6 +++---
 src/urm37/urm37.h       | 6 +++---
 src/veml6070/veml6070.c | 2 +-
 src/veml6070/veml6070.h | 4 ++--
 18 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/src/a110x/a110x.c b/src/a110x/a110x.c
index e2281532..2134d860 100644
--- a/src/a110x/a110x.c
+++ b/src/a110x/a110x.c
@@ -24,7 +24,7 @@
  */
 #include "a110x.h"
 
-a110x_context a110x_init(uint8_t pin) {
+a110x_context a110x_init(int pin) {
     // make sure MRAA is initialized
     int mraa_rv;
     if ((mraa_rv = mraa_init()) != MRAA_SUCCESS)
diff --git a/src/a110x/a110x.h b/src/a110x/a110x.h
index f0f83de9..c5e35e7c 100644
--- a/src/a110x/a110x.h
+++ b/src/a110x/a110x.h
@@ -45,7 +45,7 @@
  */
 typedef struct _a110x_context {
     mraa_gpio_context      gpio;
-    uint8_t                gpio_pin;
+    int                    gpio_pin;
     bool                   isr_installed;
 } *a110x_context;
 
@@ -55,7 +55,7 @@ typedef struct _a110x_context {
  * @param pin GPIO pin to use
  * @return device context pointer
  */
-a110x_context a110x_init(uint8_t pin);
+a110x_context a110x_init(int pin);
 
 /**
  * A110X Initialization function
diff --git a/src/abp/abp.c b/src/abp/abp.c
index 332b69a7..f9239a08 100644
--- a/src/abp/abp.c
+++ b/src/abp/abp.c
@@ -23,7 +23,7 @@
  */
 #include "abp.h"
  
-abp_context abp_init(uint8_t bus, uint8_t dev_address){
+abp_context abp_init(int bus, uint8_t dev_address){
     // make sure MRAA is initialized
     int mraa_rv;
     if ((mraa_rv = mraa_init()) != MRAA_SUCCESS)
diff --git a/src/abp/abp.h b/src/abp/abp.h
index e93f6782..54b646d9 100644
--- a/src/abp/abp.h
+++ b/src/abp/abp.h
@@ -60,7 +60,7 @@ typedef enum {
  
 typedef struct _abp_context {
     mraa_i2c_context       i2c;
-    uint8_t                i2c_bus_number;
+    int                    i2c_bus_number;
     uint8_t                address;
     int                    abp_pressure_max;
     int                    abp_pressure_min;
@@ -74,7 +74,7 @@ typedef struct _abp_context {
  * @param bus I2C bus to use
  * @return device context pointer
  */
-abp_context abp_init(uint8_t bus, uint8_t dev_address);
+abp_context abp_init(int bus, uint8_t dev_address);
 
 /**
  * ABP Close function
diff --git a/src/gp2y0a/gp2y0a.c b/src/gp2y0a/gp2y0a.c
index 0312b6bb..b1b3fccd 100644
--- a/src/gp2y0a/gp2y0a.c
+++ b/src/gp2y0a/gp2y0a.c
@@ -24,7 +24,7 @@
  */
 #include "gp2y0a.h"
 
-gp2y0a_context gp2y0a_init(uint8_t pin, float a_ref){
+gp2y0a_context gp2y0a_init(int pin, float a_ref){
     // make sure MRAA is initialized
     int mraa_rv;
     if ((mraa_rv = mraa_init()) != MRAA_SUCCESS)
diff --git a/src/gp2y0a/gp2y0a.h b/src/gp2y0a/gp2y0a.h
index 31167333..e11bdaf0 100644
--- a/src/gp2y0a/gp2y0a.h
+++ b/src/gp2y0a/gp2y0a.h
@@ -47,7 +47,7 @@
  */
 typedef struct _gp2y0a_context {
     mraa_aio_context            aio;
-    uint8_t                     pin;
+    int                         pin;
     int                         a_res;
 } *gp2y0a_context;
 
@@ -57,7 +57,7 @@ typedef struct _gp2y0a_context {
  * @param pin Analog pin to use
  * @param a_ref reference voltage
  */
-gp2y0a_context gp2y0a_init(uint8_t pin, float a_ref);
+gp2y0a_context gp2y0a_init(int pin, float a_ref);
 
 /**
  * GP2Y0A close function
diff --git a/src/lcm1602/lcm1602.c b/src/lcm1602/lcm1602.c
index 1718d79d..a8f4dc41 100644
--- a/src/lcm1602/lcm1602.c
+++ b/src/lcm1602/lcm1602.c
@@ -135,9 +135,9 @@ lcm1602_context lcm1602_i2c_init(int bus, int address, bool is_expander,
     return dev;
 }
 
-lcm1602_context lcm1602_gpio_init(uint8_t rs, uint8_t enable,
-                                  uint8_t d0, uint8_t d1, uint8_t d2,
-                                  uint8_t d3, uint8_t num_columns,
+lcm1602_context lcm1602_gpio_init(int rs, int enable,
+                                  int d0, int d1, int d2,
+                                  int d3, uint8_t num_columns,
                                   uint8_t num_rows)
 {
     lcm1602_context dev =
diff --git a/src/lcm1602/lcm1602.h b/src/lcm1602/lcm1602.h
index 2fafbcf4..14741ae3 100644
--- a/src/lcm1602/lcm1602.h
+++ b/src/lcm1602/lcm1602.h
@@ -115,9 +115,9 @@ extern "C" {
      * @param num_rows Number of rows the display has. Default 2.
      * @return Device Ccontext, or NULL on error.
      */
-    lcm1602_context lcm1602_gpio_init(uint8_t rs, uint8_t enable,
-                                      uint8_t d0, uint8_t d1, uint8_t d2,
-                                      uint8_t d3, uint8_t num_columns,
+    lcm1602_context lcm1602_gpio_init(int rs, int enable,
+                                      int d0, int d1, int d2,
+                                      int d3, uint8_t num_columns,
                                       uint8_t num_rows);
 
     /**
diff --git a/src/led/led.c b/src/led/led.c
index 438a2bda..008228bc 100644
--- a/src/led/led.c
+++ b/src/led/led.c
@@ -27,7 +27,7 @@
 #include "led.h"
 #include "upm_types.h"
 
-led_context led_init(uint8_t pin){
+led_context led_init(int pin){
     // make sure MRAA is initialized
     int mraa_rv;
     if ((mraa_rv = mraa_init()) != MRAA_SUCCESS)
diff --git a/src/led/led.h b/src/led/led.h
index ddd6822e..64cc4664 100644
--- a/src/led/led.h
+++ b/src/led/led.h
@@ -47,7 +47,7 @@
  */
 typedef struct _led_context {
     mraa_gpio_context        gpio;
-    uint8_t                  led_pin;
+    int                      led_pin;
 } *led_context;
 
 /**
@@ -56,7 +56,7 @@ typedef struct _led_context {
  * @param pin GPIO pin to use
  * @return The sensor context
  */
-led_context led_init(uint8_t pin);
+led_context led_init(int pin);
 
 /**
  * LED Initialization function
diff --git a/src/my9221/my9221.c b/src/my9221/my9221.c
index 1ac9ae09..e636cc65 100644
--- a/src/my9221/my9221.c
+++ b/src/my9221/my9221.c
@@ -48,7 +48,7 @@
 static void my9221_lock_data(const my9221_context dev);
 static void my9221_send_16bit_block(const my9221_context dev, uint16_t data);
 
-my9221_context my9221_init(uint8_t dataPin, uint8_t clockPin,
+my9221_context my9221_init(int dataPin, int clockPin,
                            int instances)
 {
     if (instances < 1)
diff --git a/src/my9221/my9221.h b/src/my9221/my9221.h
index 1f7bfdfc..24372f1e 100644
--- a/src/my9221/my9221.h
+++ b/src/my9221/my9221.h
@@ -91,7 +91,7 @@ extern "C" {
      * least 1
      * @return Device context
      */
-    my9221_context my9221_init(uint8_t dataPin, uint8_t clockPin,
+    my9221_context my9221_init(int dataPin, int clockPin,
                                int instances);
 
     /**
diff --git a/src/rsc/rsc.c b/src/rsc/rsc.c
index 5f4fc9b2..cb7daa90 100644
--- a/src/rsc/rsc.c
+++ b/src/rsc/rsc.c
@@ -34,7 +34,7 @@ upm_result_t rsc_add_dr_delay(rsc_context dev);
 
 void rsc_set_access_type(rsc_context dev, ACCESS_T type);
  
-rsc_context rsc_init(uint8_t bus, uint8_t cs_ee_pin, uint8_t cs_adc_pin) {
+rsc_context rsc_init(int bus, int cs_ee_pin, int cs_adc_pin) {
     // make sure MRAA is initialized
     int mraa_rv;
     if ((mraa_rv = mraa_init()) != MRAA_SUCCESS)
diff --git a/src/rsc/rsc.h b/src/rsc/rsc.h
index 4f8c0a32..10b161ce 100644
--- a/src/rsc/rsc.h
+++ b/src/rsc/rsc.h
@@ -53,7 +53,7 @@ typedef struct _rsc_context {
     mraa_spi_context       spi;
     mraa_gpio_context      cs_ee;
     mraa_gpio_context      cs_adc;
-    uint8_t                spi_bus_number;
+    int                    spi_bus_number;
     float                  coeff_matrix[RSC_COEFF_T_ROW_NO][RSC_COEFF_T_COL_NO];
     PRESSURE_U             unit;
     PRESSURE_T             type;
@@ -79,7 +79,7 @@ typedef struct _rsc_context {
  * @param cs_adc_pin The CS pin for accessing the ADC
  * @return The device context, or NULL if an error occurred.
  */
-rsc_context rsc_init(uint8_t bus, uint8_t cs_ee_pin, uint8_t cs_adc_pin);
+rsc_context rsc_init(int bus, int cs_ee_pin, int cs_adc_pin);
 
 /**
  * RSC Close function
diff --git a/src/urm37/urm37.c b/src/urm37/urm37.c
index 48dd05fa..1bd20b19 100644
--- a/src/urm37/urm37.c
+++ b/src/urm37/urm37.c
@@ -36,9 +36,9 @@
 #define URM37_WAIT_TIMEOUT      1000
 #define URM37_MAX_RETRIES       10
 
-urm37_context urm37_init(uint8_t a_pin, uint8_t reset_pin,
-                         uint8_t trigger_pin, float a_ref,
-                         uint8_t uart_bus, bool analog_mode)
+urm37_context urm37_init(int a_pin, int reset_pin,
+                         int trigger_pin, float a_ref,
+                         int uart_bus, bool analog_mode)
 {
   // make sure MRAA is initialized
   int mraa_rv;
diff --git a/src/urm37/urm37.h b/src/urm37/urm37.h
index 05afa04f..18cca3e1 100644
--- a/src/urm37/urm37.h
+++ b/src/urm37/urm37.h
@@ -76,9 +76,9 @@ typedef struct _urm37_context {
  * @param uart Default UART to use (0 or 1). Ignored in analog mode.
  * @param mode true for analog mode, false otherwise.
  */
-urm37_context urm37_init(uint8_t a_pin, uint8_t reset_pin,
-                         uint8_t trigger_pin, float a_ref, 
-                         uint8_t uart, bool analog_mode);
+urm37_context urm37_init(int a_pin, int reset_pin,
+                         int trigger_pin, float a_ref, 
+                         int uart, bool analog_mode);
 
 /**
  * URM37 sensor close function
diff --git a/src/veml6070/veml6070.c b/src/veml6070/veml6070.c
index 3ab17dda..66878141 100644
--- a/src/veml6070/veml6070.c
+++ b/src/veml6070/veml6070.c
@@ -23,7 +23,7 @@
  */
 #include "veml6070.h"
 
-veml6070_context veml6070_init(uint8_t bus) {
+veml6070_context veml6070_init(int bus) {
     // make sure MRAA is initialized
     int mraa_rv;
     if ((mraa_rv = mraa_init()) != MRAA_SUCCESS)
diff --git a/src/veml6070/veml6070.h b/src/veml6070/veml6070.h
index 13778018..6cb0816c 100644
--- a/src/veml6070/veml6070.h
+++ b/src/veml6070/veml6070.h
@@ -58,7 +58,7 @@ typedef struct _veml6070_context {
     mraa_i2c_context       i2c_seq2;
     uint8_t                address_seq1;
     uint8_t                address_seq2;
-    uint8_t                i2c_bus_number;
+    int                    i2c_bus_number;
 } *veml6070_context;
 
 /**
@@ -69,7 +69,7 @@ typedef struct _veml6070_context {
  *
  * @return device context pointer
  */
-veml6070_context veml6070_init(uint8_t bus);
+veml6070_context veml6070_init(int bus);
 
 /**
  * VEML6070 Close function