Move DECL_ON_LMIC_EVENT from lmic.c to lmic.h

matthijskooijman · matthijskooijman · commit 06aa91d47341 · 2016-02-20T12:24:04.000+01:00
This declares the onEvent() callback function that must be defined by an
application. Previously, the application was expected to define this
itself, and a reference to it was declared in lmic.c.

By moving the declaration into lmic.h, this prevents problems when an
application uses a different function signature for the function, or
when defining the callback in a C++ file (which will now be compiled as
a C function automatically).
diff --git a/src/lmic/lmic.c b/src/lmic/lmic.c
@@ -43,7 +43,6 @@
 #define isTESTMODE() 0
 
 DEFINE_LMIC;
-DECL_ON_LMIC_EVENT;
 
 
 // Fwd decls.
diff --git a/src/lmic/lmic.h b/src/lmic/lmic.h
@@ -262,6 +262,10 @@ void  LMIC_tryRejoin     (void);
 void LMIC_setSession (u4_t netid, devaddr_t devaddr, xref2u1_t nwkKey, xref2u1_t artKey);
 void LMIC_setLinkCheckMode (bit_t enabled);
 
+// Declare onEvent() function, to make sure any definition will have the
+// C conventions, even when in a C++ file.
+DECL_ON_LMIC_EVENT;
+
 // Special APIs - for development or testing
 // !!!See implementation for caveats!!!
 
