Private
Public Access
2
0

Merge branch 'hook'

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
9 changed files with 154 additions and 17 deletions

View File

@@ -24,9 +24,15 @@
#pragma once
#ifdef __cplusplus
extern "C" {
#endif
#include "common.h"
#include "mraa_internal_types.h"
extern mraa_adv_func advance_func;
/** Setup gpio
*
* Will check input is valid for gpio and will also setup required multiplexers.
@@ -84,3 +90,7 @@ mraa_result_t mraa_swap_complex_gpio(int pin, int out);
* @return mraa_result_t of operation
*/
mraa_result_t mraa_setup_uart(int index);
#ifdef __cplusplus
}
#endif