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

Merge branch 'hook'

Browse Source 
Conflicts:
	include/intel_galileo_rev_d.h
	include/intel_galileo_rev_g.h
	include/mraa_adv_func.h
	include/mraa_internal.h
	src/gpio/gpio.c
	src/mraa.c
This commit is contained in:
Thomas Ingleby
2014-07-11 11:56:45 +01:00
parent 9f2f5be20a d7c8f2a794
commit 9bacfcff5f
9 changed files with 154 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/mraa.c
View File

@@ -37,6 +37,7 @@
//static mraa_pininfo_t* pindata;
static mraa_board_t* plat = NULL;
static mraa_platform_t platform_type = MRAA_UNKNOWN_PLATFORM;
mraa_adv_func advance_func;
const char *
mraa_get_version()
@@ -44,15 +45,7 @@ mraa_get_version()
return gVERSION;
}
#if 0
const mraa_adv_func*
mraa_get_advance()
{
return (const mraa_adv_func*) advance;
}
#endif
mraa_result_t
mraa_result_t __attribute__((constructor))
mraa_init()
{
/** Once more board definitions have been added,
@@ -84,15 +77,16 @@ mraa_init()
free(line);
fclose(fh);
memset(&advance_func, 0, sizeof(mraa_adv_func));
switch(platform_type) {
case MRAA_INTEL_GALILEO_GEN2:
plat = mraa_intel_galileo_gen2();
plat = mraa_intel_galileo_gen2(&advance_func);
break;
case MRAA_INTEL_GALILEO_GEN1:
plat = mraa_intel_galileo_rev_d();
plat = mraa_intel_galileo_rev_d(&advance_func);
break;
default:
plat = mraa_intel_galileo_rev_d();
plat = mraa_intel_galileo_rev_d(&advance_func);
fprintf(stderr, "Platform not found, initialising MRAA_INTEL_GALILEO_GEN1\n");
}