Undo more unnecessary changes from upstream.

diff --git a/Kernel/platform-trs80/config.h b/Kernel/platform-trs80/config.h
index 5f7e2dd..b7c45bd 100644 (file)
--- 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 e82f472..07fbe34 100644 (file)
--- 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 219c83d..d0b7431 100644 (file)
--- 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;
 }
 
 /*