Skip to content

Commit 50ce4fd

Browse files
committed
Initialize ticker prior to read, this is required by the wait_api module.
1 parent e0a5ca1 commit 50ce4fd

File tree

1 file changed

+15
-14
lines changed

1 file changed

+15
-14
lines changed

hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/us_ticker.c

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
1-
/*
1+
/*
22
* Copyright (c) 2013 Nordic Semiconductor ASA
33
* All rights reserved.
4-
*
4+
*
55
* Redistribution and use in source and binary forms, with or without modification,
66
* are permitted provided that the following conditions are met:
7-
*
8-
* 1. Redistributions of source code must retain the above copyright notice, this list
7+
*
8+
* 1. Redistributions of source code must retain the above copyright notice, this list
99
* of conditions and the following disclaimer.
1010
*
11-
* 2. Redistributions in binary form, except as embedded into a Nordic Semiconductor ASA
12-
* integrated circuit in a product or a software update for such product, must reproduce
13-
* the above copyright notice, this list of conditions and the following disclaimer in
11+
* 2. Redistributions in binary form, except as embedded into a Nordic Semiconductor ASA
12+
* integrated circuit in a product or a software update for such product, must reproduce
13+
* the above copyright notice, this list of conditions and the following disclaimer in
1414
* the documentation and/or other materials provided with the distribution.
1515
*
16-
* 3. Neither the name of Nordic Semiconductor ASA nor the names of its contributors may be
17-
* used to endorse or promote products derived from this software without specific prior
16+
* 3. Neither the name of Nordic Semiconductor ASA nor the names of its contributors may be
17+
* used to endorse or promote products derived from this software without specific prior
1818
* written permission.
1919
*
20-
* 4. This software, with or without modification, must only be used with a
20+
* 4. This software, with or without modification, must only be used with a
2121
* Nordic Semiconductor ASA integrated circuit.
2222
*
23-
* 5. Any software provided in binary or object form under this license must not be reverse
24-
* engineered, decompiled, modified and/or disassembled.
25-
*
23+
* 5. Any software provided in binary or object form under this license must not be reverse
24+
* engineered, decompiled, modified and/or disassembled.
25+
*
2626
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
2727
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
2828
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -33,7 +33,7 @@
3333
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
3434
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
3535
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
36-
*
36+
*
3737
*/
3838

3939
#include "us_ticker_api.h"
@@ -198,6 +198,7 @@ void us_ticker_init(void)
198198

199199
uint32_t us_ticker_read()
200200
{
201+
us_ticker_init();
201202
return (uint32_t)common_rtc_64bit_us_get();
202203
}
203204

0 commit comments

Comments
 (0)