From df1421b163879461824bcf07e97038fb671ae1ee Mon Sep 17 00:00:00 2001 From: Wayne Warthen Date: Sat, 9 May 2020 16:48:30 -0700 Subject: [PATCH 1/3] Small Cleanup --- Makefile | 2 +- Source/HBIOS/hdsk.asm | 2 ++ Source/Images/Build.cmd | 6 +++--- Source/Images/Makefile | 8 +++++--- Source/Makefile | 2 +- 5 files changed, 12 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 65560c7d..741e5ef7 100644 --- a/Makefile +++ b/Makefile @@ -14,5 +14,5 @@ clobber: rm -f typescript diff: - $(MAKE) --directory diff + $(MAKE) --directory Source diff diff --git a/Source/HBIOS/hdsk.asm b/Source/HBIOS/hdsk.asm index a5d3b0ff..e6643dd1 100644 --- a/Source/HBIOS/hdsk.asm +++ b/Source/HBIOS/hdsk.asm @@ -27,10 +27,12 @@ HDSK_CFGTBL: .DB 0 ; DRIVER DEVICE NUMBER .DB 0 ; DEVICE STATUS .DW 0,0 ; CURRENT LBA +#IF (HDSK_DEVCNT >= 2) ; DEVICE 1 .DB 1 ; DEVICE NUMBER .DB 0 ; DEVICE STATUS .DW 0,0 ; CURRENT LBA +#ENDIF ; #IF ($ - HDSK_CFGTBL) != (HDSK_DEVCNT * HDSK_CFGSIZ) .ECHO "*** INVALID HDSK CONFIG TABLE ***\n" diff --git a/Source/Images/Build.cmd b/Source/Images/Build.cmd index 01e52351..c24948a3 100644 --- a/Source/Images/Build.cmd +++ b/Source/Images/Build.cmd @@ -21,7 +21,7 @@ call BuildDisk.cmd cpm3 wbw_hd ..\cpm3\cpmldr.sys call BuildDisk.cmd zpm3 wbw_hd ..\cpm3\cpmldr.sys call BuildDisk.cmd ws4 wbw_hd -if exist ..\BPBIOS\bpbio-ww.rel call BuildHD.cmd bp wbw_hd +if exist ..\BPBIOS\bpbio-ww.rel call BuildDisk.cmd bp wbw_hd echo. echo Building Combo Disk (legacy format) Image... @@ -37,9 +37,9 @@ call BuildDisk.cmd cpm3 wbw_hdnew ..\cpm3\cpmldr.sys call BuildDisk.cmd zpm3 wbw_hdnew ..\cpm3\cpmldr.sys call BuildDisk.cmd ws4 wbw_hdnew -if exist ..\BPBIOS\bpbio-ww.rel call BuildHD.cmd bp wbw_hdnew +if exist ..\BPBIOS\bpbio-ww.rel call BuildDisk.cmd bp wbw_hdnew -copy hd_prefix.dat ..\..\Binary\ +copy hdnew_prefix.bin ..\..\Binary\ echo. echo Building Combo Disk (new format) Image... diff --git a/Source/Images/Makefile b/Source/Images/Makefile index ea5a4e63..72fc2bf4 100644 --- a/Source/Images/Makefile +++ b/Source/Images/Makefile @@ -15,7 +15,9 @@ HDNEWIMGS = hdnew_cpm22.img hdnew_zsdos.img hdnew_nzcom.img \ HDPREFIX = HDNEWPREFIX = hdnew_prefix.bin -OBJECTS = $(FDIMGS) $(HDIMGS) hd_combo.img $(HDNEWIMGS) hdnew_combo.img +OBJECTS = $(FDIMGS) +OBJECTS += $(HDIMGS) hd_combo.img $(HDPREFIX) +OBJECTS += $(HDNEWIMGS) hdnew_combo.img $(HDNEWPREFIX) OTHERS = blank144 blankhd blankhdnew @@ -26,10 +28,10 @@ include $(TOOLS)/Makefile.inc DIFFPATH = $(DIFFTO)/Binary -hd_combo.img: $(HDPREFIX) $(HDIMGS) +hd_combo.img: $(HDPREFIX) $(HDIMGS) cat $^ > $@ -hdnew_combo.img: $(HDNEWPREFIX) $(HDNEWIMGS) +hdnew_combo.img: $(HDNEWPREFIX) $(HDNEWIMGS) cat $^ > $@ # diff --git a/Source/Makefile b/Source/Makefile index 63c4204f..3df2bab5 100644 --- a/Source/Makefile +++ b/Source/Makefile @@ -9,7 +9,7 @@ SUBDIRS += Fonts SUBDIRS += CPM22 ZCPR ZCPR-DJ ZSDOS SUBDIRS += HBIOS CPM3 SUBDIRS += ZPM3 -SUBDIRS += BPBIOS +#SUBDIRS += BPBIOS SUBDIRS += Images TOOLS = ../Tools include $(TOOLS)/Makefile.inc From a22085d8db3fcafd948e054214a1a0ccb0c76525 Mon Sep 17 00:00:00 2001 From: Wayne Warthen Date: Sat, 9 May 2020 17:07:33 -0700 Subject: [PATCH 2/3] Cleanup --- Source/Images/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Source/Images/Makefile b/Source/Images/Makefile index 72fc2bf4..be90202f 100644 --- a/Source/Images/Makefile +++ b/Source/Images/Makefile @@ -21,6 +21,8 @@ OBJECTS += $(HDNEWIMGS) hdnew_combo.img $(HDNEWPREFIX) OTHERS = blank144 blankhd blankhdnew +NODELETE = $(HDPREFIX) $(HDNEWPREFIX) + DEST=../../Binary TOOLS = ../../Tools From 2aa43a8063be08c13e8d1f5f9826f0a3805df85c Mon Sep 17 00:00:00 2001 From: Wayne Warthen Date: Sat, 9 May 2020 19:23:11 -0700 Subject: [PATCH 3/3] Propeller VGA Signal Timing Update - Propeller VGA signal now uses 60Hz refresh for better compatibility with all VGA monitors --- Doc/ChangeLog.txt | 1 + Source/Prop/Spin/ParPortProp.spin | 9 +++++---- Source/Prop/Spin/PropIO.spin | 9 +++++---- Source/Prop/Spin/PropIO2.spin | 9 +++++---- Source/Prop/Spin/vgacolour.spin | 19 +++++++++++++++++++ Source/ver.inc | 2 +- Source/ver.lib | 2 +- 7 files changed, 37 insertions(+), 14 deletions(-) diff --git a/Doc/ChangeLog.txt b/Doc/ChangeLog.txt index 060105f6..2b72545a 100644 --- a/Doc/ChangeLog.txt +++ b/Doc/ChangeLog.txt @@ -2,6 +2,7 @@ Version 3.1.1 ------------- - WBW: Version bumped due to pervasive changes - WBW: Preliminary hard disk partition support (backward compatible) +- WBW: Change Propeller VGA signal timings to 60Hz refresh Version 3.1 ----------- diff --git a/Source/Prop/Spin/ParPortProp.spin b/Source/Prop/Spin/ParPortProp.spin index 6ecf049f..5e890c21 100644 --- a/Source/Prop/Spin/ParPortProp.spin +++ b/Source/Prop/Spin/ParPortProp.spin @@ -3,8 +3,8 @@ ************************************ * ParPortProp for RomWBW * * Interface to RBC ParPortProp * - * Version 0.96 * - * March 11, 2018 * + * Version 0.97 * + * May 9, 2020 * ************************************ Wayne Warthen @@ -29,11 +29,12 @@ Updates: 2018-03-11 WBW: Implement character attributes + 2020-05-09 WBW: Switch monitor refresh to 60Hz }} CON - VERSION = (((0 << 8) + 96) << 16) + 0 + VERSION = (((0 << 8) + 97) << 16) + 0 _CLKMODE = XTAL1 + PLL16X _XINFREQ = 5_000_000 @@ -608,7 +609,7 @@ PRI Activity DAT -strVer byte "F/W v0.96",0 +strVer byte "F/W v0.97",0 strHW byte "ParPortProp",0 strROM byte "RomWBW",0 diff --git a/Source/Prop/Spin/PropIO.spin b/Source/Prop/Spin/PropIO.spin index 3d677264..9e074fe0 100644 --- a/Source/Prop/Spin/PropIO.spin +++ b/Source/Prop/Spin/PropIO.spin @@ -3,8 +3,8 @@ ******************************* * PropIO for RomWBW * * Interface to RBC PropIO * - * Version 0.96 * - * March 11, 2018 * + * Version 0.97 * + * May 9, 2020 * ******************************* Wayne Warthen @@ -34,11 +34,12 @@ 2014-02-09 WBW: Clean up 2015-11-15 WBW: Added SD card capacity reporting 2018-03-11 WBW: Implement character attributes + 2020-05-09 WBW: Switch monitor refresh to 60Hz }} CON - VERSION = (((0 << 8) + 96) << 16) + 0 + VERSION = (((0 << 8) + 97) << 16) + 0 _CLKMODE = XTAL1 + PLL16X _XINFREQ = 5_000_000 @@ -337,7 +338,7 @@ PRI DumpBuffer(Buffer) | i, j DAT -strVer byte "F/W v0.96",0 +strVer byte "F/W v0.97",0 strHW byte "PropIO",0 strROM byte "RomWBW",0 diff --git a/Source/Prop/Spin/PropIO2.spin b/Source/Prop/Spin/PropIO2.spin index 9e01d3cb..ad1592f7 100644 --- a/Source/Prop/Spin/PropIO2.spin +++ b/Source/Prop/Spin/PropIO2.spin @@ -3,8 +3,8 @@ ********************************* * PropIO 2 for RomWBW * * Interface to RBC PropIO 2 * - * Version 0.96 * - * March 11, 2018 * + * Version 0.97 * + * May 9, 2020 * ********************************* Wayne Warthen @@ -34,11 +34,12 @@ 2014-02-08 WBW: Adaptation for PropIO 2 2015-11-15 WBW: Added SD card capacity reporting 2018-03-11 WBW: Implement character attributes + 2020-05-09 WBW: Switch monitor refresh to 60Hz }} CON - VERSION = (((0 << 8) + 96) << 16) + 0 + VERSION = (((0 << 8) + 97) << 16) + 0 _CLKMODE = XTAL1 + PLL16X _XINFREQ = 5_000_000 @@ -337,7 +338,7 @@ PRI DumpBuffer(Buffer) | i, j DAT -strVer byte "F/W v0.96",0 +strVer byte "F/W v0.97",0 strHW byte "PropIO v2",0 strROM byte "RomWBW",0 diff --git a/Source/Prop/Spin/vgacolour.spin b/Source/Prop/Spin/vgacolour.spin index c5cc2f80..0981fe55 100644 --- a/Source/Prop/Spin/vgacolour.spin +++ b/Source/Prop/Spin/vgacolour.spin @@ -20,6 +20,7 @@ CON +{ ' 640 x 480 @ 69Hz settings: 80 x 30 characters hp = 640 ' horizontal pixels @@ -33,6 +34,24 @@ CON hn = 1 ' horizontal normal sync state (0|1) vn = 1 ' vertical normal sync state (0|1) pr = 30 ' pixel rate in MHz at 80MHz system clock (5MHz granularity) +} + +'{ +' 640 x 480 @ 60Hz settings: 80 x 40 characters + + hp = 640 'horizontal pixels + vp = 480 'vertical pixels + hf = 16 'horizontal front porch pixels + hs = 96 'horizontal sync pixels + hb = 48 'horizontal back porch pixels + vf = 10 'vertical front porch lines + vs = 2 'vertical sync lines + vb = 33 'vertical back porch lines + hn = 1 'horizontal normal sync state (0|1) + vn = 1 'vertical normal sync state (0|1) + pr = 25 'pixel rate in MHz at 80MHz system clock (5MHz granularity) +'} + ' columns and rows diff --git a/Source/ver.inc b/Source/ver.inc index 783d72d7..59f55502 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.4" +#DEFINE BIOSVER "3.1.1-pre.5" diff --git a/Source/ver.lib b/Source/ver.lib index 450a4790..33acdafa 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.4" + db "3.1.1-pre.5" endm