Macintosh-Tools/dingusppc
1
0
Fork 0
mirror of https://github.com/dingusdev/dingusppc.git synced 2024-06-02 21:41:31 +00:00
Code Issues Projects Releases Wiki Activity

control: incorporate recent HW knowledge.

Browse Source
This commit is contained in:
Maxim Poliakovski 2023-12-19 14:51:59 +01:00
parent 5c460c9f3b
commit d413e4a278
2 changed files with 168 additions and 219 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

301
devices/video/control.cpp
View File

@ -1,6 +1,6 @@
/* /*
DingusPPC - The Experimental PowerPC Macintosh emulator DingusPPC - The Experimental PowerPC Macintosh emulator
Copyright (C) 2018-22 divingkatae and maximum Copyright (C) 2018-23 divingkatae and maximum
(theweirdo) spatium (theweirdo) spatium
(Contact divingkatae#1017 or powermax#2286 on Discord for more info) (Contact divingkatae#1017 or powermax#2286 on Discord for more info)
@ -25,13 +25,17 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
- Chaos ASIC that provides data bus buffering between the video subsystem - Chaos ASIC that provides data bus buffering between the video subsystem
and the processor bus and the processor bus
- Control ASIC that provides addressing and control for the video subsystem - Control ASIC that provides addressing and control for the video subsystem
- RaDACal RAMDAC ASIC for generating video stream to the monitor - RaDACal RAMDAC ASIC for generating RGB video stream to the monitor
- Athens clock generator for generating pixel clock - Athens clock generator for generating pixel clock
Some TNT boards can generate composite video output and thus include
two additional components:
- Sixty6 ASIC that converts RGB pixels stored in the VRAM to YUV color space
- SAA7187 encoder that converts pixels from Sixty6 to composite video signal
Kudos to joevt#3510 for his precious technical help and HW hacking. Kudos to joevt#3510 for his precious technical help and HW hacking.
*/ */
#include <debugger/backtrace.h>
#include <devices/common/i2c/athens.h> #include <devices/common/i2c/athens.h>
#include <devices/common/i2c/i2c.h> #include <devices/common/i2c/i2c.h>
#include <devices/deviceregistry.h> #include <devices/deviceregistry.h>
@ -59,6 +63,9 @@ ControlVideo::ControlVideo()
// get VRAM size in MBs and convert it to bytes // get VRAM size in MBs and convert it to bytes
this->vram_size = GET_INT_PROP("gfxmem_size") << 20; this->vram_size = GET_INT_PROP("gfxmem_size") << 20;
// calculate number of VRAM banks from VRAM size
this->num_banks = this->vram_size >> 21; // 2 MB => 1 bank, 4 MB >> 2 banks
// allocate VRAM // allocate VRAM
this->vram_ptr = std::unique_ptr<uint8_t[]> (new uint8_t[this->vram_size]); this->vram_ptr = std::unique_ptr<uint8_t[]> (new uint8_t[this->vram_size]);
@ -92,8 +99,7 @@ ControlVideo::ControlVideo()
this->display_id = std::unique_ptr<DisplayID> (new DisplayID()); this->display_id = std::unique_ptr<DisplayID> (new DisplayID());
} }
void ControlVideo::notify_bar_change(int bar_num) void ControlVideo::notify_bar_change(int bar_num) {
{
switch (bar_num) { switch (bar_num) {
case 0: case 0:
this->io_base = this->bars[bar_num] & ~3; this->io_base = this->bars[bar_num] & ~3;
@ -118,6 +124,26 @@ void ControlVideo::notify_bar_change(int bar_num)
} }
} }
int ControlVideo::device_postinit() {
this->int_ctrl = dynamic_cast<InterruptCtrl*>(
gMachineObj->get_comp_by_type(HWCompType::INT_CTRL));
this->irq_id = 1UL << 26; // FIXME: hardcoded IRQ ID
this->vbl_cb = [this](uint8_t irq_line_state) {
if (irq_line_state != !!(this->int_status & VBL_IRQ_STAT)) {
if (irq_line_state)
this->int_status |= VBL_IRQ_STAT;
else
this->int_status &= ~VBL_IRQ_STAT;
if (this->int_enable & VBL_IRQ_EN)
this->int_ctrl->ack_int(this->irq_id, irq_line_state);
}
};
return 0;
}
static const char * get_name_controlreg(int offset) { static const char * get_name_controlreg(int offset) {
switch (offset >> 4) { switch (offset >> 4) {
case ControlRegs::CUR_LINE : return "CUR_LINE"; case ControlRegs::CUR_LINE : return "CUR_LINE";
@ -128,7 +154,7 @@ static const char * get_name_controlreg(int offset) {
case ControlRegs::VBPEQ : return "VBPEQ"; case ControlRegs::VBPEQ : return "VBPEQ";
case ControlRegs::VSYNC : return "VSYNC"; case ControlRegs::VSYNC : return "VSYNC";
case ControlRegs::VHLINE : return "VHLINE"; case ControlRegs::VHLINE : return "VHLINE";
case ControlRegs::PIPED : return "PIPED"; case ControlRegs::PIPE_DELAY : return "PIPE_DELAY";
case ControlRegs::HPIX : return "HPIX"; case ControlRegs::HPIX : return "HPIX";
case ControlRegs::HFP : return "HFP"; case ControlRegs::HFP : return "HFP";
case ControlRegs::HAL : return "HAL"; case ControlRegs::HAL : return "HAL";
@ -138,11 +164,11 @@ static const char * get_name_controlreg(int offset) {
case ControlRegs::HLFLN : return "HLFLN"; case ControlRegs::HLFLN : return "HLFLN";
case ControlRegs::HSERR : return "HSERR"; case ControlRegs::HSERR : return "HSERR";
case ControlRegs::CNTTST : return "CNTTST"; case ControlRegs::CNTTST : return "CNTTST";
case ControlRegs::TEST : return "TEST"; case ControlRegs::SWATCH_CTRL : return "SWATCH_CTRL";
case ControlRegs::GBASE : return "GBASE"; case ControlRegs::GBASE : return "GBASE";
case ControlRegs::ROW_WORDS : return "ROW_WORDS"; case ControlRegs::ROW_WORDS : return "ROW_WORDS";
case ControlRegs::MON_SENSE : return "MON_SENSE"; case ControlRegs::MON_SENSE : return "MON_SENSE";
case ControlRegs::ENABLE : return "ENABLE"; case ControlRegs::MISC_ENABLES : return "MISC_ENABLES";
case ControlRegs::GSC_DIVIDE : return "GSC_DIVIDE"; case ControlRegs::GSC_DIVIDE : return "GSC_DIVIDE";
case ControlRegs::REFRESH_COUNT : return "REFRESH_COUNT"; case ControlRegs::REFRESH_COUNT : return "REFRESH_COUNT";
case ControlRegs::INT_ENABLE : return "INT_ENABLE"; case ControlRegs::INT_ENABLE : return "INT_ENABLE";
@ -155,10 +181,19 @@ uint32_t ControlVideo::read(uint32_t rgn_start, uint32_t offset, int size)
{ {
if (rgn_start == this->vram_base) { if (rgn_start == this->vram_base) {
if (offset >= 0x800000) { if (offset >= 0x800000) {
return read_mem(&this->vram_ptr[offset - 0x800000], size); // HACK: writing to VRAM in 128bit mode with only the standard
// bank populated seems to replicate the first 64bit portion of data
// in the second 64bit portion. This "feature" is used by
// the Mac OS driver to detect how much physical VRAM is installed.
// I handle this case here because reads from VRAM seem to happen
// far less frequently than writes.
if ((this->enables & VRAM_WIDE_MODE) && this->num_banks == 1)
offset &= ~8UL;
return read_mem(&this->vram_ptr[offset & 0x3FFFFF], size);
} }
LOG_F(INFO, "Control: little-endian access to VRAM not supported yet"); LOG_F(ERROR, "%s: read from unmapped aperture address 0x%X", this->name.c_str(),
this->vram_base + offset);
return 0; return 0;
} }
@ -168,7 +203,7 @@ uint32_t ControlVideo::read(uint32_t rgn_start, uint32_t offset, int size)
switch (offset >> 4) { switch (offset >> 4) {
case ControlRegs::CUR_LINE: case ControlRegs::CUR_LINE:
value = 0; // current active video line should relate this to refresh rate value = 0; // current active video line should relate this to refresh rate
LOG_F(ERROR, "Control: read CUR_LINE %03x.%c", offset, SIZE_ARG(size)); LOG_F(ERROR, "Control: read CUR_LINE %03x", offset);
break; break;
case ControlRegs::VFPEQ: case ControlRegs::VFPEQ:
case ControlRegs::VFP: case ControlRegs::VFP:
@ -177,7 +212,7 @@ uint32_t ControlVideo::read(uint32_t rgn_start, uint32_t offset, int size)
case ControlRegs::VBPEQ: case ControlRegs::VBPEQ:
case ControlRegs::VSYNC: case ControlRegs::VSYNC:
case ControlRegs::VHLINE: case ControlRegs::VHLINE:
case ControlRegs::PIPED: case ControlRegs::PIPE_DELAY:
case ControlRegs::HPIX: case ControlRegs::HPIX:
case ControlRegs::HFP: case ControlRegs::HFP:
case ControlRegs::HAL: case ControlRegs::HAL:
@ -187,71 +222,46 @@ uint32_t ControlVideo::read(uint32_t rgn_start, uint32_t offset, int size)
case ControlRegs::HLFLN: case ControlRegs::HLFLN:
case ControlRegs::HSERR: case ControlRegs::HSERR:
value = this->swatch_params[(offset >> 4) - ControlRegs::VFPEQ]; value = this->swatch_params[(offset >> 4) - ControlRegs::VFPEQ];
LOG_F(CONTROL, "Control: read %s %03x.%c = %0*x", get_name_controlreg(offset), offset, SIZE_ARG(size), size * 2, value);
break; break;
case ControlRegs::CNTTST: case ControlRegs::CNTTST:
value = 0; value = 0;
LOG_F(ERROR, "Control: read CNTTST %03x.%c = %0*x", offset, SIZE_ARG(size), size * 2, value);
break; break;
case ControlRegs::TEST: case ControlRegs::SWATCH_CTRL:
value = this->test; value = this->swatch_ctrl;
LOG_F(CONTROL, "Control: read TEST %03x.%c = %0*x", offset, SIZE_ARG(size), size * 2, value);
break; break;
case ControlRegs::GBASE: case ControlRegs::GBASE:
value = this->fb_base; value = this->fb_base;
LOG_F(CONTROL, "Control: read GBASE %03x.%c = %0*x", offset, SIZE_ARG(size), size * 2, value);
break; break;
case ControlRegs::ROW_WORDS: case ControlRegs::ROW_WORDS:
value = this->row_words; value = this->row_words;
LOG_F(CONTROL, "Control: read ROW_WORDS %03x.%c = %0*x", offset, SIZE_ARG(size), size * 2, value);
break; break;
case ControlRegs::MON_SENSE: case ControlRegs::MON_SENSE:
value = this->cur_mon_id << 6; value = this->cur_mon_id << 6;
LOG_F(CONTROL, "Control: read MON_SENSE %03x.%c = %0*x", offset, SIZE_ARG(size), size * 2, value);
break; break;
case ControlRegs::ENABLE: case ControlRegs::MISC_ENABLES:
value = this->flags; value = this->enables;
LOG_F(CONTROL, "Control: read ENABLE %03x.%c", offset, SIZE_ARG(size));
break; break;
case ControlRegs::GSC_DIVIDE: case ControlRegs::GSC_DIVIDE:
value = this->clock_divider; value = this->clock_divider;
LOG_F(CONTROL, "Control: read GSC_DIVIDE %03x.%c = %0*x", offset, SIZE_ARG(size), size * 2, value);
break; break;
case ControlRegs::REFRESH_COUNT: case ControlRegs::REFRESH_COUNT:
value = 0; value = 0;
LOG_F(ERROR, "Control: read CNTTST %03x.%c = %0*x", offset, SIZE_ARG(size), size * 2, value);
break; break;
case ControlRegs::INT_STATUS: case ControlRegs::INT_STATUS:
value = this->int_status; value = this->int_status;
if (value != this->last_int_status) {
LOG_F(CONTROL, "Control: read (previous %d times) INT_STATUS %03x.%c = %0*x", last_int_status_read_count, offset, SIZE_ARG(size), size * 2, value);
this->last_int_status = value;
this->last_int_status_read_count = 0;
}
else {
this->last_int_status_read_count++;
}
break; break;
case ControlRegs::INT_ENABLE: case ControlRegs::INT_ENABLE:
value = this->int_enable; value = this->int_enable;
LOG_F(CONTROL, "Control: read INT_ENABLE %03x.%c = %0*x", offset, SIZE_ARG(size), size * 2, value);
break; break;
default: default:
LOG_F(ERROR, "Control: read %03x.%c", offset, SIZE_ARG(size)); LOG_F(ERROR, "Control: read %03x", offset);
value = 0; value = 0;
} }
AccessDetails details; if (offset & 3)
details.size = size; LOG_F(WARNING, "Control: unaligned read from register 0x%X", offset >> 4);
details.offset = offset & 3;
uint32_t result = pci_conv_rd_data(value, value, details);
if ((offset & 3) || (size != 4)) {
LOG_F(WARNING, "Control: read %03x.%c = %08x -> %0*x", offset, SIZE_ARG(size), value, size * 2, result);
//dump_backtrace();
}
return result; return BYTESWAP_SIZED(value, size);;
} }
return 0; return 0;
@ -261,9 +271,10 @@ void ControlVideo::write(uint32_t rgn_start, uint32_t offset, uint32_t value, in
{ {
if (rgn_start == this->vram_base) { if (rgn_start == this->vram_base) {
if (offset >= 0x800000) { if (offset >= 0x800000) {
write_mem(&this->vram_ptr[offset - 0x800000], value, size); write_mem(&this->vram_ptr[offset & 0x3FFFFF], value, size);
} else { } else {
LOG_F(INFO, "Control: little-endian access to VRAM not supported yet"); LOG_F(ERROR, "%s: write to unmapped aperture address 0x%X", this->name.c_str(),
this->vram_base + offset);
} }
return; return;
} }
@ -272,25 +283,11 @@ void ControlVideo::write(uint32_t rgn_start, uint32_t offset, uint32_t value, in
value = BYTESWAP_32(value); value = BYTESWAP_32(value);
switch (offset >> 4) { switch (offset >> 4) {
case ControlRegs::PIPED: case ControlRegs::PIPE_DELAY:
this->swatch_params[(offset >> 4) - ControlRegs::VFPEQ] = value & 0x3ff; this->swatch_params[(offset >> 4) - ControlRegs::VFPEQ] = value & 0x3FF;
if (value & ~0x3ff)
LOG_F(ERROR, "Control: write PIPED %03x.%c = %0*x", offset, SIZE_ARG(size), size * 2, value);
else
LOG_F(CONTROL, "Control: write PIPED %03x.%c = %0*x", offset, SIZE_ARG(size), size * 2, value);
if (this->display_enabled) {
this->enable_display();
}
break; break;
case ControlRegs::HEQ: case ControlRegs::HEQ:
this->swatch_params[(offset >> 4) - ControlRegs::VFPEQ] = value & 0xff; this->swatch_params[(offset >> 4) - ControlRegs::VFPEQ] = value & 0xFFU;
if (value & ~0xff)
LOG_F(ERROR, "Control: write HEQ %03x.%c = %0*x", offset, SIZE_ARG(size), size * 2, value);
else
LOG_F(CONTROL, "Control: write HEQ %03x.%c = %0*x", offset, SIZE_ARG(size), size * 2, value);
if (this->display_enabled) {
this->enable_display();
}
break; break;
case ControlRegs::VFPEQ: case ControlRegs::VFPEQ:
case ControlRegs::VFP: case ControlRegs::VFP:
@ -306,110 +303,72 @@ void ControlVideo::write(uint32_t rgn_start, uint32_t offset, uint32_t value, in
case ControlRegs::HSP: case ControlRegs::HSP:
case ControlRegs::HLFLN: case ControlRegs::HLFLN:
case ControlRegs::HSERR: case ControlRegs::HSERR:
this->swatch_params[(offset >> 4) - ControlRegs::VFPEQ] = value & 0xfff; this->swatch_params[(offset >> 4) - ControlRegs::VFPEQ] = value & 0xFFF;
if (value & ~0xfff)
LOG_F(ERROR, "Control: write %s %03x.%c = %0*x", get_name_controlreg(offset), offset, SIZE_ARG(size), size * 2, value);
else
LOG_F(CONTROL, "Control: write %s %03x.%c = %0*x", get_name_controlreg(offset), offset, SIZE_ARG(size), size * 2, value);
if (this->display_enabled) {
this->enable_display();
}
break; break;
case ControlRegs::CNTTST: case ControlRegs::CNTTST:
if (value != 0) if (value)
LOG_F(ERROR, "Control: write CNTTST %03x.%c = %0*x", offset, SIZE_ARG(size), size * 2, value); LOG_F(WARNING, "%s: CNTTST set to 0x%X", this->name.c_str(), value);
else
LOG_F(CONTROL, "Control: write CNTTST %03x.%c = %0*x", offset, SIZE_ARG(size), size * 2, value);
break; break;
case ControlRegs::TEST: case ControlRegs::SWATCH_CTRL:
if (value & ~0x7ff) if ((this->swatch_ctrl ^ value) & DISABLE_TIMING) {
LOG_F(ERROR, "Control: write TEST %03x.%c = %0*x", offset, SIZE_ARG(size), size * 2, value); this->swatch_ctrl = value;
else this->strobe_counter = 0;
LOG_F(CONTROL, "Control: write TEST %03x.%c = %0*x", offset, SIZE_ARG(size), size * 2, value); } else if ((this->swatch_ctrl ^ value) & RESET_TIMING) {
value &= 0x7ff; this->swatch_ctrl = value;
if (this->test != value) { if (value & RESET_TIMING) { // count 0-to-1 transitions
if ((this->test & ~TEST_STROBE & 0x400) != (value & ~TEST_STROBE & 0x400)) { this->strobe_counter++;
this->test = value; if (this->strobe_counter >= 2) {
this->test_shift = 0; if (value & DISABLE_TIMING)
LOG_F(CONTROL, "New TEST value: 0x%08X", this->test); disable_display();
} else { else
LOG_F(CONTROL, "TEST strobe bit flipped, new value: 0x%08X", value); enable_display();
this->test = value;
if (++this->test_shift >= 3) {
LOG_F(CONTROL, "Received TEST reg value: 0x%08X", this->test & ~TEST_STROBE);
if ((this->test ^ this->prev_test) & 0x400) {
if ((this->display_enabled = !(this->test & 0x400))) {
this->enable_display();
} else {
this->disable_display();
}
this->prev_test = this->test;
}
} }
} }
} } else
this->swatch_ctrl = value;
break; break;
case ControlRegs::GBASE: case ControlRegs::GBASE:
if (value & ~0x3fffe0) this->fb_base = value & 0x3FFFE0;
LOG_F(ERROR, "Control: write GBASE %03x.%c = %0*x", offset, SIZE_ARG(size), size * 2, value);
else
LOG_F(CONTROL, "Control: write GBASE %03x.%c = %0*x", offset, SIZE_ARG(size), size * 2, value);
this->fb_base = value & 0x3fffe0;
if (this->display_enabled) {
this->enable_display();
}
break; break;
case ControlRegs::ROW_WORDS: case ControlRegs::ROW_WORDS:
if (value & ~0x7fe0) this->row_words = value & 0x7FE0;
LOG_F(ERROR, "Control: write ROW_WORDS %03x.%c = %0*x", offset, SIZE_ARG(size), size * 2, value); break;
else case ControlRegs::MON_SENSE: {
LOG_F(CONTROL, "Control: write ROW_WORDS %03x.%c = %0*x", offset, SIZE_ARG(size), size * 2, value); uint8_t dirs = ((value >> 3) & 7) ^ 7;
this->row_words = value & 0x7fe0; uint8_t levels = ((value & 7) & dirs) | (dirs ^ 7);
if (this->display_enabled) { this->cur_mon_id = this->display_id->read_monitor_sense(levels, dirs);
this->enable_display();
} }
break; break;
case ControlRegs::MON_SENSE: case ControlRegs::MISC_ENABLES:
if (value & ~0x1FF) if ((this->enables ^ value) & BLANK_DISABLE) {
LOG_F(ERROR, "Control: write MON_SENSE %03x.%c = %0*x", offset, SIZE_ARG(size), size * 2, value); if (value & BLANK_DISABLE)
else this->blank_on = false;
LOG_F(CONTROL, "Control: write MON_SENSE %03x.%c = %0*x", offset, SIZE_ARG(size), size * 2, value); else {
value = (value >> 3) & 7; this->blank_on = true;
this->cur_mon_id = this->display_id->read_monitor_sense(value & 7, value ^ 7); this->blank_display();
break; }
case ControlRegs::ENABLE: }
if (value & ~0xfff) this->enables = value;
LOG_F(ERROR, "Control: write ENABLE %03x.%c = %0*x", offset, SIZE_ARG(size), size * 2, value); if (this->enables & FB_ENDIAN_LITTLE)
else ABORT_F("%s: little-endian framebuffer is not implemented yet",
LOG_F(CONTROL, "Control: write ENABLE %03x.%c = %0*x", offset, SIZE_ARG(size), size * 2, value); this->name.c_str());
this->flags = value & -0xfff;
break; break;
case ControlRegs::GSC_DIVIDE: case ControlRegs::GSC_DIVIDE:
if (value & ~0x3)
LOG_F(ERROR, "Control: write GSC_DIVIDE %03x.%c = %0*x", offset, SIZE_ARG(size), size * 2, value);
else
LOG_F(CONTROL, "Control: write GSC_DIVIDE %03x.%c = %0*x", offset, SIZE_ARG(size), size * 2, value);
this->clock_divider = value & 3; this->clock_divider = value & 3;
if (this->display_enabled) {
this->enable_display();
}
break; break;
case ControlRegs::REFRESH_COUNT: case ControlRegs::REFRESH_COUNT:
if (value & ~0x3ff) LOG_F(9, "Control: VRAM refresh count set to %d", value);
LOG_F(ERROR, "Control: write REFRESH_COUNT %03x.%c = %0*x", offset, SIZE_ARG(size), size * 2, value);
else
LOG_F(CONTROL, "Control: write REFRESH_COUNT %03x.%c = %0*x", offset, SIZE_ARG(size), size * 2, value);
break; break;
case ControlRegs::INT_ENABLE: case ControlRegs::INT_ENABLE:
if (value & ~0xc) if ((this->int_enable ^ value) & VBL_IRQ_CLR) {
LOG_F(ERROR, "Control: write INT_ENABLE %03x.%c = %0*x", offset, SIZE_ARG(size), size * 2, value); // clear VBL IRQ on a 1-to-0 transition of INT_ENABLE[VBL_IRQ_CLR]
else { if (!(value & VBL_IRQ_CLR))
//LOG_F(CONTROL, "Control: write INT_ENABLE %03x.%c = %0*x", offset, SIZE_ARG(size), size * 2, value); this->vbl_cb(0);
} }
this->int_enable = value & 0xf; // alternates between 0x04 and 0x0c this->int_enable = value & 0x0F;
break; break;
default: default:
LOG_F(ERROR, "Control: write %03x.%c = %0*x", offset, SIZE_ARG(size), size * 2, value); LOG_F(ERROR, "Control: write %03x = %0*x", offset, size * 2, value);
} }
} }
} }
@ -554,23 +513,13 @@ void ControlVideo::draw_hw_cursor(uint8_t *dst_buf, int dst_pitch) {
uint16_t ControlVideo::iodev_read(uint32_t address) uint16_t ControlVideo::iodev_read(uint32_t address)
{ {
uint16_t result; uint16_t result;
switch (address) { switch (address) {
case RadacalRegs::MULTI: case RadacalRegs::MULTI:
switch (this->rad_addr) { switch (this->rad_addr) {
case RadacalRegs::MISC_CTRL: case RadacalRegs::MISC_CTRL:
result = this->rad_cr; result = this->rad_cr;
LOG_F(RADACAL, "RaDACal: read MISC_CTRL = 0x%02x", result);
break; break;
/*
case RadacalRegs::CLOCK_SELECT:
result = this->dac_clock_select;
LOG_F(RADACAL, "RaDACal: read CLOCK_SELECT = 0x%02x", result);
break;
case RadacalRegs::DAC_TYPE:
result = this->dac_type;
LOG_F(RADACAL, "RaDACal: read DAC_TYPE = 0x%02x", result);
break;
*/
default: default:
LOG_F(ERROR, "RaDACal: read MULTI 0x%02x", this->rad_addr); LOG_F(ERROR, "RaDACal: read MULTI 0x%02x", this->rad_addr);
result = 0; result = 0;
@ -587,42 +536,41 @@ uint16_t ControlVideo::iodev_read(uint32_t address)
return result; return result;
} }
void ControlVideo::iodev_write(uint32_t address, uint16_t value) void ControlVideo::iodev_write(uint32_t address, uint16_t value)
{ {
switch (address) { switch (address) {
case RadacalRegs::ADDRESS: case RadacalRegs::ADDRESS:
LOG_F(RADACAL, "RaDACal: write ADDRESS = 0x%02x", value);
this->rad_addr = value; this->rad_addr = value;
this->comp_index = 0; this->comp_index = 0;
break; break;
case RadacalRegs::CURSOR_DATA: case RadacalRegs::CURSOR_DATA:
LOG_F(RADACAL, "RaDACal: write CURSOR_DATA 0x%02x = 0x%02x", this->rad_addr, value);
this->cursor_data[(this->rad_addr++) % 24] = value; this->cursor_data[(this->rad_addr++) % 24] = value;
break; break;
case RadacalRegs::MULTI: case RadacalRegs::MULTI:
switch (this->rad_addr) { switch (this->rad_addr) {
case RadacalRegs::CURSOR_POS_HI: case RadacalRegs::CURSOR_POS_HI:
LOG_F(RADACAL, "RaDACal: write CURSOR_POS_HI = 0x%02x", value);
this->rad_cur_pos = (value << 8) | (this->rad_cur_pos & 0x00ff); this->rad_cur_pos = (value << 8) | (this->rad_cur_pos & 0x00ff);
break; break;
case RadacalRegs::CURSOR_POS_LO: case RadacalRegs::CURSOR_POS_LO:
LOG_F(RADACAL, "RaDACal: write CURSOR_POS_LO = 0x%02x", value);
this->rad_cur_pos = (this->rad_cur_pos & 0xff00) | (value & 0x00ff); this->rad_cur_pos = (this->rad_cur_pos & 0xff00) | (value & 0x00ff);
break; break;
case RadacalRegs::MISC_CTRL: case RadacalRegs::MISC_CTRL:
LOG_F(RADACAL, "RaDACal: write MISC_CTRL = 0x%02x", value);
this->rad_cr = value; this->rad_cr = value;
break; break;
case RadacalRegs::DBL_BUF_CTRL: case RadacalRegs::DBL_BUF_CTRL:
LOG_F(RADACAL, "RaDACal: write DBL_BUF_CTRL = 0x%02x", value);
this->rad_dbl_buf_cr = value; this->rad_dbl_buf_cr = value;
break; break;
case RadacalRegs::TEST_CTRL:
this->tst_cr = value;
if (this->tst_cr & 1)
LOG_F(WARNING, "RaDACal: DAC test enabled!");
break;
default: default:
LOG_F(ERROR, "RaDACal: write MULTI 0x%02x = 0x%02x", this->rad_addr, value); LOG_F(ERROR, "RaDACal: write MULTI 0x%02x = 0x%02x", this->rad_addr, value);
} }
break; break;
case RadacalRegs::CLUT_DATA: case RadacalRegs::CLUT_DATA:
LOG_F(RADACAL, "RaDACal: write CLUT_DATA 0x%02x = 0x%02x", this->rad_addr, value);
this->clut_color[this->comp_index++] = value; this->clut_color[this->comp_index++] = value;
if (this->comp_index >= 3) { if (this->comp_index >= 3) {
this->set_palette_color(this->rad_addr, clut_color[0], this->set_palette_color(this->rad_addr, clut_color[0],
@ -636,27 +584,6 @@ void ControlVideo::iodev_write(uint32_t address, uint16_t value)
} }
} }
int ControlVideo::device_postinit()
{
this->int_ctrl = dynamic_cast<InterruptCtrl*>(
gMachineObj->get_comp_by_type(HWCompType::INT_CTRL));
this->irq_id = this->int_ctrl->register_dev_int(IntSrc::CONTROL);
this->vbl_cb = [this](uint8_t irq_line_state) {
if (irq_line_state)
this->int_status |= 0xc;
else
this->int_status &= ~0xc;
if (this->crtc_on && (4 & this->int_enable)) {
//this->pci_interrupt(irq_line_state);
this->int_ctrl->ack_int(this->irq_id, irq_line_state);
}
};
return 0;
}
// ========================== Device registry stuff ========================== // ========================== Device registry stuff ==========================
static const PropMap Control_Properties = { static const PropMap Control_Properties = {

86
devices/video/control.h
View File

@ -1,6 +1,6 @@
/* /*
DingusPPC - The Experimental PowerPC Macintosh emulator DingusPPC - The Experimental PowerPC Macintosh emulator
Copyright (C) 2018-22 divingkatae and maximum Copyright (C) 2018-23 divingkatae and maximum
(theweirdo) spatium (theweirdo) spatium
(Contact divingkatae#1017 or powermax#2286 on Discord for more info) (Contact divingkatae#1017 or powermax#2286 on Discord for more info)
@ -46,37 +46,57 @@ namespace ControlRegs {
enum ControlRegs : int { enum ControlRegs : int {
// 512 bytes, repeats 8 times for 4K total. // 512 bytes, repeats 8 times for 4K total.
// A register every 16 bytes, little endian, 32 bits, repeats 4 times. // A register every 16 bytes, little endian, 32 bits, repeats 4 times.
CUR_LINE = 0x00, // (ro) ; current active video line CUR_LINE = 0x00, // current active video line (ro) 12 bits
VFPEQ = 0x01, // (rw) 12 bits ; VFPEQ = 0x01, // vertical front porch with EQ (rw) 12 bits
VFP = 0x02, // (rw) 12 bits ; VFP = 0x02, // vertical front porch (rw) 12 bits
VAL = 0x03, // (rw) 12 bits ; vertical active line VAL = 0x03, // vertical active line (rw) 12 bits
VBP = 0x04, // (rw) 12 bits ; VBP = 0x04, // vertical back porch (rw) 12 bits
VBPEQ = 0x05, // (rw) 12 bits ; vertical back porch with equalization VBPEQ = 0x05, // vertical back porch with EQ (rw) 12 bits
VSYNC = 0x06, // (rw) 12 bits ; VSYNC = 0x06, // vertical sync starting point (rw) 12 bits
VHLINE = 0x07, // (rw) 12 bits ; VHLINE = 0x07, // vertical half line (rw) 12 bits
PIPED = 0x08, // (rw) 10 bits ; PIPE_DELAY = 0x08, // controls pixel pipe delay (rw) 12 bits
HPIX = 0x09, // (rw) 12 bits ; HPIX = 0x09, // horizontal pixel count (rw) 12 bits
HFP = 0x0A, // (rw) 12 bits ; HFP = 0x0A, // horizontal front porch (rw) 12 bits
HAL = 0x0B, // (rw) 12 bits ; horizontal active line HAL = 0x0B, // horizontal active line (rw) 12 bits
HBWAY = 0x0C, // (rw) 12 bits ; HBWAY = 0x0C, // horizontal breezeway (rw) 12 bits
HSP = 0x0D, // (rw) 12 bits ; HSP = 0x0D, // horizontal sync starting point (rw) 12 bits
HEQ = 0x0E, // (rw) 8 bits ; HEQ = 0x0E, // horizontal equalization (rw) 12 bits
HLFLN = 0x0F, // (rw) 12 bits ; HLFLN = 0x0F, // horizontal half line (rw) 12 bits
HSERR = 0x10, // (rw) 12 bits ; HSERR = 0x10, // horizontal serration (rw) 12 bits
CNTTST = 0x11, // (rw) 12 bits ; Swatch counter test CNTTST = 0x11, // Swatch counter test (rw) 12 bits
TEST = 0x12, // (rw) 11 bits ; ctrl SWATCH_CTRL = 0x12, // Swatch timing generator control (rw) 11 bits
GBASE = 0x13, // (rw) 22 bits, 32 byte aligned ; Graphics base address GBASE = 0x13, // graphics base address (rw) 22 bits, 32 byte aligned
ROW_WORDS = 0x14, // (rw) 15 bits, 32 byte aligned ; ROW_WORDS = 0x14, // framebuffer pitch (rw) 15 bits, 32 byte aligned
MON_SENSE = 0x15, // (rw) 9 bits ; Monitor sense control & status MON_SENSE = 0x15, // Monitor sense control & status (rw) 9 bits
ENABLE = 0x16, // (rw) 12 bits ; bit 7 does something MISC_ENABLES = 0x16, // controls chip's features (rw) 12 bits
GSC_DIVIDE = 0x17, // (rw) 2 bits ; graphics clock divide count GSC_DIVIDE = 0x17, // graphics clock divide count (rw) 2 bits
REFRESH_COUNT = 0x18, // (rw) 10 bits ; REFRESH_COUNT = 0x18, // VRAM refresh counter (rw) 10 bits
INT_ENABLE = 0x19, // (rw) 4 bits ; INT_ENABLE = 0x19, // interrupt enable bits (rw) 4 bits
INT_STATUS = 0x1A, // (ro) ? bits ; INT_STATUS = 0x1A, // interrupt status bits (ro) 3 bits
}; };
}; // namespace ControlRegs }; // namespace ControlRegs
// Bit definitions for the video timing generator (Swatch) control register.
enum {
RESET_TIMING = 1 << 3, // toggle this bit to change timing parameters
DISABLE_TIMING = 1 << 10, // 1 - disable video timing, 0 - enable it
};
// Bit definitions for MISC_ENABLES register.
enum {
FB_ENDIAN_LITTLE = 1 << 1, // framebuffer endianness: 0 - big, 1 - little
VRAM_WIDE_MODE = 1 << 6, // VRAM bus width: 1 - 128bit, 0 - 64bit
BLANK_DISABLE = 1 << 11, // 0 - enable blanking, 1 - disable it
};
// Bit definitions for INT_ENABLE & INT_STATUS registers.
enum {
VBL_IRQ_CLR = 1 << 3, // VBL interrupt clear bit (INT_ENABLE)
VBL_IRQ_EN = 1 << 2, // VBL interrupt enable bit (INT_ENABLE)
VBL_IRQ_STAT = 1 << 2, // VBL interrupt status bit (INT_STATUS)
};
namespace RadacalRegs { namespace RadacalRegs {
enum RadacalRegs : uint8_t { enum RadacalRegs : uint8_t {
@ -90,7 +110,7 @@ enum RadacalRegs : uint8_t {
CURSOR_POS_LO = 0x11, // cursor position, low-order byte CURSOR_POS_LO = 0x11, // cursor position, low-order byte
MISC_CTRL = 0x20, // miscellaneus control bits MISC_CTRL = 0x20, // miscellaneus control bits
DBL_BUF_CTRL = 0x21, // double buffer control bits DBL_BUF_CTRL = 0x21, // double buffer control bits
// = 0x22, // ? = 0 TEST_CTRL = 0x22, // enable/disable DAC tests
}; };
}; // namespace RadacalRegs }; // namespace RadacalRegs
@ -135,15 +155,16 @@ private:
uint32_t vram_base = 0; uint32_t vram_base = 0;
uint32_t regs_base = 0; uint32_t regs_base = 0;
uint32_t prev_test = 0x433; uint32_t prev_test = 0x433;
uint32_t test = 0; uint32_t swatch_ctrl = 0;
bool display_enabled = false; bool display_enabled = false;
uint32_t clock_divider = 0; uint32_t clock_divider = 0;
uint32_t row_words = 0; uint32_t row_words = 0;
uint32_t fb_base = 0; uint32_t fb_base = 0;
uint16_t swatch_params[16]; uint16_t swatch_params[16];
int test_shift = 0; int strobe_counter = 0;
uint8_t num_banks = 0;
uint8_t cur_mon_id = 0; uint8_t cur_mon_id = 0;
uint8_t flags = 0; uint8_t enables = 0;
uint8_t int_enable = 0; uint8_t int_enable = 0;
uint8_t int_status = 0; uint8_t int_status = 0;
uint8_t last_int_status = -1; uint8_t last_int_status = -1;
@ -153,6 +174,7 @@ private:
uint8_t rad_addr = 0; uint8_t rad_addr = 0;
uint8_t rad_cr = 0; uint8_t rad_cr = 0;
uint8_t rad_dbl_buf_cr = 0; uint8_t rad_dbl_buf_cr = 0;
uint8_t tst_cr = 0;
uint16_t rad_cur_pos = 0; uint16_t rad_cur_pos = 0;
uint8_t comp_index; uint8_t comp_index;
uint8_t clut_color[3]; uint8_t clut_color[3];