recipes/rc2014: move recipe blocks into local overlay

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

blk/580

@@ -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

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();

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

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

blk/599 → 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 )

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!