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

hammerhead: add configuration accessors.

Browse Source
This commit is contained in:
Maxim Poliakovski 2023-12-09 23:58:55 +01:00
parent 7cf3d9cd94
commit 858f699750
2 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
devices/memctrl/hammerhead.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)
@ -60,10 +60,10 @@ uint32_t HammerheadCtrl::read(uint32_t rgn_start, uint32_t offset, int size)
result = HH_CPU_ID_TNT; result = HH_CPU_ID_TNT;
break; break;
case HammerheadReg::MOTHERBOARD_ID: case HammerheadReg::MOTHERBOARD_ID:
result = MBID_VCI0_PRESENT << 5; result = (this->mb_id << 5) | (this->rom_type << 4);
break; break;
case HammerheadReg::CPU_SPEED: case HammerheadReg::CPU_SPEED:
result = BUS_SPEED_33_MHZ << 5; result = this->bus_speed << 5;
break; break;
case HammerheadReg::ARBITER_CONFIG: case HammerheadReg::ARBITER_CONFIG:
result = this->arb_config; result = this->arb_config;

24
devices/memctrl/hammerhead.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)
@ -41,7 +41,8 @@ namespace Hammerhead {
#define RISC_MACHINE 0x3 #define RISC_MACHINE 0x3
#define MACH_TYPE_TNT 0x1 #define MACH_TYPE_TNT 0x1
#define HH_CPU_ID_TNT ((RISC_MACHINE << 4) | (1 << 3) | MACH_TYPE_TNT) #define EXTENDED_ID 0x1 // examine some other registers to get full ID
#define HH_CPU_ID_TNT ((RISC_MACHINE << 4) | (EXTENDED_ID << 3) | MACH_TYPE_TNT)
// contants for the MBID field of the MOTHERBOARD_ID register // contants for the MBID field of the MOTHERBOARD_ID register
enum { enum {
@ -100,14 +101,29 @@ public:
uint32_t read(uint32_t rgn_start, uint32_t offset, int size); uint32_t read(uint32_t rgn_start, uint32_t offset, int size);
void write(uint32_t rgn_start, uint32_t offset, uint32_t value, int size); void write(uint32_t rgn_start, uint32_t offset, uint32_t value, int size);
void set_motherboard_id(const uint8_t val) {
this->mb_id = val & 7;
};
void set_rom_type(const uint8_t val) {
this->rom_type = val & 1;
};
void set_bus_speed(const uint8_t val) {
this->bus_speed = val & 7;
};
void insert_ram_dimm(int slot_num, uint32_t capacity); void insert_ram_dimm(int slot_num, uint32_t capacity);
void map_phys_ram(); void map_phys_ram();
private: private:
uint8_t mb_id = Hammerhead::MBID_VCI0_PRESENT;
uint8_t rom_type = 1; // 1 - burstable ROM installed
uint8_t bus_speed = Hammerhead::BUS_SPEED_40_MHZ;
uint8_t arb_config = 0; uint8_t arb_config = 0;
uint16_t bank_base[26]; uint16_t bank_base[26] = {};
uint32_t bank_size[26] = { 0 }; uint32_t bank_size[26] = {};
}; };
#endif // HAMMERHEAD_MEMCTRL_H #endif // HAMMERHEAD_MEMCTRL_H