From 4031124081357ae9ff6e0ba2624cbed79ed254a6 Mon Sep 17 00:00:00 2001
From: Henry Bruce <henry.bruce@intel.com>
Date: Mon, 10 Aug 2015 17:16:00 -0700
Subject: [PATCH] api: Renamed some sub-platform API calls.

Signed-off-by: Henry Bruce <henry.bruce@intel.com>
Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>
---
 api/mraa/common.h    | 16 ++++++++--------
 examples/mraa-gpio.c |  2 +-
 src/gpio/gpio.c      |  2 +-
 src/i2c/i2c.c        |  2 +-
 src/mraa.c           |  4 ++--
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/api/mraa/common.h b/api/mraa/common.h
index 90a111b..7c5dc49 100644
--- a/api/mraa/common.h
+++ b/api/mraa/common.h
@@ -224,25 +224,25 @@ mraa_boolean_t mraa_is_sub_platform_selected();
  *
  * @return mraa_boolean_t 1 if pin or bus is for sub platform, 0 otherwise
  */
-mraa_boolean_t mraa_is_on_sub_platform(int pin_or_bus);
+mraa_boolean_t mraa_is_sub_platform_id(int pin_or_bus_id);
 
 /**
- * Convert pin or bus id to corresponding sub platform id.
+ * Convert pin or bus index to corresponding sub platform id.
  *
- * @param int pin or bus number
+ * @param int pin or bus index
  *
  * @return int sub platform pin or bus number
  */
-int mraa_use_sub_platform(int pin_or_bus);
+int mraa_get_sub_platform_id(int pin_or_bus_index);
 
 /**
- * Convert pin or bus sub platform id to base platform id.
+ * Convert pin or bus sub platform id to index.
  *
- * @param int sub platform pin or bus number
+ * @param int sub platform pin or bus id
  *
- * @return int base platform pin or bus number
+ * @return int pin or bus index
  */
-int mraa_get_sub_platform_index(int pin_or_bus);
+int mraa_get_sub_platform_index(int pin_or_bus_id);
 
 
 
diff --git a/examples/mraa-gpio.c b/examples/mraa-gpio.c
index b466cb2..2ef470d 100644
--- a/examples/mraa-gpio.c
+++ b/examples/mraa-gpio.c
@@ -66,7 +66,7 @@ list_platform_pins()
     int i;
     for (i = 0; i < pin_count; ++i) {
         if (strcmp(mraa_get_pin_name(i), "INVALID") != 0) {
-            int pin_id = mraa_is_sub_platform_selected() ? mraa_use_sub_platform(i) : i;
+            int pin_id = mraa_is_sub_platform_selected() ? mraa_get_sub_platform_id(i) : i;
             fprintf(stdout, "%02d ", pin_id);
             fprintf(stdout, "%*s: ", (MRAA_PIN_NAME_SIZE - 1), mraa_get_pin_name(i));
             if (mraa_pin_mode_test(i, MRAA_PIN_GPIO))
diff --git a/src/gpio/gpio.c b/src/gpio/gpio.c
index 84e7c68..f66cfa9 100644
--- a/src/gpio/gpio.c
+++ b/src/gpio/gpio.c
@@ -132,7 +132,7 @@ mraa_gpio_init(int pin)
         return NULL;
     }
     
-    if (mraa_is_on_sub_platform(pin)) {
+    if (mraa_is_sub_platform_id(pin)) {
         syslog(LOG_NOTICE, "gpio: Using sub platform");
         board = board->sub_platform;
         if (board == NULL) {
diff --git a/src/i2c/i2c.c b/src/i2c/i2c.c
index 061124c..642dc74 100644
--- a/src/i2c/i2c.c
+++ b/src/i2c/i2c.c
@@ -137,7 +137,7 @@ mraa_i2c_init(int bus)
         return NULL;
     }
 
-    if (mraa_is_on_sub_platform(bus)) {
+    if (mraa_is_sub_platform_id(bus)) {
         syslog(LOG_NOTICE, "i2c: Using sub platform");
         board = board->sub_platform;
         if (board == NULL) {
diff --git a/src/mraa.c b/src/mraa.c
index fdff587..315dbe1 100644
--- a/src/mraa.c
+++ b/src/mraa.c
@@ -654,13 +654,13 @@ mraa_find_i2c_bus(const char* devname, int startfrom)
 }
 
 mraa_boolean_t
-mraa_is_on_sub_platform(int pin_or_bus)
+mraa_is_sub_platform_id(int pin_or_bus)
 {
     return (pin_or_bus & MRAA_SUB_PLATFORM_MASK) != 0;
 }
 
 int 
-mraa_use_sub_platform(int pin_or_bus)
+mraa_get_sub_platform_id(int pin_or_bus)
 {
     return pin_or_bus | MRAA_SUB_PLATFORM_MASK;
 }