ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

simplify InterruptIn - default parameter instead of multiple constructors

pull/6239/head
Brendan McDonnell 2018-02-28 14:41:23 -05:00
parent dfa6a7aa97
commit d28dbf6702
2 changed files with 3 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/InterruptIn.cpp
View File

@ -19,29 +19,16 @@
namespace mbed { namespace mbed {
InterruptIn::InterruptIn(PinName pin) : gpio(),
gpio_irq(),
_rise(NULL),
_fall(NULL) {
// No lock needed in the constructor
irq_init(pin);
gpio_init_in(&gpio, pin);
}
InterruptIn::InterruptIn(PinName pin, PinMode mode) : InterruptIn::InterruptIn(PinName pin, PinMode mode) :
gpio(), gpio(),
gpio_irq(), gpio_irq(),
_rise(NULL), _rise(NULL),
_fall(NULL) { _fall(NULL) {
// No lock needed in the constructor // No lock needed in the constructor
irq_init(pin); gpio_irq_init(&gpio_irq, pin, (&InterruptIn::_irq_handler), (uint32_t)this);
gpio_init_in_ex(&gpio, pin, mode); gpio_init_in_ex(&gpio, pin, mode);
} }
void InterruptIn::irq_init(PinName pin) {
gpio_irq_init(&gpio_irq, pin, (&InterruptIn::_irq_handler), (uint32_t)this);
}
InterruptIn::~InterruptIn() { InterruptIn::~InterruptIn() {
// No lock needed in the destructor // No lock needed in the destructor
gpio_irq_free(&gpio_irq); gpio_irq_free(&gpio_irq);

11
drivers/InterruptIn.h
View File

@ -61,17 +61,12 @@ class InterruptIn : private NonCopyable<InterruptIn> {
public: public:
/** Create an InterruptIn connected to the specified pin
*
* @param pin InterruptIn pin to connect to
*/
InterruptIn(PinName pin);
/** Create an InterruptIn connected to the specified pin, /** Create an InterruptIn connected to the specified pin,
* and the pin configured to the specified mode. * with the pin configured to the specified mode.
* *
* @param pin InterruptIn pin to connect to * @param pin InterruptIn pin to connect to
*/ */
InterruptIn(PinName pin, PinMode mode); InterruptIn(PinName pin, PinMode mode = PullDefault);
virtual ~InterruptIn(); virtual ~InterruptIn();
/** Read the input, represented as 0 or 1 (int) /** Read the input, represented as 0 or 1 (int)
@ -159,8 +154,6 @@ protected:
Callback<void()> _rise; Callback<void()> _rise;
Callback<void()> _fall; Callback<void()> _fall;
void irq_init(PinName pin);
}; };
} // namespace mbed } // namespace mbed