dragon-nx32/mooh: Rename to VC_BASE

Signed-off-by: Tormod Volden <debian.tormod@gmail.com>

diff --git a/Kernel/platform-dragon-mooh/config.h b/Kernel/platform-dragon-mooh/config.h
index d06cbac..8dab2db 100644 (file)
--- a/Kernel/platform-dragon-mooh/config.h
+++ b/Kernel/platform-dragon-mooh/config.h
@@ -47,10 +47,8 @@
 #define VT_BOTTOM      (vt_tbottom[curtty])
 #define VT_INITIAL_LINE        0
 
-#define VT_ALLBASE     0x0400  /* Two 32x16 virtual consoles here */
 #define VIDEO_BASE     0x0800  /* 0x800 - 0x1FFF (6K) */
-#define map_video(x)
-#define unmap_video(x)
+#define VC_BASE                0x0400  /* Two 32x16 virtual consoles here */
 
 #define CRT9128_BASE   0xFF7C
 

diff --git a/Kernel/platform-dragon-mooh/kernel.def b/Kernel/platform-dragon-mooh/kernel.def
index 8ecf929..318436d 100644 (file)
--- a/Kernel/platform-dragon-mooh/kernel.def
+++ b/Kernel/platform-dragon-mooh/kernel.def
@@ -7,6 +7,7 @@ U_DATA_STASH                equ 0xFC00       ; FC00-FDFF
 
 VIDEO_BASE                 equ 0x0800       ; 6K for the graphics display
 VIDEO_END                  equ 0x2000
+VC_BASE                            equ 0x0400       ; 1K for two virtual consoles
 KBANKV                     equ 0x4          ; Kernel bank overlapping video memory
 
 IDEDATA                            equ 0xFF50

diff --git a/Kernel/platform-dragon-nx32/config.h b/Kernel/platform-dragon-nx32/config.h
index 39930d5..c53dae3 100644 (file)
--- a/Kernel/platform-dragon-nx32/config.h
+++ b/Kernel/platform-dragon-nx32/config.h
@@ -46,9 +46,9 @@
 #define VT_INITIAL_LINE        0
 
 #define VIDEO_BASE     0x0400
-#define VT_ALLBASE     (VIDEO_BASE+0x1800)
 #define map_video(x)
 #define unmap_video(x)
+#define VC_BASE                0x1C00
 
 #define CRT9128_BASE   0xFF7C
 

diff --git a/Kernel/platform-dragon-nx32/kernel.def b/Kernel/platform-dragon-nx32/kernel.def
index 5cfed95..0b338a6 100644 (file)
--- a/Kernel/platform-dragon-nx32/kernel.def
+++ b/Kernel/platform-dragon-nx32/kernel.def
@@ -7,6 +7,7 @@ U_DATA_STASH                equ 0xFD00       ; FD00-FEFF
 
 VIDEO_BASE                 equ 0x0400       ; 6K for the display
 VIDEO_END                  equ 0x1C00
+VC_BASE                            equ 0x1C00       ; 1K for two virtual consoles
 
 IDEDATA                            equ 0xFF50
 IDEDATA_L                  equ 0xFF58

diff --git a/Kernel/platform-dragon-nx32/vc.c b/Kernel/platform-dragon-nx32/vc.c
index 466ef04..f1d87bb 100644 (file)
--- a/Kernel/platform-dragon-nx32/vc.c
+++ b/Kernel/platform-dragon-nx32/vc.c
@@ -9,7 +9,7 @@ unsigned char vt_mangle_6847(unsigned char c);
 /* Use macros so that functions are kept identical to Kernel/vt.c */
 #undef VT_MAP_CHAR
 #define VT_MAP_CHAR(x) vt_mangle_6847(x)
-#define VT_BASE                ((uint8_t *) VT_ALLBASE + 0x200 * (curtty - 2))
+#define VT_BASE                ((uint8_t *) VC_BASE + 0x200 * (curtty - 2))
 #define VT_WIDTH       32
 #define VC             (curtty - 2)
 
@@ -75,10 +75,10 @@ unsigned char vt_mangle_6847(unsigned char c)
        return c;
 }
 
-/* called without curtty and VC being set */
+/* called without curtty and VC being set - using VC_BASE */
 void vc_clear(int8_t vc_num)
 {
-       map_video();
-       memset((uint8_t*)VT_ALLBASE + 0x200 * vc_num, ' ', 0x200);
-       unmap_video();
+       map_video()
+       memset((uint8_t*)VC_BASE + 0x200 * vc_num, ' ', 0x200);
+       unmap_video()
 }