From c51fa1f0e9b7ce6691d140245d48e4c843782f68 Mon Sep 17 00:00:00 2001 From: Olivier Gayot Date: Sat, 10 Oct 2015 10:27:17 +0200 Subject: kfs: move the source files to follow the arborescence asked Signed-off-by: Olivier Gayot --- kernel.c | 43 ------------------------------------------- src/main.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 43 deletions(-) delete mode 100644 kernel.c create mode 100644 src/main.c diff --git a/kernel.c b/kernel.c deleted file mode 100644 index 8e59664..0000000 --- a/kernel.c +++ /dev/null @@ -1,43 +0,0 @@ -#define NB_COLS 80 -#define NB_ROWS 25 - -/* XXX doest not always handle memory overlaps */ -static void my_memmove(void *dest, const void *src, size_t n) -{ - for (size_t i = 0; i < n; ++i) { - dest[i] = src[i]; - } -} - -static void my_memset(void *dest, int c, size_t n) -{ - for (size_t i = 0; i < n; ++i) { - dest[i] = c; - } -} - -int printk(const char *str) -{ - static char *offset = (char *) 0xb8000; - static char *addr = offset; - int count = 0; - - for (int i = 0; str[i]; ++i) { - if ((long)addr >= 0xb8000 + NB_COLS * NB_ROWS) { - /* shift up */ - addr -= NB_COLS; - my_memmove(offset, offset + NB_COLS, NB_COLS * (NB_ROWS - 1)); - my_memset(offset + NB_COLS * (NB_ROWS - 1), ' ', NB_ROWS); - } - - *addr++ = str[i] - ++count; - - } - - return count; -} - -int main(void) -{ -} diff --git a/src/main.c b/src/main.c new file mode 100644 index 0000000..8e59664 --- /dev/null +++ b/src/main.c @@ -0,0 +1,43 @@ +#define NB_COLS 80 +#define NB_ROWS 25 + +/* XXX doest not always handle memory overlaps */ +static void my_memmove(void *dest, const void *src, size_t n) +{ + for (size_t i = 0; i < n; ++i) { + dest[i] = src[i]; + } +} + +static void my_memset(void *dest, int c, size_t n) +{ + for (size_t i = 0; i < n; ++i) { + dest[i] = c; + } +} + +int printk(const char *str) +{ + static char *offset = (char *) 0xb8000; + static char *addr = offset; + int count = 0; + + for (int i = 0; str[i]; ++i) { + if ((long)addr >= 0xb8000 + NB_COLS * NB_ROWS) { + /* shift up */ + addr -= NB_COLS; + my_memmove(offset, offset + NB_COLS, NB_COLS * (NB_ROWS - 1)); + my_memset(offset + NB_COLS * (NB_ROWS - 1), ' ', NB_ROWS); + } + + *addr++ = str[i] + ++count; + + } + + return count; +} + +int main(void) +{ +} -- cgit v1.2.3