Apple-2-Tools/AppleWin
1
0
Fork 0
mirror of https://github.com/AppleWin/AppleWin.git synced 2025-01-20 19:30:21 +00:00
Code Issues Projects Releases Wiki Activity

Debugger: revert behaviour from 8fce7a8 so that Ctrl+F2 doesn't immediately stop the drive spinning, but F2 still does (#460)

Browse Source
This commit is contained in:
tomcw 2017-08-12 11:50:31 +01:00
parent 88bb57d55a
commit 9e7318e7ed
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/Disk.cpp
View File

@ -828,7 +828,7 @@ void DiskReset(const bool bIsPowerCycle/*=false*/)
floppywritemode = 0;
phases = 0;
if (bIsPowerCycle) // GH#460 - Ctrl+Reset whilst debugging acts like a power-cycle
if (bIsPowerCycle) // GH#460
{
g_aFloppyDisk[DRIVE_1].spinning = 0;
g_aFloppyDisk[DRIVE_1].writelight = 0;

14
source/Frame.cpp
View File

@ -2033,13 +2033,21 @@ void RelayEvent (UINT message, WPARAM wparam, LPARAM lparam) {
//===========================================================================
// CtrlReset() vs ResetMachineState():
// . CPU:
// Ctrl+Reset : sp=-3 / CpuReset()
// Power cycle: sp=0x1ff / CpuInitialize()
// . Disk][:
// Ctrl+Reset : if motor-on, then motor-off but continue to spin for 1s
// Power cycle: motor-off & immediately stop spinning
// todo: consolidate CtrlReset() and ResetMachineState()
void ResetMachineState ()
{
DiskReset(true); // Set floppymotoron=0
DiskReset(true);
g_bFullSpeed = 0; // Might've hit reset in middle of InternalCpuExecute() - so beep may get (partially) muted
MemReset();
MemReset(); // calls CpuInitialize()
PravetsReset();
DiskBoot();
VideoResetState();
@ -2069,7 +2077,7 @@ void CtrlReset()
MemResetPaging();
PravetsReset();
DiskReset(g_nAppMode == MODE_DEBUG); // For MODE_DEBUG act like a power-cycle (GH#460)
DiskReset();
KeybReset();
if (!IS_APPLE2) // TODO: Why not for A][ & A][+ too?
VideoResetState(); // Switch Alternate char set off