diff --git a/Binary/ReadMe.txt b/Binary/ReadMe.txt index f4222ed9..9b005def 100644 --- a/Binary/ReadMe.txt +++ b/Binary/ReadMe.txt @@ -39,8 +39,8 @@ image for the Mark IV with the standard configuration. If a custom configuration called "custom" is created and built, a new file called MK4_custom.rom will be added to this directory. -Documentation of the pre-built ROM Images is contained in the -RomList.txt file in this directory. +Documentation of the pre-built ROM Images is contained in +"RomWBW User Guide.pdf" in the Doc directory. ROM Firmware Update Images (_.upd) ------------------------------------- diff --git a/Doc/ChangeLog.txt b/Doc/ChangeLog.txt index 0e7dd8fc..04fd5a39 100644 --- a/Doc/ChangeLog.txt +++ b/Doc/ChangeLog.txt @@ -17,6 +17,7 @@ Version 3.3 - WBW: Preliminary support for S100 Computers Z180 - WBW: Preliminary support for Dan Werner's ESP32 MBC Module - WBW: Early support for Duodyne base system (CPU/UART/ROM/RAM/RTC/SPK) +- M?C: Fixed XM to allow specifying HBIOS port for send operations Version 3.2.1 ------------- diff --git a/Doc/RomWBW Applications.pdf b/Doc/RomWBW Applications.pdf index f1cb3ec7..8adb6af0 100644 Binary files a/Doc/RomWBW Applications.pdf and b/Doc/RomWBW Applications.pdf differ diff --git a/Doc/RomWBW Disk Catalog.pdf b/Doc/RomWBW Disk Catalog.pdf index 0be78412..6a3c0818 100644 Binary files a/Doc/RomWBW Disk Catalog.pdf and b/Doc/RomWBW Disk Catalog.pdf differ diff --git a/Doc/RomWBW Errata.pdf b/Doc/RomWBW Errata.pdf index ef018c34..b18a9299 100644 Binary files a/Doc/RomWBW Errata.pdf and b/Doc/RomWBW Errata.pdf differ diff --git a/Doc/RomWBW ROM Applications.pdf b/Doc/RomWBW ROM Applications.pdf index 5059dfd7..5d3d0d39 100644 Binary files a/Doc/RomWBW ROM Applications.pdf and b/Doc/RomWBW ROM Applications.pdf differ diff --git a/Doc/RomWBW System Guide.pdf b/Doc/RomWBW System Guide.pdf index 83d4b0b1..182a6483 100644 Binary files a/Doc/RomWBW System Guide.pdf and b/Doc/RomWBW System Guide.pdf differ diff --git a/Doc/RomWBW User Guide.pdf b/Doc/RomWBW User Guide.pdf index 4bdaeddb..69e45f89 100644 Binary files a/Doc/RomWBW User Guide.pdf and b/Doc/RomWBW User Guide.pdf differ diff --git a/ReadMe.md b/ReadMe.md index 205a72fa..9fc48dc0 100644 --- a/ReadMe.md +++ b/ReadMe.md @@ -3,7 +3,7 @@ **RomWBW ReadMe** \ Version 3.3 \ Wayne Warthen ([wwarthen@gmail.com](mailto:wwarthen@gmail.com)) \ -02 Aug 2023 +08 Aug 2023 # Overview diff --git a/ReadMe.txt b/ReadMe.txt index 2bbabf39..d2eb2bc4 100644 --- a/ReadMe.txt +++ b/ReadMe.txt @@ -1,6 +1,6 @@ RomWBW ReadMe Wayne Warthen (wwarthen@gmail.com) -02 Aug 2023 +08 Aug 2023 diff --git a/Source/Doc/UserGuide.md b/Source/Doc/UserGuide.md index c6003d12..7eabd3e6 100644 --- a/Source/Doc/UserGuide.md +++ b/Source/Doc/UserGuide.md @@ -3967,26 +3967,15 @@ the RomWBW HBIOS configuration. |-------------------|---------------| | ROM Image File | DUO_std.rom | | Console Baud Rate | 38400 | -| Interrupts | None | +| Interrupts | Mode 2 | - CPU speed is detected at startup if DS1302 RTC is active - Otherwise 8.000 MHz assumed - System timer is generated by CTC if available - Hardware auto-detected: - DS1302 RTC - - Zilog CTC - Zilog DMA Module - UART Serial Adapter - - SIO Serial Interface - - LPT Printer Interface - - Zilog Parallel Interface - - CVDU Display Adapter - - TMS9938/58 Display Adapter - - PS/2 Keyboard Interface - - AY-3-8910/YM2149 Sound Module - - Floppy Disk Controller w/ 3.5" HD Drives - - PPIDE Hard Disk Interface - - Interrupts may be enabled in build options `\clearpage`{=latex} diff --git a/Source/HBIOS/ROM Layout.txt b/Source/HBIOS/ROM Layout.txt index c15694a3..5fb0a7b4 100644 --- a/Source/HBIOS/ROM Layout.txt +++ b/Source/HBIOS/ROM Layout.txt @@ -1,4 +1,4 @@ -RomWBW ROM Layout Notes +RomWBW ROM Layout Bank Module Start Size ------ ------ ------ ------ @@ -24,4 +24,16 @@ Bank Module Start Size 3 imgpad2 0x0000 0x8000 0x8000 -4-N ROM Disk Data \ No newline at end of file +4 - N ROM Disk Data + + +RomWBW RAM Layout + +Bank ID Usage Physical Address +------- ------ ---------------- +0x80-0x87 RAM Disk Data 0x80000-0xBFFFF +0x88-0x8B CP/M 3 Buffers 0xC0000-0xDFFFF +0x8C CP/M 3 OS 0xE0000-0xE7FFF +0x8D RomWBW HBIOS 0xE8000-0xEFFFF +0x8E User TPA 0xF0000-0xF7FFF +0x8F Common 0xF8000-0xFFFFF diff --git a/Source/HBIOS/esp.asm b/Source/HBIOS/esp.asm index 1b2fedb1..ad47aa2f 100644 --- a/Source/HBIOS/esp.asm +++ b/Source/HBIOS/esp.asm @@ -68,12 +68,27 @@ ESP_DETECT: RET NZ ; IF FAILS, ASSUME NOT PRESENT LD A,ESP_CMD_DISC ; DISCOVER COMMAND CALL ESP_OUT ; SEND IT - LD DE,10 ; DELAY 160US - CALL VDELAY ; ... TO ENSURE OUTPUT RDY SET - IN A,(ESP_STAT) ; GET STATUS - AND ESP_0_RDY ; ISOLATE OUTPUT READY BIT - XOR ESP_0_RDY ; INVERT SO 0=FOUND - RET ; DONE +; + ; LOOK FOR SIGNATURE STARTING WITH "ESP" + CALL ESP_INWAIT ; ATTEMPT TO GET CHAR + ;CALL PRTHEXBYTE + CP 'E' + RET NZ + CALL ESP_INWAIT ; ATTEMPT TO GET CHAR + ;CALL PRTHEXBYTE + CP 'S' + RET NZ + CALL ESP_INWAIT ; ATTEMPT TO GET CHAR + ;CALL PRTHEXBYTE + CP 'P' + RET + + ;LD DE,10 ; DELAY 160US + ;CALL VDELAY ; ... TO ENSURE OUTPUT RDY SET + ;IN A,(ESP_STAT) ; GET STATUS + ;AND ESP_0_RDY ; ISOLATE OUTPUT READY BIT + ;XOR ESP_0_RDY ; INVERT SO 0=FOUND + ;RET ; DONE ; ; CLEAR ESP INPUT QUEUE ; @@ -81,6 +96,7 @@ ESP_CLR: LD B,0 ; MAX CHARS TO READ ESP_CLR0: CALL ESP_WTNBSY ; WAIT TILL NOT BUSY + RET NZ ; BAIL OUT IF TIMEOUT IN A,(ESP_STAT) ; GET STATUS AND ESP_0_RDY ; IS THERE MORE DATA? RET Z ; IF NOT, DONE diff --git a/Source/ver.inc b/Source/ver.inc index e77af0e0..17fe5ab8 100644 --- a/Source/ver.inc +++ b/Source/ver.inc @@ -2,7 +2,7 @@ #DEFINE RMN 3 #DEFINE RUP 0 #DEFINE RTP 0 -#DEFINE BIOSVER "3.3.0-dev.41" +#DEFINE BIOSVER "3.3.0-dev.42" #define rmj RMJ #define rmn RMN #define rup RUP diff --git a/Source/ver.lib b/Source/ver.lib index 6d4d459f..c8a80e26 100644 --- a/Source/ver.lib +++ b/Source/ver.lib @@ -3,5 +3,5 @@ rmn equ 3 rup equ 0 rtp equ 0 biosver macro - db "3.3.0-dev.41" + db "3.3.0-dev.42" endm