From 97ec2569a0bd9b31df4bba4eb488b764d0c58695 Mon Sep 17 00:00:00 2001
From: Virgil Dupras <hsoft@hardcoded.net>
Date: Sun, 20 Sep 2020 10:50:13 -0400
Subject: [PATCH] recipes/rc2014: move recipe blocks into local overlay

---
 blk/001                           |  3 +--
 blk/580                           |  8 --------
 cvm/vm.h                          |  2 +-
 recipes/rc2014/Makefile           | 17 ++++++++++++-----
 recipes/rc2014/blk/600            |  8 ++++++++
 blk/581 => recipes/rc2014/blk/601 |  0
 blk/582 => recipes/rc2014/blk/602 |  0
 blk/583 => recipes/rc2014/blk/603 |  0
 blk/584 => recipes/rc2014/blk/604 |  0
 blk/585 => recipes/rc2014/blk/605 |  0
 blk/586 => recipes/rc2014/blk/606 |  0
 blk/587 => recipes/rc2014/blk/607 |  0
 blk/588 => recipes/rc2014/blk/608 |  0
 blk/589 => recipes/rc2014/blk/609 |  0
 blk/590 => recipes/rc2014/blk/610 |  0
 blk/592 => recipes/rc2014/blk/612 |  0
 blk/593 => recipes/rc2014/blk/613 |  0
 blk/595 => recipes/rc2014/blk/615 |  0
 blk/596 => recipes/rc2014/blk/616 |  0
 blk/599 => recipes/rc2014/blk/619 |  4 ++--
 recipes/rc2014/xcomp.fs           |  2 +-
 21 files changed, 25 insertions(+), 19 deletions(-)
 delete mode 100644 blk/580
 create mode 100644 recipes/rc2014/blk/600
 rename blk/581 => recipes/rc2014/blk/601 (100%)
 rename blk/582 => recipes/rc2014/blk/602 (100%)
 rename blk/583 => recipes/rc2014/blk/603 (100%)
 rename blk/584 => recipes/rc2014/blk/604 (100%)
 rename blk/585 => recipes/rc2014/blk/605 (100%)
 rename blk/586 => recipes/rc2014/blk/606 (100%)
 rename blk/587 => recipes/rc2014/blk/607 (100%)
 rename blk/588 => recipes/rc2014/blk/608 (100%)
 rename blk/589 => recipes/rc2014/blk/609 (100%)
 rename blk/590 => recipes/rc2014/blk/610 (100%)
 rename blk/592 => recipes/rc2014/blk/612 (100%)
 rename blk/593 => recipes/rc2014/blk/613 (100%)
 rename blk/595 => recipes/rc2014/blk/615 (100%)
 rename blk/596 => recipes/rc2014/blk/616 (100%)
 rename blk/599 => recipes/rc2014/blk/619 (81%)

diff --git a/blk/001 b/blk/001
index 388b804..bab85b6 100644
--- a/blk/001
+++ b/blk/001
@@ -9,8 +9,7 @@ MASTER INDEX
 410 PS/2 keyboard subsystem   420 SD Card subsystem
 440-489 unused
 490 TRS-80 Recipe             520 Fonts
-550 TI-84+ Recipe             580 RC2014 Recipe
-600-649 unused
+550 TI-84+ Recipe             580-649 unused
 650 AVR assembler             690 AVR SPI programmer
 700-729 unused                730 8086 assembler
 800 8086 boot code            830 PC/AT recipe
diff --git a/blk/580 b/blk/580
deleted file mode 100644
index dbb6e64..0000000
--- a/blk/580
+++ /dev/null
@@ -1,8 +0,0 @@
-RC2014 Recipe
-
-Support code for the RC2014 recipe. Contains drivers for the
-ACIA, SD card and AT28 EEPROM.
-
-581 ACIA                       586 Zilog SIO driver
-592 AT28 EEPROM                595 SPI relay
-599 Xcomp unit
diff --git a/cvm/vm.h b/cvm/vm.h
index 215bd9e..bab6e18 100644
--- a/cvm/vm.h
+++ b/cvm/vm.h
@@ -46,7 +46,7 @@ typedef struct {
     bool oflw;
 } VM;
 
-VM* VM_init();
+VM* VM_init(char *blkfs_path);
 void VM_deinit();
 bool VM_steps(int n);
 void VM_memdump();
diff --git a/recipes/rc2014/Makefile b/recipes/rc2014/Makefile
index 506639a..d4d26ef 100644
--- a/recipes/rc2014/Makefile
+++ b/recipes/rc2014/Makefile
@@ -1,14 +1,21 @@
 TARGET = os.bin
-BASEDIR = ../..
-CDIR = $(BASEDIR)/cvm
-EDIR = $(BASEDIR)/emul
+BASE = ../..
+CDIR = $(BASE)/cvm
+EDIR = $(BASE)/emul
 STAGE = $(CDIR)/stage
