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

VHD fixes.

Browse Source
This commit is contained in:
OBattler
2020-11-20 23:59:04 +01:00
parent 98b57e9a4b
commit 77d7c0fb81
1 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/disk/hdd_image.c
View File

@@ -270,6 +270,8 @@ hdd_image_load(int id)
int is_hdx[2] = { 0, 0 }; int is_hdx[2] = { 0, 0 };
int is_vhd[2] = { 0, 0 }; int is_vhd[2] = { 0, 0 };
int vhd_error = 0; int vhd_error = 0;
MVHDMeta *vhdm;
MVHDGeom geom;
memset(empty_sector, 0, sizeof(empty_sector)); memset(empty_sector, 0, sizeof(empty_sector));
@@ -358,6 +360,7 @@ hdd_image_load(int id)
full_size = ((uint64_t) hdd[id].spt) * full_size = ((uint64_t) hdd[id].spt) *
((uint64_t) hdd[id].hpc) * ((uint64_t) hdd[id].hpc) *
((uint64_t) hdd[id].tracks) << 9LL; ((uint64_t) hdd[id].tracks) << 9LL;
hdd_images[id].last_sector = (full_size >> 9LL) - 1;
wcstombs(fn_multibyte_buf, fn, sizeof fn_multibyte_buf); wcstombs(fn_multibyte_buf, fn, sizeof fn_multibyte_buf);
hdd_images[id].vhd = mvhd_create_fixed(fn_multibyte_buf, geometry, &vhd_error, NULL); hdd_images[id].vhd = mvhd_create_fixed(fn_multibyte_buf, geometry, &vhd_error, NULL);
@@ -460,10 +463,13 @@ hdd_image_load(int id)
fatal("hdd_image_load(): VHD: Parent/child timestamp mismatch for VHD file '%s'\n", fn_multibyte_buf); fatal("hdd_image_load(): VHD: Parent/child timestamp mismatch for VHD file '%s'\n", fn_multibyte_buf);
} }
full_size = hdd_images[id].vhd->footer.curr_sz; mvhd_get_geometry(hdd_images[id].vhd);
hdd[id].tracks = hdd_images[id].vhd->footer.geom.cyl; hdd[id].spt = geom.spt;
hdd[id].hpc = hdd_images[id].vhd->footer.geom.heads; hdd[id].hpc = geom.heads;
hdd[id].spt = hdd_images[id].vhd->footer.geom.spt; hdd[id].tracks = geom.cyl;
full_size = ((uint64_t) hdd[id].spt) *
((uint64_t) hdd[id].hpc) *
((uint64_t) hdd[id].tracks) << 9LL;
hdd_images[id].type = HDD_IMAGE_VHD; hdd_images[id].type = HDD_IMAGE_VHD;
/* If we're here, this means there is a valid VHD footer in the /* If we're here, this means there is a valid VHD footer in the
image, which means that by definition, all valid sectors image, which means that by definition, all valid sectors
@@ -533,15 +539,17 @@ hdd_image_read(uint8_t id, uint32_t sector, uint32_t count, uint8_t *buffer)
} }
uint32_t
hdd_image_get_last_sector(uint8_t id)
{
return hdd_images[id].last_sector;
}
uint32_t uint32_t
hdd_sectors(uint8_t id) hdd_sectors(uint8_t id)
{ {
if (hdd_images[id].type == HDD_IMAGE_VHD) { return hdd_image_get_last_sector(id) - 1;
return (uint32_t) (hdd_images[id].vhd->footer.curr_sz >> 9);
} else {
fseeko64(hdd_images[id].file, 0, SEEK_END);
return (uint32_t)((ftello64(hdd_images[id].file) - hdd_images[id].base) >> 9);
}
} }
@@ -648,13 +656,6 @@ hdd_image_zero_ex(uint8_t id, uint32_t sector, uint32_t count)
} }
uint32_t
hdd_image_get_last_sector(uint8_t id)
{
return hdd_images[id].last_sector;
}
uint32_t uint32_t
hdd_image_get_pos(uint8_t id) hdd_image_get_pos(uint8_t id)
{ {