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:
508:4f5903e025e6
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 157:90e3acc479a2 1 /* mbed Microcontroller Library
mbed_official 157:90e3acc479a2 2 *******************************************************************************
mbed_official 157:90e3acc479a2 3 * Copyright (c) 2014, STMicroelectronics
mbed_official 157:90e3acc479a2 4 * All rights reserved.
mbed_official 157:90e3acc479a2 5 *
mbed_official 157:90e3acc479a2 6 * Redistribution and use in source and binary forms, with or without
mbed_official 157:90e3acc479a2 7 * modification, are permitted provided that the following conditions are met:
mbed_official 157:90e3acc479a2 8 *
mbed_official 157:90e3acc479a2 9 * 1. Redistributions of source code must retain the above copyright notice,
mbed_official 157:90e3acc479a2 10 * this list of conditions and the following disclaimer.
mbed_official 157:90e3acc479a2 11 * 2. Redistributions in binary form must reproduce the above copyright notice,
mbed_official 157:90e3acc479a2 12 * this list of conditions and the following disclaimer in the documentation
mbed_official 157:90e3acc479a2 13 * and/or other materials provided with the distribution.
mbed_official 157:90e3acc479a2 14 * 3. Neither the name of STMicroelectronics nor the names of its contributors
mbed_official 157:90e3acc479a2 15 * may be used to endorse or promote products derived from this software
mbed_official 157:90e3acc479a2 16 * without specific prior written permission.
mbed_official 157:90e3acc479a2 17 *
mbed_official 157:90e3acc479a2 18 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
mbed_official 157:90e3acc479a2 19 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
mbed_official 157:90e3acc479a2 20 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
mbed_official 157:90e3acc479a2 21 * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
mbed_official 157:90e3acc479a2 22 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
mbed_official 157:90e3acc479a2 23 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
mbed_official 157:90e3acc479a2 24 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
mbed_official 157:90e3acc479a2 25 * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
mbed_official 157:90e3acc479a2 26 * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
mbed_official 157:90e3acc479a2 27 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
mbed_official 157:90e3acc479a2 28 *******************************************************************************
mbed_official 157:90e3acc479a2 29 */
mbed_official 227:7bd0639b8911 30 #include "mbed_assert.h"
mbed_official 157:90e3acc479a2 31 #include "gpio_api.h"
mbed_official 157:90e3acc479a2 32 #include "pinmap.h"
mbed_official 285:31249416b6f9 33 #include "mbed_error.h"
mbed_official 157:90e3acc479a2 34
mbed_official 157:90e3acc479a2 35 extern uint32_t Set_GPIO_Clock(uint32_t port_idx);
mbed_official 157:90e3acc479a2 36
mbed_official 403:91a4bea587f4 37 uint32_t gpio_set(PinName pin)
mbed_official 403:91a4bea587f4 38 {
mbed_official 227:7bd0639b8911 39 MBED_ASSERT(pin != (PinName)NC);
mbed_official 157:90e3acc479a2 40
mbed_official 403:91a4bea587f4 41 pin_function(pin, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0));
mbed_official 403:91a4bea587f4 42
mbed_official 157:90e3acc479a2 43 return (uint32_t)(1 << ((uint32_t)pin & 0xF)); // Return the pin mask
mbed_official 157:90e3acc479a2 44 }
mbed_official 157:90e3acc479a2 45
mbed_official 403:91a4bea587f4 46 void gpio_init(gpio_t *obj, PinName pin)
mbed_official 403:91a4bea587f4 47 {
mbed_official 227:7bd0639b8911 48 obj->pin = pin;
mbed_official 403:91a4bea587f4 49 if (pin == (PinName)NC) {
mbed_official 227:7bd0639b8911 50 return;
mbed_official 403:91a4bea587f4 51 }
mbed_official 157:90e3acc479a2 52
mbed_official 157:90e3acc479a2 53 uint32_t port_index = STM_PORT(pin);
mbed_official 227:7bd0639b8911 54
mbed_official 157:90e3acc479a2 55 // Enable GPIO clock
mbed_official 157:90e3acc479a2 56 uint32_t gpio_add = Set_GPIO_Clock(port_index);
mbed_official 157:90e3acc479a2 57 GPIO_TypeDef *gpio = (GPIO_TypeDef *)gpio_add;
mbed_official 227:7bd0639b8911 58
mbed_official 157:90e3acc479a2 59 // Fill GPIO object structure for future use
mbed_official 157:90e3acc479a2 60 obj->mask = gpio_set(pin);
mbed_official 157:90e3acc479a2 61 obj->reg_in = &gpio->IDR;
mbed_official 403:91a4bea587f4 62 obj->reg_set = &gpio->BSRRL;
mbed_official 403:91a4bea587f4 63 obj->reg_clr = &gpio->BSRRH;
mbed_official 157:90e3acc479a2 64 }
mbed_official 157:90e3acc479a2 65
mbed_official 403:91a4bea587f4 66 void gpio_mode(gpio_t *obj, PinMode mode)
mbed_official 403:91a4bea587f4 67 {
mbed_official 157:90e3acc479a2 68 pin_mode(obj->pin, mode);
mbed_official 157:90e3acc479a2 69 }
mbed_official 157:90e3acc479a2 70
mbed_official 403:91a4bea587f4 71 void gpio_dir(gpio_t *obj, PinDirection direction)
mbed_official 403:91a4bea587f4 72 {
mbed_official 227:7bd0639b8911 73 MBED_ASSERT(obj->pin != (PinName)NC);
mbed_official 157:90e3acc479a2 74 if (direction == PIN_OUTPUT) {
mbed_official 403:91a4bea587f4 75 pin_function(obj->pin, STM_PIN_DATA(STM_MODE_OUTPUT_PP, GPIO_NOPULL, 0));
mbed_official 157:90e3acc479a2 76 } else { // PIN_INPUT
mbed_official 403:91a4bea587f4 77 pin_function(obj->pin, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0));
mbed_official 157:90e3acc479a2 78 }
mbed_official 157:90e3acc479a2 79 }