Rename /hrcg to /terminal and terminal* to hrcg_terminal*, add forgotten script

diff --git a/.gitignore b/.gitignore
index 15100b8..f72ea74 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -8,8 +8,6 @@
 __pycache__
 /bas_to_tok.py
 /element.py
-/hrcg/bootable.dsk
-/hrcg/emu_65c02
 /lemonade/bootable.dsk
 /lemonade/lemonade.bas
 /lemonade/lemonade_flash.asm
@@ -34,6 +32,8 @@ __pycache__
 /ribbit/ribbit_tone.asm
 /ribbit/ribbit_patched.bas
 /ribbit/ribbit_patched.dsk
+/terminal/bootable.dsk
+/terminal/emu_65c02
 /test/bootable.dsk
 /test/lemonade_music.bas
 /tok_to_bas.py

diff --git a/.gitmodules b/.gitmodules
index 99aff21..e8d6ce0 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -5,5 +5,5 @@
        path = linapple-pie
        url = https://github.com/nickd4/linapple-pie.git
 [submodule "hrcg/vrEmu6502"]
-       path = hrcg/vrEmu6502
+       path = terminal/vrEmu6502
        url = https://github.com/nickd4/vrEmu6502

diff --git a/Makefile b/Makefile
index 6f82596..b02b4c9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -7,12 +7,12 @@
 .PHONY: all
 all: \
 dos33fsprogs \
-hrcg \
 lemonade \
 linapple-pie \
 little_brick_out \
 orig \
 ribbit \
+terminal \
 element.py \
 lex_yy.py \
 t_def.py \
@@ -24,13 +24,6 @@ tok_to_bas.py
 dos33fsprogs:
        ${MAKE} ${MAKEFLAGS} -C dos33fsprogs/utils/dos33fs-utils dos33 mkdos33fs
 
-.PHONY: hrcg
-hrcg: \
-dos33fsprogs \
-linapple-pie \
-orig
-       ${MAKE} ${MAKEFLAGS} -C hrcg
-
 .PHONY: lemonade
 lemonade: \
 dos33fsprogs \
@@ -72,6 +65,13 @@ tok_to_bas.py \
 bas_to_tok.py
        ${MAKE} ${MAKEFLAGS} -C ribbit
 
+.PHONY: terminal
+terminal: \
+dos33fsprogs \
+linapple-pie \
+orig
+       ${MAKE} ${MAKEFLAGS} -C terminal
+
 element.py:
        pitree --install-element
 
@@ -90,11 +90,11 @@ tok_to_bas.py: tok_to_bas.l
 
 clean:
        ${MAKE} ${MAKEFLAGS} -C dos33fsprogs/utils/dos33fs-utils clean
-       ${MAKE} ${MAKEFLAGS} -C hrcg clean
        ${MAKE} ${MAKEFLAGS} -C lemonade clean
        ${MAKE} ${MAKEFLAGS} -C little_brick_out clean
        ${MAKE} ${MAKEFLAGS} -C orig clean
        ${MAKE} ${MAKEFLAGS} -C ribbit clean
+       ${MAKE} ${MAKEFLAGS} -C terminal clean
        rm -f \
 element.py \
 lex_yy.py \

diff --git a/hrcg/terminal_asm.txt b/hrcg/terminal_asm.txt
deleted file mode 100644 (file)
index 0ac1480..0000000
--- a/hrcg/terminal_asm.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-BRUN EDASM.OBJ
-PR#1
-DR 2
-ASM TERMINAL.ASM,TERMINAL.OBJ
-

diff --git a/hrcg/Makefile b/terminal/Makefile
similarity index 72%
rename from hrcg/Makefile
rename to terminal/Makefile
index 644f810..6288b3b 100644 (file)
--- a/hrcg/Makefile
+++ b/terminal/Makefile
@@ -13,7 +13,7 @@ all: \
 emu_65c02 \
 hrcg.obj \
 monitor_rom.obj \
-terminal.obj \
+hrcg_terminal.obj \
 frogs1.set \
 frogs2.set \
 lily_pad.pic
@@ -28,7 +28,7 @@ bootable.dsk \
        tr '\n' '\r' <hrcg_obj_bsave.txt |\
 ( \
   cd ../linapple-pie && \
-  ./linapple -b -1 ../hrcg/__temp__.dsk -2 ../orig/DOS_Tool_Kit_v1.0_1980_Apple.do \
+  ./linapple -b -1 ../terminal/__temp__.dsk -2 ../orig/DOS_Tool_Kit_v1.0_1980_Apple.do \
 )
        ${DOS33} __temp__.dsk LOAD HRCG.OBJ $@
        rm __temp__.dsk
@@ -39,24 +39,24 @@ monitor_rom.obj: ../orig/apple2.rom monitor_rom_obj_header.txt
   dd if=$< bs=1024 skip=18 count=2 \
 ) >$@
 
-terminal.obj: \
-terminal.asm \
-terminal_asm.txt \
+hrcg_terminal.obj: \
+hrcg_terminal.asm \
+hrcg_terminal_asm.txt \
 bootable.dsk \
 ../orig/DOS_Tool_Kit_v1.0_1980_Apple.do
        cp ../orig/DOS_Tool_Kit_v1.0_1980_Apple.do .
