3diy
/
klipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

generic: Move board timer.h files into generic/misc.h 

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2016-06-05 14:58:12 -04:00
parent 9971f999b3
commit 9f8817a47e
5 changed files with 8 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/avr/timer.c
View File

@ -6,10 +6,10 @@
#include <avr/interrupt.h> // TCNT1 #include <avr/interrupt.h> // TCNT1
#include "autoconf.h" // CONFIG_AVR_CLKPR #include "autoconf.h" // CONFIG_AVR_CLKPR
#include "board/misc.h" // timer_from_us
#include "command.h" // shutdown #include "command.h" // shutdown
#include "irq.h" // irq_save #include "irq.h" // irq_save
#include "sched.h" // sched_timer_kick #include "sched.h" // sched_timer_kick
#include "timer.h" // timer_from_us
/**************************************************************** /****************************************************************

12
src/avr/timer.h
View File

@ -1,12 +0,0 @@
#ifndef __AVR_TIMER_H
#define __AVR_TIMER_H
#include <stdint.h>
uint32_t timer_from_us(uint32_t us);
void timer_periodic(void);
uint32_t timer_read_time(void);
uint8_t timer_set_next(uint32_t next);
uint8_t timer_try_set_next(uint32_t next);
#endif // timer.h

6
src/generic/misc.h
View File

@ -9,6 +9,12 @@ void console_pop_input(uint8_t len);
char *console_get_output(uint8_t len); char *console_get_output(uint8_t len);
void console_push_output(uint8_t len); void console_push_output(uint8_t len);
uint32_t timer_from_us(uint32_t us);
void timer_periodic(void);
uint32_t timer_read_time(void);
uint8_t timer_set_next(uint32_t next);
uint8_t timer_try_set_next(uint32_t next);
size_t alloc_maxsize(size_t reqsize); size_t alloc_maxsize(size_t reqsize);
uint16_t crc16_ccitt(char *buf, uint8_t len); uint16_t crc16_ccitt(char *buf, uint8_t len);

2
src/sched.c
View File

@ -9,7 +9,7 @@
#include <stddef.h> // NULL #include <stddef.h> // NULL
#include "autoconf.h" // CONFIG_* #include "autoconf.h" // CONFIG_*
#include "board/irq.h" // irq_save #include "board/irq.h" // irq_save
#include "board/timer.h" // timer_from_us #include "board/misc.h" // timer_from_us
#include "command.h" // shutdown #include "command.h" // shutdown
#include "sched.h" // sched_from_us #include "sched.h" // sched_from_us
#include "stepper.h" // stepper_event #include "stepper.h" // stepper_event

12
src/simulator/timer.h
View File

@ -1,12 +0,0 @@
#ifndef __SIMU_TIMER_H
#define __SIMU_TIMER_H
#include <stdint.h>
uint32_t timer_from_us(uint32_t us);
void timer_periodic(void);
uint32_t timer_read_time(void);
uint8_t timer_set_next(uint32_t next);
uint8_t timer_try_set_next(uint32_t next);
#endif // timer.h