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

common/Ethernet.cpp@641:be9b2017785a, 2016-07-13 (annotated)

Committer:
LancasterUniversity
Date:
Wed Jul 13 12:52:54 2016 +0100
Revision:
641:be9b2017785a
Parent:
13:0645d8841f51 
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 13:0645d8841f51 1 /* mbed Microcontroller Library
bogdanm 13:0645d8841f51 2 * Copyright (c) 2006-2013 ARM Limited
bogdanm 13:0645d8841f51 3 *
bogdanm 13:0645d8841f51 4 * Licensed under the Apache License, Version 2.0 (the "License");
bogdanm 13:0645d8841f51 5 * you may not use this file except in compliance with the License.
bogdanm 13:0645d8841f51 6 * You may obtain a copy of the License at
bogdanm 13:0645d8841f51 7 *
bogdanm 13:0645d8841f51 8 * http://www.apache.org/licenses/LICENSE-2.0
bogdanm 13:0645d8841f51 9 *
bogdanm 13:0645d8841f51 10 * Unless required by applicable law or agreed to in writing, software
bogdanm 13:0645d8841f51 11 * distributed under the License is distributed on an "AS IS" BASIS,
bogdanm 13:0645d8841f51 12 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
bogdanm 13:0645d8841f51 13 * See the License for the specific language governing permissions and
bogdanm 13:0645d8841f51 14 * limitations under the License.
bogdanm 13:0645d8841f51 15 */
bogdanm 13:0645d8841f51 16 #include "Ethernet.h"
bogdanm 13:0645d8841f51 17
bogdanm 13:0645d8841f51 18 #if DEVICE_ETHERNET
bogdanm 13:0645d8841f51 19
bogdanm 13:0645d8841f51 20 #include "ethernet_api.h"
bogdanm 13:0645d8841f51 21
bogdanm 13:0645d8841f51 22 namespace mbed {
bogdanm 13:0645d8841f51 23
bogdanm 13:0645d8841f51 24 Ethernet::Ethernet() {
bogdanm 13:0645d8841f51 25 ethernet_init();
bogdanm 13:0645d8841f51 26 }
bogdanm 13:0645d8841f51 27
bogdanm 13:0645d8841f51 28 Ethernet::~Ethernet() {
bogdanm 13:0645d8841f51 29 ethernet_free();
bogdanm 13:0645d8841f51 30 }
bogdanm 13:0645d8841f51 31
bogdanm 13:0645d8841f51 32 int Ethernet::write(const char *data, int size) {
bogdanm 13:0645d8841f51 33 return ethernet_write(data, size);
bogdanm 13:0645d8841f51 34 }
bogdanm 13:0645d8841f51 35
bogdanm 13:0645d8841f51 36 int Ethernet::send() {
bogdanm 13:0645d8841f51 37 return ethernet_send();
bogdanm 13:0645d8841f51 38 }
bogdanm 13:0645d8841f51 39
bogdanm 13:0645d8841f51 40 int Ethernet::receive() {
bogdanm 13:0645d8841f51 41 return ethernet_receive();
bogdanm 13:0645d8841f51 42 }
bogdanm 13:0645d8841f51 43
bogdanm 13:0645d8841f51 44 int Ethernet::read(char *data, int size) {
bogdanm 13:0645d8841f51 45 return ethernet_read(data, size);
bogdanm 13:0645d8841f51 46 }
bogdanm 13:0645d8841f51 47
bogdanm 13:0645d8841f51 48 void Ethernet::address(char *mac) {
bogdanm 13:0645d8841f51 49 return ethernet_address(mac);
bogdanm 13:0645d8841f51 50 }
bogdanm 13:0645d8841f51 51
bogdanm 13:0645d8841f51 52 int Ethernet::link() {
bogdanm 13:0645d8841f51 53 return ethernet_link();
bogdanm 13:0645d8841f51 54 }
bogdanm 13:0645d8841f51 55
bogdanm 13:0645d8841f51 56 void Ethernet::set_link(Mode mode) {
bogdanm 13:0645d8841f51 57 int speed = -1;
bogdanm 13:0645d8841f51 58 int duplex = 0;
bogdanm 13:0645d8841f51 59
bogdanm 13:0645d8841f51 60 switch(mode) {
bogdanm 13:0645d8841f51 61 case AutoNegotiate : speed = -1; duplex = 0; break;
bogdanm 13:0645d8841f51 62 case HalfDuplex10 : speed = 0; duplex = 0; break;
bogdanm 13:0645d8841f51 63 case FullDuplex10 : speed = 0; duplex = 1; break;
bogdanm 13:0645d8841f51 64 case HalfDuplex100 : speed = 1; duplex = 0; break;
bogdanm 13:0645d8841f51 65 case FullDuplex100 : speed = 1; duplex = 1; break;
bogdanm 13:0645d8841f51 66 }
bogdanm 13:0645d8841f51 67
bogdanm 13:0645d8841f51 68 ethernet_set_link(speed, duplex);
bogdanm 13:0645d8841f51 69 }
bogdanm 13:0645d8841f51 70
bogdanm 13:0645d8841f51 71 } // namespace mbed
bogdanm 13:0645d8841f51 72
bogdanm 13:0645d8841f51 73 #endif