diff --git a/Doc/RomWBW Applications.pdf b/Doc/RomWBW Applications.pdf index 19b6c364..27775981 100644 Binary files a/Doc/RomWBW Applications.pdf and b/Doc/RomWBW Applications.pdf differ diff --git a/Doc/RomWBW Architecture.pdf b/Doc/RomWBW Architecture.pdf index 236b127a..5a4c1402 100644 Binary files a/Doc/RomWBW Architecture.pdf and b/Doc/RomWBW Architecture.pdf differ diff --git a/Doc/RomWBW Disk Catalog.pdf b/Doc/RomWBW Disk Catalog.pdf index 08d9fe75..7d0a6528 100644 Binary files a/Doc/RomWBW Disk Catalog.pdf and b/Doc/RomWBW Disk Catalog.pdf differ diff --git a/Doc/RomWBW Getting Started.pdf b/Doc/RomWBW Getting Started.pdf index 23254d00..4bca51e3 100644 Binary files a/Doc/RomWBW Getting Started.pdf and b/Doc/RomWBW Getting Started.pdf differ diff --git a/ReadMe.md b/ReadMe.md index f36aeaa5..e7a8b863 100644 --- a/ReadMe.md +++ b/ReadMe.md @@ -3,7 +3,7 @@ ## Z80/Z180 System Software Version 3.1 Pre-release -Tuesday 5 January 2021 +Friday 15 January 2021 Wayne Warthen @@ -37,7 +37,7 @@ General features include: - Disk drivers for RAM, ROM, Floppy, IDE, CF, and SD - Serial drivers including UART (16550-like), ASCI, ACIA, SIO - Video drivers including TMS9918, SY6545, MOS8563, HD6445 - - Real time clock drivers including DS1322, BQ4845 + - Real time clock drivers including DS1302, BQ4845 - Multiple OS support including CP/M 2.2, ZSDOS, CP/M 3, ZPM3 - Built-in VT-100 terminal emulation support diff --git a/ReadMe.txt b/ReadMe.txt index 1ba93914..12c59c23 100644 --- a/ReadMe.txt +++ b/ReadMe.txt @@ -3,7 +3,7 @@ RomWBW Z80/Z180 System Software Version 3.1 Pre-release -Tuesday 5 January 2021 +Friday 15 January 2021 Wayne Warthen wwarthen@gmail.com @@ -33,7 +33,7 @@ General features include: - Disk drivers for RAM, ROM, Floppy, IDE, CF, and SD - Serial drivers including UART (16550-like), ASCI, ACIA, SIO - Video drivers including TMS9918, SY6545, MOS8563, HD6445 -- Real time clock drivers including DS1322, BQ4845 +- Real time clock drivers including DS1302, BQ4845 - Multiple OS support including CP/M 2.2, ZSDOS, CP/M 3, ZPM3 - Built-in VT-100 terminal emulation support diff --git a/Source/HBIOS/romldr.asm b/Source/HBIOS/romldr.asm index fafa28a6..38ff1a29 100644 --- a/Source/HBIOS/romldr.asm +++ b/Source/HBIOS/romldr.asm @@ -444,14 +444,14 @@ setcon: jp c,err_nocon ; handle overflow error ; ; Check against max char unit - PUSH DE + push de push af ; save requested unit ld b,BF_SYSGET ; HBIOS func: SYS GET ld c,BF_SYSGET_CIOCNT ; HBIOS subfunc: CIO unit count rst 08 ; E := unit count pop af ; restore requested unit cp e ; compare - POP DE + pop de jp nc,err_nocon ; handle invalid unit ld (newcon),a ; save validated console ; diff --git a/Source/HBIOS/sd.asm b/Source/HBIOS/sd.asm index b8df9f64..c3707e69 100644 --- a/Source/HBIOS/sd.asm +++ b/Source/HBIOS/sd.asm @@ -1320,6 +1320,10 @@ SD_INITCMD1: INC HL ; POINT TO NEXT BYTE LD (HL),A ; CLEAR IT DJNZ SD_INITCMD1 ; LOOP TILL DONE + ; CRC POSITION SHOULD BE COMPLETELY IGNORED BECAUSE WE DON'T + ; ENABLE IT AND WE ARE IN SPI MODE. HOWEVER, AT LEAST ONE SD + ; CARD IS KNOWN TO FAIL ANY COMMAND WHERE THE CRC POSITION + ; IS NOT $FF! SO, BELOW WE STUFF THE CRC POSITION WITH $FF. DEC A ; $FF TO ACCUM LD (SD_CMDCRC),A ; PUT $FF IN CRC POSITION RET diff --git a/Source/HBIOS/unlzsa2s.asm b/Source/HBIOS/unlzsa2s.asm index 5709fc07..02de89cb 100644 --- a/Source/HBIOS/unlzsa2s.asm +++ b/Source/HBIOS/unlzsa2s.asm @@ -82,10 +82,12 @@ #DEFCONT \ lddr #ENDIF + + .ECHO "UNLZSA2 for " #IFDEF HD64180 - .ECHO "HD64180 " + .ECHO "HD64180" #DEFINE LD_IX_DE \ #DEFCONT \ ld ixl,e \ ld ixh,d @@ -95,7 +97,7 @@ #ELSE - .ECHO "Z80 " + .ECHO "Z80" #DEFINE LD_IX_DE \ #DEFCONT \ push de \ pop ix @@ -104,6 +106,8 @@ #DEFCONT \ push ix \ pop de #ENDIF + + .ECHO ".\n" DLZSA2: xor a \ ld b,a \ ex af,af' \ jr ReadToken diff --git a/Source/ver.inc b/Source/ver.inc index 29bea73d..6830eb97 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.27" +#DEFINE BIOSVER "3.1.1-pre.28" diff --git a/Source/ver.lib b/Source/ver.lib index b773165e..9bd6e1f1 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.27" + db "3.1.1-pre.28" endm