diff --git a/.gitignore b/.gitignore index 5761abc..8332460 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ *.o +*.core +memdump diff --git a/blk/001 b/blk/001 index 258f475..fc599b0 100644 --- a/blk/001 +++ b/blk/001 @@ -8,7 +8,7 @@ MASTER INDEX 280 Z80 boot code 350 Core words 410 PS/2 keyboard subsystem 420 SD Card subsystem 440-519 unused 520 Fonts -550 TI-84+ Recipe 580-649 unused +550-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/recipes/.gitignore b/recipes/.gitignore index f10dad4..c285f4f 100644 --- a/recipes/.gitignore +++ b/recipes/.gitignore @@ -5,3 +5,4 @@ *.rom *.8xu *.sms +blkfs diff --git a/recipes/ti84/Makefile b/recipes/ti84/Makefile index 858e637..324c976 100644 --- a/recipes/ti84/Makefile +++ b/recipes/ti84/Makefile @@ -1,14 +1,21 @@ TARGET = os.bin -BASEDIR = ../.. -CDIR = $(BASEDIR)/cvm +BASE = ../.. +CDIR = $(BASE)/cvm STAGE = $(CDIR)/stage -EMUL = $(BASEDIR)/emul/hw/ti/ti84 +BLKPACK = $(BASE)/tools/blkpack +EMUL = $(BASE)/emul/hw/ti/ti84 MKTIUPGRADE = mktiupgrade .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/blk/550 b/recipes/ti84/blk/600 similarity index 100% rename from blk/550 rename to recipes/ti84/blk/600 diff --git a/blk/551 b/recipes/ti84/blk/601 similarity index 100% rename from blk/551 rename to recipes/ti84/blk/601 diff --git a/blk/552 b/recipes/ti84/blk/602 similarity index 100% rename from blk/552 rename to recipes/ti84/blk/602 diff --git a/blk/553 b/recipes/ti84/blk/603 similarity index 100% rename from blk/553 rename to recipes/ti84/blk/603 diff --git a/blk/554 b/recipes/ti84/blk/604 similarity index 100% rename from blk/554 rename to recipes/ti84/blk/604 diff --git a/blk/555 b/recipes/ti84/blk/605 similarity index 100% rename from blk/555 rename to recipes/ti84/blk/605 diff --git a/blk/556 b/recipes/ti84/blk/606 similarity index 100% rename from blk/556 rename to recipes/ti84/blk/606 diff --git a/blk/557 b/recipes/ti84/blk/607 similarity index 100% rename from blk/557 rename to recipes/ti84/blk/607 diff --git a/blk/558 b/recipes/ti84/blk/608 similarity index 100% rename from blk/558 rename to recipes/ti84/blk/608 diff --git a/blk/559 b/recipes/ti84/blk/609 similarity index 100% rename from blk/559 rename to recipes/ti84/blk/609 diff --git a/blk/560 b/recipes/ti84/blk/610 similarity index 100% rename from blk/560 rename to recipes/ti84/blk/610 diff --git a/blk/564 b/recipes/ti84/blk/614 similarity index 100% rename from blk/564 rename to recipes/ti84/blk/614 diff --git a/blk/565 b/recipes/ti84/blk/615 similarity index 100% rename from blk/565 rename to recipes/ti84/blk/615 diff --git a/blk/566 b/recipes/ti84/blk/616 similarity index 100% rename from blk/566 rename to recipes/ti84/blk/616 diff --git a/blk/567 b/recipes/ti84/blk/617 similarity index 100% rename from blk/567 rename to recipes/ti84/blk/617 diff --git a/blk/568 b/recipes/ti84/blk/618 similarity index 100% rename from blk/568 rename to recipes/ti84/blk/618 diff --git a/blk/569 b/recipes/ti84/blk/619 similarity index 100% rename from blk/569 rename to recipes/ti84/blk/619 diff --git a/blk/570 b/recipes/ti84/blk/620 similarity index 100% rename from blk/570 rename to recipes/ti84/blk/620 diff --git a/recipes/ti84/xcomp.fs b/recipes/ti84/xcomp.fs index ab288a6..af1cfd7 100644 --- a/recipes/ti84/xcomp.fs +++ b/recipes/ti84/xcomp.fs @@ -64,8 +64,8 @@ CURRENT @ XCURRENT ! 283 335 LOADR ( boot.z80 ) 353 LOAD ( xcomp core low ) CREATE ~FNT CPFNT3x5 -555 560 LOADR ( LCD low ) -566 570 LOADR ( KBD low ) +605 610 LOADR ( LCD low ) +616 620 LOADR ( KBD low ) 380 LOAD ( xcomp core high ) (entry) _ ( Update LATEST )