claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MO and ZIP: Fix reading, writing, and formatting, also fix > 2 GB MO images.

Browse Source
This commit is contained in:
OBattler
2025-03-18 00:43:49 +01:00
parent 48c294a13b
commit be2a435e05
2 changed files with 28 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/disk/mo.c
View File

@@ -63,7 +63,7 @@ const uint8_t mo_command_flags[0x100] = {
[0x0a] = IMPLEMENTED | CHECK_READY, [0x0a] = IMPLEMENTED | CHECK_READY,
[0x0b] = IMPLEMENTED | CHECK_READY, [0x0b] = IMPLEMENTED | CHECK_READY,
[0x12] = IMPLEMENTED | ALLOW_UA, [0x12] = IMPLEMENTED | ALLOW_UA,
[0x13] = IMPLEMENTED | CHECK_READY | SCSI_ONLY, [0x13] = IMPLEMENTED | CHECK_READY,
[0x15] = IMPLEMENTED, [0x15] = IMPLEMENTED,
[0x16] = IMPLEMENTED | SCSI_ONLY, [0x16] = IMPLEMENTED | SCSI_ONLY,
[0x17] = IMPLEMENTED | SCSI_ONLY, [0x17] = IMPLEMENTED | SCSI_ONLY,
@@ -74,8 +74,7 @@ const uint8_t mo_command_flags[0x100] = {
[0x25] = IMPLEMENTED | CHECK_READY, [0x25] = IMPLEMENTED | CHECK_READY,
[0x28] = IMPLEMENTED | CHECK_READY, [0x28] = IMPLEMENTED | CHECK_READY,
[0x2a ... 0x2c] = IMPLEMENTED | CHECK_READY, [0x2a ... 0x2c] = IMPLEMENTED | CHECK_READY,
[0x2e] = IMPLEMENTED | CHECK_READY, [0x2e ... 0x2f] = IMPLEMENTED | CHECK_READY,
[0x2f] = IMPLEMENTED | CHECK_READY | SCSI_ONLY,
[0x41] = IMPLEMENTED | CHECK_READY, [0x41] = IMPLEMENTED | CHECK_READY,
[0x55] = IMPLEMENTED, [0x55] = IMPLEMENTED,
[0x5a] = IMPLEMENTED, [0x5a] = IMPLEMENTED,
@@ -172,9 +171,9 @@ mo_load(const mo_t *dev, const char *fn, const int skip_insert)
} }
if (ret) { if (ret) {
fseek(dev->drv->fp, 0, SEEK_END); fseeko64(dev->drv->fp, 0, SEEK_END);
uint32_t size = (uint32_t) ftell(dev->drv->fp); uint64_t size = (uint64_t) ftello64(dev->drv->fp);
unsigned int found = 0; unsigned int found = 0;
if (is_mdi) { if (is_mdi) {
@@ -185,7 +184,7 @@ mo_load(const mo_t *dev, const char *fn, const int skip_insert)
dev->drv->base = 0; dev->drv->base = 0;
for (uint8_t i = 0; i < KNOWN_MO_TYPES; i++) { for (uint8_t i = 0; i < KNOWN_MO_TYPES; i++) {
if (size == (mo_types[i].sectors * mo_types[i].bytes_per_sector)) { if (size == ((uint64_t) mo_types[i].sectors * mo_types[i].bytes_per_sector)) {
found = 1; found = 1;
dev->drv->medium_size = mo_types[i].sectors; dev->drv->medium_size = mo_types[i].sectors;
dev->drv->sector_size = mo_types[i].bytes_per_sector; dev->drv->sector_size = mo_types[i].bytes_per_sector;
@@ -194,7 +193,7 @@ mo_load(const mo_t *dev, const char *fn, const int skip_insert)
} }
if (found) { if (found) {
if (fseek(dev->drv->fp, dev->drv->base, SEEK_SET) == -1) if (fseeko64(dev->drv->fp, (uint64_t) dev->drv->base, SEEK_SET) == -1)
log_fatal(dev->log, "mo_load(): Error seeking to the beginning of " log_fatal(dev->log, "mo_load(): Error seeking to the beginning of "
"the file\n"); "the file\n");
@@ -799,21 +798,21 @@ mo_blocks(mo_t *dev, int32_t *len, int out)
*len = 0; *len = 0;
if (!dev->sector_len) if (dev->sector_len == 0) {
mo_command_complete(dev);
else {
mo_log(dev->log, "%sing %i blocks starting from %i...\n", out ? "Writ" : "Read", mo_log(dev->log, "%sing %i blocks starting from %i...\n", out ? "Writ" : "Read",
dev->requested_blocks, dev->sector_pos); dev->requested_blocks, dev->sector_pos);
if (dev->sector_pos >= dev->drv->medium_size) { if (dev->sector_pos >= dev->drv->medium_size) {
mo_log(dev->log, "Trying to %s beyond the end of disk\n", out ? "write" : "read"); mo_log(dev->log, "Trying to %s beyond the end of disk\n", out ? "write" : "read");
mo_lba_out_of_range(dev); mo_lba_out_of_range(dev);
ret = 0;
} else { } else {
*len = dev->requested_blocks * dev->drv->sector_size; *len = dev->requested_blocks * dev->drv->sector_size;
ret = 1; ret = 1;
for (int i = 0; i < dev->requested_blocks; i++) { for (int i = 0; i < dev->requested_blocks; i++) {
if (fseek(dev->drv->fp, dev->drv->base + (dev->sector_pos * dev->drv->sector_size) + (i * dev->drv->sector_size), SEEK_SET) == -1) { if (fseeko64(dev->drv->fp, dev->drv->base +
((uint64_t) dev->sector_pos * dev->drv->sector_size), SEEK_SET) == -1) {
if (out) if (out)
mo_write_error(dev); mo_write_error(dev);
else else
@@ -854,6 +853,9 @@ mo_blocks(mo_t *dev, int32_t *len, int out)
dev->sector_len -= dev->requested_blocks; dev->sector_len -= dev->requested_blocks;
} }
} }
} else {
mo_command_complete(dev);
ret = 0;
} }
return ret; return ret;
@@ -888,7 +890,7 @@ mo_format(mo_t *dev)
mo_log(dev->log, "Formatting media...\n"); mo_log(dev->log, "Formatting media...\n");
fseek(dev->drv->fp, 0, SEEK_END); fseeko64(dev->drv->fp, 0, SEEK_END);
long size = ftell(dev->drv->fp); long size = ftell(dev->drv->fp);
#ifdef _WIN32 #ifdef _WIN32
@@ -962,7 +964,8 @@ mo_erase(mo_t *dev)
mo_buf_alloc(dev, dev->drv->sector_size); mo_buf_alloc(dev, dev->drv->sector_size);
memset(dev->buffer, 0, dev->drv->sector_size); memset(dev->buffer, 0, dev->drv->sector_size);
fseek(dev->drv->fp, dev->drv->base + (dev->sector_pos * dev->drv->sector_size), fseeko64(dev->drv->fp, dev->drv->base +
((uint64_t) dev->sector_pos * dev->drv->sector_size),
SEEK_SET); SEEK_SET);
for (i = 0; i < dev->requested_blocks; i++) { for (i = 0; i < dev->requested_blocks; i++) {
@@ -1878,7 +1881,8 @@ mo_phase_data_out(scsi_common_t *sc)
dev->buffer[6] = (s >> 8) & 0xff; dev->buffer[6] = (s >> 8) & 0xff;
dev->buffer[7] = s & 0xff; dev->buffer[7] = s & 0xff;
} }
if (fseek(dev->drv->fp, (i * dev->drv->sector_size), SEEK_SET) == -1) if (fseeko64(dev->drv->fp,
((uint64_t) i * dev->drv->sector_size), SEEK_SET) == -1)
mo_write_error(dev); mo_write_error(dev);
if (feof(dev->drv->fp)) if (feof(dev->drv->fp))
break; break;

17
src/disk/zip.c
View File

@@ -53,7 +53,7 @@ const uint8_t zip_command_flags[0x100] = {
[0x0c] = IMPLEMENTED, [0x0c] = IMPLEMENTED,
[0x0d] = IMPLEMENTED | ATAPI_ONLY, [0x0d] = IMPLEMENTED | ATAPI_ONLY,
[0x12] = IMPLEMENTED | ALLOW_UA, [0x12] = IMPLEMENTED | ALLOW_UA,
[0x13] = IMPLEMENTED | CHECK_READY | SCSI_ONLY, [0x13] = IMPLEMENTED | CHECK_READY,
[0x15] = IMPLEMENTED, [0x15] = IMPLEMENTED,
[0x16 ... 0x17] = IMPLEMENTED | SCSI_ONLY, [0x16 ... 0x17] = IMPLEMENTED | SCSI_ONLY,
[0x1a] = IMPLEMENTED, [0x1a] = IMPLEMENTED,
@@ -64,8 +64,7 @@ const uint8_t zip_command_flags[0x100] = {
[0x25] = IMPLEMENTED | CHECK_READY, [0x25] = IMPLEMENTED | CHECK_READY,
[0x28] = IMPLEMENTED | CHECK_READY, [0x28] = IMPLEMENTED | CHECK_READY,
[0x2a ... 0x2b] = IMPLEMENTED | CHECK_READY, [0x2a ... 0x2b] = IMPLEMENTED | CHECK_READY,
[0x2e] = IMPLEMENTED | CHECK_READY, [0x2e ... 0x2f] = IMPLEMENTED | CHECK_READY,
[0x2f] = IMPLEMENTED | CHECK_READY | SCSI_ONLY,
[0x41] = IMPLEMENTED | CHECK_READY, [0x41] = IMPLEMENTED | CHECK_READY,
[0x55] = IMPLEMENTED, [0x55] = IMPLEMENTED,
[0x5a] = IMPLEMENTED, [0x5a] = IMPLEMENTED,
@@ -898,9 +897,7 @@ zip_blocks(zip_t *dev, int32_t *len, const int out)
int ret = 1; int ret = 1;
*len = 0; *len = 0;
if (!dev->sector_len) if (dev->sector_len > 0) {
zip_command_complete(dev);
else {
zip_log(dev->log, "%sing %i blocks starting from %i...\n", out ? "Writ" : "Read", zip_log(dev->log, "%sing %i blocks starting from %i...\n", out ? "Writ" : "Read",
dev->requested_blocks, dev->sector_pos); dev->requested_blocks, dev->sector_pos);
@@ -908,12 +905,13 @@ zip_blocks(zip_t *dev, int32_t *len, const int out)
zip_log(dev->log, "Trying to %s beyond the end of disk\n", zip_log(dev->log, "Trying to %s beyond the end of disk\n",
out ? "write" : "read"); out ? "write" : "read");
zip_lba_out_of_range(dev); zip_lba_out_of_range(dev);
ret = 0;
} else { } else {
*len = dev->requested_blocks << 9; *len = dev->requested_blocks << 9;
for (int i = 0; i < dev->requested_blocks; i++) { for (int i = 0; i < dev->requested_blocks; i++) {
if (fseek(dev->drv->fp, dev->drv->base + (dev->sector_pos << 9) + if (fseek(dev->drv->fp, dev->drv->base + (dev->sector_pos << 9),
(i << 9), SEEK_SET) == -1) { SEEK_SET) == -1) {
if (out) if (out)
zip_write_error(dev); zip_write_error(dev);
else else
@@ -952,6 +950,9 @@ zip_blocks(zip_t *dev, int32_t *len, const int out)
dev->sector_len -= dev->requested_blocks; dev->sector_len -= dev->requested_blocks;
} }
} }
} else {
zip_command_complete(dev);
ret = 0;
} }
return ret; return ret;