From fea9beac1e1336b4a369372f35a799392c6f82c9 Mon Sep 17 00:00:00 2001
From: Virgil Dupras <hsoft@hardcoded.net>
Date: Sun, 20 Sep 2020 20:48:52 -0400
Subject: [PATCH] recipes/pcat: move recipe blocks into local overlay

---
 blk/001                         |  2 +-
 blk/830                         |  5 -----
 recipes/pcat/Makefile           | 25 ++++++++++++++++---------
 recipes/pcat/blk/600            |  5 +++++
 blk/832 => recipes/pcat/blk/602 |  0
 blk/834 => recipes/pcat/blk/604 |  0
 blk/836 => recipes/pcat/blk/606 |  0
 blk/837 => recipes/pcat/blk/607 |  0
 blk/838 => recipes/pcat/blk/608 |  0
 blk/840 => recipes/pcat/blk/610 |  0
 blk/842 => recipes/pcat/blk/612 |  8 ++++----
 recipes/pcat/xcomp.fs           |  2 +-
 12 files changed, 27 insertions(+), 20 deletions(-)
 delete mode 100644 blk/830
 create mode 100644 recipes/pcat/blk/600
 rename blk/832 => recipes/pcat/blk/602 (100%)
 rename blk/834 => recipes/pcat/blk/604 (100%)
 rename blk/836 => recipes/pcat/blk/606 (100%)
 rename blk/837 => recipes/pcat/blk/607 (100%)
 rename blk/838 => recipes/pcat/blk/608 (100%)
 rename blk/840 => recipes/pcat/blk/610 (100%)
 rename blk/842 => recipes/pcat/blk/612 (71%)

diff --git a/blk/001 b/blk/001
index fc599b0..942518f 100644
--- a/blk/001
+++ b/blk/001
@@ -11,4 +11,4 @@ MASTER INDEX
 550-649 unused
 650 AVR assembler             690 AVR SPI programmer
 700-729 unused                730 8086 assembler
-800 8086 boot code            830 PC/AT recipe
+800 8086 boot code
diff --git a/blk/830 b/blk/830
deleted file mode 100644
index cd0efe3..0000000
--- a/blk/830
+++ /dev/null
@@ -1,5 +0,0 @@
-PC/AT recipe
-
-832 MBR bootloader             834 KEY/EMIT drivers
-836-838 BLK drivers            840 AT-XY drivers
-842 xcomp unit
diff --git a/recipes/pcat/Makefile b/recipes/pcat/Makefile
index 0181aab..66f1509 100644
--- a/recipes/pcat/Makefile
+++ b/recipes/pcat/Makefile
@@ -1,23 +1,30 @@
 TARGET = disk.bin
-BASEDIR = ../..
-CDIR = $(BASEDIR)/cvm
+BASE = ../..
+CDIR = $(BASE)/cvm
+BLKPACK = $(BASE)/tools/blkpack
 STAGE = $(CDIR)/stage
 
 .PHONY: all
 all: $(TARGET) 
-mbr.bin: mbr.fs $(STAGE)
-	cat mbr.fs | $(STAGE) > $@
+os.bin: xcomp.fs $(STAGE) blkfs
+	$(STAGE) blkfs < xcomp.fs > $@
 
-os.bin: xcomp.fs $(STAGE)
-	cat xcomp.fs | $(STAGE) > $@
+$(BLKPACK):
+	$(MAKE) -C ../tools
 
-disk.bin: mbr.bin os.bin
-	cat mbr.bin os.bin > $@
-	dd if=$(CDIR)/blkfs of=$@ bs=512 seek=16
+blkfs: $(BLKPACK)
+	$(BLKPACK) $(BASE)/blk blk > $@
 
 $(STAGE):
 	$(MAKE) -C $(CDIR) stage
 
+mbr.bin: mbr.fs $(STAGE)
+	cat mbr.fs | $(STAGE) > $@
+
+$(TARGET): mbr.bin os.bin
+	cat mbr.bin os.bin > $@
+	dd if=blkfs of=$@ bs=512 seek=16
+
 .PHONY: emul
 emul: $(TARGET)
 	qemu-system-i386 -drive file=$(TARGET),if=floppy,format=raw
diff --git a/recipes/pcat/blk/600 b/recipes/pcat/blk/600
new file mode 100644
index 0000000..ce63d16
--- /dev/null
+++ b/recipes/pcat/blk/600
@@ -0,0 +1,5 @@
+PC/AT recipe
+
+602 MBR bootloader             604 KEY/EMIT drivers
+606-608 BLK drivers            610 AT-XY drivers
+612 xcomp unit
diff --git a/blk/832 b/recipes/pcat/blk/602
similarity index 100%
rename from blk/832
rename to recipes/pcat/blk/602
diff --git a/blk/834 b/recipes/pcat/blk/604
similarity index 100%
rename from blk/834
rename to recipes/pcat/blk/604
diff --git a/blk/836 b/recipes/pcat/blk/606
similarity index 100%
rename from blk/836
rename to recipes/pcat/blk/606
diff --git a/blk/837 b/recipes/pcat/blk/607
similarity index 100%
rename from blk/837
rename to recipes/pcat/blk/607
diff --git a/blk/838 b/recipes/pcat/blk/608
similarity index 100%
rename from blk/838
rename to recipes/pcat/blk/608
diff --git a/blk/840 b/recipes/pcat/blk/610
similarity index 100%
rename from blk/840
rename to recipes/pcat/blk/610
diff --git a/blk/842 b/recipes/pcat/blk/612
similarity index 71%
rename from blk/842
rename to recipes/pcat/blk/612
index e550917..bf847f9 100644
--- a/blk/842
+++ b/recipes/pcat/blk/612
@@ -3,11 +3,11 @@
 RS_ADDR 0x80 - CONSTANT SYSVARS
 750 LOAD  ( 8086 asm )
 262 LOAD  ( xcomp ) 270 LOAD  ( xcomp overrides )
-805 820 LOADR
+805 820 LOADR ( 8086 boot code )
 353 LOAD  ( xcomp core low )
-834 LOAD  ( KEY/EMIT drivers )
-836 838 LOADR  ( BLK drivers )
-840 LOAD  ( AT-XY drivers )
+604 LOAD  ( KEY/EMIT drivers )
+606 608 LOADR  ( BLK drivers )
+610 LOAD  ( AT-XY drivers )
 380 LOAD  ( xcomp core high )
 (entry) _ ( Update LATEST ) PC ORG @ 8 + !
 ," BLK$ FD$ ' FD@ BLK@* ! ' FD! BLK!* ! " EOT,
diff --git a/recipes/pcat/xcomp.fs b/recipes/pcat/xcomp.fs
index 66328b1..541918e 100644
--- a/recipes/pcat/xcomp.fs
+++ b/recipes/pcat/xcomp.fs
@@ -1,3 +1,3 @@
-842 LOAD ( PC/AT xcomp )
+612 LOAD ( PC/AT xcomp )
 ORG @ 256 /MOD 2 PC! 2 PC!
 H@ 256 /MOD 2 PC! 2 PC!