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

Remove __enable and __disable irq calls from mbed hal common code

pull/1807/head
Sam Grove 2016-05-28 17:19:55 +08:00
parent d2fd820e13
commit 284bd081b4
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hal/common/SPI.cpp
View File

@ -14,6 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
#include "SPI.h" #include "SPI.h"
#include "critical.h"
#if DEVICE_SPI #if DEVICE_SPI
@ -124,12 +125,12 @@ int SPI::queue_transfer(const void *tx_buffer, int tx_length, void *rx_buffer, i
if (_transaction_buffer.full()) { if (_transaction_buffer.full()) {
return -1; // the buffer is full return -1; // the buffer is full
} else { } else {
__disable_irq(); core_util_critical_section_enter();
_transaction_buffer.push(transaction); _transaction_buffer.push(transaction);
if (!spi_active(&_spi)) { if (!spi_active(&_spi)) {
dequeue_transaction(); dequeue_transaction();
} }
__enable_irq(); core_util_critical_section_exit();
return 0; return 0;
} }
#else #else

3
hal/common/board.c
View File

@ -17,10 +17,11 @@
#include "wait_api.h" #include "wait_api.h"
#include "toolchain.h" #include "toolchain.h"
#include "mbed_interface.h" #include "mbed_interface.h"
#include "critical.h"
WEAK void mbed_die(void) { WEAK void mbed_die(void) {
#if !defined (NRF51_H) && !defined(TARGET_EFM32) #if !defined (NRF51_H) && !defined(TARGET_EFM32)
__disable_irq(); // dont allow interrupts to disturb the flash pattern core_util_critical_section_enter();
#endif #endif
#if (DEVICE_ERROR_RED == 1) #if (DEVICE_ERROR_RED == 1)
gpio_t led_red; gpio_init_out(&led_red, LED_RED); gpio_t led_red; gpio_init_out(&led_red, LED_RED);

5
libraries/tests/libs/SerialHalfDuplex/SerialHalfDuplex.cpp
View File

@ -2,6 +2,7 @@
* Copyright (c) 2010-2011 ARM Limited. All rights reserved. * Copyright (c) 2010-2011 ARM Limited. All rights reserved.
*/ */
#include "SerialHalfDuplex.h" #include "SerialHalfDuplex.h"
#include "critical.h"
#if DEVICE_SERIAL #if DEVICE_SERIAL
@ -29,7 +30,7 @@ int SerialHalfDuplex::_putc(int c) {
int retc; int retc;
// TODO: We should not disable all interrupts // TODO: We should not disable all interrupts
__disable_irq(); core_util_critical_section_enter();
serial_pinout_tx(gpio.pin); serial_pinout_tx(gpio.pin);
@ -38,7 +39,7 @@ int SerialHalfDuplex::_putc(int c) {
pin_function(gpio.pin, 0); pin_function(gpio.pin, 0);
__enable_irq(); core_util_critical_section_exit();
return retc; return retc;
} }