diff --git a/api/mraa/common.h b/api/mraa/common.h index 0357f0c..1880852 100644 --- a/api/mraa/common.h +++ b/api/mraa/common.h @@ -64,9 +64,7 @@ typedef unsigned int mraa_boolean_t; * * Detects running platform and attempts to use included pinmap, this is run on * module/library init/load but is handy to rerun to check board initialised - * correctly. MRAA_SUCCESS inidicates correct (first time) initialisation - * whilst MRAA_ERROR_PLATFORM_ALREADY_INITIALISED indicates the board is - * already initialised correctly + * correctly. MRAA_SUCCESS inidicates correct initialisation. * * @return Result of operation */ diff --git a/api/mraa/common.hpp b/api/mraa/common.hpp index 26f4a60..65202b1 100644 --- a/api/mraa/common.hpp +++ b/api/mraa/common.hpp @@ -46,9 +46,7 @@ namespace mraa * * Detects running platform and attempts to use included pinmap, this is run on * module/library init/load but is handy to rerun to check board initialised - * correctly. MRAA_SUCCESS inidicates correct (first time) initialisation - * whilst MRAA_ERROR_PLATFORM_ALREADY_INITIALISED indicates the board is - * already initialised correctly + * correctly. mraa::SUCCESS inidicates correct initialisation. * * @return Result of operation */ @@ -260,7 +258,7 @@ isSubPlatformId(int pin_or_bus_id) * * @return int sub platform pin or bus number */ -inline int +inline int getSubPlatformId(int pin_or_bus_index) { return mraa_get_sub_platform_id(pin_or_bus_index); diff --git a/api/mraa/types.h b/api/mraa/types.h index fe0daad..36f2e27 100644 --- a/api/mraa/types.h +++ b/api/mraa/types.h @@ -203,7 +203,7 @@ typedef enum { MRAA_ERROR_NO_DATA_AVAILABLE = 9, /**< No data available */ MRAA_ERROR_INVALID_PLATFORM = 10, /**< Platform not recognised */ MRAA_ERROR_PLATFORM_NOT_INITIALISED = 11, /**< Board information not initialised */ - MRAA_ERROR_PLATFORM_ALREADY_INITIALISED = 12, /**< Board is already initialised */ + MRAA_ERROR_PLATFORM_ALREADY_INITIALISED = 0, /**< Board is already initialised, same as MRAA_SUCESS */ MRAA_ERROR_UNSPECIFIED = 99 /**< Unknown Error */ } mraa_result_t; diff --git a/api/mraa/types.hpp b/api/mraa/types.hpp index cc6f53a..522a7f4 100644 --- a/api/mraa/types.hpp +++ b/api/mraa/types.hpp @@ -195,7 +195,7 @@ typedef enum { ERROR_NO_DATA_AVAILABLE = 9, /**< No data available */ ERROR_INVALID_PLATFORM = 10, /**< Platform not recognised */ ERROR_PLATFORM_NOT_INITIALISED = 11, /**< Board information not initialised */ - ERROR_PLATFORM_ALREADY_INITIALISED = 12, /**< Board is already initialised */ + ERROR_PLATFORM_ALREADY_INITIALISED = 0, /**< Board is already initialised, same as SUCCESS */ ERROR_UNSPECIFIED = 99 /**< Unknown Error */ } Result; diff --git a/src/mraa.c b/src/mraa.c index b2307ea..e5f9d05 100644 --- a/src/mraa.c +++ b/src/mraa.c @@ -83,7 +83,7 @@ mraa_result_t __attribute__((constructor)) mraa_init() { if (plat != NULL) { - return MRAA_ERROR_PLATFORM_ALREADY_INITIALISED; + return MRAA_SUCCESS; } uid_t proc_euid = geteuid(); @@ -320,9 +320,6 @@ mraa_result_print(mraa_result_t result) case MRAA_ERROR_PLATFORM_NOT_INITIALISED: fprintf(stdout, "MRAA: Platform not initialised.\n"); break; - case MRAA_ERROR_PLATFORM_ALREADY_INITIALISED: - fprintf(stdout, "MRAA: Platform already initialised.\n"); - break; case MRAA_ERROR_UNSPECIFIED: fprintf(stdout, "MRAA: Unspecified Error.\n"); break;