mbed source development branch

Fork of mbed-dev by mbed official

Committer:
ptpaterson
Date:
Thu Nov 03 16:21:53 2016 +0000
Revision:
150:cd63f849362a
Parent:
149:156823d33999
targets LPC11Cxx, LPC15xx:  can_api can_filter function properly returns 0 if handle argument is out of bounds (handle > 32).

Who changed what in which revision?

UserRevisionLine numberNew contents of line
<> 149:156823d33999 1 /* mbed Microcontroller Library
<> 149:156823d33999 2 * Copyright (c) 2006-2013 ARM Limited
<> 149:156823d33999 3 *
<> 149:156823d33999 4 * Licensed under the Apache License, Version 2.0 (the "License");
<> 149:156823d33999 5 * you may not use this file except in compliance with the License.
<> 149:156823d33999 6 * You may obtain a copy of the License at
<> 149:156823d33999 7 *
<> 149:156823d33999 8 * http://www.apache.org/licenses/LICENSE-2.0
<> 149:156823d33999 9 *
<> 149:156823d33999 10 * Unless required by applicable law or agreed to in writing, software
<> 149:156823d33999 11 * distributed under the License is distributed on an "AS IS" BASIS,
<> 149:156823d33999 12 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
<> 149:156823d33999 13 * See the License for the specific language governing permissions and
<> 149:156823d33999 14 * limitations under the License.
<> 149:156823d33999 15 */
<> 149:156823d33999 16 #include "drivers/Timer.h"
<> 149:156823d33999 17 #include "hal/ticker_api.h"
<> 149:156823d33999 18 #include "hal/us_ticker_api.h"
<> 149:156823d33999 19 #include "platform/critical.h"
<> 149:156823d33999 20
<> 149:156823d33999 21 namespace mbed {
<> 149:156823d33999 22
<> 149:156823d33999 23 Timer::Timer() : _running(), _start(), _time(), _ticker_data(get_us_ticker_data()) {
<> 149:156823d33999 24 reset();
<> 149:156823d33999 25 }
<> 149:156823d33999 26
<> 149:156823d33999 27 Timer::Timer(const ticker_data_t *data) : _running(), _start(), _time(), _ticker_data(data) {
<> 149:156823d33999 28 reset();
<> 149:156823d33999 29 }
<> 149:156823d33999 30
<> 149:156823d33999 31 void Timer::start() {
<> 149:156823d33999 32 core_util_critical_section_enter();
<> 149:156823d33999 33 if (!_running) {
<> 149:156823d33999 34 _start = ticker_read(_ticker_data);
<> 149:156823d33999 35 _running = 1;
<> 149:156823d33999 36 }
<> 149:156823d33999 37 core_util_critical_section_exit();
<> 149:156823d33999 38 }
<> 149:156823d33999 39
<> 149:156823d33999 40 void Timer::stop() {
<> 149:156823d33999 41 core_util_critical_section_enter();
<> 149:156823d33999 42 _time += slicetime();
<> 149:156823d33999 43 _running = 0;
<> 149:156823d33999 44 core_util_critical_section_exit();
<> 149:156823d33999 45 }
<> 149:156823d33999 46
<> 149:156823d33999 47 int Timer::read_us() {
<> 149:156823d33999 48 core_util_critical_section_enter();
<> 149:156823d33999 49 int time = _time + slicetime();
<> 149:156823d33999 50 core_util_critical_section_exit();
<> 149:156823d33999 51 return time;
<> 149:156823d33999 52 }
<> 149:156823d33999 53
<> 149:156823d33999 54 float Timer::read() {
<> 149:156823d33999 55 return (float)read_us() / 1000000.0f;
<> 149:156823d33999 56 }
<> 149:156823d33999 57
<> 149:156823d33999 58 int Timer::read_ms() {
<> 149:156823d33999 59 return read_us() / 1000;
<> 149:156823d33999 60 }
<> 149:156823d33999 61
<> 149:156823d33999 62 int Timer::slicetime() {
<> 149:156823d33999 63 core_util_critical_section_enter();
<> 149:156823d33999 64 int ret = 0;
<> 149:156823d33999 65 if (_running) {
<> 149:156823d33999 66 ret = ticker_read(_ticker_data) - _start;
<> 149:156823d33999 67 }
<> 149:156823d33999 68 core_util_critical_section_exit();
<> 149:156823d33999 69 return ret;
<> 149:156823d33999 70 }
<> 149:156823d33999 71
<> 149:156823d33999 72 void Timer::reset() {
<> 149:156823d33999 73 core_util_critical_section_enter();
<> 149:156823d33999 74 _start = ticker_read(_ticker_data);
<> 149:156823d33999 75 _time = 0;
<> 149:156823d33999 76 core_util_critical_section_exit();
<> 149:156823d33999 77 }
<> 149:156823d33999 78
<> 149:156823d33999 79 Timer::operator float() {
<> 149:156823d33999 80 return read();
<> 149:156823d33999 81 }
<> 149:156823d33999 82
<> 149:156823d33999 83 } // namespace mbed