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

- fix some type mismatch which causes error in build time

pull/407/head
fritzprix 2014-07-17 23:38:34 +09:00
parent e3018e766b
commit 8c7e738263
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libraries/mbed/common/InterruptManager.cpp
View File

@ -7,7 +7,7 @@ namespace mbed {
typedef void (*pvoidf)(void); typedef void (*pvoidf)(void);
InterruptManager* InterruptManager::_instance = NULL; InterruptManager* InterruptManager::_instance = (InterruptManager*)NULL;
InterruptManager* InterruptManager::get() { InterruptManager* InterruptManager::get() {
if (NULL == _instance) if (NULL == _instance)
@ -25,7 +25,7 @@ void InterruptManager::destroy() {
// is very likely to occur // is very likely to occur
if (NULL != _instance) { if (NULL != _instance) {
delete _instance; delete _instance;
_instance = NULL; _instance = (InterruptManager*)NULL;
} }
} }
@ -68,7 +68,7 @@ bool InterruptManager::remove_handler(pFunctionPointer_t handler, IRQn_Type irq)
if (_chains[irq_pos]->size() == 1 && NULL != _chains[irq_pos]->get(0)->get_function()) { if (_chains[irq_pos]->size() == 1 && NULL != _chains[irq_pos]->get(0)->get_function()) {
NVIC_SetVector(irq, (uint32_t)_chains[irq_pos]->get(0)->get_function()); NVIC_SetVector(irq, (uint32_t)_chains[irq_pos]->get(0)->get_function());
delete _chains[irq_pos]; delete _chains[irq_pos];
_chains[irq_pos] = NULL; _chains[irq_pos] = (CallChain*) NULL;
} }
return true; return true;
} }