Common DriveWire files for coco2/coco2cart/dragon-nx32

The coco2 and coco2cart platforms were missing the
low-level DriveWire drivers. They can use the same as
the dragon-nx32 platform, so make them common.

Now that coco2 and coco2cart build again, also add
the build memory map check while we are at it.

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

diff --git a/Kernel/platform-dragon-nx32/dw.def b/Kernel/dev/drivewire/dw-6809.def
similarity index 100%
rename from Kernel/platform-dragon-nx32/dw.def
rename to Kernel/dev/drivewire/dw-6809.def

diff --git a/Kernel/platform-dragon-nx32/dwread.s b/Kernel/dev/drivewire/dwread-6809.s
similarity index 100%
rename from Kernel/platform-dragon-nx32/dwread.s
rename to Kernel/dev/drivewire/dwread-6809.s

diff --git a/Kernel/platform-dragon-nx32/dwwrite.s b/Kernel/dev/drivewire/dwwrite-6809.s
similarity index 100%
rename from Kernel/platform-dragon-nx32/dwwrite.s
rename to Kernel/dev/drivewire/dwwrite-6809.s

diff --git a/Kernel/platform-coco2/Makefile b/Kernel/platform-coco2/Makefile
index c926b53..5fc6af5 100644 (file)
--- a/Kernel/platform-coco2/Makefile
+++ b/Kernel/platform-coco2/Makefile
@@ -56,6 +56,7 @@ image: bootfuz.bin
        ../tty.o ../devsys.o ../usermem.o ../syscall_fs2.o ../syscall_exec16.o \
        devtty.o libc.o ../vt.o ../syscall_fs3.o
        ../tools/decb-image <../fuzix.bin fuzix.img
+       ../tools/lw-checkmap ../fuzix.map
        # Repack the high 5K where the loader wants it
        dd if=fuzix.img of=fuzix.tmp bs=1024 skip=59
        dd if=fuzix.tmp of=fuzix.img bs=1024 seek=32 conv=notrunc

diff --git a/Kernel/platform-coco2/drivewire.s b/Kernel/platform-coco2/drivewire.s
index 85962fe..4c20871 100644 (file)
--- a/Kernel/platform-coco2/drivewire.s
+++ b/Kernel/platform-coco2/drivewire.s
@@ -231,7 +231,7 @@ BAUD38400 equ 0
 
 ; These files are copied almost as-is from HDB-DOS
        *PRAGMA nonewsource
-         include "dw.def"
-         include "dwread.s"
-         include "dwwrite.s"
+         include "../dev/drivewire/dw-6809.def"
+         include "../dev/drivewire/dwread-6809.s"
+         include "../dev/drivewire/dwwrite-6809.s"
 

diff --git a/Kernel/platform-coco2cart/Makefile b/Kernel/platform-coco2cart/Makefile
index e396cc0..1d60d95 100644 (file)
--- a/Kernel/platform-coco2cart/Makefile
+++ b/Kernel/platform-coco2cart/Makefile
@@ -64,6 +64,7 @@ image:
        ../tty.o ../devsys.o ../usermem.o usermem.o ../syscall_fs2.o \
        ../syscall_exec16.o devtty.o libc.o ../vt.o video.o  ../syscall_fs3.o \
        ../font8x8.o devsdc.o sdc.o
+       ../tools/lw-checkmap ../fuzix.map
        ../tools/decb-image <../fuzix.bin fuzix.img
        dd if=fuzix.img of=fuzix.rom bs=1024 skip=48 count=16
        dd if=fuzix.img of=fuzix.ide bs=256 skip=26 count=102

diff --git a/Kernel/platform-coco2cart/drivewire.s b/Kernel/platform-coco2cart/drivewire.s
index 1dfba90..3e72a3a 100644 (file)
--- a/Kernel/platform-coco2cart/drivewire.s
+++ b/Kernel/platform-coco2cart/drivewire.s
@@ -231,7 +231,7 @@ BAUD38400 equ 0
 
 ; These files are copied almost as-is from HDB-DOS
        *PRAGMA nonewsource
-         include "dw.def"
-         include "dwread.s"
-         include "dwwrite.s"
+         include "../dev/drivewire/dw-6809.def"
+         include "../dev/drivewire/dwread-6809.s"
+         include "../dev/drivewire/dwwrite-6809.s"
 

diff --git a/Kernel/platform-dragon-nx32/drivewire.s b/Kernel/platform-dragon-nx32/drivewire.s
index 1b11752..13c2fc6 100644 (file)
--- a/Kernel/platform-dragon-nx32/drivewire.s
+++ b/Kernel/platform-dragon-nx32/drivewire.s
@@ -231,7 +231,7 @@ BAUD38400 equ 0
 
 ; These files are copied almost as-is from HDB-DOS
        *PRAGMA nonewsource
-         include "dw.def"
-         include "dwread.s"
-         include "dwwrite.s"
+         include "../dev/drivewire/dw-6809.def"
+         include "../dev/drivewire/dwread-6809.s"
+         include "../dev/drivewire/dwwrite-6809.s"