Lancaster University / mbed-src

Lancaster University's (short term!) clone of mbed-src for micro:bit. This is a copy of the github branch https://github.com/lancaster-university/mbed-classic

Fork of mbed-src by mbed official

hal/pinmap.h@641:be9b2017785a, 2016-07-13 (annotated)

Committer:
LancasterUniversity
Date:
Wed Jul 13 12:52:54 2016 +0100
Revision:
641:be9b2017785a
Parent:
511:532f83b66a7f 
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
emilmont 10:3bc89ef62ce7 1 /* mbed Microcontroller Library
emilmont 10:3bc89ef62ce7 2 * Copyright (c) 2006-2013 ARM Limited
emilmont 10:3bc89ef62ce7 3 *
emilmont 10:3bc89ef62ce7 4 * Licensed under the Apache License, Version 2.0 (the "License");
emilmont 10:3bc89ef62ce7 5 * you may not use this file except in compliance with the License.
emilmont 10:3bc89ef62ce7 6 * You may obtain a copy of the License at
emilmont 10:3bc89ef62ce7 7 *
emilmont 10:3bc89ef62ce7 8 * http://www.apache.org/licenses/LICENSE-2.0
emilmont 10:3bc89ef62ce7 9 *
emilmont 10:3bc89ef62ce7 10 * Unless required by applicable law or agreed to in writing, software
emilmont 10:3bc89ef62ce7 11 * distributed under the License is distributed on an "AS IS" BASIS,
emilmont 10:3bc89ef62ce7 12 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
emilmont 10:3bc89ef62ce7 13 * See the License for the specific language governing permissions and
emilmont 10:3bc89ef62ce7 14 * limitations under the License.
emilmont 10:3bc89ef62ce7 15 */
emilmont 10:3bc89ef62ce7 16 #ifndef MBED_PINMAP_H
emilmont 10:3bc89ef62ce7 17 #define MBED_PINMAP_H
emilmont 10:3bc89ef62ce7 18
emilmont 10:3bc89ef62ce7 19 #include "PinNames.h"
emilmont 10:3bc89ef62ce7 20
emilmont 10:3bc89ef62ce7 21 #ifdef __cplusplus
emilmont 10:3bc89ef62ce7 22 extern "C" {
emilmont 10:3bc89ef62ce7 23 #endif
emilmont 10:3bc89ef62ce7 24
emilmont 10:3bc89ef62ce7 25 typedef struct {
emilmont 10:3bc89ef62ce7 26 PinName pin;
emilmont 10:3bc89ef62ce7 27 int peripheral;
emilmont 10:3bc89ef62ce7 28 int function;
emilmont 10:3bc89ef62ce7 29 } PinMap;
emilmont 10:3bc89ef62ce7 30
emilmont 10:3bc89ef62ce7 31 void pin_function(PinName pin, int function);
emilmont 10:3bc89ef62ce7 32 void pin_mode (PinName pin, PinMode mode);
emilmont 10:3bc89ef62ce7 33
emilmont 10:3bc89ef62ce7 34 uint32_t pinmap_peripheral(PinName pin, const PinMap* map);
mbed_official 511:532f83b66a7f 35 uint32_t pinmap_function(PinName pin, const PinMap* map);
emilmont 10:3bc89ef62ce7 36 uint32_t pinmap_merge (uint32_t a, uint32_t b);
emilmont 10:3bc89ef62ce7 37 void pinmap_pinout (PinName pin, const PinMap *map);
mbed_official 64:7b352733b00a 38 uint32_t pinmap_find_peripheral(PinName pin, const PinMap* map);
mbed_official 511:532f83b66a7f 39 uint32_t pinmap_find_function(PinName pin, const PinMap* map);
emilmont 10:3bc89ef62ce7 40
emilmont 10:3bc89ef62ce7 41 #ifdef __cplusplus
emilmont 10:3bc89ef62ce7 42 }
emilmont 10:3bc89ef62ce7 43 #endif
emilmont 10:3bc89ef62ce7 44
emilmont 10:3bc89ef62ce7 45 #endif