Macintosh-Tools/dingusppc
1
0
Fork 0
mirror of https://github.com/dingusdev/dingusppc.git synced 2024-05-28 17:41:40 +00:00
Code Issues Projects Releases Wiki Activity

scsihd: Rename hdd_img to disk_img.

Browse Source
This commit is contained in:
joevt 2023-10-31 02:49:23 -07:00 committed by dingusdev
parent 96b9b6a375
commit 569f782a60
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
devices/common/scsi/scsihd.cpp
View File

@ -42,10 +42,10 @@ ScsiHardDisk::ScsiHardDisk(std::string name, int my_id) : ScsiDevice(name, my_id
void ScsiHardDisk::insert_image(std::string filename) {
//We don't want to store everything in memory, but
//we want to keep the hard disk available.
if (!this->hdd_img.open(filename))
if (!this->disk_img.open(filename))
ABORT_F("%s: could not open image file %s", this->name.c_str(), filename.c_str());
this->img_size = this->hdd_img.size();
this->img_size = this->disk_img.size();
uint64_t tb = (this->img_size + HDD_SECTOR_SIZE - 1) / HDD_SECTOR_SIZE;
this->total_blocks = static_cast<int>(tb);
if (this->total_blocks < 0 || tb != this->total_blocks) {
@ -331,7 +331,7 @@ void ScsiHardDisk::read(uint32_t lba, uint16_t transfer_len, uint8_t cmd_len) {
transfer_size *= HDD_SECTOR_SIZE;
uint64_t device_offset = lba * HDD_SECTOR_SIZE;
this->hdd_img.read(img_buffer, device_offset, transfer_size);
this->disk_img.read(img_buffer, device_offset, transfer_size);
this->bytes_out = transfer_size;
@ -351,7 +351,7 @@ void ScsiHardDisk::write(uint32_t lba, uint16_t transfer_len, uint8_t cmd_len) {
this->incoming_size = transfer_size;
this->post_xfer_action = [this, device_offset]() {
this->hdd_img.write(this->img_buffer, device_offset, this->incoming_size);
this->disk_img.write(this->img_buffer, device_offset, this->incoming_size);
};
}

2
devices/common/scsi/scsihd.h
View File

@ -62,7 +62,7 @@ protected:
void read_buffer();
private:
ImgFile hdd_img;
ImgFile disk_img;
uint64_t img_size;
int total_blocks;
uint64_t file_offset = 0;