Merge pull request #85 from cm68/master

fixes for blackmailer issue and hd64180
This commit is contained in:
Wayne Warthen
2020-02-23 12:52:16 -08:00
committed by GitHub
119 changed files with 18324 additions and 126 deletions

View File

@@ -1,12 +1,16 @@
SYSFILES = cpm_wbw.sys cpm_una.sys
BINFILES = cpm_wbw.bin cpm_una.bin
OBJECTS = CCP.bin BDOS.bin CCP22.bin BDOS22.bin OS2CCP.bin OS3BDOS.bin \
ccpb03.bin bdosb01.bin loader.bin $(SYSFILES)
ccpb03.bin bdosb01.bin loader.bin $(SYSFILES) $(BINFILES)
OTHERS = *.hex
TOOLS = ../../Tools
include $(TOOLS)/Makefile.inc
cpm_wbw.sys: loader.bin OS2CCP.bin OS3BDOS.bin ../CBIOS/cbios_wbw.bin
cat loader.bin OS2CCP.bin OS3BDOS.bin ../CBIOS/cbios_wbw.bin > $@
%.sys: %.bin loader.bin
cat loader.bin $*.bin > $@
cpm_una.sys: loader.bin OS2CCP.bin OS3BDOS.bin ../CBIOS/cbios_una.bin
cat loader.bin OS2CCP.bin OS3BDOS.bin ../CBIOS/cbios_una.bin > $@
cpm_una.bin: OS2CCP.bin OS3BDOS.bin ../CBIOS/cbios_una.bin
cat OS2CCP.bin OS3BDOS.bin ../CBIOS/cbios_una.bin > $@
cpm_wbw.bin: OS2CCP.bin OS3BDOS.bin ../CBIOS/cbios_wbw.bin
cat OS2CCP.bin OS3BDOS.bin ../CBIOS/cbios_wbw.bin > $@

View File

@@ -1,7 +0,0 @@
; global assembler options for CP/M loader
; when loading from a command line
true equ -1
false equ not true
cmdline equ true

28
Source/Fonts/Makefile Normal file
View File

@@ -0,0 +1,28 @@
OBJECTS = \
font8x8u.asm font8x11u.asm font8x16u.asm \
font8x8c.asm font8x11c.asm font8x16c.asm
OTHERS = font8x8c.bin font8x11c.bin font8x16c.bin
DEST = ../HBIOS
TOOLS = ../../Tools
include $(TOOLS)/Makefile.inc
#
# these 2 rules cancel out the default rules from the Makefile.inc
#
%.rel: %.asm
%.bin: %.asm
font8x8c.bin: font8x8u.bin
$(BINDIR)/lzsa -f2 -r $< $@
font8x11c.bin: font8x11u.bin
$(BINDIR)/lzsa -f2 -r $< $@
font8x16c.bin: font8x16u.bin
$(BINDIR)/lzsa -f2 -r $< $@
%.asm: %.bin
$(BINDIR)/bin2asm $< > $@

View File

@@ -1,4 +1,6 @@
OBJECTS = camel80.bin
TOOLS = ../../Tools
OTHERS = *.rel
DEST = ../HBIOS
include $(TOOLS)/Makefile.inc

View File

@@ -1,5 +1,8 @@
#!/bin/bash
# fail on any error
set -e
CPMCP=../../Tools/`uname`/cpmcp
# positional arguments
@@ -64,11 +67,21 @@ ROMSIZE .EQU $romsize
;
EOF
cp ../Forth/camel80.bin camel80.bin
cp ../Fonts/font*.asm .
echo "checking prerequisites"
for need in ../CPM22/cpm_$BIOS.bin ../ZSDOS/zsys_$BIOS.bin \
../Forth/camel80.bin font8x11c.asm font8x11u.asm font8x16c.asm \
font8x16u.asm font8x8c.asm font8x8u.asm ; do
if [ ! -f $need ] ; then
echo $need missing
exit 2
fi
done
cp ../Forth/camel80.bin .
make dbgmon.bin prefix.bin romldr.bin eastaegg.bin nascom.bin \
tastybasic.bin game.bin usrrom.bin imgpad.bin imgpad0.bin
if [ $platform != UNA ] ; then
make hbios_rom.bin hbios_app.bin hbios_img.bin
fi
@@ -99,7 +112,7 @@ fi
echo "adding apps to $romdiskfile"
for i in assign fdu format mode osldr rtc survey syscopy sysgen talk timer xm inttest ; do
f=$(../../Tools/unix/casefn.sh ../../Binary/Apps/$i.com)
if [ "$f" = "nofile" ] ; then
if [ -z "$f" ] ; then
echo " " $i "not found"
else
echo " " $f

