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

scsihd: Add sector_size.

Browse Source 
Replace HDD_SECTOR_SIZE with class field sector_size.
This commit is contained in:
joevt
2024-03-09 23:49:34 -08:00
committed by dingusdev
parent ec01993d84
commit bfc703a556
2 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,11 +29,6 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
#include <machines/machineproperties.h> #include <machines/machineproperties.h>
#include <memaccess.h> #include <memaccess.h>
#include <fstream>
#include <cstring>
#define HDD_SECTOR_SIZE 512
using namespace std; using namespace std;
ScsiHardDisk::ScsiHardDisk(std::string name, int my_id) : ScsiDevice(name, my_id) { ScsiHardDisk::ScsiHardDisk(std::string name, int my_id) : ScsiDevice(name, my_id) {
@@ -46,7 +41,7 @@ void ScsiHardDisk::insert_image(std::string filename) {
ABORT_F("%s: could not open image file %s", this->name.c_str(), filename.c_str()); ABORT_F("%s: could not open image file %s", this->name.c_str(), filename.c_str());
this->img_size = this->disk_img.size(); this->img_size = this->disk_img.size();
uint64_t tb = (this->img_size + HDD_SECTOR_SIZE - 1) / HDD_SECTOR_SIZE; uint64_t tb = (this->img_size + this->sector_size - 1) / this->sector_size;
this->total_blocks = static_cast<int>(tb); this->total_blocks = static_cast<int>(tb);
if (this->total_blocks < 0 || tb != this->total_blocks) { if (this->total_blocks < 0 || tb != this->total_blocks) {
ABORT_F("ScsiHardDisk: file size is too large"); ABORT_F("ScsiHardDisk: file size is too large");
@@ -255,7 +250,7 @@ void ScsiHardDisk::mode_select_6(uint8_t param_len) {
this->incoming_size = param_len; this->incoming_size = param_len;
std::memset(&this->data_buf[0], 0xDD, HDD_SECTOR_SIZE); std::memset(&this->data_buf[0], 0xDD, this->sector_size);
this->post_xfer_action = [this]() { this->post_xfer_action = [this]() {
// TODO: parse the received mode parameter list here // TODO: parse the received mode parameter list here
@@ -280,10 +275,7 @@ void ScsiHardDisk::mode_sense_6() {
this->data_buf[ 5] = (this->total_blocks >> 16) & 0xFFU; this->data_buf[ 5] = (this->total_blocks >> 16) & 0xFFU;
this->data_buf[ 6] = (this->total_blocks >> 8) & 0xFFU; this->data_buf[ 6] = (this->total_blocks >> 8) & 0xFFU;
this->data_buf[ 7] = (this->total_blocks ) & 0xFFU; this->data_buf[ 7] = (this->total_blocks ) & 0xFFU;
this->data_buf[ 8] = 0; WRITE_DWORD_BE_A(&this->data_buf[8], this->sector_size);
this->data_buf[ 9] = 0; // sector size MSB
this->data_buf[10] = 2; // sector size
this->data_buf[11] = 0; // sector size LSB
this->data_buf[12] = page_code; this->data_buf[12] = page_code;
@@ -337,7 +329,7 @@ void ScsiHardDisk::read_capacity_10() {
} }
uint32_t last_lba = this->total_blocks - 1; uint32_t last_lba = this->total_blocks - 1;
uint32_t blk_len = HDD_SECTOR_SIZE; uint32_t blk_len = this->sector_size;
WRITE_DWORD_BE_A(&data_buf[0], last_lba); WRITE_DWORD_BE_A(&data_buf[0], last_lba);
WRITE_DWORD_BE_A(&data_buf[4], blk_len); WRITE_DWORD_BE_A(&data_buf[4], blk_len);
@@ -368,8 +360,8 @@ void ScsiHardDisk::read(uint32_t lba, uint16_t transfer_len, uint8_t cmd_len) {
transfer_size = 256; transfer_size = 256;
} }
transfer_size *= HDD_SECTOR_SIZE; transfer_size *= this->sector_size;
uint64_t device_offset = lba * HDD_SECTOR_SIZE; uint64_t device_offset = lba * this->sector_size;
this->disk_img.read(data_buf, device_offset, transfer_size); this->disk_img.read(data_buf, device_offset, transfer_size);
@@ -385,8 +377,8 @@ void ScsiHardDisk::write(uint32_t lba, uint16_t transfer_len, uint8_t cmd_len) {
transfer_size = 256; transfer_size = 256;
} }
transfer_size *= HDD_SECTOR_SIZE; transfer_size *= this->sector_size;
uint64_t device_offset = lba * HDD_SECTOR_SIZE; uint64_t device_offset = lba * this->sector_size;
this->incoming_size = transfer_size; this->incoming_size = transfer_size;

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

@@ -66,6 +66,7 @@ private:
uint64_t img_size; uint64_t img_size;
int total_blocks; int total_blocks;
uint64_t file_offset = 0; uint64_t file_offset = 0;
static const int sector_size = 512;
int bytes_out = 0; int bytes_out = 0;
uint8_t data_buf[1 << 21]; // TODO: add proper buffer management! uint8_t data_buf[1 << 21]; // TODO: add proper buffer management!