From c0df0ee6437aa2786b1a92bc6af1284958d104c7 Mon Sep 17 00:00:00 2001 From: Franklin Wei Date: Sat, 7 Feb 2015 11:03:48 -0500 Subject: new rng, some rework of I/O --- kernel/include/log.h | 4 ++-- kernel/include/timer.h | 9 +++++++-- 2 files changed, 9 insertions(+), 4 deletions(-) (limited to 'kernel/include') diff --git a/kernel/include/log.h b/kernel/include/log.h index fb29dd3..6953bee 100644 --- a/kernel/include/log.h +++ b/kernel/include/log.h @@ -1,3 +1,3 @@ -int log_putchar(char); -int log_puts(const char*); +void log_putchar(char); +void log_puts(const char*); void log(const char*, ...); diff --git a/kernel/include/timer.h b/kernel/include/timer.h index a7459a6..bf2eddd 100644 --- a/kernel/include/timer.h +++ b/kernel/include/timer.h @@ -1,7 +1,12 @@ #include -extern const uint64_t *current_tick; +#define HZ 100 +#define PIT_FREQ 1193182 + +extern volatile const uint64_t *current_tick; struct regs_t; -void timer_init(void); +void timer_init(uint32_t freq); + +void timer_delay(uint64_t ticks); -- cgit v1.1