mirror of
https://github.com/AppleWin/AppleWin.git
synced 2024-06-11 19:29:35 +00:00
Debugger: revert behaviour from 8fce7a8
so that Ctrl+F2 doesn't immediately stop the drive spinning, but F2 still does (#460)
This commit is contained in:
parent
88bb57d55a
commit
9e7318e7ed
|
@ -828,7 +828,7 @@ void DiskReset(const bool bIsPowerCycle/*=false*/)
|
||||||
floppywritemode = 0;
|
floppywritemode = 0;
|
||||||
phases = 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].spinning = 0;
|
||||||
g_aFloppyDisk[DRIVE_1].writelight = 0;
|
g_aFloppyDisk[DRIVE_1].writelight = 0;
|
||||||
|
|
|
@ -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()
|
// todo: consolidate CtrlReset() and ResetMachineState()
|
||||||
void 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
|
g_bFullSpeed = 0; // Might've hit reset in middle of InternalCpuExecute() - so beep may get (partially) muted
|
||||||
|
|
||||||
MemReset();
|
MemReset(); // calls CpuInitialize()
|
||||||
PravetsReset();
|
PravetsReset();
|
||||||
DiskBoot();
|
DiskBoot();
|
||||||
VideoResetState();
|
VideoResetState();
|
||||||
|
@ -2069,7 +2077,7 @@ void CtrlReset()
|
||||||
MemResetPaging();
|
MemResetPaging();
|
||||||
|
|
||||||
PravetsReset();
|
PravetsReset();
|
||||||
DiskReset(g_nAppMode == MODE_DEBUG); // For MODE_DEBUG act like a power-cycle (GH#460)
|
DiskReset();
|
||||||
KeybReset();
|
KeybReset();
|
||||||
if (!IS_APPLE2) // TODO: Why not for A][ & A][+ too?
|
if (!IS_APPLE2) // TODO: Why not for A][ & A][+ too?
|
||||||
VideoResetState(); // Switch Alternate char set off
|
VideoResetState(); // Switch Alternate char set off
|
||||||
|
|
Loading…
Reference in New Issue
Block a user