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

mraa.c: subplatforms need to be defined after platforms

Browse Source 
This also means arm subplatforms can work and removes a plat == NULL check
which will never be true if -DUSBPLAT=ON

Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>
This commit is contained in:
Brendan Le Foll
2015-06-26 09:59:40 +01:00
parent 6dfe6ff6bc
commit e170e21031
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/mraa.c
View File

@@ -101,9 +101,16 @@ mraa_init()
advance_func = (mraa_adv_func_t*) malloc(sizeof(mraa_adv_func_t)); advance_func = (mraa_adv_func_t*) malloc(sizeof(mraa_adv_func_t));
memset(advance_func, 0, sizeof(mraa_adv_func_t)); memset(advance_func, 0, sizeof(mraa_adv_func_t));
#ifdef X86PLAT #if defined(X86PLAT)
// Use runtime x86 platform detection // Use runtime x86 platform detection
platform_type = mraa_x86_platform(); platform_type = mraa_x86_platform();
#elif defined(ARMPLAT)
// Use runtime ARM platform detection
platform_type = mraa_arm_platform();
#else
#error mraa_ARCH NOTHING
#endif
#ifdef USBPLAT #ifdef USBPLAT
// This is a platform extender so create null base platform if one doesn't already exist // This is a platform extender so create null base platform if one doesn't already exist
if (plat == NULL) { if (plat == NULL) {
@@ -115,17 +122,11 @@ mraa_init()
platform_type = usb_platform_type; platform_type = usb_platform_type;
} }
} }
#endif
#if defined(ARMPLAT)
// Use runtime ARM platform detection
platform_type = mraa_arm_platform();
#endif
if (plat == NULL) { if (plat == NULL) {
printf("mraa: FATAL error, failed to initialise platform\n"); printf("mraa: FATAL error, failed to initialise platform\n");
return MRAA_ERROR_PLATFORM_NOT_INITIALISED; return MRAA_ERROR_PLATFORM_NOT_INITIALISED;
} }
#endif
syslog(LOG_NOTICE, "libmraa initialised for platform '%s' of type %d", mraa_get_platform_name(), platform_type); syslog(LOG_NOTICE, "libmraa initialised for platform '%s' of type %d", mraa_get_platform_name(), platform_type);
return MRAA_SUCCESS; return MRAA_SUCCESS;