80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Fixed the HDD image code.

Browse Source
This commit is contained in:
OBattler
2022-07-10 21:49:04 +02:00
parent e69f8f85fe
commit cb54e1f90f
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/disk/hdd_image.c
View File

@@ -495,8 +495,11 @@ hdd_image_seek(uint8_t id, uint32_t sector)
void void
hdd_image_read(uint8_t id, uint32_t sector, uint32_t count, uint8_t *buffer) hdd_image_read(uint8_t id, uint32_t sector, uint32_t count, uint8_t *buffer)
{ {
int non_transferred_sectors;
size_t num_read;
if (hdd_images[id].type == HDD_IMAGE_VHD) { if (hdd_images[id].type == HDD_IMAGE_VHD) {
int non_transferred_sectors = mvhd_read_sectors(hdd_images[id].vhd, sector, count, buffer); non_transferred_sectors = mvhd_read_sectors(hdd_images[id].vhd, sector, count, buffer);
hdd_images[id].pos = sector + count - non_transferred_sectors - 1; hdd_images[id].pos = sector + count - non_transferred_sectors - 1;
} else { } else {
if (fseeko64(hdd_images[id].file, ((uint64_t)(sector) << 9LL) + hdd_images[id].base, SEEK_SET) == -1) { if (fseeko64(hdd_images[id].file, ((uint64_t)(sector) << 9LL) + hdd_images[id].base, SEEK_SET) == -1) {
@@ -504,10 +507,7 @@ hdd_image_read(uint8_t id, uint32_t sector, uint32_t count, uint8_t *buffer)
return; return;
} }
size_t num_read = fread(buffer, 512, count, hdd_images[id].file); num_read = fread(buffer, 512, count, hdd_images[id].file);
if (num_read != count) {
fatal("Hard disk image %i: Read error\n", id);
}
hdd_images[id].pos = sector + num_read; hdd_images[id].pos = sector + num_read;
} }
} }
@@ -547,8 +547,11 @@ hdd_image_read_ex(uint8_t id, uint32_t sector, uint32_t count, uint8_t *buffer)
void void
hdd_image_write(uint8_t id, uint32_t sector, uint32_t count, uint8_t *buffer) hdd_image_write(uint8_t id, uint32_t sector, uint32_t count, uint8_t *buffer)
{ {
int non_transferred_sectors;
size_t num_write;
if (hdd_images[id].type == HDD_IMAGE_VHD) { if (hdd_images[id].type == HDD_IMAGE_VHD) {
int non_transferred_sectors = mvhd_write_sectors(hdd_images[id].vhd, sector, count, buffer); non_transferred_sectors = mvhd_write_sectors(hdd_images[id].vhd, sector, count, buffer);
hdd_images[id].pos = sector + count - non_transferred_sectors - 1; hdd_images[id].pos = sector + count - non_transferred_sectors - 1;
} else { } else {
if (fseeko64(hdd_images[id].file, ((uint64_t)(sector) << 9LL) + hdd_images[id].base, SEEK_SET) == -1) { if (fseeko64(hdd_images[id].file, ((uint64_t)(sector) << 9LL) + hdd_images[id].base, SEEK_SET) == -1) {
@@ -556,10 +559,7 @@ hdd_image_write(uint8_t id, uint32_t sector, uint32_t count, uint8_t *buffer)
return; return;
} }
size_t num_write = fwrite(buffer, 512, count, hdd_images[id].file); num_write = fwrite(buffer, 512, count, hdd_images[id].file);
if (num_write != count) {
fatal("Hard disk image %i: Write error\n", id);
}
hdd_images[id].pos = sector + num_write; hdd_images[id].pos = sector + num_write;
} }
} }