From 0fec33e939569ca9672ce8f8aac61e10a62af5ec Mon Sep 17 00:00:00 2001 From: David Given Date: Mon, 19 Oct 2015 20:30:59 +0200 Subject: [PATCH] Undo more unnecessary changes from upstream. --- Kernel/platform-trs80/config.h | 2 +- Kernel/simple.c | 4 ++-- Kernel/syscall_exec16.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Kernel/platform-trs80/config.h b/Kernel/platform-trs80/config.h index 5f7e2dd3..b7c45bd4 100644 --- a/Kernel/platform-trs80/config.h +++ b/Kernel/platform-trs80/config.h @@ -51,7 +51,7 @@ #define CMDLINE NULL /* Location of root dev name */ /* Device parameters */ -#define NUM_DEV_TTY 1 +#define NUM_DEV_TTY 3 #define TTYDEV BOOT_TTY /* Device used by kernel for messages, panics */ #define SWAPDEV (swap_dev) /* Device for swapping (dynamic). */ #define NBUFS 10 /* Number of block buffers */ diff --git a/Kernel/simple.c b/Kernel/simple.c index e82f4727..07fbe344 100644 --- a/Kernel/simple.c +++ b/Kernel/simple.c @@ -34,14 +34,14 @@ int pagemap_alloc(ptptr p) return 0; } -int pagemap_realloc(usize_t size) +int pagemap_realloc(uint16_t size) { if (size >= ramtop) return ENOMEM; return 0; } -uaddr_t pagemap_mem_used(void) +uint16_t pagemap_mem_used(void) { return (PROGTOP - PROGBASE) >> 10; } diff --git a/Kernel/syscall_exec16.c b/Kernel/syscall_exec16.c index 219c83d6..d0b74313 100644 --- a/Kernel/syscall_exec16.c +++ b/Kernel/syscall_exec16.c @@ -322,7 +322,7 @@ char **wargs(char *ptr, struct s_argblk *argbuf, int *cnt) // ptr is in userspac } } uputp(0, argv); /*;;26Feb- Add Null Pointer to end of array */ - return (char **) argbase; + return (char **)argbase; } /* -- 2.34.1