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

types: Remove MRAA_ERROR_PLATFORM_ALREADY_INITIALISED

Browse Source 
Enum was deprecated in 0.10.x and causes issues with strict C89 compliance so
is now removed

Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>
This commit is contained in:
Brendan Le Foll
2016-04-15 14:01:23 +01:00
parent 2404b0a683
commit acf90073a8
3 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/mraa/types.h
View File

@@ -206,7 +206,6 @@ typedef enum {
MRAA_ERROR_NO_DATA_AVAILABLE = 9, /**< No data available */ MRAA_ERROR_NO_DATA_AVAILABLE = 9, /**< No data available */
MRAA_ERROR_INVALID_PLATFORM = 10, /**< Platform not recognised */ MRAA_ERROR_INVALID_PLATFORM = 10, /**< Platform not recognised */
MRAA_ERROR_PLATFORM_NOT_INITIALISED = 11, /**< Board information not initialised */ MRAA_ERROR_PLATFORM_NOT_INITIALISED = 11, /**< Board information not initialised */
MRAA_ERROR_PLATFORM_ALREADY_INITIALISED = 0, /**< Board is already initialised, same as MRAA_SUCESS */
MRAA_ERROR_UART_OW_SHORTED = 12, /**< UART OW Short Circuit Detected*/ MRAA_ERROR_UART_OW_SHORTED = 12, /**< UART OW Short Circuit Detected*/
MRAA_ERROR_UART_OW_NO_DEVICES = 13, /**< UART OW No devices detected */ MRAA_ERROR_UART_OW_NO_DEVICES = 13, /**< UART OW No devices detected */
MRAA_ERROR_UART_OW_DATA_ERROR = 14, /**< UART OW Data/Bus error detected */ MRAA_ERROR_UART_OW_DATA_ERROR = 14, /**< UART OW Data/Bus error detected */

1
api/mraa/types.hpp
View File

@@ -204,7 +204,6 @@ typedef enum {
ERROR_NO_DATA_AVAILABLE = 9, /**< No data available */ ERROR_NO_DATA_AVAILABLE = 9, /**< No data available */
ERROR_INVALID_PLATFORM = 10, /**< Platform not recognised */ ERROR_INVALID_PLATFORM = 10, /**< Platform not recognised */
ERROR_PLATFORM_NOT_INITIALISED = 11, /**< Board information not initialised */ ERROR_PLATFORM_NOT_INITIALISED = 11, /**< Board information not initialised */
ERROR_PLATFORM_ALREADY_INITIALISED = 0, /**< Board is already initialised, same as SUCCESS */
ERROR_UART_OW_SHORTED = 12, /**< UART OW Short Circuit Detected*/ ERROR_UART_OW_SHORTED = 12, /**< UART OW Short Circuit Detected*/
ERROR_UART_OW_NO_DEVICES = 13, /**< UART OW No devices detected */ ERROR_UART_OW_NO_DEVICES = 13, /**< UART OW No devices detected */
ERROR_UART_OW_DATA_ERROR = 14, /**< UART OW Data/Bus error detected */ ERROR_UART_OW_DATA_ERROR = 14, /**< UART OW Data/Bus error detected */

4
src/mraa.c
View File

@@ -90,7 +90,7 @@ mraa_result_t
imraa_init() imraa_init()
{ {
if (plat != NULL) { if (plat != NULL) {
return MRAA_ERROR_PLATFORM_ALREADY_INITIALISED; return MRAA_SUCCESS;
} }
uid_t proc_euid = geteuid(); uid_t proc_euid = geteuid();
@@ -187,7 +187,7 @@ mraa_result_t __attribute__((constructor))
mraa_init() mraa_init()
{ {
if (plat != NULL) { if (plat != NULL) {
return MRAA_ERROR_PLATFORM_ALREADY_INITIALISED; return MRAA_SUCCESS;
} else { } else {
return imraa_init(); return imraa_init();
} }