View File

@@ -1,4 +1,4 @@
OBJECTS = ZETA2_std.rom
OBJECTS = ZETA2_std.rom N8_std.rom SBC_std.rom
MOREDIFF = camel80.bin game.bin hbios_rom.bin nascom.bin prefix.bin usrrom.bin \
dbgmon.bin hbios_app.bin imgpad0.bin osimg1.bin romldr.bin \
eastaegg.bin hbios_img.bin imgpad.bin osimg.bin tastybasic.bin \
@@ -11,15 +11,23 @@ OTHERS = *.bin *.z80 cpm.sys zsys.sys Build.inc
include $(TOOLS)/Makefile.inc
DIFFPATH = $(DIFFTO)/Binary
ZETA2_std.rom:
bash Build.sh ZETA2 std 512
hbios_rom.bin: hbios.asm
ROMSIZE=512
N8_std.rom: ROMSIZE=1024
%.rom:
bash Build.sh $(shell echo $* | tr '_' ' ') $(ROMSIZE)
#ZETA2_std.rom:
# bash Build.sh ZETA2 std 512
hbios_rom.bin: hbios.asm build.inc
$(TASM) -dROMBOOT hbios.asm hbios_rom.bin
hbios_app.bin: hbios.asm
hbios_app.bin: hbios.asm build.inc
$(TASM) -dAPPBOOT hbios.asm hbios_app.bin
hbios_img.bin: hbios.asm
hbios_img.bin: hbios.asm build.inc
$(TASM) -dIMGBOOT hbios.asm hbios_img.bin

View File

@@ -76,7 +76,7 @@ blankhd:
if [ "$$file" = "../../Binary/Apps/Tunes/*.*" ] ; then hack=../../Binary/Apps/Tunes/Makefile ; fi ; \
rf=$$($(CASEFN) $$hack $$file | sort -V) ; \
echo " " $$rf ; \
if [ "$$rf" = nofile ] ; then \
if [ -z "$$rf" ] ; then \
echo " " $$file missing ; \
else \
$(CPMCP) -f $$fmt $@ $$rf $$user ; \

View File

@@ -5,11 +5,11 @@ NOTDONE = Doc
SUBDIRS = Prop
SUBDIRS += Apps
SUBDIRS += CBIOS
SUBDIRS += Forth
SUBDIRS += Fonts
SUBDIRS += CPM22 ZCPR ZCPR-DJ ZSDOS
SUBDIRS += HBIOS CPM3
SUBDIRS += ZPM3
SUBDIRS += Forth
NOTDONE += Fonts
SUBDIRS += BPBIOS
SUBDIRS += Images
TOOLS = ../Tools

View File

@@ -1,5 +1,6 @@
SYSFILES = zsys_wbw.sys zsys_una.sys
OBJECTS = $(SYSFILES)
BINFILES = zsys_wbw.bin zsys_una.bin
OBJECTS = $(SYSFILES) $(BINFILES)
OTHERS = zsdos.rel zsdos.err loader.bin
TOOLS = ../../Tools
CCP = ../ZCPR-DJ/zcpr.bin
@@ -12,9 +13,12 @@ zsdos.rel: zsdos.z80
zsdos.bin: zsdos.rel
$(ZXCC) $(CPM)/LINK -$@=$<[LD800]
zsys_wbw.sys: loader.bin $(CCP) zsdos.bin ../CBIOS/cbios_wbw.bin
cat loader.bin $(CCP) zsdos.bin ../CBIOS/cbios_wbw.bin > $@
%.sys: %.bin loader.bin
cat loader.bin $*.bin > $@
zsys_wbw.bin: $(CCP) zsdos.bin ../CBIOS/cbios_wbw.bin
cat $(CCP) zsdos.bin ../CBIOS/cbios_wbw.bin > $@
zsys_una.sys: loader.bin $(CCP) zsdos.bin ../CBIOS/cbios_una.bin
cat loader.bin $(CCP) zsdos.bin ../CBIOS/cbios_una.bin > $@
zsys_una.bin: $(CCP) zsdos.bin ../CBIOS/cbios_una.bin
cat $(CCP) zsdos.bin ../CBIOS/cbios_una.bin > $@