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:
469:fc4922e0c183
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 130:1dec54e4aec3 1 /* mbed Microcontroller Library
mbed_official 130:1dec54e4aec3 2 *******************************************************************************
mbed_official 130:1dec54e4aec3 3 * Copyright (c) 2014, STMicroelectronics
mbed_official 130:1dec54e4aec3 4 * All rights reserved.
mbed_official 130:1dec54e4aec3 5 *
mbed_official 130:1dec54e4aec3 6 * Redistribution and use in source and binary forms, with or without
mbed_official 130:1dec54e4aec3 7 * modification, are permitted provided that the following conditions are met:
mbed_official 130:1dec54e4aec3 8 *
mbed_official 130:1dec54e4aec3 9 * 1. Redistributions of source code must retain the above copyright notice,
mbed_official 130:1dec54e4aec3 10 * this list of conditions and the following disclaimer.
mbed_official 130:1dec54e4aec3 11 * 2. Redistributions in binary form must reproduce the above copyright notice,
mbed_official 130:1dec54e4aec3 12 * this list of conditions and the following disclaimer in the documentation
mbed_official 130:1dec54e4aec3 13 * and/or other materials provided with the distribution.
mbed_official 130:1dec54e4aec3 14 * 3. Neither the name of STMicroelectronics nor the names of its contributors
mbed_official 130:1dec54e4aec3 15 * may be used to endorse or promote products derived from this software
mbed_official 130:1dec54e4aec3 16 * without specific prior written permission.
mbed_official 130:1dec54e4aec3 17 *
mbed_official 130:1dec54e4aec3 18 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
mbed_official 130:1dec54e4aec3 19 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
mbed_official 130:1dec54e4aec3 20 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
mbed_official 130:1dec54e4aec3 21 * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
mbed_official 130:1dec54e4aec3 22 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
mbed_official 130:1dec54e4aec3 23 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
mbed_official 130:1dec54e4aec3 24 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
mbed_official 130:1dec54e4aec3 25 * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
mbed_official 130:1dec54e4aec3 26 * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
mbed_official 130:1dec54e4aec3 27 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
mbed_official 130:1dec54e4aec3 28 *******************************************************************************
mbed_official 130:1dec54e4aec3 29 */
mbed_official 130:1dec54e4aec3 30 #ifndef MBED_OBJECTS_H
mbed_official 130:1dec54e4aec3 31 #define MBED_OBJECTS_H
mbed_official 130:1dec54e4aec3 32
mbed_official 130:1dec54e4aec3 33 #include "cmsis.h"
mbed_official 130:1dec54e4aec3 34 #include "PortNames.h"
mbed_official 130:1dec54e4aec3 35 #include "PeripheralNames.h"
mbed_official 130:1dec54e4aec3 36 #include "PinNames.h"
mbed_official 130:1dec54e4aec3 37
mbed_official 130:1dec54e4aec3 38 #ifdef __cplusplus
mbed_official 130:1dec54e4aec3 39 extern "C" {
mbed_official 130:1dec54e4aec3 40 #endif
mbed_official 130:1dec54e4aec3 41
mbed_official 130:1dec54e4aec3 42 struct gpio_irq_s {
mbed_official 130:1dec54e4aec3 43 IRQn_Type irq_n;
mbed_official 130:1dec54e4aec3 44 uint32_t irq_index;
mbed_official 130:1dec54e4aec3 45 uint32_t event;
mbed_official 423:560d1a9f3083 46 PinName pin;
mbed_official 130:1dec54e4aec3 47 };
mbed_official 130:1dec54e4aec3 48
mbed_official 130:1dec54e4aec3 49 struct port_s {
mbed_official 130:1dec54e4aec3 50 PortName port;
mbed_official 130:1dec54e4aec3 51 uint32_t mask;
mbed_official 130:1dec54e4aec3 52 PinDirection direction;
mbed_official 423:560d1a9f3083 53 __IO uint32_t *reg_in;
mbed_official 423:560d1a9f3083 54 __IO uint32_t *reg_out;
mbed_official 130:1dec54e4aec3 55 };
mbed_official 130:1dec54e4aec3 56
mbed_official 130:1dec54e4aec3 57 struct analogin_s {
mbed_official 130:1dec54e4aec3 58 ADCName adc;
mbed_official 130:1dec54e4aec3 59 PinName pin;
mbed_official 130:1dec54e4aec3 60 };
mbed_official 130:1dec54e4aec3 61
mbed_official 130:1dec54e4aec3 62 struct dac_s {
mbed_official 130:1dec54e4aec3 63 DACName dac;
mbed_official 130:1dec54e4aec3 64 PinName channel;
mbed_official 130:1dec54e4aec3 65 };
mbed_official 130:1dec54e4aec3 66
mbed_official 130:1dec54e4aec3 67 struct serial_s {
mbed_official 130:1dec54e4aec3 68 UARTName uart;
mbed_official 130:1dec54e4aec3 69 int index; // Used by irq
mbed_official 130:1dec54e4aec3 70 uint32_t baudrate;
mbed_official 130:1dec54e4aec3 71 uint32_t databits;
mbed_official 130:1dec54e4aec3 72 uint32_t stopbits;
mbed_official 130:1dec54e4aec3 73 uint32_t parity;
mbed_official 240:9a7c54113eaf 74 PinName pin_tx;
mbed_official 240:9a7c54113eaf 75 PinName pin_rx;
mbed_official 130:1dec54e4aec3 76 };
mbed_official 130:1dec54e4aec3 77
mbed_official 130:1dec54e4aec3 78 struct spi_s {
mbed_official 130:1dec54e4aec3 79 SPIName spi;
mbed_official 130:1dec54e4aec3 80 uint32_t bits;
mbed_official 130:1dec54e4aec3 81 uint32_t cpol;
mbed_official 130:1dec54e4aec3 82 uint32_t cpha;
mbed_official 130:1dec54e4aec3 83 uint32_t mode;
mbed_official 130:1dec54e4aec3 84 uint32_t nss;
mbed_official 130:1dec54e4aec3 85 uint32_t br_presc;
mbed_official 240:9a7c54113eaf 86 PinName pin_miso;
mbed_official 240:9a7c54113eaf 87 PinName pin_mosi;
mbed_official 240:9a7c54113eaf 88 PinName pin_sclk;
mbed_official 240:9a7c54113eaf 89 PinName pin_ssel;
mbed_official 130:1dec54e4aec3 90 };
mbed_official 130:1dec54e4aec3 91
mbed_official 130:1dec54e4aec3 92 struct i2c_s {
mbed_official 130:1dec54e4aec3 93 I2CName i2c;
mbed_official 130:1dec54e4aec3 94 };
mbed_official 130:1dec54e4aec3 95
mbed_official 130:1dec54e4aec3 96 struct pwmout_s {
mbed_official 130:1dec54e4aec3 97 PWMName pwm;
mbed_official 130:1dec54e4aec3 98 PinName pin;
mbed_official 130:1dec54e4aec3 99 uint32_t period;
mbed_official 130:1dec54e4aec3 100 uint32_t pulse;
mbed_official 130:1dec54e4aec3 101 };
mbed_official 130:1dec54e4aec3 102
mbed_official 130:1dec54e4aec3 103 #include "gpio_object.h"
mbed_official 130:1dec54e4aec3 104
mbed_official 130:1dec54e4aec3 105 #ifdef __cplusplus
mbed_official 130:1dec54e4aec3 106 }
mbed_official 130:1dec54e4aec3 107 #endif
mbed_official 130:1dec54e4aec3 108
mbed_official 130:1dec54e4aec3 109 #endif