c64/pi1541
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Put the bus read and writes back to v1.19 timings.

Browse source 
Fixes the need to overclock a Pi3 for Option A hardware.
Hopefully fixes  #160
This commit is contained in:
Stephen White 2019-12-02 19:33:40 +11:00
parent 253e26594a
commit 28d1a443c6
2 changed files with 33 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/iec_bus.cpp
View file

@ -392,16 +392,9 @@ void IEC_Bus::RefreshOuts1541(void)
if (OutputSound) set |= 1 << PIGPIO_OUT_SOUND; if (OutputSound) set |= 1 << PIGPIO_OUT_SOUND;
else clear |= 1 << PIGPIO_OUT_SOUND; else clear |= 1 << PIGPIO_OUT_SOUND;
#endif #endif
if (oldClears != clear)
{ write32(ARM_GPIO_GPCLR0, clear);
write32(ARM_GPIO_GPCLR0, clear); write32(ARM_GPIO_GPSET0, set);
oldClears = clear;
}
if (oldSets != set)
{
write32(ARM_GPIO_GPSET0, set);
oldSets = set;
}
} }
void IEC_Bus::PortB_OnPortOut(void* pUserData, unsigned char status) void IEC_Bus::PortB_OnPortOut(void* pUserData, unsigned char status)

43
src/main.cpp
View file

@ -548,7 +548,9 @@ void UpdateScreen()
if (screenLCD) if (screenLCD)
{ {
#if not defined(EXPERIMENTALZERO)
core0RefreshingScreen.Acquire(); core0RefreshingScreen.Acquire();
#endif
IEC_Bus::WaitMicroSeconds(100); IEC_Bus::WaitMicroSeconds(100);
@ -557,7 +559,9 @@ void UpdateScreen()
screenLCD->RefreshRows(0, 1); screenLCD->RefreshRows(0, 1);
IEC_Bus::WaitMicroSeconds(100); IEC_Bus::WaitMicroSeconds(100);
#if not defined(EXPERIMENTALZERO)
core0RefreshingScreen.Release(); core0RefreshingScreen.Release();
#endif
} }
} }
@ -574,13 +578,17 @@ void UpdateScreen()
if (screenLCD) if (screenLCD)
{ {
#if not defined(EXPERIMENTALZERO)
core0RefreshingScreen.Acquire(); core0RefreshingScreen.Acquire();
#endif
IEC_Bus::WaitMicroSeconds(100); IEC_Bus::WaitMicroSeconds(100);
screenLCD->PrintText(false, 0, 0, tempBuffer, 0, RGBA(0xff, 0xff, 0xff, 0xff)); screenLCD->PrintText(false, 0, 0, tempBuffer, 0, RGBA(0xff, 0xff, 0xff, 0xff));
// screenLCD->SetContrast(255.0/79.0*track); // screenLCD->SetContrast(255.0/79.0*track);
screenLCD->RefreshRows(0, 1); screenLCD->RefreshRows(0, 1);
IEC_Bus::WaitMicroSeconds(100); IEC_Bus::WaitMicroSeconds(100);
#if not defined(EXPERIMENTALZERO)
core0RefreshingScreen.Release(); core0RefreshingScreen.Release();
#endif
} }
} }
@ -793,6 +801,8 @@ EXIT_TYPE Emulate1541(FileBrowser* fileBrowser)
while (exitReason == EXIT_UNKNOWN) while (exitReason == EXIT_UNKNOWN)
{ {
if (refreshOutsAfterCPUStep)
IEC_Bus::ReadEmulationMode1541();
if (pi1541.m6502.SYNC()) // About to start a new instruction. if (pi1541.m6502.SYNC()) // About to start a new instruction.
{ {
@ -847,16 +857,7 @@ EXIT_TYPE Emulate1541(FileBrowser* fileBrowser)
} }
} }
if (options.SoundOnGPIO() && headSoundCounter > 0)
{
headSoundFreqCounter--; // Continue updating a GPIO non DMA sound.
if (headSoundFreqCounter <= 0)
{
headSoundFreqCounter = headSoundFreq;
headSoundCounter -= headSoundFreq * 8;
IEC_Bus::OutputSound = !IEC_Bus::OutputSound;
}
}
#endif #endif
} }
@ -911,9 +912,25 @@ EXIT_TYPE Emulate1541(FileBrowser* fileBrowser)
} while (ctAfter == ctBefore); } while (ctAfter == ctBefore);
} }
ctBefore = ctAfter; ctBefore = ctAfter;
IEC_Bus::ReadEmulationMode1541();
if (cycleCount >= FAST_BOOT_CYCLES) // cycleCount is used so we can quickly get through 1541's self test code. This will make the emulated 1541 responsive to commands asap. During this time we don't need to set outputs. if (!refreshOutsAfterCPUStep)
IEC_Bus::RefreshOuts1541(); // Now output all outputs. {
IEC_Bus::ReadEmulationMode1541();
if (cycleCount >= FAST_BOOT_CYCLES) // cycleCount is used so we can quickly get through 1541's self test code. This will make the emulated 1541 responsive to commands asap. During this time we don't need to set outputs.
IEC_Bus::RefreshOuts1541(); // Now output all outputs.
}
#if not defined(EXPERIMENTALZERO)
if (options.SoundOnGPIO() && headSoundCounter > 0)
{
headSoundFreqCounter--; // Continue updating a GPIO non DMA sound.
if (headSoundFreqCounter <= 0)
{
headSoundFreqCounter = headSoundFreq;
headSoundCounter -= headSoundFreq * 8;
IEC_Bus::OutputSound = !IEC_Bus::OutputSound;
}
}
#endif
if (numberOfImages > 1) if (numberOfImages > 1)
{ {