Macintosh-Tools/dingusppc
1
0
Fork 0
mirror of https://github.com/dingusdev/dingusppc.git synced 2025-02-03 00:29:48 +00:00
Code Issues Projects Releases Wiki Activity

grandcentral: connect external SCSI HW.

Browse Source
This commit is contained in:
Maxim Poliakovski 2024-02-12 02:00:08 +01:00
parent b3e3b73159
commit a0e56aa4cf
2 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
devices/ioctrl/grandcentral.cpp
View File

@ -77,8 +77,11 @@ GrandCentral::GrandCentral() : PCIDevice("mac-io/grandcentral"), InterruptCtrl()
this->mesh->set_dma_channel(this->mesh_dma.get()); this->mesh->set_dma_channel(this->mesh_dma.get());
} }
// connect SCSI HW // connect external SCSI controller (Curio) to its DMA channel
this->scsi_0 = dynamic_cast<Sc53C94*>(gMachineObj->get_comp_by_name("Sc53C94")); this->ext_scsi = dynamic_cast<Sc53C94*>(gMachineObj->get_comp_by_name("Sc53C94"));
this->ext_scsi_dma = std::unique_ptr<DMAChannel> (new DMAChannel());
this->ext_scsi_dma->register_dma_int(this, this->register_dma_int(IntSrc::DMA_SCSI_CURIO));
this->ext_scsi->set_dma_channel(this->ext_scsi_dma.get());
// connect Ethernet HW // connect Ethernet HW
this->mace = dynamic_cast<MaceController*>(gMachineObj->get_comp_by_name("Mace")); this->mace = dynamic_cast<MaceController*>(gMachineObj->get_comp_by_name("Mace"));
@ -112,7 +115,7 @@ uint32_t GrandCentral::read(uint32_t rgn_start, uint32_t offset, int size)
switch (subdev_num) { switch (subdev_num) {
case 0: // Curio SCSI case 0: // Curio SCSI
return this->scsi_0->read((offset >> 4) & 0xF); return this->ext_scsi->read((offset >> 4) & 0xF);
case 1: // MACE case 1: // MACE
return this->mace->read((offset >> 4) & 0x1F); return this->mace->read((offset >> 4) & 0x1F);
case 2: // ESCC compatible addressing case 2: // ESCC compatible addressing
@ -153,6 +156,8 @@ uint32_t GrandCentral::read(uint32_t rgn_start, uint32_t offset, int size)
unsigned subdev_num = (offset >> 8) & 0xF; unsigned subdev_num = (offset >> 8) & 0xF;
switch (subdev_num) { switch (subdev_num) {
case 0:
return this->ext_scsi_dma->reg_read(offset & 0xFF, size);
case 1: case 1:
return this->floppy_dma->reg_read(offset & 0xFF, size); return this->floppy_dma->reg_read(offset & 0xFF, size);
case 8: case 8:
@ -189,7 +194,7 @@ void GrandCentral::write(uint32_t rgn_start, uint32_t offset, uint32_t value, in
switch (subdev_num) { switch (subdev_num) {
case 0: // Curio SCSI case 0: // Curio SCSI
this->scsi_0->write((offset >> 4) & 0xF, value); this->ext_scsi->write((offset >> 4) & 0xF, value);
break; break;
case 1: // MACE registers case 1: // MACE registers
this->mace->write((offset >> 4) & 0x1F, value); this->mace->write((offset >> 4) & 0x1F, value);
@ -251,6 +256,9 @@ void GrandCentral::write(uint32_t rgn_start, uint32_t offset, uint32_t value, in
unsigned subdev_num = (offset >> 8) & 0xF; unsigned subdev_num = (offset >> 8) & 0xF;
switch (subdev_num) { switch (subdev_num) {
case 0:
this->ext_scsi_dma->reg_write(offset & 0xFF, value, size);
break;
case 1: case 1:
this->floppy_dma->reg_write(offset & 0xFF, value, size); this->floppy_dma->reg_write(offset & 0xFF, value, size);
break; break;

13
devices/ioctrl/macio.h
View File

@ -136,14 +136,15 @@ private:
// subdevice objects // subdevice objects
std::unique_ptr<AwacsScreamer> awacs; // AWACS audio codec instance std::unique_ptr<AwacsScreamer> awacs; // AWACS audio codec instance
NVram* nvram; // NVRAM module NVram* nvram; // NVRAM module
MaceController* mace; MaceController* mace;
ViaCuda* viacuda; // VIA cell with Cuda MCU attached to it ViaCuda* viacuda; // VIA cell with Cuda MCU attached to it
EsccController* escc; // ESCC serial controller EsccController* escc; // ESCC serial controller
MeshController* mesh; // internal SCSI (fast) MeshController* mesh; // internal SCSI (fast)
Sc53C94* scsi_0; // external SCSI (slow) Sc53C94* ext_scsi; // external SCSI (slow)
Swim3::Swim3Ctrl* swim3; // floppy disk controller Swim3::Swim3Ctrl* swim3; // floppy disk controller
std::unique_ptr<DMAChannel> ext_scsi_dma;
std::unique_ptr<DMAChannel> mesh_dma; std::unique_ptr<DMAChannel> mesh_dma;
std::unique_ptr<DMAChannel> snd_out_dma; std::unique_ptr<DMAChannel> snd_out_dma;
std::unique_ptr<DMAChannel> floppy_dma; std::unique_ptr<DMAChannel> floppy_dma;