pentagon1024: get it building and running

diff --git a/Kernel/platform-pentagon1024/devices.c b/Kernel/platform-pentagon1024/devices.c
index 779457f..90c608d 100644 (file)
--- a/Kernel/platform-pentagon1024/devices.c
+++ b/Kernel/platform-pentagon1024/devices.c
@@ -7,7 +7,7 @@
 #include <devide.h>
 #include <devsd.h>
 #include <blkdev.h>
-#include <zxtty.h>
+#include <devtty.h>
 
 struct devsw dev_tab[] =  /* The device driver switch table */
 {

diff --git a/Kernel/platform-pentagon1024/discard.c b/Kernel/platform-pentagon1024/discard.c
index 30da276..4fa024e 100644 (file)
--- a/Kernel/platform-pentagon1024/discard.c
+++ b/Kernel/platform-pentagon1024/discard.c
@@ -2,7 +2,7 @@
 #include <timer.h>
 #include <kdata.h>
 #include <printf.h>
-#include <zxtty.h>
+#include <devtty.h>
 #include <blkdev.h>
 
 extern uint8_t fuller, kempston, kmouse, kempston_mbmask;
@@ -18,7 +18,7 @@ void pagemap_init(void)
 
        /* Add the high pages */
        for (i = 8; i < 32; i++) {
-               r = i & 0x07);
+               r = i & 0x07;
                /* Merge in bits 3-5 */
                r |= (i & 0x38) << 2;
                /* Select BASIC ROM. Doesn't matter really at the moment */

diff --git a/Kernel/platform-pentagon1024/main.c b/Kernel/platform-pentagon1024/main.c
index 05e564b..8b9869a 100644 (file)
--- a/Kernel/platform-pentagon1024/main.c
+++ b/Kernel/platform-pentagon1024/main.c
@@ -2,7 +2,7 @@
 #include <timer.h>
 #include <kdata.h>
 #include <printf.h>
-#include <zxtty.h>
+#include <devtty.h>
 #include <devinput.h>
 
 uint16_t ramtop = PROGTOP;