6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2025-01-13 07:30:21 +00:00
Code Issues Projects Releases Wiki Activity

Switch and -> or for testing transitions from ::PlayingLow.

Browse Source
This commit is contained in:
Thomas Harte 2021-12-04 08:24:41 -05:00
parent 42d3bdd373
commit 3b027c4593
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Machines/Amiga/Audio.cpp
View File

@ -233,11 +233,11 @@ void Audio::output() {
action: percount, and not penhi
-> State::Disabled (000)
if: perfin and not (AUDxON and not AUDxIP)
if: perfin and not (AUDxON or not AUDxIP)
action: None
-> State::PlayingHigh (010)
if: perfin and AUDxON and not AUDxIP
if: perfin and (AUDxON or not AUDxIP)
action:
1. pbufld
2. percntrld
@ -258,7 +258,7 @@ void Audio::output() {
AUDxIP Audio interrupt pending (input to channel from interrupt circuitry).
AUDxIR Audio interrupt request (output from channel to interrupt circuitry)
AUDxIR Audio interrupt request (output from channel to interrupt circuitry).
intreq1 Interrupt request that combines with intreq2 to form AUDxIR.
@ -510,17 +510,15 @@ template <> void Audio::Channel::begin_state<Audio::Channel::State::PlayingLow>(
template <> bool Audio::Channel::output<Audio::Channel::State::PlayingLow>() {
-- period_counter;
const bool dma_and_not_done = dma_enabled && !interrupt_pending;
if(!period_counter && !dma_and_not_done) {
return transit<State::PlayingLow, State::Disabled>();
if(!period_counter) {
const bool dma_or_no_interrupt = dma_enabled || !interrupt_pending;
if(dma_or_no_interrupt) {
return transit<State::PlayingLow, State::PlayingHigh>();
} else {
return transit<State::PlayingLow, State::Disabled>();
}
}
if(!period_counter && dma_and_not_done) {
return transit<State::PlayingLow, State::PlayingHigh>();
}
return false;
}