From 373d03e0b1eaf00494dcd65cb8a0ffee445a1a35 Mon Sep 17 00:00:00 2001
From: Virgil Dupras <hsoft@hardcoded.net>
Date: Sun, 20 Sep 2020 11:57:04 -0400
Subject: [PATCH] recipes/trs80: move recipe blocks into local overlay

---
 blk/001                          |  3 +--
 recipes/trs80/Makefile           | 17 ++++++++++++-----
 blk/490 => recipes/trs80/blk/600 |  5 ++---
 blk/492 => recipes/trs80/blk/602 |  0
 blk/493 => recipes/trs80/blk/603 |  0
 blk/494 => recipes/trs80/blk/604 |  0
 blk/495 => recipes/trs80/blk/605 |  0
 blk/496 => recipes/trs80/blk/606 |  0
 blk/497 => recipes/trs80/blk/607 |  0
 blk/499 => recipes/trs80/blk/609 |  0
 blk/500 => recipes/trs80/blk/610 |  0
 blk/502 => recipes/trs80/blk/612 |  0
 blk/503 => recipes/trs80/blk/613 |  0
 recipes/trs80/xcomp.fs           |  2 +-
 14 files changed, 16 insertions(+), 11 deletions(-)
 rename blk/490 => recipes/trs80/blk/600 (67%)
 rename blk/492 => recipes/trs80/blk/602 (100%)
 rename blk/493 => recipes/trs80/blk/603 (100%)
 rename blk/494 => recipes/trs80/blk/604 (100%)
 rename blk/495 => recipes/trs80/blk/605 (100%)
 rename blk/496 => recipes/trs80/blk/606 (100%)
 rename blk/497 => recipes/trs80/blk/607 (100%)
 rename blk/499 => recipes/trs80/blk/609 (100%)
 rename blk/500 => recipes/trs80/blk/610 (100%)
 rename blk/502 => recipes/trs80/blk/612 (100%)
 rename blk/503 => recipes/trs80/blk/613 (100%)

diff --git a/blk/001 b/blk/001
index bab85b6..258f475 100644
--- a/blk/001
+++ b/blk/001
@@ -7,8 +7,7 @@ MASTER INDEX
 200 Z80 assembler             260 Cross compilation
 280 Z80 boot code             350 Core words
 410 PS/2 keyboard subsystem   420 SD Card subsystem
-440-489 unused
-490 TRS-80 Recipe             520 Fonts
+440-519 unused                520 Fonts
 550 TI-84+ Recipe             580-649 unused
 650 AVR assembler             690 AVR SPI programmer
 700-729 unused                730 8086 assembler
diff --git a/recipes/trs80/Makefile b/recipes/trs80/Makefile
index d9d358d..1d5773e 100644
--- a/recipes/trs80/Makefile
+++ b/recipes/trs80/Makefile
@@ -1,11 +1,18 @@
 TARGET = os.bin
-CDIR = ../../cvm
-STAGE = $(CDIR)/stage
+BASE = ../..
+BLKPACK = $(BASE)/tools/blkpack
+STAGE = $(BASE)/cvm/stage
 
 .PHONY: all
 all: $(TARGET) 
-$(TARGET): xcomp.fs $(STAGE)
-	cat xcomp.fs | $(STAGE) > $@
+$(TARGET): xcomp.fs $(STAGE) blkfs
+	cat xcomp.fs | $(STAGE) blkfs > $@
+
+$(BLKPACK):
+	$(MAKE) -C ../tools
+
+blkfs: $(BLKPACK)
+	$(BLKPACK) $(BASE)/blk blk > $@
 
 $(STAGE):
-	$(MAKE) -C $(CDIR) stage
+	$(MAKE) -C $(BASE)/cvm stage
diff --git a/blk/490 b/recipes/trs80/blk/600
similarity index 67%
rename from blk/490
rename to recipes/trs80/blk/600
index 64ad5e0..ac3b45a 100644
--- a/blk/490
+++ b/recipes/trs80/blk/600
@@ -4,7 +4,6 @@ Support code for the TRS-80 recipe. Contains drivers for the
 keyboard, video and floppy. At the moment, they are thin layer
 over the drivers provided by TRSDOS' SVC.
 
-Load with "492 LOAD".
+Load with "602 LOAD".
 
-There is also the RECV program at B502 and the XCOMP unit at
-B504
+There is also the RECV program at B612.
diff --git a/blk/492 b/recipes/trs80/blk/602
similarity index 100%
rename from blk/492
rename to recipes/trs80/blk/602
diff --git a/blk/493 b/recipes/trs80/blk/603
similarity index 100%
rename from blk/493
rename to recipes/trs80/blk/603
diff --git a/blk/494 b/recipes/trs80/blk/604
similarity index 100%
rename from blk/494
rename to recipes/trs80/blk/604
diff --git a/blk/495 b/recipes/trs80/blk/605
similarity index 100%
rename from blk/495
rename to recipes/trs80/blk/605
diff --git a/blk/496 b/recipes/trs80/blk/606
similarity index 100%
rename from blk/496
rename to recipes/trs80/blk/606
diff --git a/blk/497 b/recipes/trs80/blk/607
similarity index 100%
rename from blk/497
rename to recipes/trs80/blk/607
diff --git a/blk/499 b/recipes/trs80/blk/609
similarity index 100%
rename from blk/499
rename to recipes/trs80/blk/609
diff --git a/blk/500 b/recipes/trs80/blk/610
similarity index 100%
rename from blk/500
rename to recipes/trs80/blk/610
diff --git a/blk/502 b/recipes/trs80/blk/612
similarity index 100%
rename from blk/502
rename to recipes/trs80/blk/612
diff --git a/blk/503 b/recipes/trs80/blk/613
similarity index 100%
rename from blk/503
rename to recipes/trs80/blk/613
diff --git a/recipes/trs80/xcomp.fs b/recipes/trs80/xcomp.fs
index ec6073f..5a61f9c 100644
--- a/recipes/trs80/xcomp.fs
+++ b/recipes/trs80/xcomp.fs
@@ -9,7 +9,7 @@ RS_ADDR 0x80 - CONSTANT SYSVARS
 0x3000 BIN( !
 283 335 LOADR ( boot.z80 )
 353 LOAD ( xcomp core low )
-492 LOAD ( trs80 )
+602 LOAD ( trs80 )
 380 LOAD ( xcomp core high )
 (entry) _
 ( Update LATEST )