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

IDE refinements

Browse Source
This commit is contained in:
dingusdev 2022-12-05 08:42:51 -07:00
parent 311538b81d
commit 58908621e6
10 changed files with 276 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devices/CMakeLists.txt
View File

@ -6,7 +6,7 @@ file(GLOB SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/common/*.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/common/adb/*.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/common/i2c/*.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/common/ide/*.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/common/ata/*.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/common/pci/*.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/common/scsi/*.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/ethernet/*.cpp"

37
devices/common/ata/ata_bus.cpp Normal file
View File

@ -0,0 +1,37 @@
/*
DingusPPC - The Experimental PowerPC Macintosh emulator
Copyright (C) 2018-22 divingkatae and maximum
(theweirdo) spatium
(Contact divingkatae#1017 or powermax#2286 on Discord for more info)
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
/** @file Heathrow hard drive controller */
#include <devices/deviceregistry.h>
#include <devices/common/ata/ata_bus.h>
#include <fstream>
#include <limits>
#include <stdio.h>
#include <loguru.hpp>
#define sector_size 512
using namespace std;
AtaBus::AtaBus() {
supports_types(HWCompType::IDE_BUS);
}

40
devices/common/ide/ide_hd.h → devices/common/ata/ata_bus.h
View File

@ -21,8 +21,8 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
/** @file ATA hard drive support */
#ifndef IDE_HD_H
#define IDE_HD_H
#ifndef IDEDEVICE_H
#define IDEDEVICE_H
#include <devices/common/hwcomponent.h>
#include <cinttypes>
@ -52,6 +52,7 @@ enum IDE_Reg : int {
TIME_CONFIG = 0x20
};
/** Status Register Bits */
enum IDE_Status : int {
ERR = 0x1,
IDX = 0x2,
@ -63,6 +64,18 @@ enum IDE_Status : int {
BSY = 0x80
};
/** Error Register Bits */
enum IDE_Error : int {
ANMF = 0x1,
TK0NF = 0x2,
ABRT = 0x4,
MCR = 0x8,
IDNF = 0x10,
MC = 0x20,
UNC = 0x40,
BBK = 0x80
};
/** Heath IDE commands. */
enum IDE_Cmd : int {
IDE_NOP = 0x00,
@ -79,26 +92,13 @@ enum IDE_Cmd : int {
WRITE_DMA = 0xCA,
};
class IdeHardDisk : public HWComponent {
class AtaBus : public HWComponent {
public:
IdeHardDisk();
~IdeHardDisk() = default;
static std::unique_ptr<HWComponent> create() {
return std::unique_ptr<IdeHardDisk>(new IdeHardDisk());
}
AtaBus();
~AtaBus() = default;
void insert_image(std::string filename);
uint32_t read(int reg);
void write(int reg, uint32_t value);
void perform_command(uint32_t command);
private:
std::fstream hdd_img;
uint64_t img_size;
uint32_t regs[33];
uint8_t buffer[SEC_SIZE];
void connect_msg();
void pass_msg();
};
#endif

44
devices/common/ide/ide_hd.cpp → devices/common/ata/ata_full.cpp
View File

@ -21,35 +21,40 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
/** @file Heathrow hard drive controller */
#include <devices/common/ata/ata_full.h>
#include <devices/deviceregistry.h>
#include <devices/common/ide/ide_hd.h>
#include <fstream>
#include <limits>
#include <stdio.h>
#include <loguru.hpp>
#include <stdio.h>
#define sector_size 512
using namespace std;
IdeHardDisk::IdeHardDisk() {
this->name = "IdeHardDisk";
AtaFullDevice::AtaFullDevice() {
supports_types(HWCompType::IDE_DEV);
regs[IDE_Reg::ERROR] = IDE_Error::ANMF;
regs[IDE_Reg::SEC_COUNT] = 0x1;
regs[IDE_Reg::SEC_NUM] = 0x1;
regs[IDE_Reg::STATUS] = IDE_Status::DRDY | IDE_Status::DSC;
regs[IDE_Reg::ALT_STATUS] = IDE_Status::DRDY | IDE_Status::DSC;
}
void IdeHardDisk::insert_image(std::string filename) {
this->hdd_img.open(filename, ios::out | ios::in | ios::binary);
void AtaFullDevice::insert_image(std::string filename) {
this->ide_img.open(filename, ios::out | ios::in | ios::binary);
// Taken from:
// https://stackoverflow.com/questions/22984956/tellg-function-give-wrong-size-of-file/22986486
hdd_img.ignore(std::numeric_limits<std::streamsize>::max());
img_size = this->hdd_img.gcount();
hdd_img.clear(); // Since ignore will have set eof.
hdd_img.seekg(0, std::ios_base::beg);
ide_img.ignore(std::numeric_limits<std::streamsize>::max());
img_size = this->ide_img.gcount();
ide_img.clear(); // Since ignore will have set eof.
ide_img.seekg(0, std::ios_base::beg);
}
uint32_t IdeHardDisk::read(int reg) {
switch (reg) {
uint32_t AtaFullDevice::read(int reg) {
switch (reg) {
case IDE_Reg::IDE_DATA:
LOG_F(0, "Retrieving DATA from IDE: %x", regs[IDE_Reg::IDE_DATA]);
return regs[IDE_Reg::IDE_DATA];
@ -75,15 +80,13 @@ uint32_t IdeHardDisk::read(int reg) {
LOG_F(WARNING, "Attempted to read unknown IDE register: %x", reg);
return 0x0;
}
}
void IdeHardDisk::write(int reg, uint32_t value) {
void AtaFullDevice::write(int reg, uint32_t value) {
switch (reg) {
case IDE_Reg::IDE_DATA:
regs[IDE_Reg::IDE_DATA] = value;
break;
break;
case IDE_Reg::FEATURES:
regs[IDE_Reg::FEATURES] = value;
break;
@ -118,7 +121,7 @@ void IdeHardDisk::write(int reg, uint32_t value) {
}
}
void IdeHardDisk::perform_command(uint32_t command) {
int AtaFullDevice::perform_command(uint32_t command) {
switch (command) {
case IDE_Cmd::READ_SECTOR:
LOG_F(WARNING, "Trying to read sector with: %x", command);
@ -129,10 +132,13 @@ void IdeHardDisk::perform_command(uint32_t command) {
default:
LOG_F(WARNING, "Attempted to execute IDE command: %x", command);
}
return 0;
}
static const DeviceDescription IDE_Descriptor = {
IdeHardDisk::create, {}, {}
static const DeviceDescription ATA_Full_Descriptor = {
AtaFullDevice::create, {}, {}
};
REGISTER_DEVICE(IdeHardDisk, IDE_Descriptor);
REGISTER_DEVICE(AtaFullDevice, ATA_Full_Descriptor);

55
devices/common/ata/ata_full.h Normal file
View File

@ -0,0 +1,55 @@
/*
DingusPPC - The Experimental PowerPC Macintosh emulator
Copyright (C) 2018-22 divingkatae and maximum
(theweirdo) spatium
(Contact divingkatae#1017 or powermax#2286 on Discord for more info)
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
/** @file Full ATA device */
#include <devices/common/ata/ata_bus.h>
#define SEC_SIZE 512
#ifndef ATA_FULL_H
#define ATA_FULL_H
class AtaFullDevice : public AtaBus {
public:
AtaFullDevice();
~AtaFullDevice() = default;
static std::unique_ptr<HWComponent> create() {
return std::unique_ptr<AtaFullDevice>(new AtaFullDevice());
}
void insert_image(std::string filename);
uint32_t read(int reg);
void write(int reg, uint32_t value);
int perform_command(uint32_t command);
void get_status();
private:
uint32_t regs[33] = {0x0};
uint8_t buffer[SEC_SIZE];
std::fstream ide_img;
uint64_t img_size;
};
#endif

64
devices/common/ata/ata_null.cpp Normal file
View File

@ -0,0 +1,64 @@
/*
DingusPPC - The Experimental PowerPC Macintosh emulator
Copyright (C) 2018-22 divingkatae and maximum
(theweirdo) spatium
(Contact divingkatae#1017 or powermax#2286 on Discord for more info)
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
/** @file Null ATA device */
#include <devices/common/ata/ata_null.h>
#include <devices/deviceregistry.h>
#include <cinttypes>
#include <fstream>
#include <loguru.hpp>
AtaNullDevice::AtaNullDevice() {
supports_types(HWCompType::IDE_DEV);
regs[IDE_Reg::STATUS] = IDE_Status::DRDY | IDE_Status::DSC;
regs[IDE_Reg::ALT_STATUS] = IDE_Status::DRDY | IDE_Status::DSC;
}
uint32_t AtaNullDevice::read(int reg) {
if (reg == IDE_Reg::ERROR) {
return IDE_Error::TK0NF;
}
else if (reg == IDE_Reg::STATUS) {
return IDE_Status::ERR;
}
LOG_F(WARNING, "Dummy read for IDE register 0x%x", reg);
return 0x0;
}
void AtaNullDevice::write(int reg, uint32_t value) {
if (reg == IDE_Reg::COMMAND) {
process_command(value);
}
LOG_F(WARNING, "Dummy write for IDE register 0x%x with value 0x%x", reg, value);
}
int AtaNullDevice::process_command(uint32_t cmd) {
LOG_F(ERROR, "Attempted to execute command %x", cmd);
return 0;
}
static const DeviceDescription ATA_Null_Descriptor = {
AtaNullDevice::create, {}, {}
};
REGISTER_DEVICE(AtaNullDevice, ATA_Null_Descriptor);

50
devices/common/ata/ata_null.h Normal file
View File

@ -0,0 +1,50 @@
/*
DingusPPC - The Experimental PowerPC Macintosh emulator
Copyright (C) 2018-22 divingkatae and maximum
(theweirdo) spatium
(Contact divingkatae#1017 or powermax#2286 on Discord for more info)
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
/** @file Null ATA device */
#include <devices/common/ata/ata_bus.h>
#define SEC_SIZE 512
#ifndef ATA_NULL_H
#define ATA_NULL_H
class AtaNullDevice : public AtaBus {
public:
AtaNullDevice();
~AtaNullDevice() = default;
static std::unique_ptr<HWComponent> create() {
return std::unique_ptr<AtaNullDevice>(new AtaNullDevice());
}
int process_command(uint32_t cmd);
uint32_t read(int reg);
void write(int reg, uint32_t value);
private:
uint32_t regs[33] = {0x0};
uint8_t buffer[SEC_SIZE];
};
#endif

24
devices/ioctrl/heathrow.cpp
View File

@ -24,7 +24,8 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
#include <devices/common/dbdma.h>
#include <devices/common/hwcomponent.h>
#include <devices/common/viacuda.h>
#include <devices/common/ide/ide_hd.h>
#include <devices/common/ata/ata_full.h>
#include <devices/common/ata/ata_null.h>
#include <devices/floppy/swim3.h>
#include <devices/ioctrl/macio.h>
#include <devices/serial/escc.h>
@ -80,7 +81,8 @@ HeathrowIC::HeathrowIC() : PCIDevice("mac-io/heathrow"), InterruptCtrl()
this->mesh = dynamic_cast<MESHController*>(gMachineObj->get_comp_by_name("Mesh"));
// connect IDE HW
this->ide_1 = dynamic_cast<IdeHardDisk*>(gMachineObj->get_comp_by_name("IdeHardDisk"));
this->ide_0 = dynamic_cast<AtaNullDevice*>(gMachineObj->get_comp_by_name("AtaNullDevice"));
this->ide_1 = dynamic_cast<AtaNullDevice*>(gMachineObj->get_comp_by_name("AtaNullDevice"));
//std::string hd_image_path = GET_STR_PROP("hdd_img");
//if (!hd_image_path.empty()) {
@ -170,9 +172,13 @@ uint32_t HeathrowIC::read(uint32_t rgn_start, uint32_t offset, int size) {
case 0x17:
res = this->viacuda->read((offset - 0x16000) >> 9);
break;
case 0x20: // IDE 0
LOG_F(0, "Read IDE 0 - offset=0x%X", offset);
res = this->ide_0->read((offset >> 4) & 0x1F);
break;
case 0x21: //IDE 1
LOG_F(0, "Read IDE offset=0x%X", offset);
res = this->ide_1->read((offset - 0x21000) >> 4);
LOG_F(0, "Read IDE 1 - offset=0x%X", offset);
res = this->ide_1->read((offset >> 4) & 0x1F);
break;
default:
if (sub_addr >= 0x60) {
@ -219,9 +225,13 @@ void HeathrowIC::write(uint32_t rgn_start, uint32_t offset, uint32_t value, int
case 0x17:
this->viacuda->write((offset - 0x16000) >> 9, value);
break;
case 0x20:
LOG_F(0, "Write IDE 0 - offset=0x%X", offset);
this->ide_0->write((offset >> 4) & 0x1F, value);
break;
case 0x21:
LOG_F(0, "Write IDE offset=0x%X", offset);
this->ide_1->write(((offset - 0x21000) >> 4), value);
LOG_F(0, "Write IDE 1 - offset=0x%X", offset);
this->ide_1->write((offset >> 4) & 0x1F, value);
break;
default:
if (sub_addr >= 0x60) {
@ -399,7 +409,7 @@ void HeathrowIC::clear_cpu_int()
}
static const vector<string> Heathrow_Subdevices = {
"NVRAM", "ViaCuda", "Mesh", "Escc", "Swim3", "IdeHardDisk"};
"NVRAM", "ViaCuda", "Mesh", "Escc", "Swim3", "AtaNullDevice"};
static const DeviceDescription Heathrow_Descriptor = {
HeathrowIC::create, Heathrow_Subdevices, {}

9
devices/ioctrl/macio.h
View File

@ -54,7 +54,8 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
#include <devices/common/dbdma.h>
#include <devices/common/mmiodevice.h>
#include <devices/common/nvram.h>
#include <devices/common/ide/ide_hd.h>
#include <devices/common/ata/ata_full.h>
#include <devices/common/ata/ata_null.h>
#include <devices/common/pci/pcidevice.h>
#include <devices/common/pci/pcihost.h>
#include <devices/common/scsi/mesh.h>
@ -138,7 +139,8 @@ private:
MaceController* mace;
ViaCuda* viacuda; // VIA cell with Cuda MCU attached to it
EsccController* escc; // ESCC serial controller
IdeHardDisk* ide_0; // Internal ATA
AtaNullDevice* ide_0; // Internal ATA
AtaNullDevice* ide_1; // Media Bay ATA
Sc53C94* scsi_0; // external SCSI
Swim3::Swim3Ctrl* swim3; // floppy disk controller
@ -231,7 +233,8 @@ private:
ViaCuda* viacuda; // VIA cell with Cuda MCU attached to it
MESHController* mesh; // MESH SCSI cell instance
EsccController* escc; // ESCC serial controller
IdeHardDisk* ide_1; // Internal ATA
AtaNullDevice* ide_0; // Internal ATA
AtaNullDevice* ide_1; // Media Bay ATA
Swim3::Swim3Ctrl* swim3; // floppy disk controller
std::unique_ptr<DMAChannel> snd_out_dma;

2
machines/machinegossamer.cpp
View File

@ -164,7 +164,7 @@ static const PropMap gossamer_settings = {
};
static vector<string> pmg3_devices = {
"Grackle", "Heathrow", "AtiRageGT", "IdeHardDisk"
"Grackle", "Heathrow", "AtiRageGT"
};
static const MachineDescription pmg3dt_descriptor = {