Revision 0:e62fc62bc488, committed 2011-12-11

Comitter:

Renegr

Date:

Sun Dec 11 22:04:59 2011 +0000

Commit message:

Changed in this revision

diff -r 000000000000 -r e62fc62bc488 FunctionPointers.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/FunctionPointers.h	Sun Dec 11 22:04:59 2011 +0000
@@ -0,0 +1,107 @@
+/* FunctionPointers.h
+ * Modified version of Andy Kirkhams FPointer.h
+ * http://mbed.org/users/AjK/libraries/FPointer/ll7nhv
+ * Advantages:
+ * - reduced size of from 12 -> 8 byte by usage of a unnamed union
+ * - speedup function call by removing one error check
+ * - replaced call() function by () operator
+ * - templated: you can define the return and argument types
+ * - implementations for 1 and 2 arguments, easy extendable to more arguments
+ * Disadvantage:
+ * - do NOT call operator() without an attached callback function
+ */ 
+  
+#ifndef FUNCTIONPOINTERS_H 
+#define FUNCTIONPOINTERS_H 
+
+template<class Tret=void>
+class FPtrRetT {
+public:
+    FPtrRetT() : obj_callback( NULL), c_callback( NULL)  {
+    }
+
+    void attach(Tret (*function)()) {
+        c_callback = function;
+    }
+
+    template<class T>
+    void attach(T& item, Tret (T::*method)()) {
+        obj_callback    = reinterpret_cast<FPtrDummy*>(&item);
+        method_callback = reinterpret_cast<Tret (FPtrDummy::*)()>(method);
+    }
+
+    Tret operator()() const {
+        return obj_callback ? (obj_callback->*method_callback)() : (*c_callback)();
+    }
+
+private:
+    class FPtrDummy;
+
+    FPtrDummy  *obj_callback;
+    union {
+        Tret (*c_callback)();
+        Tret (FPtrDummy::*method_callback)();
+    };
+};
+
+template<class Tret, class Targ1>
+class FPtr1ArgT {
+public:
+    FPtr1ArgT() : obj_callback( NULL), c_callback( NULL)  {
+    }
+
+    void attach(Tret (*function)(Targ1)) {
+        c_callback = function;
+    }
+
+    template<class T>
+    void attach(T& item, Tret (T::*method)(Targ1)) {
+        obj_callback    = reinterpret_cast<FPtrDummy*>(&item);
+        method_callback = reinterpret_cast<Tret (FPtrDummy::*)(Targ1)>(method);
+    }
+
+    Tret operator()(Targ1 arg1) const {
+        return obj_callback ? (obj_callback->*method_callback)(arg1) : (*c_callback)(arg1);
+    }
+
+private:
+    class FPtrDummy;
+
+    FPtrDummy  *obj_callback;
+    union {
+        Tret (*c_callback)(Targ1);
+        Tret (FPtrDummy::*method_callback)(Targ1);
+    };
+};
+
+template<class Tret, class Targ1, class Targ2>
+class FPtr2ArgT {
+public:
+    FPtr2ArgT() : obj_callback( NULL), c_callback( NULL)  {
+    }
+
+    void attach(Tret (*function)(Targ1,Targ2)) {
+        c_callback = function;
+    }
+
+    template<class T>
+    void attach(T& item, Tret (T::*method)(Targ1,Targ2)) {
+        obj_callback    = reinterpret_cast<FPointerDummy*>(&item);
+        method_callback = reinterpret_cast<Tret (FPtrDummy::*)(Targ1,Targ2)>(method);
+    }
+
+    Tret operator()(Targ1 arg1, Targ2 arg2) const {
+        return obj_callback ? (obj_callback->*method_callback)(arg1, arg2) : (*c_callback)(arg1, arg2);
+    }
+
+private:
+    class FPtrDummy;
+
+    FPtrDummy  *obj_callback;
+    union {
+        Tret (*c_callback)(Targ1,Targ2);
+        Tret (FPtrDummy::*method_callback)(Targ1,Targ2);
+    };
+};
+
+#endif
\ No newline at end of file

diff -r 000000000000 -r e62fc62bc488 main.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/main.cpp	Sun Dec 11 22:04:59 2011 +0000
@@ -0,0 +1,15 @@
+#include "mbed.h"
+#include "FunctionPointers.h"
+
+DigitalOut myled(LED1);
+FPtr1ArgT<void,int> fp;
+
+int main() {
+  fp.attach( myled, &DigitalOut::write);
+    while(1) {
+        fp(1);
+        wait(0.2);
+        fp(0);
+        wait(0.2);
+    }
+}

diff -r 000000000000 -r e62fc62bc488 mbed.bld
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mbed.bld	Sun Dec 11 22:04:59 2011 +0000
@@ -0,0 +1,1 @@
+http://mbed.org/users/mbed_official/code/mbed/builds/078e4b97a13e