From 1d2f74b5b0ea63d99a0f58da72f3596e4a6ce485 Mon Sep 17 00:00:00 2001 From: Phillip Stevens Date: Tue, 12 Nov 2019 13:53:37 +1100 Subject: [PATCH 1/4] scz180 - config fast --- Source/HBIOS/Config/SCZ180_130.asm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Source/HBIOS/Config/SCZ180_130.asm b/Source/HBIOS/Config/SCZ180_130.asm index 5ef52318..679058ba 100644 --- a/Source/HBIOS/Config/SCZ180_130.asm +++ b/Source/HBIOS/Config/SCZ180_130.asm @@ -28,15 +28,15 @@ ; CPUOSC .SET 18432000 ; CPU OSC FREQ IN MHZ ; -Z180_CLKDIV .SET 1 ; Z180: CHK DIV: 0=OSC/2, 1=OSC, 2=OSC*2 -Z180_MEMWAIT .SET 0 ; Z180: MEMORY WAIT STATES (0-3) +Z180_CLKDIV .SET 2 ; Z180: CHK DIV: 0=OSC/2, 1=OSC, 2=OSC*2 +Z180_MEMWAIT .SET 1 ; Z180: MEMORY WAIT STATES (0-3) Z180_IOWAIT .SET 1 ; Z180: I/O WAIT STATES TO ADD ABOVE 1 W/S BUILT-IN (0-3) ; LEDENABLE .SET TRUE ; ENABLES STATUS LED (SINGLE LED) ; ASCIENABLE .SET TRUE ; ASCI: ENABLE Z180 ASCI SERIAL DRIVER (ASCI.ASM) -;ASCI0CFG .SET SER_115200_8N1 ; ASCI 0: SERIAL LINE CONFIG -;ASCI1CFG .SET SER_115200_8N1 ; ASCI 1: SERIAL LINE CONFIG +ASCI0CFG .SET SER_115200_8N1 ; ASCI 0: SERIAL LINE CONFIG +ASCI1CFG .SET SER_115200_8N1 ; ASCI 1: SERIAL LINE CONFIG ; ACIAENABLE .SET FALSE ; ACIA: ENABLE MOTOROLA 6850 ACIA DRIVER (ACIA.ASM) SIOENABLE .SET FALSE ; SIO: ENABLE ZILOG SIO SERIAL DRIVER (SIO.ASM) @@ -47,6 +47,6 @@ FDMODE .SET FDMODE_RCWDC ; FD: DRIVER MODE: FDMODE_[DIO|ZETA|DIDE|N8|DIO3] IDEENABLE .SET TRUE ; IDE: ENABLE IDE DISK DRIVER (IDE.ASM) IDEMODE .SET IDEMODE_RC ; IDE: DRIVER MODE: IDEMODE_[DIO|DIDE] ; -PPIDEENABLE .SET FALSE ; PPIDE: ENABLE PARALLEL PORT IDE DISK DRIVER (PPIDE.ASM) +PPIDEENABLE .SET TRUE ; PPIDE: ENABLE PARALLEL PORT IDE DISK DRIVER (PPIDE.ASM) ; SDENABLE .SET TRUE ; SD: ENABLE SD CARD DISK DRIVER (SD.ASM) From 446d969779fb114dfd6e2701466e8087152bd2bb Mon Sep 17 00:00:00 2001 From: Phillip Stevens Date: Thu, 14 Nov 2019 23:00:35 +1100 Subject: [PATCH 2/4] hbios - use z180 instructions --- Source/HBIOS/hbios.asm | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/Source/HBIOS/hbios.asm b/Source/HBIOS/hbios.asm index 16b76ac3..c695f2bc 100644 --- a/Source/HBIOS/hbios.asm +++ b/Source/HBIOS/hbios.asm @@ -1247,16 +1247,11 @@ HB_CPU1: ; SETUP PERIODIC TIMER INTERRUPT ON TIMER 0 ; LD HL,CPUOSC/TICKSPERSEC/20-1 ; 50HZ = 18432000 / 50 / 20 LD HL,(CPUKHZ) ; 50HZ = 18432000 / 20 / 50 / X, SO X = CPU KHZ - LD B,0 ; 16-BIT I/O ADDRESS - LD C,Z180_TMDR0L ; INITIALIZE TIMER 0 DATA REGISTER - OUT (C),L - INC C - OUT (C),H - DEC HL ; RELOAD OCCURS *AFTER* ZERO - LD C,Z180_RLDR0L ; INITIALIZE TIMER 0 RELOAD REGISTER - OUT (C),L - INC C - OUT (C),H + DEC HL ; RELOAD OCCURS *AFTER* ZERO + OUT0 (Z180_TMDR0L),L ; INITIALIZE TIMER 0 DATA REGISTER + OUT0 (Z180_TMDR0H),H + OUT0 (Z180_RLDR0L),L ; INITIALIZE TIMER 0 RELOAD REGISTER + OUT0 (Z180_RLDR0H),H LD A,%00010001 ; ENABLE TIMER0 INT AND DOWN COUNTING OUT0 (Z180_TCR),A ; From fa7eb7f91610bf66edc031a6885344192f07d189 Mon Sep 17 00:00:00 2001 From: Phillip Stevens Date: Thu, 14 Nov 2019 23:22:11 +1100 Subject: [PATCH 3/4] scz180 revert fast for pr --- Source/HBIOS/Config/SCZ180_130.asm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Source/HBIOS/Config/SCZ180_130.asm b/Source/HBIOS/Config/SCZ180_130.asm index 679058ba..5ef52318 100644 --- a/Source/HBIOS/Config/SCZ180_130.asm +++ b/Source/HBIOS/Config/SCZ180_130.asm @@ -28,15 +28,15 @@ ; CPUOSC .SET 18432000 ; CPU OSC FREQ IN MHZ ; -Z180_CLKDIV .SET 2 ; Z180: CHK DIV: 0=OSC/2, 1=OSC, 2=OSC*2 -Z180_MEMWAIT .SET 1 ; Z180: MEMORY WAIT STATES (0-3) +Z180_CLKDIV .SET 1 ; Z180: CHK DIV: 0=OSC/2, 1=OSC, 2=OSC*2 +Z180_MEMWAIT .SET 0 ; Z180: MEMORY WAIT STATES (0-3) Z180_IOWAIT .SET 1 ; Z180: I/O WAIT STATES TO ADD ABOVE 1 W/S BUILT-IN (0-3) ; LEDENABLE .SET TRUE ; ENABLES STATUS LED (SINGLE LED) ; ASCIENABLE .SET TRUE ; ASCI: ENABLE Z180 ASCI SERIAL DRIVER (ASCI.ASM) -ASCI0CFG .SET SER_115200_8N1 ; ASCI 0: SERIAL LINE CONFIG -ASCI1CFG .SET SER_115200_8N1 ; ASCI 1: SERIAL LINE CONFIG +;ASCI0CFG .SET SER_115200_8N1 ; ASCI 0: SERIAL LINE CONFIG +;ASCI1CFG .SET SER_115200_8N1 ; ASCI 1: SERIAL LINE CONFIG ; ACIAENABLE .SET FALSE ; ACIA: ENABLE MOTOROLA 6850 ACIA DRIVER (ACIA.ASM) SIOENABLE .SET FALSE ; SIO: ENABLE ZILOG SIO SERIAL DRIVER (SIO.ASM) @@ -47,6 +47,6 @@ FDMODE .SET FDMODE_RCWDC ; FD: DRIVER MODE: FDMODE_[DIO|ZETA|DIDE|N8|DIO3] IDEENABLE .SET TRUE ; IDE: ENABLE IDE DISK DRIVER (IDE.ASM) IDEMODE .SET IDEMODE_RC ; IDE: DRIVER MODE: IDEMODE_[DIO|DIDE] ; -PPIDEENABLE .SET TRUE ; PPIDE: ENABLE PARALLEL PORT IDE DISK DRIVER (PPIDE.ASM) +PPIDEENABLE .SET FALSE ; PPIDE: ENABLE PARALLEL PORT IDE DISK DRIVER (PPIDE.ASM) ; SDENABLE .SET TRUE ; SD: ENABLE SD CARD DISK DRIVER (SD.ASM) From 294b42f5a4cbdd5ff4e4fb35ef4b0289ede8f0c1 Mon Sep 17 00:00:00 2001 From: Phillip Stevens Date: Thu, 14 Nov 2019 23:25:16 +1100 Subject: [PATCH 4/4] scz180 white space --- Source/HBIOS/hbios.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/HBIOS/hbios.asm b/Source/HBIOS/hbios.asm index c695f2bc..3169899d 100644 --- a/Source/HBIOS/hbios.asm +++ b/Source/HBIOS/hbios.asm @@ -1247,7 +1247,7 @@ HB_CPU1: ; SETUP PERIODIC TIMER INTERRUPT ON TIMER 0 ; LD HL,CPUOSC/TICKSPERSEC/20-1 ; 50HZ = 18432000 / 50 / 20 LD HL,(CPUKHZ) ; 50HZ = 18432000 / 20 / 50 / X, SO X = CPU KHZ - DEC HL ; RELOAD OCCURS *AFTER* ZERO + DEC HL ; RELOAD OCCURS *AFTER* ZERO OUT0 (Z180_TMDR0L),L ; INITIALIZE TIMER 0 DATA REGISTER OUT0 (Z180_TMDR0H),H OUT0 (Z180_RLDR0L),L ; INITIALIZE TIMER 0 RELOAD REGISTER