Merge branch 'master' into feature/pypi

Author: parisk

libraries/mbed/api/InterruptIn.h

@@ -22,9 +22,7 @@
 
 #include "gpio_api.h"
 #include "gpio_irq_api.h"
-
 #include "FunctionPointer.h"
-#include "CallChain.h"
 
 namespace mbed {
 
@@ -73,167 +71,37 @@ class InterruptIn {
     /** Attach a function to call when a rising edge occurs on the input
      *
      *  @param fptr A pointer to a void function, or 0 to set as none
-     *
-     *  @returns
-     *  The function object created for 'fptr'
-     */
-    pFunctionPointer_t rise(void (*fptr)(void));
-
-    /** Add a function to be called when a rising edge occurs at the end of the call chain
-     *
-     *  @param fptr the function to add
-     *
-     *  @returns
-     *  The function object created for 'fptr'
      */
-    pFunctionPointer_t rise_add(void (*fptr)(void)) {
-        return rise_add_common(fptr);
-    }
-
-    /** Add a function to be called when a rising edge occurs at the beginning of the call chain
-     *
-     *  @param fptr the function to add
-     *
-     *  @returns
-     *  The function object created for 'fptr'
-     */
-    pFunctionPointer_t rise_add_front(void (*fptr)(void)) {
-        return rise_add_common(fptr, true);
-    }
+    void rise(void (*fptr)(void));
 
     /** Attach a member function to call when a rising edge occurs on the input
      *
      *  @param tptr pointer to the object to call the member function on
      *  @param mptr pointer to the member function to be called
-     *
-     *  @returns
-     *  The function object created for 'tptr' and 'mptr'
      */
     template<typename T>
-    pFunctionPointer_t rise(T* tptr, void (T::*mptr)(void)) {
-        _rise.clear();
-        pFunctionPointer_t pf = _rise.add(tptr, mptr);
+    void rise(T* tptr, void (T::*mptr)(void)) {
+        _rise.attach(tptr, mptr);
         gpio_irq_set(&gpio_irq, IRQ_RISE, 1);
-        return pf;
     }
 
-    /** Add a function to be called when a rising edge occurs at the end of the call chain
-     *
-     *  @param tptr pointer to the object to call the member function on
-     *  @param mptr pointer to the member function to be called
-     *
-     *  @returns
-     *  The function object created for 'tptr' and 'mptr'
-     */
-    template<typename T>
-    pFunctionPointer_t rise_add(T* tptr, void (T::*mptr)(void)) {
-        return rise_add_common(tptr, mptr);
-    }
-
-    /** Add a function to be called when a rising edge occurs at the beginning of the call chain
-     *
-     *  @param tptr pointer to the object to call the member function on
-     *  @param mptr pointer to the member function to be called
-     *
-     *  @returns
-     *  The function object created for 'tptr' and 'mptr'
-     */
-    template<typename T>
-    pFunctionPointer_t rise_add_front(T* tptr, void (T::*mptr)(void)) {
-        return rise_add_common(tptr, mptr, true);
-    }
-
-    /** Remove a function from the list of functions to be called when a rising edge occurs
-     *
-     *  @param pf the function object to remove
-     *
-     *  @returns
-     *  true if the function was found and removed, false otherwise
-     */
-    bool rise_remove(pFunctionPointer_t pf);
-
     /** Attach a function to call when a falling edge occurs on the input
      *
      *  @param fptr A pointer to a void function, or 0 to set as none
-     *
-     *  @returns
-     *  The function object created for 'fptr'
      */
-    pFunctionPointer_t fall(void (*fptr)(void));
-
-     /** Add a function to be called when a falling edge occurs at the end of the call chain
-     *
-     *  @param fptr the function to add
-     *
-     *  @returns
-     *  The function object created for 'fptr'
-     */
-    pFunctionPointer_t fall_add(void (*fptr)(void)) {
-        return fall_add_common(fptr);
-    }
-
-    /** Add a function to be called when a falling edge occurs at the beginning of the call chain
-     *
-     *  @param fptr the function to add
-     *
-     *  @returns
-     *  The function object created for 'fptr'
-     */
-    pFunctionPointer_t fall_add_front(void (*fptr)(void)) {
-        return fall_add_common(fptr, true);
-    }
+    void fall(void (*fptr)(void));
 
     /** Attach a member function to call when a falling edge occurs on the input
      *
      *  @param tptr pointer to the object to call the member function on
      *  @param mptr pointer to the member function to be called
-     *
-     *  @returns
-     *  The function object created for 'tptr' and 'mptr'
      */
     template<typename T>
-    pFunctionPointer_t fall(T* tptr, void (T::*mptr)(void)) {
-        _fall.clear();
-        pFunctionPointer_t pf = _fall.add(tptr, mptr);
+    void fall(T* tptr, void (T::*mptr)(void)) {
+        _fall.attach(tptr, mptr);
         gpio_irq_set(&gpio_irq, IRQ_FALL, 1);
-        return pf;
-    }
-
-    /** Add a function to be called when a falling edge occurs at the end of the call chain
-     *
-     *  @param tptr pointer to the object to call the member function on
-     *  @param mptr pointer to the member function to be called
-     *
-     *  @returns
-     *  The function object created for 'tptr' and 'mptr'
-     */
-    template<typename T>
-    pFunctionPointer_t fall_add(T* tptr, void (T::*mptr)(void)) {
-        return fall_add_common(tptr, mptr);
-    }
-
-    /** Add a function to be called when a falling edge occurs at the beginning of the call chain
-     *
-     *  @param tptr pointer to the object to call the member function on
-     *  @param mptr pointer to the member function to be called
-     *
-     *  @returns
-     *  The function object created for 'tptr' and 'mptr'
-     */
-    template<typename T>
-    pFunctionPointer_t fall_add_front(T* tptr, void (T::*mptr)(void)) {
-        return fall_add_common(tptr, mptr, true);
     }
 
-    /** Remove a function from the list of functions to be called when a falling edge occurs
-     *
-     *  @param pf the function object to remove
-     *
-     *  @returns
-     *  true if the function was found and removed, false otherwise
-     */
-    bool fall_remove(pFunctionPointer_t pf);
-
     /** Set the input pin mode
      *
      *  @param mode PullUp, PullDown, PullNone
@@ -251,27 +119,11 @@ class InterruptIn {
     static void _irq_handler(uint32_t id, gpio_irq_event event);
 
 protected:
-    pFunctionPointer_t rise_add_common(void (*fptr)(void), bool front=false);
-    pFunctionPointer_t fall_add_common(void (*fptr)(void), bool front=false);
-
-    template<typename T>
-    pFunctionPointer_t rise_add_common(T* tptr, void (T::*mptr)(void), bool front=false) {
-        pFunctionPointer_t pf = front ? _rise.add_front(tptr, mptr) : _rise.add(tptr, mptr);
-        gpio_irq_set(&gpio_irq, IRQ_RISE, 1);
-        return pf;
-    }
-    template<typename T>
-    pFunctionPointer_t fall_add_common(T* tptr, void (T::*mptr)(void), bool front=false) {
-        pFunctionPointer_t pf = front ? _fall.add_front(tptr, mptr) : _fall.add(tptr, mptr);
-        gpio_irq_set(&gpio_irq, IRQ_FALL, 1);
-        return pf;
-    }
-
     gpio_t gpio;
     gpio_irq_t gpio_irq;
 
-    CallChain _rise;
-    CallChain _fall;
+    FunctionPointer _rise;
+    FunctionPointer _fall;
 };
 
 } // namespace mbed

libraries/mbed/api/RawSerial.h

@@ -0,0 +1,80 @@
+/* mbed Microcontroller Library
+ * Copyright (c) 2006-2013 ARM Limited
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef MBED_RAW_SERIAL_H
+#define MBED_RAW_SERIAL_H
+
+#include "platform.h"
+
+#if DEVICE_SERIAL
+
+#include "SerialBase.h"
+#include "serial_api.h"
+
+namespace mbed {
+
+/** A serial port (UART) for communication with other serial devices
+ * This is a variation of the Serial class that doesn't use streams,
+ * thus making it safe to use in interrupt handlers with the RTOS.
+ *
+ * Can be used for Full Duplex communication, or Simplex by specifying
+ * one pin as NC (Not Connected)
+ *
+ * Example:
+ * @code
+ * // Send a char to the PC
+ *
+ * #include "mbed.h"
+ *
+ * RawSerial pc(USBTX, USBRX);
+ *
+ * int main() {
+ *     pc.putc('A');
+ * }
+ * @endcode
+ */
+class RawSerial: public SerialBase {
+
+public:
+    /** Create a RawSerial port, connected to the specified transmit and receive pins
+     *
+     *  @param tx Transmit pin
+     *  @param rx Receive pin
+     *
+     *  @note
+     *    Either tx or rx may be specified as NC if unused
+     */
+    RawSerial(PinName tx, PinName rx);
+
+    /** Write a char to the serial port
+     *
+     * @param c The char to write
+     *
+     * @returns The written char or -1 if an error occured
+     */
+    int putc(int c);
+
+    /** Read a char from the serial port
+     *
+     * @returns The char read from the serial port
+     */
+    int getc();
+};
+
+} // namespace mbed
+
+#endif
+
+#endif