Fix crazy dependencies.

Author: dok-net

cores/esp8266/core_esp8266_wiring_digital.cpp

@@ -115,16 +115,21 @@ typedef struct {
   bool functional;
 } interrupt_handler_t;
 
-//duplicate from functionalInterrupt.h keep in sync
+//duplicates from functionalInterrupt.h keep in sync
 typedef struct InterruptInfo {
 	uint8_t pin;
 	uint8_t value;
 	uint32_t micro;
 } InterruptInfo;
 
-typedef struct {
+typedef struct FunctionInfo {
+  std::function<void(void)> reqFunction;
+  std::function<void(InterruptInfo)> reqScheduledFunction;
+} FunctionInfo;
+
+typedef struct ArgStructure {
 	InterruptInfo* interruptInfo;
-	void* functionInfo;
+	FunctionInfo* functionInfo;
 } ArgStructure;
 
 static interrupt_handler_t interrupt_handlers[16] = { {0, 0, 0, 0}, };
@@ -172,7 +177,13 @@ void ICACHE_RAM_ATTR interrupt_handler(void*)
   ETS_GPIO_INTR_ENABLE();
 }
 
-extern void cleanupFunctional(void* arg);
+static void cleanupFunctional(void* arg)
+{
+  ArgStructure* localArg = (ArgStructure*)arg;
+  delete (FunctionInfo*)localArg->functionInfo;
+  delete (InterruptInfo*)localArg->interruptInfo;
+  delete localArg;
+}
 
 static void set_interrupt_handlers(uint8_t pin, voidFuncPtr userFunc, void* arg, uint8_t mode, bool functional)
 {

libraries/FunctionalInterrupt/src/FunctionalInterrupt.cpp

@@ -23,17 +23,6 @@ void ICACHE_RAM_ATTR interruptFunctional(void* arg)
 	}
 }
 
-extern "C"
-{
-   void cleanupFunctional(void* arg)
-   {
-	 ArgStructure* localArg = (ArgStructure*)arg;
-	 delete (FunctionInfo*)localArg->functionInfo;
-     delete (InterruptInfo*)localArg->interruptInfo;
-	 delete localArg;
-   }
-}
-
 void attachInterrupt(uint8_t pin, std::function<void(void)> intRoutine, int mode)
 {
 	// use the local interrupt routine which takes the ArgStructure as argument

libraries/FunctionalInterrupt/src/FunctionalInterrupt.h

@@ -31,5 +31,4 @@ struct ArgStructure {
 void attachInterrupt(uint8_t pin, std::function<void(void)> intRoutine, int mode);
 void attachScheduledInterrupt(uint8_t pin, std::function<void(InterruptInfo)> scheduledIntRoutine, int mode);
 
-
-#endif //INTERRUPTS_H
+#endif //FUNCTIONALINTERRUPT_H