6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2025-02-27 15:29:34 +00:00
Code Issues Projects Releases Wiki Activity

Closes the loop on interrupts.

Browse Source
This commit is contained in:
Thomas Harte 2020-11-26 19:56:42 -05:00
parent f54a3f8619
commit 950f5b1691
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Machines/Apple/AppleIIgs/Sound.cpp
View File

@ -88,7 +88,6 @@ void GLU::EnsoniqState::set_register(uint16_t address, uint8_t value) {
switch(address & 0xff) { switch(address & 0xff) {
case 0xe0: case 0xe0:
/* Does setting the interrupt register really make any sense? */ /* Does setting the interrupt register really make any sense? */
interrupt_state = value;
break; break;
case 0xe1: case 0xe1:
oscillator_count = 1 + ((value >> 1) & 31); oscillator_count = 1 + ((value >> 1) & 31);
@ -118,10 +117,18 @@ uint8_t GLU::get_data() {
default: default:
switch(address & 0xff) { switch(address & 0xff) {
case 0xe0: case 0xe0: {
/* TODO: generate the actual interrupt state. */ // Find the first enabled oscillator that is signalling an interrupt and has interrupts enabled.
return local_.interrupt_state; for(int c = 0; c < local_.oscillator_count; c++) {
break; if(local_.oscillators[c].interrupt_request && (local_.oscillators[c].control & 0x08)) {
local_.oscillators[c].interrupt_request = false;
return uint8_t(0x41 | (c << 1));
}
}
// No interrupt found.
return 0xc1;
} break;
case 0xe1: return uint8_t((local_.oscillator_count - 1) << 1); // TODO: should other bits be 0 or 1? case 0xe1: return uint8_t((local_.oscillator_count - 1) << 1); // TODO: should other bits be 0 or 1?
case 0xe2: return 128; // Input audio. Unimplemented! case 0xe2: return 128; // Input audio. Unimplemented!
} }
@ -132,6 +139,13 @@ uint8_t GLU::get_data() {
} }
bool GLU::get_interrupt_line() { bool GLU::get_interrupt_line() {
// Return @c true if any oscillator currently has its interrupt request
// set, and has interrupts enabled.
for(int c = 0; c < local_.oscillator_count; c++) {
if(local_.oscillators[c].interrupt_request && (local_.oscillators[c].control & 0x08)) {
return true;
}
}
return false; return false;
} }

1
Machines/Apple/AppleIIgs/Sound.hpp
View File

@ -90,7 +90,6 @@ class GLU: public Outputs::Speaker::SampleSource {
// Some of these aren't actually needed on both threads. // Some of these aren't actually needed on both threads.
uint8_t control; uint8_t control;
uint8_t interrupt_state;
int oscillator_count; int oscillator_count;
void set_register(uint16_t address, uint8_t value); void set_register(uint16_t address, uint8_t value);