From b6f51bde9fcc44858723a844d9096a1a78d900e8 Mon Sep 17 00:00:00 2001 From: tomcw Date: Thu, 18 Feb 2021 21:13:32 +0000 Subject: [PATCH 1/4] Help doc: Troubleshooting 'switch to 2x mode' --- help/Troubleshooting.html | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/help/Troubleshooting.html b/help/Troubleshooting.html index 307844c4..d034e00d 100644 --- a/help/Troubleshooting.html +++ b/help/Troubleshooting.html @@ -58,5 +58,15 @@
  • Renegade: switches to 160x192 mode at the title screen and then B&W (at the title screen) after game play.
  • Apple's AppleColor card or Video7's RGB-SL7 card: corruption for titles/demos that accidentally switch to foreground/background hi-res mode, eg. French Touch DIGIDREAM demo.
    • + + Can't switch to 2x windowed mode: + From c906fb58727da7fe3a3852a5b0270b43a8217605 Mon Sep 17 00:00:00 2001 From: tomcw Date: Fri, 19 Feb 2021 15:51:34 +0000 Subject: [PATCH 2/4] Help doc: bump (c) year --- help/configuration.html | 21 +++------------------ help/toc.html | 5 ++--- 2 files changed, 5 insertions(+), 21 deletions(-) diff --git a/help/configuration.html b/help/configuration.html index 12378eaf..d6c57ecb 100644 --- a/help/configuration.html +++ b/help/configuration.html @@ -1,35 +1,20 @@ - AppleWin Configuration - - - -

    AppleWin Configuration

    -

    Select one of the following topics:

    - - diff --git a/help/toc.html b/help/toc.html index 0c31caa2..b4f2fa13 100644 --- a/help/toc.html +++ b/help/toc.html @@ -11,9 +11,8 @@
    Copyright © 1994-1996, Michael O'Brien
    Copyright © 2001, Oliver Schmidt
    - Copyright © 2002-2005, Tom Charlesworth
    - Copyright © 2006-2020, Tom Charlesworth, Michael Pohoreski, Nick Westgate, Linards Ticmanis -
    + Copyright © 2002-2005, Tom Charlesworth
    + Copyright © 2006-2021, Tom Charlesworth, Michael Pohoreski, Nick Westgate, Linards Ticmanis

    AppleWin team
    From 62ade0774644f453e5b50e023fff6f473536ff0a Mon Sep 17 00:00:00 2001 From: tomcw Date: Fri, 19 Feb 2021 15:54:22 +0000 Subject: [PATCH 3/4] Resource: bump (c) year --- resource/Applewin.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resource/Applewin.rc b/resource/Applewin.rc index e96132ac..1941f789 100644 --- a/resource/Applewin.rc +++ b/resource/Applewin.rc @@ -278,7 +278,7 @@ BEGIN VALUE "FileDescription", "Apple //e Emulator for Windows" VALUE "FileVersion", APPLEWIN_VERSION_STR VALUE "InternalName", "APPLEWIN" - VALUE "LegalCopyright", " 1994-2020 Michael O'Brien, Oliver Schmidt, Tom Charlesworth, Michael Pohoreski, Nick Westgate, Linards Ticmanis" + VALUE "LegalCopyright", " 1994-2021 Michael O'Brien, Oliver Schmidt, Tom Charlesworth, Michael Pohoreski, Nick Westgate, Linards Ticmanis" VALUE "OriginalFilename", "APPLEWIN.EXE" VALUE "ProductName", "Apple //e Emulator" VALUE "ProductVersion", APPLEWIN_VERSION_STR From 0bb34bfb485466dbe7fd0703b310623eec56fa5a Mon Sep 17 00:00:00 2001 From: tomcw Date: Fri, 19 Feb 2021 16:21:44 +0000 Subject: [PATCH 4/4] Disk: remove debug DumpSectorWOZ() func --- source/Disk.cpp | 60 ------------------------------------------------- 1 file changed, 60 deletions(-) diff --git a/source/Disk.cpp b/source/Disk.cpp index 14a4b12e..e2b2fa1b 100644 --- a/source/Disk.cpp +++ b/source/Disk.cpp @@ -1202,7 +1202,6 @@ void Disk2InterfaceCard::DataLatchReadWOZ(WORD pc, WORD addr, UINT bitCellRemain if (dbgWOZ) { dbgWOZ = 0; -// DumpSectorWOZ(floppy); DumpTrackWOZ(floppy); // Enable as necessary } #endif @@ -1360,65 +1359,6 @@ void Disk2InterfaceCard::DataShiftWriteWOZ(WORD pc, WORD addr, ULONG uExecutedCy //=========================================================================== #ifdef _DEBUG -// Dump nibbles from current position until 0xDEAA (ie. data epilogue) -void Disk2InterfaceCard::DumpSectorWOZ(FloppyDisk floppy) // pass a copy of m_floppy -{ - BYTE shiftReg = 0; - UINT32 lastNibbles = 0; - UINT zeroCount = 0; - UINT nibbleCount = 0; - - while (1) - { - BYTE n = floppy.m_trackimage[floppy.m_byte]; - BYTE outputBit = (n & floppy.m_bitMask) ? 1 : 0; - - floppy.m_bitMask >>= 1; - if (!floppy.m_bitMask) - { - floppy.m_bitMask = 1 << 7; - floppy.m_byte++; - } - - floppy.m_bitOffset++; - if (floppy.m_bitOffset == floppy.m_bitCount) - { - floppy.m_bitMask = 1 << 7; - floppy.m_bitOffset = 0; - floppy.m_byte = 0; - } - - if (shiftReg == 0 && outputBit == 0) - { - zeroCount++; - continue; - } - - shiftReg <<= 1; - shiftReg |= outputBit; - - if ((shiftReg & 0x80) == 0) - continue; - - nibbleCount++; - - char str[10]; - sprintf(str, "%02X ", shiftReg); - OutputDebugString(str); - if ((nibbleCount & 0xf) == 0) - OutputDebugString("\n"); - - lastNibbles <<= 8; - lastNibbles |= shiftReg; - - if ((lastNibbles & 0xffff) == 0xDEAA) - break; - - shiftReg = 0; - zeroCount = 0; - } -} - // Dump nibbles from current position bitstream wraps to same position void Disk2InterfaceCard::DumpTrackWOZ(FloppyDisk floppy) // pass a copy of m_floppy {