6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-09-29 16:55:59 +00:00
Code Issues Projects Releases Wiki Activity

Make first attempt at palette support.

Browse Source
This commit is contained in:
Thomas Harte 2023-12-06 11:19:04 -05:00
parent bf49f745bf
commit 6adaf89934
3 changed files with 62 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
Machines/PCCompatible/CGA.hpp
View File

@ -40,21 +40,25 @@ class CGA {
template <int address>
void write(uint8_t value) {
if constexpr (address & 0x8) {
outputter_.set_mode(value);
} else {
if constexpr (address & 0x1) {
crtc_.set_register(value);
} else {
switch(address) {
case 0: case 2: case 4: case 6:
crtc_.select_register(value);
}
break;
case 1: case 3: case 5: case 7:
crtc_.set_register(value);
break;
case 0x8: outputter_.set_mode(value); break;
case 0x9: outputter_.set_colours(value); break;
}
}
template <int address>
uint8_t read() {
switch(address) {
default: return crtc_.get_register();
case 1: case 3: case 5: case 7:
return crtc_.get_register();
case 0xa:
return
// b3: 1 => in vsync; 0 => not;
@ -64,6 +68,8 @@ class CGA {
(crtc_.get_bus_state().vsync ? 0b1001 : 0b0000) |
(crtc_.get_bus_state().hsync ? 0b0001 : 0b0000) |
0b0100;
default: return 0xff;
}
}
@ -106,6 +112,20 @@ class CGA {
clock_divider = 1 + !(control & 0x01);
}
void set_colours(uint8_t value) {
if(value & 0x20) {
palette[0] = 0b00'00'00;
palette[1] = 0b00'10'10;
palette[2] = 0b10'00'10;
palette[3] = 0b10'10'10;
} else {
palette[0] = 0b00'00'00;
palette[1] = 0b00'10'00;
palette[2] = 0b10'00'00;
palette[3] = 0b10'10'00; // TODO: brown, here and elsewhere.
}
}
uint8_t control() {
return control_;
}
@ -189,15 +209,17 @@ class CGA {
ram[base_address + 1],
};
// Better than nothing...
pixel_pointer[0] = (bitmap[0] & 0xc0) >> 6;
pixel_pointer[1] = (bitmap[0] & 0x30) >> 4;
pixel_pointer[2] = (bitmap[0] & 0x0c) >> 2;
pixel_pointer[3] = (bitmap[0] & 0x03) >> 0;
pixel_pointer[4] = (bitmap[1] & 0xc0) >> 6;
pixel_pointer[5] = (bitmap[1] & 0x30) >> 4;
pixel_pointer[6] = (bitmap[1] & 0x0c) >> 2;
pixel_pointer[7] = (bitmap[1] & 0x03) >> 0;
if(mode_ == Mode::Pixels320) {
pixel_pointer[0] = palette[(bitmap[0] & 0xc0) >> 6];
pixel_pointer[1] = palette[(bitmap[0] & 0x30) >> 4];
pixel_pointer[2] = palette[(bitmap[0] & 0x0c) >> 2];
pixel_pointer[3] = palette[(bitmap[0] & 0x03) >> 0];
pixel_pointer[4] = palette[(bitmap[1] & 0xc0) >> 6];
pixel_pointer[5] = palette[(bitmap[1] & 0x30) >> 4];
pixel_pointer[6] = palette[(bitmap[1] & 0x0c) >> 2];
pixel_pointer[7] = palette[(bitmap[1] & 0x03) >> 0];
} else {
}
}
void serialise_text(const Motorola::CRTC::BusState &state) {
@ -264,6 +286,8 @@ class CGA {
Pixels640, Pixels320, Text,
} mode_ = Mode::Text;
uint8_t palette[4];
} outputter_;
Motorola::CRTC::CRTC6845<CRTCOutputter, Motorola::CRTC::CursorType::MDA> crtc_;

30
Machines/PCCompatible/MDA.hpp
View File

@ -39,23 +39,31 @@ class MDA {
template <int address>
void write(uint8_t value) {
if constexpr (address & 0x8) {
outputter_.set_control(value);
} else {
if constexpr (address & 0x1) {
crtc_.set_register(value);
} else {
switch(address) {
case 0: case 2: case 4: case 6:
crtc_.select_register(value);
}
break;
case 1: case 3: case 5: case 7:
crtc_.set_register(value);
break;
case 0x8:
outputter_.set_control(value);
break;
default: break;
}
}
template <int address>
uint8_t read() {
if constexpr (address & 0x8) {
return outputter_.control();
} else {
return crtc_.get_register();
switch(address) {
case 1: case 3: case 5: case 7:
return crtc_.get_register();
case 0x8: return outputter_.control();
default: return 0xff;
}
}

5
Machines/PCCompatible/PCCompatible.cpp
View File

@ -685,9 +685,8 @@ class IO {
}
break;
case crtc_base + 8:
video_.template write<8>(uint8_t(value));
break;
case crtc_base + 0x8: video_.template write<0x8>(uint8_t(value)); break;
case crtc_base + 0x9: video_.template write<0x9>(uint8_t(value)); break;
case 0x03f2:
fdc_.set_digital_output(uint8_t(value));