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:
576:99a3d3d9c43f
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 #include "mbed_assert.h"
mbed_official 558:0880f51c4036 32 #include "gpio_api.h"
mbed_official 558:0880f51c4036 33 #include "pinmap.h"
mbed_official 558:0880f51c4036 34
mbed_official 558:0880f51c4036 35 extern uint32_t Get_GPIO_BaseAddress(uint32_t port_idx);
mbed_official 558:0880f51c4036 36
mbed_official 576:99a3d3d9c43f 37 uint32_t gpio_set(PinName pin)
mbed_official 576:99a3d3d9c43f 38 {
mbed_official 576:99a3d3d9c43f 39 MBED_ASSERT(pin != (PinName)NC);
mbed_official 558:0880f51c4036 40
mbed_official 576:99a3d3d9c43f 41 pin_function(pin, WIZ_PIN_DATA(WIZ_MODE_INPUT, WIZ_GPIO_NOPULL, Px_AFSR_AF1));
mbed_official 558:0880f51c4036 42
mbed_official 576:99a3d3d9c43f 43 return (uint32_t)(1 << ((uint32_t)pin & 0xF)); // Return the pin mask
mbed_official 576:99a3d3d9c43f 44 }
mbed_official 558:0880f51c4036 45
mbed_official 558:0880f51c4036 46 void gpio_init(gpio_t *obj, PinName pin)
mbed_official 558:0880f51c4036 47 {
mbed_official 558:0880f51c4036 48 if (pin == (PinName)NC) {
mbed_official 558:0880f51c4036 49 return;
mbed_official 558:0880f51c4036 50 }
mbed_official 567:a97fd0eca828 51
mbed_official 567:a97fd0eca828 52 obj->port_num = WIZ_PORT(pin);
mbed_official 567:a97fd0eca828 53 obj->pin_index = WIZ_PIN_INDEX(pin);
mbed_official 567:a97fd0eca828 54 obj->pin = pin;
mbed_official 567:a97fd0eca828 55 GPIO_TypeDef *gpio = (GPIO_TypeDef *)Get_GPIO_BaseAddress(obj->port_num);
mbed_official 558:0880f51c4036 56 obj->reg_data_in = &gpio->DATA;
mbed_official 558:0880f51c4036 57 }
mbed_official 558:0880f51c4036 58
mbed_official 558:0880f51c4036 59 void gpio_mode(gpio_t *obj, PinMode mode)
mbed_official 558:0880f51c4036 60 {
mbed_official 558:0880f51c4036 61 pin_mode(obj->pin, mode);
mbed_official 567:a97fd0eca828 62 obj->mode = mode;
mbed_official 558:0880f51c4036 63 }
mbed_official 558:0880f51c4036 64
mbed_official 558:0880f51c4036 65 void gpio_dir(gpio_t *obj, PinDirection direction)
mbed_official 558:0880f51c4036 66 {
mbed_official 558:0880f51c4036 67 MBED_ASSERT(obj->pin != (PinName)NC);
mbed_official 558:0880f51c4036 68 obj->direction = direction;
mbed_official 558:0880f51c4036 69
mbed_official 567:a97fd0eca828 70 pin_function(obj->pin, WIZ_PIN_DATA(obj->direction, obj->mode, 1));
mbed_official 558:0880f51c4036 71 }