Lancaster University / mbed-src

Fork of mbed-src by mbed official

Committer:
LancasterUniversity
Date:
Wed Jul 13 12:52:54 2016 +0100
Revision:
641:be9b2017785a
Parent:
567:a97fd0eca828
Synchronized with git rev 1fb8ab4c
Author: James Devine
mbed-classic: BUGFIX for timer when using wait_ms from interrupt context

Previously if a user used wait[_ms,_us] in interrupt context the device would
hang indefinitely. This was due to incrementing overflowCount from
interrupt context only.

This meant that if a user used wait[_ms,_us] in an ISR with
the same or greater interrupt priority, it would result in an infinite
loop as the overflowCount variable would never be incremented, and
wait[_ms,_us] would never return.

This patch simply applies a better solution for the race condition
mentioned in the previous commit. It instead disables the timer1
interrupt and increments the overflowCount variable, preventing
the race condition whilst supporting wait[_ms,_us] in interrupt
context.

Who changed what in which revision?

UserRevisionLine numberNew contents of line
mbed_official 558:0880f51c4036 1 /* mbed Microcontroller Library
mbed_official 558:0880f51c4036 2 *******************************************************************************
mbed_official 558:0880f51c4036 3 * Copyright (c) 2015 WIZnet Co.,Ltd. All rights reserved.
mbed_official 558:0880f51c4036 4 * All rights reserved.
mbed_official 558:0880f51c4036 5 *
mbed_official 558:0880f51c4036 6 * Redistribution and use in source and binary forms, with or without
mbed_official 558:0880f51c4036 7 * modification, are permitted provided that the following conditions are met:
mbed_official 558:0880f51c4036 8 *
mbed_official 558:0880f51c4036 9 * 1. Redistributions of source code must retain the above copyright notice,
mbed_official 558:0880f51c4036 10 * this list of conditions and the following disclaimer.
mbed_official 558:0880f51c4036 11 * 2. Redistributions in binary form must reproduce the above copyright notice,
mbed_official 558:0880f51c4036 12 * this list of conditions and the following disclaimer in the documentation
mbed_official 558:0880f51c4036 13 * and/or other materials provided with the distribution.
mbed_official 558:0880f51c4036 14 * 3. Neither the name of ARM Limited nor the names of its contributors
mbed_official 558:0880f51c4036 15 * may be used to endorse or promote products derived from this software
mbed_official 558:0880f51c4036 16 * without specific prior written permission.
mbed_official 558:0880f51c4036 17 *
mbed_official 558:0880f51c4036 18 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
mbed_official 558:0880f51c4036 19 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
mbed_official 558:0880f51c4036 20 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
mbed_official 558:0880f51c4036 21 * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
mbed_official 558:0880f51c4036 22 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
mbed_official 558:0880f51c4036 23 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
mbed_official 558:0880f51c4036 24 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
mbed_official 558:0880f51c4036 25 * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
mbed_official 558:0880f51c4036 26 * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
mbed_official 558:0880f51c4036 27 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
mbed_official 558:0880f51c4036 28 *******************************************************************************
mbed_official 558:0880f51c4036 29 */
mbed_official 558:0880f51c4036 30
mbed_official 558:0880f51c4036 31 #ifndef MBED_PERIPHERALPINS_H
mbed_official 558:0880f51c4036 32 #define MBED_PERIPHERALPINS_H
mbed_official 558:0880f51c4036 33
mbed_official 558:0880f51c4036 34 #include "pinmap.h"
mbed_official 558:0880f51c4036 35 #include "PeripheralNames.h"
mbed_official 558:0880f51c4036 36
mbed_official 558:0880f51c4036 37
mbed_official 558:0880f51c4036 38 //*** ADC ***
mbed_official 558:0880f51c4036 39 extern const PinMap PinMap_ADC[];
mbed_official 558:0880f51c4036 40
mbed_official 558:0880f51c4036 41 //*** SERIAL ***
mbed_official 558:0880f51c4036 42 extern const PinMap PinMap_UART_TX[];
mbed_official 558:0880f51c4036 43 extern const PinMap PinMap_UART_RX[];
mbed_official 558:0880f51c4036 44
mbed_official 558:0880f51c4036 45 //*** I2C ***
mbed_official 558:0880f51c4036 46 extern const PinMap PinMap_I2C_SDA[];
mbed_official 558:0880f51c4036 47 extern const PinMap PinMap_I2C_SCL[];
mbed_official 558:0880f51c4036 48
mbed_official 558:0880f51c4036 49
mbed_official 558:0880f51c4036 50 //*** SPI ***
mbed_official 558:0880f51c4036 51
mbed_official 558:0880f51c4036 52 extern const PinMap PinMap_SPI_SCLK[];
mbed_official 558:0880f51c4036 53 extern const PinMap PinMap_SPI_MOSI[];
mbed_official 558:0880f51c4036 54 extern const PinMap PinMap_SPI_MISO[];
mbed_official 558:0880f51c4036 55 extern const PinMap PinMap_SPI_SSEL[];
mbed_official 567:a97fd0eca828 56
mbed_official 567:a97fd0eca828 57 //*** PWM ***
mbed_official 567:a97fd0eca828 58
mbed_official 567:a97fd0eca828 59 extern const PinMap PinMap_PWM[];
mbed_official 558:0880f51c4036 60 #endif