Raspberries/mraa
Private
Public Access
2
0
Fork 0
Code Activity

api: Renamed some sub-platform API calls.

Browse Source 
Signed-off-by: Henry Bruce <henry.bruce@intel.com>
Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>
This commit is contained in:
Henry Bruce
2015-08-10 17:16:00 -07:00
committed by Brendan Le Foll
parent b109a12dd1
commit 4031124081
5 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
api/mraa/common.h
View File

@@ -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);

2
examples/mraa-gpio.c
View File

@@ -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))

2
src/gpio/gpio.c
View File

@@ -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) {

2
src/i2c/i2c.c
View File

@@ -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) {

4
src/mraa.c
View File

@@ -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;
}