periphmraa: Create IndexLookup functions for GPIO, I2C, SPI, PWM

These lookups provide the MRAA index with the Pin/Bus name as input

Signed-off-by: Vineela Tummalapalli <vineela.tummalapalli@intel.com>
Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>

api/mraa/common.h

@@ -233,6 +233,42 @@ unsigned int mraa_get_platform_pin_count(uint8_t platform_offset);
 */
 char* mraa_get_pin_name(int pin);
 
+/**
+* Get pin number, board must be initialised.
+*
+* @param pin_name: GPIO Pin Name. Eg: IO0
+* @return int of MRAA index for gpio
+*/
+
+int mraa_gpio_lookup(const char* pin_name);
+
+/**
+* Get pin number, board must be initialised.
+*
+* @param i2c_name: I2c Bus Name. Eg: I2C6
+* @return int of MRAA index of i2c bus
+*/
+
+int mraa_i2c_lookup(const char* i2c_name);
+
+/**
+* Get pin number, board must be initialised.
+*
+* @param spi_name: Name of spi bus. Eg: SPI2
+* @return int for MRAA index of spi bus
+*/
+
+int mraa_spi_lookup(const char* spi_name);
+
+/**
+* Get pin number, board must be initialised.
+*
+* @param pwm_name: Name of pwm. Eg:PWM0
+* @return int of MRAA index for pwm bus
+*/
+
+int mraa_pwm_lookup(const char* pwm_name);
+
 /**
  * Get default i2c bus, board must be initialised.
  *

api/mraa/common.hpp

@@ -27,6 +27,8 @@
 #include "common.h"
 #include "types.hpp"
 #include <string>
+#include <sstream>
+#include <stdexcept>
 
 /**
  * @namespace mraa namespace
@@ -214,6 +216,90 @@ getPinName(int pin)
     return ret_val;
 }
 
+/**
+* Get pin number, board must be initialised.
+*
+* @param pin_name: GPIO Pin Name. Eg: IO0
+* @throws std::invalid_argument if name is not valid
+* @return int of MRAA index for gpio
+*/
+inline int
+getGpioLookup(std::string pin_name)
+{
+    int index = mraa_gpio_lookup(pin_name.c_str());
+
+    if (index < 0){
+        std::ostringstream oss;
+        oss << "Gpio name " << pin_name << " is not valid";
+        throw std::invalid_argument(oss.str());
+    }
+
+    return index;
+}
+
+/**
+* Get pin number, board must be initialised.
+*
+* @param i2c_name: I2c Bus Name. Eg: I2C6
+* @throws std::invalid_argument if name is not valid
+* @return int of MRAA index of i2c bus
+*/
+inline int
+getI2cLookup(std::string i2c_name)
+{
+    int index = mraa_i2c_lookup(i2c_name.c_str());
+
+    if (index < 0){
+        std::ostringstream oss;
+        oss << "i2c name " << i2c_name << " is not valid";
+        throw std::invalid_argument(oss.str());
+    }
+
+    return index;
+}
+
+/**
+* Get pin number, board must be initialised.
+*
+* @param spi_name: Name of spi bus. Eg: SPI2
+* @throws std::invalid_argument if name is not valid
+* @return int for MRAA index of spi bus
+*/
+inline int
+getSpiLookup(std::string spi_name)
+{
+    int index = mraa_spi_lookup(spi_name.c_str());
+
+    if (index < 0){
+        std::ostringstream oss;
+        oss << "Spi name " << spi_name << " is not valid";
+        throw std::invalid_argument(oss.str());
+    }
+
+    return index;
+}
+
+/**
+* Get pin number, board must be initialised.
+*
+* @param pwm_name: Name of pwm. Eg:PWM0
+* @throws std::invalid_argument if name is not valid
+* @return int of MRAA index for pwm bus
+*/
+inline int
+getPwmLookup(std::string pwm_name)
+{
+    int index = mraa_pwm_lookup(pwm_name.c_str());
+
+    if (index < 0){
+        std::ostringstream oss;
+        oss << "PWM name " << pwm_name << " is not valid";
+        throw std::invalid_argument(oss.str());
+    }
+
+    return index;
+}
+
 /**
  * Sets the log level to use from 0-7 where 7 is very verbose. These are the
  * syslog log levels, see syslog(3) for more information on the levels.

include/mraa_internal_types.h

@@ -339,6 +339,7 @@ typedef struct {
  */
 typedef struct {
     /*@{*/
+    char *name; /**< i2c bus name */
     int bus_id; /**< ID as exposed in the system */
     int scl; /**< i2c SCL */
     int sda; /**< i2c SDA */
@@ -351,6 +352,7 @@ typedef struct {
  */
 typedef struct {
     /*@{*/
+    char *name; /**< spi bus name */
     unsigned int bus_id; /**< The Bus ID as exposed to the system. */
     unsigned int slave_s; /**< Slave select */
     mraa_boolean_t three_wire; /**< Is the bus only a three wire system */
@@ -366,6 +368,7 @@ typedef struct {
  */
 typedef struct {
     /*@{*/
+    char *name; /**< uart name */
     unsigned int index; /**< ID as exposed in the system */
     int rx; /**< uart rx */
     int tx; /**< uart tx */
@@ -378,6 +381,7 @@ typedef struct {
  */
 typedef struct {
     /*@{*/
+    char *name; /**< pwm device name */
     unsigned int index; /**< ID as exposed in the system */
     char* device_path; /**< To store "/dev/pwm" for example */
     /*@}*/

src/mraa.c

@@ -799,8 +799,9 @@ mraa_get_platform_pin_count(uint8_t platform_offset)
 char*
 mraa_get_pin_name(int pin)
 {
-    if (plat == NULL)
+    if (plat == NULL) {
         return 0;
+    }
 
     mraa_board_t* current_plat = plat;
     if (mraa_is_sub_platform_id(pin)) {
@@ -812,11 +813,88 @@ mraa_get_pin_name(int pin)
         pin = mraa_get_sub_platform_index(pin);
     }
 
-    if (pin > (current_plat->phy_pin_count - 1) || pin < 0)
+    if (pin > (current_plat->phy_pin_count - 1) || pin < 0) {
         return NULL;
+    }
     return (char*) current_plat->pins[pin].name;
 }
 
+int mraa_gpio_lookup(const char* pin_name)
+{
+    if (plat == NULL) {
+        return -1;
+    }
+
+    if (strlen(pin_name) == 0) {
+        return -1;
+    }
+
+    int i = 0;
+    for (; i < plat->gpio_count; i++) {
+         if (0 == strcmp(pin_name, plat->pins[i].name)) {
+             return plat->pins[i].gpio.pinmap;
+         }
+    }
+    return -1;
+}
+
+int mraa_i2c_lookup(const char* i2c_name)
+{
+    if (plat == NULL) {
+        return -1;
+    }
+
+    if (strlen(i2c_name) == 0) {
+        return -1;
+    }
+
+    int i = 0;
+    for (; i < plat->i2c_bus_count; i++) {
+         if (0 == strcmp(i2c_name, plat->i2c_bus[i].name)) {
+             return plat->i2c_bus[i].bus_id;
+         }
+    }
+    return -1;
+}
+
+int mraa_spi_lookup(const char* spi_name)
+{
+    if (plat == NULL) {
+        return -1;
+    }
+
+    if (strlen(spi_name) == 0) {
+        return -1;
+    }
+
+    int i = 0;
+    for (; i < plat->spi_bus_count; i++) {
+         if (0 == strcmp(spi_name, plat->spi_bus[i].name)) {
+             return plat->spi_bus[i].bus_id;
+         }
+    }
+    return -1;
+}
+
+int mraa_pwm_lookup(const char* pwm_name)
+{
+    if (plat == NULL) {
+        return -1;
+    }
+
+    if (strlen(pwm_name) == 0) {
+        return -1;
+    }
+
+    int i = 0;
+    for (; i < plat->pwm_dev_count; i++) {
+         if (0 == strcmp(pwm_name, plat->pwm_dev[i].name)) {
+             return plat->pwm_dev[i].index;
+         }
+    }
+    return -1;
+}
+
 int
 mraa_get_default_i2c_bus(uint8_t platform_offset)
 {

src/peripheralman/peripheralman.c

@@ -788,6 +788,7 @@ mraa_peripheralman_plat_init()
 
     //Updating I2C bus structure
     for (i = 0; i < i2c_busses_count; i++) {
+        b->i2c_bus[i].name = i2c_busses[i];
         b->i2c_bus[i].bus_id = i;
         b->i2c_bus[i].sda = -1;
         b->i2c_bus[i].scl = -1;
@@ -795,6 +796,7 @@ mraa_peripheralman_plat_init()
 
     //Updating SPI bus structure
     for (i =0; i < spi_busses_count; i++) {
+        b->spi_bus[i].name = spi_busses[i];
         b->spi_bus[i].bus_id = i;
         b->spi_bus[i].slave_s = -1;
         b->spi_bus[i].three_wire = -1;
@@ -806,6 +808,7 @@ mraa_peripheralman_plat_init()
 
     //Updating PWM structure
     for (i = 0; i < pwm_dev_count; i++) {
+        b->pwm_dev[i].name = pwm_devices[i];
         b->pwm_dev[i].index = i;
     }