diff --git a/Doc/ChangeLog.txt b/Doc/ChangeLog.txt index 7a3861a1..2afffb6e 100644 --- a/Doc/ChangeLog.txt +++ b/Doc/ChangeLog.txt @@ -60,6 +60,8 @@ Version 3.1.1 - D?T: Substantial update to TastyBasic incuding a .COM executable - PMS: Added VGM audio file player - WBW: ZPMLDR and ZPM3 fixes, credit to Lars Nelson for finding ZPM3 source! +- DDW: Add support for MBC sound card +- WBW: Add support for "romless" booting Version 3.1 ----------- diff --git a/Source/HBIOS/Build.cmd b/Source/HBIOS/Build.cmd index 43e777cd..04dad21d 100644 --- a/Source/HBIOS/Build.cmd +++ b/Source/HBIOS/Build.cmd @@ -93,8 +93,10 @@ copy /b romldr.bin + dbgmon.bin + ..\zsdos\zsys_wbw.bin osimg_small.bin || exit :: should yield a result of zero. :: -for %%f in (hbios_rom.bin osimg.bin osimg1.bin osimg2.bin) do ( - "%TOOLS%\srecord\srec_cat.exe" %%f -Binary -Crop 0 0x7FFF -Checksum_Negative_Big_Endian 0x7FFF 1 1 -o %%f -Binary || exit /b +if %ROMSize% gtr 0 ( + for %%f in (hbios_rom.bin osimg.bin osimg1.bin osimg2.bin) do ( + "%TOOLS%\srecord\srec_cat.exe" %%f -Binary -Crop 0 0x7FFF -Checksum_Negative_Big_Endian 0x7FFF 1 1 -o %%f -Binary || exit /b + ) ) :: @@ -113,17 +115,23 @@ for %%f in (hbios_rom.bin osimg.bin osimg1.bin osimg2.bin) do ( :: HBIOS on the fly for testing purposes. :: -copy /b hbios_rom.bin + osimg.bin + osimg1.bin + osimg2.bin + ..\RomDsk\rom%ROMSize%_wbw.dat %ROMName%.rom || exit /b -copy /b hbios_rom.bin + osimg.bin + osimg1.bin + osimg2.bin %ROMName%.upd || exit /b -copy /b hbios_app.bin + osimg_small.bin %ROMName%.com || exit /b +if %ROMSize% gtr 0 ( + copy /b hbios_rom.bin + osimg.bin + osimg1.bin + osimg2.bin + ..\RomDsk\rom%ROMSize%_wbw.dat %ROMName%.rom || exit /b + copy /b hbios_rom.bin + osimg.bin + osimg1.bin + osimg2.bin %ROMName%.upd || exit /b + copy /b hbios_app.bin + osimg_small.bin %ROMName%.com || exit /b +) else ( + copy /b hbios_rom.bin + osimg_small.bin %ROMName%.rom || exit /b + copy /b hbios_rom.bin + osimg_small.bin %ROMName%.upd || exit /b + copy /b hbios_app.bin + osimg_small.bin %ROMName%.com || exit /b +) :: :: Copy results to output directory :: -copy %ROMName%.rom ..\..\Binary || exit /b -copy %ROMName%.upd ..\..\Binary || exit /b -copy %ROMName%.com ..\..\Binary || exit /b +if exist %ROMName%.rom copy %ROMName%.rom ..\..\Binary || exit /b +if exist %ROMName%.upd copy %ROMName%.upd ..\..\Binary || exit /b +if exist %ROMName%.com copy %ROMName%.com ..\..\Binary || exit /b goto :eof @@ -188,6 +196,7 @@ call Build RCZ80 kio 512 || exit /b call Build RCZ80 mt 512 || exit /b call Build RCZ80 duart 512 || exit /b call Build RCZ80 zrc 512 || exit /b +call Build RCZ80 zrc_ram 0 || exit /b call Build RCZ180 ext 512 || exit /b call Build RCZ180 nat 512 || exit /b call Build RCZ280 ext 512 || exit /b diff --git a/Source/HBIOS/Build.ps1 b/Source/HBIOS/Build.ps1 index e6b62fec..a5606716 100644 --- a/Source/HBIOS/Build.ps1 +++ b/Source/HBIOS/Build.ps1 @@ -76,8 +76,8 @@ while ($true) while ($true) { - if (($RomSize -eq 128) -or ($RomSize -eq 256) -or ($RomSize -eq 512) -or ($RomSize -eq 1024)) {break} - $RomSize = (Read-Host -prompt "ROM Size [128|256|512|1024]").Trim() + if (($RomSize -eq 0) -or ($RomSize -eq 128) -or ($RomSize -eq 256) -or ($RomSize -eq 512) -or ($RomSize -eq 1024)) {break} + $RomSize = (Read-Host -prompt "ROM Size [0|128|256|512|1024]").Trim() } # diff --git a/Source/HBIOS/Build.sh b/Source/HBIOS/Build.sh index cc4d5304..818b45fa 100755 --- a/Source/HBIOS/Build.sh +++ b/Source/HBIOS/Build.sh @@ -26,6 +26,7 @@ if [ "${ROM_PLATFORM}" == "dist" ] ; then ROM_PLATFORM="RCZ80"; ROM_CONFIG="std"; ROMSIZE="512"; bash Build.sh ROM_PLATFORM="RCZ80"; ROM_CONFIG="skz"; ROMSIZE="512"; bash Build.sh ROM_PLATFORM="RCZ80"; ROM_CONFIG="zrc"; ROMSIZE="512"; bash Build.sh + ROM_PLATFORM="RCZ80"; ROM_CONFIG="zrc_ram"; ROMSIZE="0"; bash Build.sh ROM_PLATFORM="SBC"; ROM_CONFIG="std"; ROMSIZE="512"; bash Build.sh ROM_PLATFORM="SBC"; ROM_CONFIG="simh"; ROMSIZE="512"; bash Build.sh ROM_PLATFORM="MBC"; ROM_CONFIG="std"; ROMSIZE="512"; bash Build.sh @@ -71,7 +72,7 @@ if [ -z "${ROMSIZE}" ] ; then ROMSIZE="512" fi -while [ ! '(' "${ROMSIZE}" = 1024 -o "${ROMSIZE}" = 512 -o "${ROMSIZE}" = 256 -o "${ROMSIZE}" = 128 ')' ] ; do +while [ ! '(' "${ROMSIZE}" = 1024 -o "${ROMSIZE}" = 512 -o "${ROMSIZE}" = 256 -o "${ROMSIZE}" = 128 -o "${ROMSIZE}" = 0 ')' ] ; do echo -n "Romsize :" read ROMSIZE done diff --git a/Source/HBIOS/Config/RCZ80_zrc_ram.asm b/Source/HBIOS/Config/RCZ80_zrc_ram.asm new file mode 100644 index 00000000..cd68248d --- /dev/null +++ b/Source/HBIOS/Config/RCZ80_zrc_ram.asm @@ -0,0 +1,54 @@ +; +;================================================================================================== +; RC2014 Z80 ZRC CONFIGURATION +;================================================================================================== +; +; THE COMPLETE SET OF DEFAULT CONFIGURATION SETTINGS FOR THIS PLATFORM ARE FOUND IN THE +; CFG_.ASM INCLUDED FILE WHICH IS FOUND IN THE PARENT DIRECTORY. THIS FILE CONTAINS +; COMMON CONFIGURATION SETTINGS THAT OVERRIDE THE DEFAULTS. IT IS INTENDED THAT YOU MAKE +; YOUR CUSTOMIZATIONS IN THIS FILE AND JUST INHERIT ALL OTHER SETTINGS FROM THE DEFAULTS. +; EVEN BETTER, YOU CAN MAKE A COPY OF THIS FILE WITH A NAME LIKE _XXX.ASM AND SPECIFY +; YOUR FILE IN THE BUILD PROCESS. +; +; THE SETTINGS BELOW ARE THE SETTINGS THAT ARE MOST COMMONLY MODIFIED FOR THIS PLATFORM. +; MANY OF THEM ARE EQUAL TO THE SETTINGS IN THE INCLUDED FILE, SO THEY DON'T REALLY DO +; ANYTHING AS IS. THEY ARE LISTED HERE TO MAKE IT EASY FOR YOU TO ADJUST THE MOST COMMON +; SETTINGS. +; +; N.B., SINCE THE SETTINGS BELOW ARE REDEFINING VALUES ALREADY SET IN THE INCLUDED FILE, +; TASM INSISTS THAT YOU USE THE .SET OPERATOR AND NOT THE .EQU OPERATOR BELOW. ATTEMPTING +; TO REDEFINE A VALUE WITH .EQU BELOW WILL CAUSE TASM ERRORS! +; +; PLEASE REFER TO THE CUSTOM BUILD INSTRUCTIONS (README.TXT) IN THE SOURCE DIRECTORY (TWO +; DIRECTORIES ABOVE THIS ONE). +; +#DEFINE BOOT_DEFAULT "H" ; DEFAULT BOOT LOADER CMD ON OR AUTO BOOT +; +#include "cfg_rcz80.asm" +; +CRTACT .SET FALSE ; ACTIVATE CRT (VDU,CVDU,PROPIO,ETC) AT STARTUP +; +CPUOSC .SET 7372800 ; CPU OSC FREQ IN MHZ +; +RAMSIZE .SET 2048 ; SIZE OF RAM IN KB (MUST MATCH YOUR HARDWARE!!!) +MEMMGR .SET MM_ZRC ; MEMORY MANAGER: MM_[SBC|Z2|N8|Z180] +; +MDROM .SET FALSE ; MD: ENABLE ROM DISK +; +UARTENABLE .SET TRUE ; UART: ENABLE 8250/16550-LIKE SERIAL DRIVER (UART.ASM) +ACIAENABLE .SET TRUE ; ACIA: ENABLE MOTOROLA 6850 ACIA DRIVER (ACIA.ASM) +SIOENABLE .SET TRUE ; SIO: ENABLE ZILOG SIO SERIAL DRIVER (SIO.ASM) +; +TMSENABLE .SET FALSE ; TMS: ENABLE TMS9918 VIDEO/KBD DRIVER (TMS.ASM) +TMSTIMENABLE .SET FALSE ; TMS: ENABLE TIMER INTERRUPTS (REQUIRES IM1) +; +AY38910ENABLE .SET TRUE ; AY: AY-3-8910 / YM2149 SOUND DRIVER +; +FDENABLE .SET TRUE ; FD: ENABLE FLOPPY DISK DRIVER (FD.ASM) +FDMODE .SET FDMODE_RCWDC ; FD: DRIVER MODE: FDMODE_[DIO|ZETA|ZETA2|DIDE|N8|DIO3|RCSMC|RCWDC|DYNO|EPWDC] +; +IDEENABLE .SET TRUE ; IDE: ENABLE IDE DISK DRIVER (IDE.ASM) +; +PPIDEENABLE .SET TRUE ; PPIDE: ENABLE PARALLEL PORT IDE DISK DRIVER (PPIDE.ASM) +; +PRPENABLE .SET FALSE ; PRP: ENABLE ECB PROPELLER IO BOARD DRIVER (PRP.ASM) diff --git a/Source/HBIOS/Makefile b/Source/HBIOS/Makefile index f1c5ef01..371f24d2 100644 --- a/Source/HBIOS/Makefile +++ b/Source/HBIOS/Makefile @@ -56,18 +56,26 @@ $(ROMNAME).rom $(ROMNAME).com $(ROMNAME).img &: $(ROMDEPS) if [ $(ROM_PLATFORM) != UNA ] ; then \ cat camel80.bin nascom.bin tastybasic.bin game.bin eastaegg.bin netboot.mod updater.bin usrrom.bin >osimg1.bin ; \ cat imgpad2.bin >osimg2.bin ; \ - for f in hbios_rom.bin osimg.bin osimg1.bin osimg2.bin ; do \ - srec_cat $$f -Binary -Crop 0 0x7FFF -Checksum_Negative_Big_Endian 0x7FFF 1 1 -o $$f -Binary ; \ - done \ + if [ $(ROMSIZE) -gt 0 ] ; then \ + for f in hbios_rom.bin osimg.bin osimg1.bin osimg2.bin ; do \ + srec_cat $$f -Binary -Crop 0 0x7FFF -Checksum_Negative_Big_Endian 0x7FFF 1 1 -o $$f -Binary ; \ + done \ + fi \ fi if [ $(ROM_PLATFORM) = UNA ] ; then \ cp osimg.bin $(DEST)/UNA_WBW_SYS.bin ; \ cp ../RomDsk/rom$(ROMSIZE)_una.dat $(DEST)/UNA_WBW_ROM$(ROMSIZE).bin ; \ cat ../UBIOS/UNA-BIOS.BIN osimg.bin ../UBIOS/FSFAT.BIN ../RomDsk/rom$(ROMSIZE)_una.dat >$(ROMNAME).rom ; \ else \ - cat hbios_rom.bin osimg.bin osimg1.bin osimg2.bin ../RomDsk/rom$(ROMSIZE)_wbw.dat >$(ROMNAME).rom ; \ - cat hbios_rom.bin osimg.bin osimg1.bin osimg2.bin >$(ROMNAME).upd ; \ - cat hbios_app.bin osimg_small.bin > $(ROMNAME).com ; \ + if [ $(ROMSIZE) -gt 0 ] ; then \ + cat hbios_rom.bin osimg.bin osimg1.bin osimg2.bin ../RomDsk/rom$(ROMSIZE)_wbw.dat >$(ROMNAME).rom ; \ + cat hbios_rom.bin osimg.bin osimg1.bin osimg2.bin >$(ROMNAME).upd ; \ + cat hbios_app.bin osimg_small.bin > $(ROMNAME).com ; \ + else \ + cat hbios_rom.bin osimg_small.bin > $(ROMNAME).rom ; \ + cat hbios_rom.bin osimg_small.bin > $(ROMNAME).upd ; \ + cat hbios_app.bin osimg_small.bin > $(ROMNAME).com ; \ + fi \ fi prereq: $(FONTS) camel80.bin tastybasic.bin diff --git a/Source/HBIOS/hbios.asm b/Source/HBIOS/hbios.asm index abb3ae04..24cdd573 100644 --- a/Source/HBIOS/hbios.asm +++ b/Source/HBIOS/hbios.asm @@ -513,7 +513,7 @@ HBX_BNKSEL1: BIT 7,A ; BIT 7 SET REQUESTS RAM PAGE JR Z,HBX_ROM ; NOT SET, SELECT ROM PAGE RES 7,A ; RAM PAGE REQUESTED: CLEAR ROM BIT - ADD A,$10 ; ADD 16 x 32K - RAM STARTS FROM 512K + ADD A,ROMSIZE / 32 ; STARTING RAM BANK NUMBER OFFSET ; HBX_ROM: OUT ($1F),A ; HCS WRITE TO THE BANK CONTROL REGISTER @@ -1530,16 +1530,30 @@ MBC_SINGLE: ; #ENDIF ; -; IF THIS IS NOT A ROMBOOT, THEN WE NEED TO COPY THE "APP" BANK TO +; IF THIS IS A ROM-LESS SYSTEM, THEN WE NEED TO COPY THE "APP" BANK TO ; TPA. IT IS DONE PRIOR TO COPYING HBIOS TO IT'S FINAL BANK BECAUSE ; THE SOURCE OF THE APP BANK CODE MAY BE THE BANK THAT HBIOS WANTS TO ; USE AS IT'S FINAL LOCATION (PRIMARILY IN CASE OF RAMBOOT WHERE THE ; SYSTEM HAS THE MINIMUM 128KB OF RAM). ; - - - - +#IFDEF ROMBOOT + #IF (ROMSIZE == 0) + LD A,(HB_CURBNK) + LD (HB_SRCBNK),A + LD A,BID_USR + LD (HB_DSTBNK),A + LD HL,HB_END + LD DE,0 + LD BC,$8000 + #IF (MEMMGR == MM_Z280) + CALL Z280_BNKCPY + #ELSE + CALL HBX_BNKCPY + #ENDIF +; + #ENDIF +; +#ENDIF ; ; IF ALREADY EXECUTING IN RAM, BYPASS RAM BANK INSTALLATION ; @@ -2450,6 +2464,7 @@ HB_Z280BUS1: #ENDIF ; #IFDEF ROMBOOT + #IF (ROMSIZE > 0) ; ; ROM CHECKSUM VERIFICATION ; EACH OF THE FIRST 4 ROM BANKS HAS A CHECKSUM INJECTED SUCH THAT @@ -2520,6 +2535,7 @@ HB_CKBNKSIZ .EQU $-HB_CKBNK ; SIZE OF ROUTINE ; HB_ROMCKZ: ; + #ENDIF #ENDIF ; ; LOW BATTERY DIAGNOSTIC MESSAGE @@ -2723,15 +2739,8 @@ INITSYS4: LDCTL (C),HL #ENDIF ; -; CHAIN TO OS LOADER +#IFNDEF ROMBOOT ; -#IFDEF ROMBOOT - ; PERFORM BANK CALL TO OS IMAGES BANK IN ROM - LD A,BID_IMG0 ; CHAIN TO OS IMAGES BANK - LD IX,0 ; ENTER AT ADDRESS 0 - CALL HBX_BNKCALL ; GO THERE - HALT ; WE SHOULD NEVER COME BACK! -#ELSE ; COPY OS IMAGE: BID_USR: --> BID_USR:0 LD B,BF_SYSSETCPY ; HBIOS FUNC: SETUP BANK COPY LD D,BID_USR ; D = DEST BANK = USER BANK @@ -2745,16 +2754,23 @@ INITSYS4: LD DE,0 ; TO USER ADDRESS 0 RST 08 ; DO IT ; - ; PERFORM BANK CALL TO USER BANK - LD A,BID_USR ; CHAIN TO OS IMAGES BANK +#ENDIF +; +; CHAIN TO LOADER +; +#IFDEF ROMBOOT + #IF (ROMSIZE > 0) + LD A,BID_IMG0 ; CHAIN TO OS IMAGES BANK + #ELSE + LD A,BID_USR ; CHAIN TO USER BANK + #ENDIF +#ELSE + LD A,BID_USR ; CHAIN TO USER BANK +#ENDIF LD IX,0 ; ENTER AT ADDRESS 0 CALL HBX_BNKCALL ; GO THERE HALT ; WE SHOULD NEVER COME BACK! ; -#ENDIF -; - RET -; ; CALL A LIST OF ROUTINES POINTED TO BY DE OF LENGTH B. ; CALLLIST: @@ -7025,7 +7041,9 @@ SLACK .EQU BNKTOP - $ .ECHO " bytes.\n" ; #IFDEF ROMBOOT + #IF (ROMSIZE > 0) .FILL SLACK + #ENDIF #ENDIF ; .END diff --git a/Source/HBIOS/std.asm b/Source/HBIOS/std.asm index 3c5b330d..aa9b12b4 100644 --- a/Source/HBIOS/std.asm +++ b/Source/HBIOS/std.asm @@ -529,6 +529,10 @@ BID_IMG2 .EQU BID_ROM0 + 3 ; NETWORK BOOT -+ ROM BANKS BID_ROMD0 .EQU BID_ROM0 + 4 ; FIRST ROM DRIVE BANK | ROM BID_ROMDN .EQU BID_ROMN ; LAST ROM DRIVE BANK V DRIVE ; +#IF (ROMSIZE == 0) +BID_BOOT .SET BID_RAM0 ; SPECIAL CASE ROM-LESS SYSTEM +#ENDIF +; #IF (BIOS == BIOS_WBW) ; #IF (!MDRAM) diff --git a/Source/ZRC/Build.cmd b/Source/ZRC/Build.cmd index d303209d..99b9b522 100644 --- a/Source/ZRC/Build.cmd +++ b/Source/ZRC/Build.cmd @@ -1,8 +1,38 @@ @echo off setlocal -if not exist ..\..\Binary\RCZ80_zrc.rom goto :eof +set TOOLS=../../Tools -copy /b zrc_cfldr.bin + zrc_ptbl.bin + zrc_fill_1.bin + zrc_mon.bin + zrc_fill_2.bin + ..\..\Binary\RCZ80_zrc.rom + zrc_fill_3.bin ..\..\Binary\hd1024_zrc_prefix.dat || exit /b +set PATH=%TOOLS%\srecord;%PATH% -copy /b ..\..\Binary\hd1024_zrc_prefix.dat + ..\..\Binary\hd1024_cpm22.img + ..\..\Binary\hd1024_zsdos.img + ..\..\Binary\hd1024_nzcom.img + ..\..\Binary\hd1024_cpm3.img + ..\..\Binary\hd1024_zpm3.img + ..\..\Binary\hd1024_ws4.img ..\..\Binary\hd1024_zrc_combo.img || exit /b \ No newline at end of file +if exist ..\..\Binary\RCZ80_zrc.rom call :build_zrc + +if exist ..\..\Binary\RCZ80_zrc_ram.rom call :build_zrc_ram + +goto :eof + +:build_zrc + +srec_cat -generate 0x0 0x100000 --constant 0x00 -o temp.dat -binary +srec_cat temp.dat -binary -exclude 0x0 0x100 zrc_cfldr.bin -binary -o temp.dat -binary +srec_cat temp.dat -binary -exclude 0x100 0x200 zrc_ptbl.bin -binary -offset 0x100 -o temp.dat -binary +srec_cat temp.dat -binary -exclude 0x1F000 0x20000 zrc_mon.bin -binary -offset 0x1F000 -o temp.dat -binary +srec_cat temp.dat -binary -exclude 0x24000 0xA4000 ..\..\Binary\RCZ80_zrc.rom -binary -offset 0x24000 -o temp.dat -binary +move temp.dat ..\..\Binary\hd1024_zrc_prefix.dat + +copy /b ..\..\Binary\hd1024_zrc_prefix.dat + ..\..\Binary\hd1024_cpm22.img + ..\..\Binary\hd1024_zsdos.img + ..\..\Binary\hd1024_nzcom.img + ..\..\Binary\hd1024_cpm3.img + ..\..\Binary\hd1024_zpm3.img + ..\..\Binary\hd1024_ws4.img ..\..\Binary\hd1024_zrc_combo.img || exit /b + +goto :eof + +:build_zrc_ram + +srec_cat -generate 0x0 0x100000 --constant 0x00 -o temp.dat -binary +srec_cat temp.dat -binary -exclude 0x0 0x100 zrc_cfldr.bin -binary -o temp.dat -binary +srec_cat temp.dat -binary -exclude 0x100 0x200 zrc_ptbl.bin -binary -offset 0x100 -o temp.dat -binary +srec_cat temp.dat -binary -exclude 0x1F000 0x20000 zrc_mon.bin -binary -offset 0x1F000 -o temp.dat -binary +srec_cat temp.dat -binary -exclude 0x24000 0xA4000 ..\..\Binary\RCZ80_zrc_ram.rom -binary -offset 0x24000 -o temp.dat -binary +move temp.dat ..\..\Binary\hd1024_zrc_ram_prefix.dat + +copy /b ..\..\Binary\hd1024_zrc_ram_prefix.dat + ..\..\Binary\hd1024_cpm22.img + ..\..\Binary\hd1024_zsdos.img + ..\..\Binary\hd1024_nzcom.img + ..\..\Binary\hd1024_cpm3.img + ..\..\Binary\hd1024_zpm3.img + ..\..\Binary\hd1024_ws4.img ..\..\Binary\hd1024_zrc_ram_combo.img || exit /b + +goto :eof diff --git a/Source/ZRC/Makefile b/Source/ZRC/Makefile index 3c582211..b2248ad1 100644 --- a/Source/ZRC/Makefile +++ b/Source/ZRC/Makefile @@ -1,6 +1,9 @@ HD1024ZRCPREFIX = hd1024_zrc_prefix.dat HD1024ZRCCOMBOIMG = hd1024_zrc_combo.img +HD1024ZRCRAMPREFIX = hd1024_zrc_ram_prefix.dat +HD1024ZRCRAMCOMBOIMG = hd1024_zrc_ram_combo.img ZRCROM = ../../Binary/RCZ80_zrc.rom +ZRCRAMROM = ../../Binary/RCZ80_zrc_ram.rom HD1024IMGS = ../../Binary/hd1024_cpm22.img ../../Binary/hd1024_zsdos.img ../../Binary/hd1024_nzcom.img \ ../../Binary/hd1024_cpm3.img ../../Binary/hd1024_zpm3.img ../../Binary/hd1024_ws4.img @@ -10,6 +13,10 @@ ifneq ($(wildcard $(ZRCROM)),) OBJECTS += $(HD1024ZRCPREFIX) $(HD1024ZRCCOMBOIMG) endif +ifneq ($(wildcard $(ZRCRAMROM)),) + OBJECTS += $(HD1024ZRCRAMPREFIX) $(HD1024ZRCRAMCOMBOIMG) +endif + DEST=../../Binary TOOLS = ../../Tools @@ -19,7 +26,23 @@ include $(TOOLS)/Makefile.inc DIFFPATH = $(DIFFTO)/Binary $(HD1024ZRCPREFIX): - cat zrc_cfldr.bin zrc_ptbl.bin zrc_fill_1.bin zrc_mon.bin zrc_fill_2.bin $(ZRCROM) zrc_fill_3.bin >$@ + srec_cat -generate 0x0 0x100000 --constant 0x00 -o temp.dat -binary + srec_cat temp.dat -binary -exclude 0x0 0x100 zrc_cfldr.bin -binary -o temp.dat -binary + srec_cat temp.dat -binary -exclude 0x100 0x200 zrc_ptbl.bin -binary -offset 0x100 -o temp.dat -binary + srec_cat temp.dat -binary -exclude 0x1F000 0x20000 zrc_mon.bin -binary -offset 0x1F000 -o temp.dat -binary + srec_cat temp.dat -binary -exclude 0x24000 0xA4000 $(ZRCROM) -binary -offset 0x24000 -o temp.dat -binary + mv temp.dat $@ + +$(HD1024ZRCRAMPREFIX): + srec_cat -generate 0x0 0x100000 --constant 0x00 -o temp.dat -binary + srec_cat temp.dat -binary -exclude 0x0 0x100 zrc_cfldr.bin -binary -o temp.dat -binary + srec_cat temp.dat -binary -exclude 0x100 0x200 zrc_ptbl.bin -binary -offset 0x100 -o temp.dat -binary + srec_cat temp.dat -binary -exclude 0x1F000 0x20000 zrc_mon.bin -binary -offset 0x1F000 -o temp.dat -binary + srec_cat temp.dat -binary -exclude 0x24000 0xA4000 $(ZRCRAMROM) -binary -offset 0x24000 -o temp.dat -binary + mv temp.dat $@ $(HD1024ZRCCOMBOIMG): $(HD1024ZRCPREFIX) $(HD1024IMGS) - cat $^ > $@ \ No newline at end of file + cat $^ > $@ + +$(HD1024ZRCRAMCOMBOIMG): $(HD1024ZRCRAMPREFIX) $(HD1024IMGS) + cat $^ > $@ diff --git a/Source/ZRC/zrc_fill_1.bin b/Source/ZRC/zrc_fill_1.bin deleted file mode 100644 index 705bedcd..00000000 Binary files a/Source/ZRC/zrc_fill_1.bin and /dev/null differ diff --git a/Source/ZRC/zrc_fill_2.bin b/Source/ZRC/zrc_fill_2.bin deleted file mode 100644 index 294f4016..00000000 Binary files a/Source/ZRC/zrc_fill_2.bin and /dev/null differ diff --git a/Source/ZRC/zrc_fill_3.bin b/Source/ZRC/zrc_fill_3.bin deleted file mode 100644 index a461d083..00000000 Binary files a/Source/ZRC/zrc_fill_3.bin and /dev/null differ diff --git a/Source/ver.inc b/Source/ver.inc index 3b25aa3f..709318d5 100644 --- a/Source/ver.inc +++ b/Source/ver.inc @@ -2,4 +2,4 @@ #DEFINE RMN 1 #DEFINE RUP 1 #DEFINE RTP 0 -#DEFINE BIOSVER "3.1.1-pre.160" +#DEFINE BIOSVER "3.1.1-pre.161" diff --git a/Source/ver.lib b/Source/ver.lib index 364713e9..dd51943f 100644 --- a/Source/ver.lib +++ b/Source/ver.lib @@ -3,5 +3,5 @@ rmn equ 1 rup equ 1 rtp equ 0 biosver macro - db "3.1.1-pre.160" + db "3.1.1-pre.161" endm