From 187296183deefc9b6b300ae8daef8f761c8aa743 Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Sat, 29 Sep 2018 16:23:45 +0100 Subject: [PATCH] m8vem/p112: update to new core --- Kernel/platform-mtx/Makefile | 2 +- Kernel/platform-n8vem-mark4/config.h | 2 ++ Kernel/platform-n8vem-mark4/devtty.c | 2 +- Kernel/platform-n8vem-mark4/devtty.h | 1 - Kernel/platform-p112/config.h | 2 ++ Kernel/platform-p112/devtty.c | 2 +- Kernel/platform-p112/devtty.h | 1 - 7 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Kernel/platform-mtx/Makefile b/Kernel/platform-mtx/Makefile index 3bf371e8..18447fe8 100644 --- a/Kernel/platform-mtx/Makefile +++ b/Kernel/platform-mtx/Makefile @@ -28,7 +28,7 @@ $(DOBJS): %.rel: ../dev/%.c clean: - rm -f $(OBJS) $(JUNK) core *~ + rm -f $(OBJS) $(JUNK) core *~ fuzix.com image: cp ../fuzix.bin fuzix.com diff --git a/Kernel/platform-n8vem-mark4/config.h b/Kernel/platform-n8vem-mark4/config.h index 27dbcea2..6737bcc6 100644 --- a/Kernel/platform-n8vem-mark4/config.h +++ b/Kernel/platform-n8vem-mark4/config.h @@ -83,3 +83,5 @@ /* ASCI0 as the console */ #define TTYDEV (512+1) /* System console (used by kernel, init) */ #endif + +#define platform_copyright() \ No newline at end of file diff --git a/Kernel/platform-n8vem-mark4/devtty.c b/Kernel/platform-n8vem-mark4/devtty.c index 7d723c87..c0c1cef3 100644 --- a/Kernel/platform-n8vem-mark4/devtty.c +++ b/Kernel/platform-n8vem-mark4/devtty.c @@ -23,7 +23,7 @@ struct s_queue ttyinq[NUM_DEV_TTY+1] = { /* ttyinq[0] is never used */ #endif }; -void tty_setup(uint8_t minor) +void tty_setup(uint8_t minor, uint8_t flags) { minor; } diff --git a/Kernel/platform-n8vem-mark4/devtty.h b/Kernel/platform-n8vem-mark4/devtty.h index 30f7020b..12401d82 100644 --- a/Kernel/platform-n8vem-mark4/devtty.h +++ b/Kernel/platform-n8vem-mark4/devtty.h @@ -1,6 +1,5 @@ #ifndef __DEVTTY_DOT_H__ #define __DEVTTY_DOT_H__ -void tty_putc(uint8_t minor, unsigned char c); void tty_pollirq_asci0(void); void tty_pollirq_asci1(void); diff --git a/Kernel/platform-p112/config.h b/Kernel/platform-p112/config.h index 6dfb9bac..ea706645 100644 --- a/Kernel/platform-p112/config.h +++ b/Kernel/platform-p112/config.h @@ -66,3 +66,5 @@ /* We have the P112 floppy controller */ #define CONFIG_P112_FLOPPY + +#define platform_copyright() diff --git a/Kernel/platform-p112/devtty.c b/Kernel/platform-p112/devtty.c index 94e2b7c1..e284ef8d 100644 --- a/Kernel/platform-p112/devtty.c +++ b/Kernel/platform-p112/devtty.c @@ -61,7 +61,7 @@ struct s_queue ttyinq[NUM_DEV_TTY+1] = { /* ttyinq[0] is never used */ /* tty_hw_init() which sets up tty5 can be found in discard.c */ -void tty_setup(uint8_t minor) +void tty_setup(uint8_t minor, uint8_t flags) { minor; } diff --git a/Kernel/platform-p112/devtty.h b/Kernel/platform-p112/devtty.h index d72a7dbb..93c557f1 100644 --- a/Kernel/platform-p112/devtty.h +++ b/Kernel/platform-p112/devtty.h @@ -2,7 +2,6 @@ #define __DEVTTY_DOT_H__ void tty_hw_init(void); -void tty_putc(uint8_t minor, unsigned char c); void tty_pollirq_escc(void); void tty_pollirq_asci0(void); void tty_pollirq_asci1(void); -- 2.34.1