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:
455:8bc3a354916d
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
bogdanm 15:4892fe388435 1 /* mbed Microcontroller Library
bogdanm 15:4892fe388435 2 * Copyright (c) 2006-2013 ARM Limited
bogdanm 15:4892fe388435 3 *
bogdanm 15:4892fe388435 4 * Licensed under the Apache License, Version 2.0 (the "License");
bogdanm 15:4892fe388435 5 * you may not use this file except in compliance with the License.
bogdanm 15:4892fe388435 6 * You may obtain a copy of the License at
bogdanm 15:4892fe388435 7 *
bogdanm 15:4892fe388435 8 * http://www.apache.org/licenses/LICENSE-2.0
bogdanm 15:4892fe388435 9 *
bogdanm 15:4892fe388435 10 * Unless required by applicable law or agreed to in writing, software
bogdanm 15:4892fe388435 11 * distributed under the License is distributed on an "AS IS" BASIS,
bogdanm 15:4892fe388435 12 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
bogdanm 15:4892fe388435 13 * See the License for the specific language governing permissions and
bogdanm 15:4892fe388435 14 * limitations under the License.
bogdanm 15:4892fe388435 15 */
bogdanm 15:4892fe388435 16 #ifndef MBED_GPIO_OBJECT_H
bogdanm 15:4892fe388435 17 #define MBED_GPIO_OBJECT_H
bogdanm 15:4892fe388435 18
mbed_official 227:7bd0639b8911 19 #include "mbed_assert.h"
mbed_official 227:7bd0639b8911 20
bogdanm 15:4892fe388435 21 #ifdef __cplusplus
bogdanm 15:4892fe388435 22 extern "C" {
bogdanm 15:4892fe388435 23 #endif
bogdanm 15:4892fe388435 24
bogdanm 15:4892fe388435 25 typedef struct {
bogdanm 15:4892fe388435 26 PinName pin;
bogdanm 15:4892fe388435 27 uint32_t mask;
bogdanm 15:4892fe388435 28
bogdanm 15:4892fe388435 29 __IO uint32_t *reg_dir;
bogdanm 15:4892fe388435 30 __IO uint32_t *reg_set;
bogdanm 15:4892fe388435 31 __IO uint32_t *reg_clr;
bogdanm 15:4892fe388435 32 __I uint32_t *reg_in;
bogdanm 15:4892fe388435 33 } gpio_t;
bogdanm 15:4892fe388435 34
bogdanm 15:4892fe388435 35 static inline void gpio_write(gpio_t *obj, int value) {
mbed_official 227:7bd0639b8911 36 MBED_ASSERT(obj->pin != (PinName)NC);
bogdanm 15:4892fe388435 37 if (value)
bogdanm 15:4892fe388435 38 *obj->reg_set = obj->mask;
bogdanm 15:4892fe388435 39 else
bogdanm 15:4892fe388435 40 *obj->reg_clr = obj->mask;
bogdanm 15:4892fe388435 41 }
bogdanm 15:4892fe388435 42
bogdanm 15:4892fe388435 43 static inline int gpio_read(gpio_t *obj) {
mbed_official 227:7bd0639b8911 44 MBED_ASSERT(obj->pin != (PinName)NC);
bogdanm 15:4892fe388435 45 return ((*obj->reg_in & obj->mask) ? 1 : 0);
bogdanm 15:4892fe388435 46 }
bogdanm 15:4892fe388435 47
mbed_official 455:8bc3a354916d 48 static inline int gpio_is_connected(const gpio_t *obj) {
mbed_official 455:8bc3a354916d 49 return obj->pin != (PinName)NC;
mbed_official 455:8bc3a354916d 50 }
mbed_official 455:8bc3a354916d 51
bogdanm 15:4892fe388435 52 #ifdef __cplusplus
bogdanm 15:4892fe388435 53 }
bogdanm 15:4892fe388435 54 #endif
bogdanm 15:4892fe388435 55
bogdanm 15:4892fe388435 56 #endif