6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-11-19 08:31:11 +00:00
Code Issues Projects Releases Wiki Activity

Fixes video base address and mono/colour monitor value.

Browse Source 
Now I see a GEM desktop. In blue.
This commit is contained in:
Thomas Harte 2019-11-02 19:36:15 -04:00
parent c070f2100c
commit a67e0014a4
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Machines/AtariST/AtariST.cpp
View File

@ -637,7 +637,7 @@ class ConcreteMachine:
GPIP 0: centronics busy GPIP 0: centronics busy
*/ */
mfp_->set_port_input( mfp_->set_port_input(
0x00 | // b7: Monochrome monitor detect (1 = is monochrome). 0x80 | // b7: Monochrome monitor detect (1 = is monochrome).
0x40 | // b6: RS-232 ring indicator. 0x40 | // b6: RS-232 ring indicator.
(dma_->get_interrupt_line() ? 0x00 : 0x20) | // b5: FD/HS interrupt (0 = interrupt requested). (dma_->get_interrupt_line() ? 0x00 : 0x20) | // b5: FD/HS interrupt (0 = interrupt requested).
((keyboard_acia_->get_interrupt_line() || midi_acia_->get_interrupt_line()) ? 0x00 : 0x10) | // b4: Keyboard/MIDI interrupt (0 = interrupt requested). ((keyboard_acia_->get_interrupt_line() || midi_acia_->get_interrupt_line()) ? 0x00 : 0x10) | // b4: Keyboard/MIDI interrupt (0 = interrupt requested).

2
Machines/AtariST/Video.cpp
View File

@ -149,7 +149,7 @@ void Video::run_for(HalfCycles duration) {
x = 0; x = 0;
y = (y + 1) % mode_params.lines_per_frame; y = (y + 1) % mode_params.lines_per_frame;
if(!y) if(!y)
current_address_ = base_address_; current_address_ = base_address_ >> 1;
} }
} }

2
Processors/68000/Implementation/68000Implementation.hpp
View File

@ -2001,7 +2001,7 @@ template <class T, bool dtack_is_implicit, bool signal_will_perform> void Proces
// Otherwise, the vector is whatever we were just told it is. // Otherwise, the vector is whatever we were just told it is.
effective_address_[0].full = uint32_t(source_bus_data_[0].halves.low.halves.low << 2); effective_address_[0].full = uint32_t(source_bus_data_[0].halves.low.halves.low << 2);
printf("Interrupt vector: %06x\n", effective_address_[0].full); // printf("Interrupt vector: %06x\n", effective_address_[0].full);
break; break;
case int_type(MicroOp::Action::CopyNextWord): case int_type(MicroOp::Action::CopyNextWord):