+BLKPACK = $(BASE)/tools/blkpack
 EMUL = $(EDIR)/hw/rc2014/classic
 
 .PHONY: all
 all: $(TARGET) 
-$(TARGET): xcomp.fs $(STAGE)
-	cat xcomp.fs | $(STAGE) > $@
+$(TARGET): xcomp.fs $(STAGE) blkfs
+	$(STAGE) blkfs < xcomp.fs > $@
+
+$(BLKPACK):
+	$(MAKE) -C ../tools
+
+blkfs: $(BLKPACK)
+	$(BLKPACK) $(BASE)/blk blk > $@
 
 $(STAGE):
 	$(MAKE) -C $(CDIR) stage
diff --git a/recipes/rc2014/blk/600 b/recipes/rc2014/blk/600
new file mode 100644
index 0000000..3cea5ef
--- /dev/null
+++ b/recipes/rc2014/blk/600
@@ -0,0 +1,8 @@
+RC2014 Recipe
+
+Support code for the RC2014 recipe. Contains drivers for the
+ACIA, SD card and AT28 EEPROM.
+
+601 ACIA                       606 Zilog SIO driver
+612 AT28 EEPROM                615 SPI relay
+619 Xcomp unit
diff --git a/blk/581 b/recipes/rc2014/blk/601
similarity index 100%
rename from blk/581
rename to recipes/rc2014/blk/601
diff --git a/blk/582 b/recipes/rc2014/blk/602
similarity index 100%
rename from blk/582
rename to recipes/rc2014/blk/602
diff --git a/blk/583 b/recipes/rc2014/blk/603
similarity index 100%
rename from blk/583
rename to recipes/rc2014/blk/603
diff --git a/blk/584 b/recipes/rc2014/blk/604
similarity index 100%
rename from blk/584
rename to recipes/rc2014/blk/604
diff --git a/blk/585 b/recipes/rc2014/blk/605
similarity index 100%
rename from blk/585
rename to recipes/rc2014/blk/605
diff --git a/blk/586 b/recipes/rc2014/blk/606
similarity index 100%
rename from blk/586
rename to recipes/rc2014/blk/606
diff --git a/blk/587 b/recipes/rc2014/blk/607
similarity index 100%
rename from blk/587
rename to recipes/rc2014/blk/607
diff --git a/blk/588 b/recipes/rc2014/blk/608
similarity index 100%
rename from blk/588
rename to recipes/rc2014/blk/608
diff --git a/blk/589 b/recipes/rc2014/blk/609
similarity index 100%
rename from blk/589
rename to recipes/rc2014/blk/609
diff --git a/blk/590 b/recipes/rc2014/blk/610
similarity index 100%
rename from blk/590
rename to recipes/rc2014/blk/610
diff --git a/blk/592 b/recipes/rc2014/blk/612
similarity index 100%
rename from blk/592
rename to recipes/rc2014/blk/612
diff --git a/blk/593 b/recipes/rc2014/blk/613
similarity index 100%
rename from blk/593
rename to recipes/rc2014/blk/613
diff --git a/blk/595 b/recipes/rc2014/blk/615
similarity index 100%
rename from blk/595
rename to recipes/rc2014/blk/615
diff --git a/blk/596 b/recipes/rc2014/blk/616
similarity index 100%
rename from blk/596
rename to recipes/rc2014/blk/616
diff --git a/blk/599 b/recipes/rc2014/blk/619
similarity index 81%
rename from blk/599
rename to recipes/rc2014/blk/619
index 1e8eb2f..c1ab969 100644
--- a/blk/599
+++ b/recipes/rc2014/blk/619
@@ -1,11 +1,11 @@
 0xff00 CONSTANT RS_ADDR        0xfffa CONSTANT PS_ADDR
 RS_ADDR 0x80 - CONSTANT SYSVARS
 0x8000 CONSTANT HERESTART
-582 LOAD  ( acia decl )
+602 LOAD  ( acia decl )
 212 LOAD  ( z80 assembler )
 262 LOAD  ( xcomp )            282 LOAD  ( boot.z80.decl )
 270 LOAD  ( xcomp overrides )  283 335 LOADR ( boot.z80 )
-353 LOAD  ( xcomp core low )   583 585 LOADR ( acia )
+353 LOAD  ( xcomp core low )   603 605 LOADR ( acia )
 380 LOAD  ( xcomp core high )
 (entry) _
 ( Update LATEST )
diff --git a/recipes/rc2014/xcomp.fs b/recipes/rc2014/xcomp.fs
index dd40448..026cc27 100644
--- a/recipes/rc2014/xcomp.fs
+++ b/recipes/rc2014/xcomp.fs
@@ -1,3 +1,3 @@
-599 LOAD
+619 LOAD
 ORG @ 256 /MOD 2 PC! 2 PC!
 H@ 256 /MOD 2 PC! 2 PC!