Macintosh-Tools/dingusppc
1
0
Fork 0
mirror of https://github.com/dingusdev/dingusppc.git synced 2024-06-25 23:29:33 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'tnt'

Browse Source
This commit is contained in:
Maxim Poliakovski 2022-06-18 18:47:31 +02:00
commit f9ec73cd05
7 changed files with 141 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
devices/ioctrl/grandcentral.cpp
View File

@ -22,6 +22,7 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
#include <cpu/ppc/ppcemu.h>
#include <devices/common/scsi/sc53c94.h>
#include <devices/ethernet/mace.h>
#include <devices/floppy/swim3.h>
#include <devices/ioctrl/macio.h>
#include <devices/serial/escc.h>
#include <endianswap.h>
@ -67,6 +68,9 @@ GrandCentral::GrandCentral() : PCIDevice("mac-io/grandcentral"), InterruptCtrl()
this->scsi_0 = std::unique_ptr<Sc53C94> (new Sc53C94());
gMachineObj->add_subdevice("Curio_SCSI0", this->scsi_0.get());
this->swim3 = std::unique_ptr<Swim3::Swim3Ctrl> (new Swim3::Swim3Ctrl());
gMachineObj->add_subdevice("SWIM3", this->swim3.get());
}
void GrandCentral::notify_bar_change(int bar_num)
@ -103,6 +107,8 @@ uint32_t GrandCentral::read(uint32_t reg_start, uint32_t offset, int size)
return this->escc->read((offset >> 4) & 0xF);
case 4: // AWACS
return this->awacs->snd_ctrl_read(offset & 0xFF, size);
case 5: // SWIM3
return this->swim3->read((offset >> 4) & 0xF);
case 6:
case 7: // VIA-CUDA
return this->viacuda->read((offset >> 9) & 0xF);
@ -163,6 +169,9 @@ void GrandCentral::write(uint32_t reg_start, uint32_t offset, uint32_t value, in
case 4: // AWACS
this->awacs->snd_ctrl_write(offset & 0xFF, value, size);
break;
case 5:
this->swim3->write((offset >> 4) & 0xF, value);
break;
case 6:
case 7: // VIA-CUDA
this->viacuda->write((offset >> 9) & 0xF, value);

9
devices/ioctrl/heathrow.cpp
View File

@ -76,7 +76,10 @@ HeathrowIC::HeathrowIC() : PCIDevice("mac-io/heathrow"), InterruptCtrl()
this->mesh = std::unique_ptr<MESHController> (new MESHController(HeathrowMESHID));
this->escc = std::unique_ptr<EsccController> (new EsccController());
// intialize floppy disk HW
this->swim3 = std::unique_ptr<Swim3::Swim3Ctrl> (new Swim3::Swim3Ctrl());
gMachineObj->add_subdevice("SWIM3", this->swim3.get());
}
void HeathrowIC::notify_bar_change(int bar_num)
@ -147,7 +150,7 @@ uint32_t HeathrowIC::read(uint32_t reg_start, uint32_t offset, int size) {
res = this->screamer->snd_ctrl_read(offset - 0x14000, size);
break;
case 0x15: // SWIM3
return this->swim3->read(offset & 0xF);
return this->swim3->read((offset >> 4 )& 0xF);
case 0x16:
case 0x17:
res = this->viacuda->read((offset - 0x16000) >> 9);
@ -190,8 +193,8 @@ void HeathrowIC::write(uint32_t reg_start, uint32_t offset, uint32_t value, int
case 0x14:
this->screamer->snd_ctrl_write(offset - 0x14000, value, size);
break;
case 0x15:
this->swim3->write(offset & 0xF, value);
case 0x15: // SWIM3
this->swim3->write((offset >> 4) & 0xF, value);
break;
case 0x16:
case 0x17:

13
devices/ioctrl/macio.h
View File

@ -113,12 +113,13 @@ private:
uint32_t nvram_addr_hi;
// device cells
std::unique_ptr<MaceController> mace;
std::unique_ptr<AwacsScreamer> awacs; // AWACS audio codec instance
std::unique_ptr<ViaCuda> viacuda; // VIA cell with Cuda MCU attached to it
std::unique_ptr<NVram> nvram; // NVRAM module
std::unique_ptr<EsccController> escc; // ESCC serial controller
std::unique_ptr<Sc53C94> scsi_0; // external SCSI
std::unique_ptr<MaceController> mace;
std::unique_ptr<AwacsScreamer> awacs; // AWACS audio codec instance
std::unique_ptr<ViaCuda> viacuda; // VIA cell with Cuda MCU attached to it
std::unique_ptr<NVram> nvram; // NVRAM module
std::unique_ptr<EsccController> escc; // ESCC serial controller
std::unique_ptr<Sc53C94> scsi_0; // external SCSI
std::unique_ptr<Swim3::Swim3Ctrl> swim3; // floppy disk controller
std::unique_ptr<DMAChannel> snd_out_dma;
};

69
devices/memctrl/platinum.cpp
View File

@ -19,12 +19,14 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
/** Platinum Memory Controller emulation. */
/** Platinum Memory/Display Controller emulation. */
#include "platinum.h"
#include <devices/memctrl/platinum.h>
#include <devices/video/displayid.h>
#include <loguru.hpp>
#include <cinttypes>
#include <memory>
using namespace Platinum;
@ -35,9 +37,17 @@ PlatinumCtrl::PlatinumCtrl() : MemCtrlBase()
// add MMIO region for the configuration and status registers
add_mmio_region(0xF8000000, 0x500, this);
// determine actual VRAM size (min. 1MB, max. 4MB)
this->vram_size = 1 << 20;
// insert video memory region into the main memory map
this->add_ram_region(0xF1000000UL, this->vram_size);
// initialize the CPUID register with the following CPU:
// PowerPC 601 @ 75 MHz, bus frequency: 37,5 MHz
this->cpu_id = (0x3001 << 16) | ClkSrc3 | (CpuSpeed3::CPU_75_BUS_38 << 8);
this->display_id = std::unique_ptr<DisplayID> (new DisplayID());
}
uint32_t PlatinumCtrl::read(uint32_t reg_start, uint32_t offset, int size)
@ -63,6 +73,11 @@ uint32_t PlatinumCtrl::read(uint32_t reg_start, uint32_t offset, int size)
return this->bank_base[(offset - PlatinumReg::BANK_0_BASE) >> 4];
case PlatinumReg::CACHE_CONFIG:
return 0; // report no L2 cache installed
case PlatinumReg::FB_BASE_ADDR:
return this->fb_addr;
case PlatinumReg::MON_ID_SENSE:
LOG_F(INFO, "Platinum: display sense read");
return (this->cur_mon_id ^ 7);
default:
LOG_F(WARNING, "Platinum: unknown register read at offset 0x%X", offset);
}
@ -82,12 +97,6 @@ void PlatinumCtrl::write(uint32_t rgn_start, uint32_t offset, uint32_t value, in
case PlatinumReg::DRAM_REFRESH:
this->dram_refresh = value;
break;
case PlatinumReg::FB_CONFIG_2:
this->fb_config_2 = value;
break;
case PlatinumReg::VRAM_REFRESH:
this->vram_refresh = value;
break;
case PlatinumReg::BANK_0_BASE:
case PlatinumReg::BANK_1_BASE:
case PlatinumReg::BANK_2_BASE:
@ -98,6 +107,50 @@ void PlatinumCtrl::write(uint32_t rgn_start, uint32_t offset, uint32_t value, in
case PlatinumReg::BANK_7_BASE:
this->bank_base[(offset - PlatinumReg::BANK_0_BASE) >> 4] = value;
break;
case PlatinumReg::FB_BASE_ADDR:
this->fb_addr = value;
LOG_F(INFO, "Platinum: Framebuffer address set to 0x%X", value);
break;
case PlatinumReg::FB_CONFIG_1:
this->fb_config_1 = value;
break;
case PlatinumReg::FB_CONFIG_2:
this->fb_config_2 = value;
break;
case PlatinumReg::VMEM_PAGE_MODE:
this->vmem_fp_mode = value;
break;
case PlatinumReg::MON_ID_SENSE:
LOG_F(INFO, "Platinum: display sense written with 0x%X", value);
this->cur_mon_id = this->display_id->read_monitor_sense(value & 7, value ^ 7);
break;
case PlatinumReg::FB_RESET:
this->fb_reset = value;
break;
case PlatinumReg::VRAM_REFRESH:
this->vram_refresh = value;
break;
case PlatinumReg::SWATCH_CONFIG:
this->swatch_config = value;
break;
case PlatinumReg::SWATCH_INT_MASK:
this->swatch_int_mask = value;
break;
case PlatinumReg::SWATCH_HAL:
LOG_F(INFO, "Swatch HAL set to 0x%X", value);
break;
case PlatinumReg::SWATCH_HFP:
LOG_F(INFO, "Swatch HFP set to 0x%X", value);
break;
case PlatinumReg::SWATCH_HPIX:
LOG_F(INFO, "Swatch HPIX set to 0x%X", value);
break;
case PlatinumReg::SWATCH_VAL:
LOG_F(INFO, "Swatch VAL set to 0x%X", value);
break;
case PlatinumReg::SWATCH_VFP:
LOG_F(INFO, "Swatch VFP set to 0x%X", value);
break;
default:
LOG_F(WARNING, "Platinum: unknown register write at offset 0x%X", offset);
}

77
devices/memctrl/platinum.h
View File

@ -33,8 +33,10 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
#include <devices/common/hwcomponent.h>
#include <devices/common/mmiodevice.h>
#include <devices/memctrl/memctrlbase.h>
#include <devices/video/displayid.h>
#include <cinttypes>
#include <memory>
namespace Platinum {
@ -101,25 +103,37 @@ enum CpuSpeed3 {
/** Configuration and status register offsets. */
enum PlatinumReg : uint32_t {
CPU_ID = 0x000,
ASIC_REVISION = 0x010,
ROM_TIMING = 0x020,
CACHE_CONFIG = 0x030,
DRAM_TIMING = 0x040,
DRAM_REFRESH = 0x050,
BANK_0_BASE = 0x060,
BANK_1_BASE = 0x070,
BANK_2_BASE = 0x080,
BANK_3_BASE = 0x090,
BANK_4_BASE = 0x0A0,
BANK_5_BASE = 0x0B0,
BANK_6_BASE = 0x0C0,
BANK_7_BASE = 0x0D0,
GP_SW_SCRATCH = 0x0E0,
PCI_ADDR_MASK = 0x0F0,
FB_CONFIG_1 = 0x140,
FB_CONFIG_2 = 0x150,
VRAM_REFRESH = 0x1B0,
CPU_ID = 0x000,
ASIC_REVISION = 0x010,
ROM_TIMING = 0x020,
CACHE_CONFIG = 0x030,
DRAM_TIMING = 0x040,
DRAM_REFRESH = 0x050,
BANK_0_BASE = 0x060,
BANK_1_BASE = 0x070,
BANK_2_BASE = 0x080,
BANK_3_BASE = 0x090,
BANK_4_BASE = 0x0A0,
BANK_5_BASE = 0x0B0,
BANK_6_BASE = 0x0C0,
BANK_7_BASE = 0x0D0,
GP_SW_SCRATCH = 0x0E0,
PCI_ADDR_MASK = 0x0F0,
FB_BASE_ADDR = 0x100,
FB_CONFIG_1 = 0x140,
FB_CONFIG_2 = 0x150,
VMEM_PAGE_MODE = 0x160,
MON_ID_SENSE = 0x170,
FB_RESET = 0x180,
VRAM_REFRESH = 0x1B0,
SWATCH_CONFIG = 0x200,
SWATCH_INT_MASK = 0x210,
SWATCH_HAL = 0x300,
SWATCH_HFP = 0x310,
SWATCH_HPIX = 0x320,
SWATCH_VAL = 0x370,
SWATCH_VFP = 0x380,
IRIDIUM_CONFIG = 0x4A0,
};
enum {
@ -132,6 +146,13 @@ enum {
DRAM_CAP_128MB = (1 << 27),
};
// FB_RESET register bits.
enum {
VRAM_SM_RESET = (1 << 0), // VRAM state machine reset
VREFRESH_SM_RESET = (1 << 1), // Video refresh state machine reset
SWATCH_RESET = (1 << 2), // Swatch reset
};
}; // namespace Platinum
class PlatinumCtrl : public MemCtrlBase, public MMIODevice {
@ -158,10 +179,24 @@ private:
uint32_t rom_timing = 0;
uint32_t dram_timing = 0xEFF;
uint32_t dram_refresh = 0x1F4;
uint32_t fb_config_2 = 0x1FFF;
uint32_t vram_refresh = 0x1F4;
uint32_t bank_base[8];
uint32_t bank_size[8] = { 0 };
// display controller state
uint32_t fb_addr = 0xF1000000;
uint32_t fb_config_1 = 0x1F00;
uint32_t fb_config_2 = 0x1FFF;
uint32_t fb_reset = 7;
uint32_t vram_refresh = 0x1F4;
uint32_t vram_size = 0;
uint8_t vmem_fp_mode = 0;
uint8_t cur_mon_id = 0;
// video timing generator (Swatch) state
uint32_t swatch_config = 0xFFD;
uint32_t swatch_int_mask = 0;
std::unique_ptr<DisplayID> display_id;
};
#endif // PLATINUM_MEMCTRL_H

2
machines/machinefactory.cpp
View File

@ -83,7 +83,7 @@ static const PropMap CatalystSettings = {
{"gfxmem_size",
new IntProperty( 1, vector<uint32_t>({1, 2, 4}))},
{"mon_id",
new StrProperty("")},
new StrProperty("HiRes12-14in")},
{"fdd_img",
new StrProperty("")},
{"serial_backend", new StrProperty("null", CharIoBackends)},

2
machines/machinegossamer.cpp
View File

@ -72,7 +72,7 @@ int create_gossamer(std::string& id) {
MPC106* grackle_obj = dynamic_cast<MPC106*>(gMachineObj->get_comp_by_name("Grackle"));
/* add the machine ID register */
gMachineObj->add_component("MachineID", new GossamerID(0x3d8c));
gMachineObj->add_component("MachineID", new GossamerID(0xBF3D));
grackle_obj->add_mmio_region(
0xFF000004, 4096, dynamic_cast<MMIODevice*>(gMachineObj->get_comp_by_name("MachineID")));