-       tr '\t\na-z' ' \rA-Z' <terminal.asm |\
+       tr '\t\na-z' ' \rA-Z' <hrcg_terminal.asm |\
 LC_ALL=C tr '\000-\177' '\200-\377' >__temp__.asm
        ${MKDOS33FS} __temp__.dsk
-       ${DOS33} __temp__.dsk SAVE T __temp__.asm TERMINAL.ASM
+       ${DOS33} __temp__.dsk SAVE T __temp__.asm "HRCG TERMINAL.ASM"
        rm -f ../linapple-pie/Printer.txt
-       tr '\n' '\r' <terminal_asm.txt |\
+       tr '\n' '\r' <hrcg_terminal_asm.txt |\
 ( \
   cd ../linapple-pie && \
-  ./linapple -b -1 ../hrcg/DOS_Tool_Kit_v1.0_1980_Apple.do -2 ../hrcg/__temp__.dsk \
+  ./linapple -b -1 ../terminal/DOS_Tool_Kit_v1.0_1980_Apple.do -2 ../terminal/__temp__.dsk \
 )
-       tr -d '\r' <../linapple-pie/Printer.txt >terminal.lst
-       ${DOS33} __temp__.dsk LOAD TERMINAL.OBJ $@
+       tr -d '\r' <../linapple-pie/Printer.txt >hrcg_terminal.lst
+       ${DOS33} __temp__.dsk LOAD "HRCG TERMINAL.OBJ" $@
        rm DOS_Tool_Kit_v1.0_1980_Apple.do __temp__.asm __temp__.dsk
 
 frogs1.set: \
@@ -73,10 +73,10 @@ lily_pad.pic: \
        
 bootable.dsk: ../orig/Apple_DOS_v3.3_1980_Apple.do bootable.txt
        dd if=/dev/zero of=$@ count=35 bs=4096
-       tr '\n' '\r' <../hrcg/bootable.txt |\
+       tr '\n' '\r' <../terminal/bootable.txt |\
 ( \
   cd ../linapple-pie && \
-  ./linapple -b -1 ../orig/Apple_DOS_v3.3_1980_Apple.do -2 ../hrcg/$@ \
+  ./linapple -b -1 ../orig/Apple_DOS_v3.3_1980_Apple.do -2 ../terminal/$@ \
 )
 
 clean:
@@ -86,6 +86,7 @@ vrEmu6502/src/*.o \
 emu_65c02 \
 hrcg.obj \
 monitor_rom.obj \
+hrcg_terminal.obj \
 bootable.dsk \
 __temp__.asm \
 __temp__.dsk \

diff --git a/hrcg/bootable.txt b/terminal/bootable.txt
similarity index 100%
rename from hrcg/bootable.txt
rename to terminal/bootable.txt

diff --git a/terminal/busybox.sh b/terminal/busybox.sh
new file mode 100755 (executable)
index 0000000..5af7b9c
--- /dev/null
+++ b/terminal/busybox.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+./emu_65c02 monitor_rom.obj hrcg.obj terminal.obj -- /bin/busybox sh

diff --git a/hrcg/emu_65c02.c b/terminal/emu_65c02.c
similarity index 100%
rename from hrcg/emu_65c02.c
rename to terminal/emu_65c02.c

diff --git a/hrcg/hrcg_obj_bsave.txt b/terminal/hrcg_obj_bsave.txt
similarity index 100%
rename from hrcg/hrcg_obj_bsave.txt
rename to terminal/hrcg_obj_bsave.txt

diff --git a/hrcg/terminal.asm b/terminal/hrcg_terminal.asm
similarity index 100%
rename from hrcg/terminal.asm
rename to terminal/hrcg_terminal.asm

diff --git a/terminal/hrcg_terminal_asm.txt b/terminal/hrcg_terminal_asm.txt
new file mode 100644 (file)
index 0000000..8c16c36
--- /dev/null
+++ b/terminal/hrcg_terminal_asm.txt
@@ -0,0 +1,5 @@
+BRUN EDASM.OBJ
+PR#1
+DR 2
+ASM HRCG TERMINAL.ASM,HRCG TERMINAL.OBJ
+

diff --git a/hrcg/monitor_rom_obj_header.txt b/terminal/monitor_rom_obj_header.txt
similarity index 100%
rename from hrcg/monitor_rom_obj_header.txt
rename to terminal/monitor_rom_obj_header.txt

diff --git a/hrcg/palette.py b/terminal/palette.py
similarity index 100%
rename from hrcg/palette.py
rename to terminal/palette.py

diff --git a/hrcg/ribbit.sh b/terminal/ribbit.sh
similarity index 100%
rename from hrcg/ribbit.sh
rename to terminal/ribbit.sh

diff --git a/hrcg/stty_sane.c b/terminal/stty_sane.c
similarity index 100%
rename from hrcg/stty_sane.c
rename to terminal/stty_sane.c

diff --git a/hrcg/stty_sane.h b/terminal/stty_sane.h
similarity index 100%
rename from hrcg/stty_sane.h
rename to terminal/stty_sane.h

diff --git a/hrcg/vrEmu6502 b/terminal/vrEmu6502
similarity index 100%
rename from hrcg/vrEmu6502
rename to terminal/vrEmu6502