Adapt to be used as Mbed library

Author: facchinm

cores/arduino/Arduino.h

@@ -20,19 +20,28 @@
 #ifndef Arduino_h
 #define Arduino_h
 
-// TEMP: include proper CMSIS
-inline void NVIC_SystemReset() {}
-
-#ifdef __cplusplus
+#if defined(__cplusplus)
+#if !defined(ARDUINO_AS_MBED_LIBRARY)
 #define PinMode MbedPinMode
+#endif
 #include "mbed.h"
 #undef PinMode
 #endif
 
+#if defined(ARDUINO_AS_MBED_LIBRARY)
+#define PinMode ArduinoPinMode
+#endif
+
 #include "api/ArduinoAPI.h"
 
-#ifdef __cplusplus
+#if defined(ARDUINO_AS_MBED_LIBRARY)
+#undef PinMode
+#endif
+
+#if defined(__cplusplus)
+#if !defined(ARDUINO_AS_MBED_LIBRARY)
 using namespace arduino;
+#endif
 extern "C"{
 #endif
 

cores/arduino/Serial.h

@@ -1,8 +1,5 @@
-#include "api/HardwareSerial.h"
 #include "api/RingBuffer.h"
-#include "mbed/drivers/Serial.h"
-#include "mbed/rtos/Thread.h"
-#include "mbed/events/EventQueue.h"
+#include "Arduino.h"
 
 #ifdef __cplusplus
 
@@ -35,7 +32,7 @@ class UART : public HardwareSerial {
 };
 }
 
-extern UART UART1;
+extern arduino::UART UART1;
 
 #endif
 #endif

cores/arduino/main.cpp

@@ -39,7 +39,7 @@ int main(void)
 
 	for (;;) {
 		loop();
-		if (serialEventRun) serialEventRun();
+		if (arduino::serialEventRun) arduino::serialEventRun();
 	}
 
 	return 0;