Skip to content

Commit cacac37

Browse files
Bogdan PricopKevin Moloney
Bogdan Pricop
authored and
Kevin Moloney
committed
Fix Klocwork#137: Non-void function does not return value
Change getTimeStampClks() implementation from assembly to C. Signed-off-by: Bogdan Pricop <bogdan.pricop@emutex.com>
1 parent 2ae262a commit cacac37

File tree

3 files changed

+14
-47
lines changed

3 files changed

+14
-47
lines changed

cores/arduino/utils.S

Lines changed: 0 additions & 43 deletions
This file was deleted.

cores/arduino/wiring.c

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,20 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
2929
#define FREQ_MHZ ((ARCV2_TIMER0_CLOCK_FREQ)/1000000)
3030
static const uint64_t MS_TO_CLKS = (FREQ_MHZ * 1000);
3131

32-
extern uint64_t getTimeStampClks(void);
32+
static inline __attribute__((always_inline))
33+
uint64_t getTimeStampClks(void)
34+
{
35+
uint32_t time_stamp;
36+
int key = interrupt_lock();
37+
uint64_t ret = timer0_overflows;
38+
time_stamp = aux_reg_read(ARC_V2_TMR0_COUNT);
39+
if (aux_reg_read(ARC_V2_TMR0_CONTROL) & (0x01 << 3)) {
40+
time_stamp = aux_reg_read(ARC_V2_TMR0_COUNT);
41+
ret++;
42+
}
43+
interrupt_unlock(key);
44+
return ((ret << 32) | time_stamp);
45+
}
3346

3447
void delay(uint32_t msec)
3548
{

platform.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,6 @@ build.usb_manufacturer="Unknown"
5959
## Compile c files
6060
recipe.c.o.pattern="{compiler.path}{compiler.c.cmd}" {compiler.c.flags} -DF_CPU={build.f_cpu} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} {compiler.c.extra_flags} {build.extra_flags} {includes} "{source_file}" -o "{object_file}"
6161

62-
## Compile S files
63-
recipe.S.o.pattern="{compiler.path}{compiler.c.cmd}" {compiler.c.flags} -DF_CPU={build.f_cpu} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} {compiler.c.extra_flags} {build.extra_flags} {includes} "{source_file}" -o "{object_file}"
64-
6562
## Compile c++ files
6663
recipe.cpp.o.pattern="{compiler.path}{compiler.cpp.cmd}" {compiler.cpp.flags} -DF_CPU={build.f_cpu} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} {compiler.cpp.extra_flags} {build.extra_flags} {includes} "{source_file}" -o "{object_file}"
6764

0 commit comments

Comments
 (0)