move cons under unibus

davecheney · Sep 16, 2020 · 918840c · 918840c
1 parent 1898391
commit 918840c
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 12 deletions.
diff --git a/avr11.cc b/avr11.cc
@@ -7,12 +7,10 @@
 #include <termios.h>
 
 #include "avr11.h"
-#include "dl11.h"
 #include "kb11.h"
 #include "rk11.h"
 
 KB11 cpu;
-DL11 cons;
 RK11 rk11;
 
 void setup() {
@@ -80,7 +78,7 @@ void loop0() {
                 cpu.interrupt(INTCLOCK, 6);
             }
         }
-        cons.poll();
+        cpu.unibus.cons.poll();
     }
 }
 

diff --git a/dl11.h b/dl11.h
@@ -1,3 +1,4 @@
+#pragma once
 #include <stdint.h>
 
 class DL11 {

diff --git a/kb11.cc b/kb11.cc
@@ -5,15 +5,13 @@
 #include <stdio.h>
 
 #include "avr11.h"
-#include "dl11.h"
+#include "bootrom.h"
 #include "kb11.h"
 #include "rk11.h"
-#include "bootrom.h"
 
 extern jmp_buf trapbuf;
-extern DL11 cons;
 extern RK11 rk11;
-extern    UNIBUS unibus;
+extern UNIBUS unibus;
 
 void KB11::reset() {
     LKS = 1 << 7;
@@ -22,7 +20,7 @@ void KB11::reset() {
         unibus.access<1>(02000 + (i * 2), bootrom[i]);
     }
     R[7] = 002002;
-    cons.clearterminal();
+    unibus.cons.clearterminal();
     rk11.reset();
 }
 
@@ -31,7 +29,6 @@ bool KB11::Z() { return PS & FLAGZ; }
 bool KB11::V() { return PS & FLAGV; }
 bool KB11::C() { return PS & FLAGC; }
 
-
 inline uint16_t KB11::fetch16() {
     const uint16_t val = access<0>(R[7]);
     R[7] += 2;
@@ -316,7 +313,6 @@ void KB11::JMP(const uint16_t instr) {
     R[7] = uval;
 }
 
-
 void KB11::MARK(const uint16_t instr) {
     R[6] = R[7] + ((instr & 077) << 1);
     R[7] = R[5];
@@ -420,7 +416,7 @@ void KB11::RESET() {
     if (curuser) {
         return;
     }
-    cons.clearterminal();
+    unibus.cons.clearterminal();
     rk11.reset();
 }
 

diff --git a/unibus.cc b/unibus.cc
@@ -10,7 +10,6 @@
 #include "rk11.h"
 #include "unibus.h"
 
-extern DL11 cons;
 extern KB11 cpu;
 extern RK11 rk11;
 

diff --git a/unibus.h b/unibus.h
@@ -1,11 +1,13 @@
 #pragma once
 #include "ms11.h"
+#include "dl11.h"
 #include <stdint.h>
 
 class UNIBUS {
 
   public:
     MS11 core;
+    DL11 cons;
 
     uint16_t read8(const uint32_t a);
     void write8(const uint32_t a, const uint16_t v);