projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos/draw: Skip line adjustment for vertical/horizontal
[fw/altos]
/
src
/
stm
/
ao_profile.h
diff --git
a/src/stm/ao_profile.h
b/src/stm/ao_profile.h
index f8a0c25e97eb6632eb72ea2d1f3b8fae3e28ca31..fcbba45dd79910289db12503a710a8394a369866 100644
(file)
--- a/
src/stm/ao_profile.h
+++ b/
src/stm/ao_profile.h
@@
-3,7
+3,8
@@
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-18,15
+19,15
@@
#ifndef _AO_PROFILE_H_
#define _AO_PROFILE_H_
#ifndef _AO_PROFILE_H_
#define _AO_PROFILE_H_
-void ao_profile_init();
+void ao_profile_init(
void
);
static inline uint32_t ao_profile_tick(void) {
uint16_t hi, lo, second_hi;
do {
static inline uint32_t ao_profile_tick(void) {
uint16_t hi, lo, second_hi;
do {
- hi = stm_tim2.cnt;
- lo = stm_tim4.cnt;
- second_hi = stm_tim2.cnt;
+ hi =
(uint16_t)
stm_tim2.cnt;
+ lo =
(uint16_t)
stm_tim4.cnt;
+ second_hi =
(uint16_t)
stm_tim2.cnt;
} while (hi != second_hi);
return ((uint32_t) hi << 16) | lo;
}
} while (hi != second_hi);
return ((uint32_t) hi << 16) | lo;
}