1
0
Fork 0

clang-format changes

This commit is contained in:
skullY 2019-08-30 11:19:03 -07:00 committed by skullydazed
parent 61af76a10d
commit b624f32f94
502 changed files with 32259 additions and 39062 deletions

View file

@ -22,7 +22,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "timer_avr.h"
#include "timer.h"
// counter resolution 1ms
// NOTE: union { uint32_t timer32; struct { uint16_t dummy; uint16_t timer16; }}
volatile uint32_t timer_count;
@ -31,8 +30,7 @@ volatile uint32_t timer_count;
*
* FIXME: needs doc
*/
void timer_init(void)
{
void timer_init(void) {
#if TIMER_PRESCALER == 1
uint8_t prescaler = 0x01;
#elif TIMER_PRESCALER == 8
@ -44,7 +42,7 @@ void timer_init(void)
#elif TIMER_PRESCALER == 1024
uint8_t prescaler = 0x05;
#else
# error "Timer prescaler value is NOT vaild."
# error "Timer prescaler value is NOT vaild."
#endif
#ifndef __AVR_ATmega32A__
@ -53,13 +51,13 @@ void timer_init(void)
TCCR0B = prescaler;
OCR0A = TIMER_RAW_TOP;
TIMSK0 = (1<<OCIE0A);
OCR0A = TIMER_RAW_TOP;
TIMSK0 = (1 << OCIE0A);
#else
// Timer0 CTC mode
TCCR0 = (1 << WGM01) | prescaler;
OCR0 = TIMER_RAW_TOP;
OCR0 = TIMER_RAW_TOP;
TIMSK = (1 << OCIE0);
#endif
}
@ -68,26 +66,18 @@ void timer_init(void)
*
* FIXME: needs doc
*/
inline
void timer_clear(void)
{
ATOMIC_BLOCK(ATOMIC_RESTORESTATE) {
timer_count = 0;
}
inline void timer_clear(void) {
ATOMIC_BLOCK(ATOMIC_RESTORESTATE) { timer_count = 0; }
}
/** \brief timer read
*
* FIXME: needs doc
*/
inline
uint16_t timer_read(void)
{
inline uint16_t timer_read(void) {
uint32_t t;
ATOMIC_BLOCK(ATOMIC_RESTORESTATE) {
t = timer_count;
}
ATOMIC_BLOCK(ATOMIC_RESTORESTATE) { t = timer_count; }
return (t & 0xFFFF);
}
@ -96,14 +86,10 @@ uint16_t timer_read(void)
*
* FIXME: needs doc
*/
inline
uint32_t timer_read32(void)
{
inline uint32_t timer_read32(void) {
uint32_t t;
ATOMIC_BLOCK(ATOMIC_RESTORESTATE) {
t = timer_count;
}
ATOMIC_BLOCK(ATOMIC_RESTORESTATE) { t = timer_count; }
return t;
}
@ -112,14 +98,10 @@ uint32_t timer_read32(void)
*
* FIXME: needs doc
*/
inline
uint16_t timer_elapsed(uint16_t last)
{
inline uint16_t timer_elapsed(uint16_t last) {
uint32_t t;
ATOMIC_BLOCK(ATOMIC_RESTORESTATE) {
t = timer_count;
}
ATOMIC_BLOCK(ATOMIC_RESTORESTATE) { t = timer_count; }
return TIMER_DIFF_16((t & 0xFFFF), last);
}
@ -128,25 +110,18 @@ uint16_t timer_elapsed(uint16_t last)
*
* FIXME: needs doc
*/
inline
uint32_t timer_elapsed32(uint32_t last)
{
inline uint32_t timer_elapsed32(uint32_t last) {
uint32_t t;
ATOMIC_BLOCK(ATOMIC_RESTORESTATE) {
t = timer_count;
}
ATOMIC_BLOCK(ATOMIC_RESTORESTATE) { t = timer_count; }
return TIMER_DIFF_32(t, last);
}
// excecuted once per 1ms.(excess for just timer count?)
#ifndef __AVR_ATmega32A__
#define TIMER_INTERRUPT_VECTOR TIMER0_COMPA_vect
# define TIMER_INTERRUPT_VECTOR TIMER0_COMPA_vect
#else
#define TIMER_INTERRUPT_VECTOR TIMER0_COMP_vect
# define TIMER_INTERRUPT_VECTOR TIMER0_COMP_vect
#endif
ISR(TIMER_INTERRUPT_VECTOR, ISR_NOBLOCK)
{
timer_count++;
}
ISR(TIMER_INTERRUPT_VECTOR, ISR_NOBLOCK) { timer_count++; }