Skip to content

Commit

Permalink
Bugfix: use hardfile with A600/A1200/A4000 IDE controller
Browse files Browse the repository at this point in the history
  • Loading branch information
@midwan
midwan committed Mar 22, 2021
1 parent ea45865 commit 9573496
Show file tree
Hide file tree
Showing 2 changed files with 67 additions and 57 deletions.
58 changes: 27 additions & 31 deletions src/osdep/amiberry_hardfile.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -299,20 +299,25 @@ static int hdf_seek(struct hardfiledata *hfd, uae_u64 offset)
gui_message(_T("hd: hdf handle is not valid. bug."));
abort();
}
if (offset >= hfd->physsize - hfd->virtual_size)
{
write_log(_T("hd: tried to seek out of bounds! (%I64X >= %I64X - %I64X)\n"), offset, hfd->physsize, hfd->virtual_size);
gui_message(_T("hd: tried to seek out of bounds!"));
abort();
}
offset += hfd->offset;
if (offset & (hfd->ci.blocksize - 1))
{
write_log(_T("hd: poscheck failed, offset=%I64X not aligned to blocksize=%d! (%I64X & %04X = %04X)\n"),
offset, hfd->ci.blocksize, offset, hfd->ci.blocksize, offset & (hfd->ci.blocksize - 1));
gui_message(_T("hd: poscheck failed, offset not aligned to blocksize!"));
abort();
if (hfd->physsize) {
if (offset >= hfd->physsize - hfd->virtual_size)
{
if (hfd->virtual_rdb)
return -1;
write_log(_T("hd: tried to seek out of bounds! (%I64X >= %I64X - %I64X)\n"), offset, hfd->physsize, hfd->virtual_size);
gui_message(_T("hd: tried to seek out of bounds!"));
abort();
}
offset += hfd->offset;
if (offset & (hfd->ci.blocksize - 1))
{
write_log(_T("hd: poscheck failed, offset=%I64X not aligned to blocksize=%d! (%I64X & %04X = %04X)\n"),
offset, hfd->ci.blocksize, offset, hfd->ci.blocksize, offset & (hfd->ci.blocksize - 1));
gui_message(_T("hd: poscheck failed, offset not aligned to blocksize!"));
abort();
}
}

if (hfd->handle_valid == HDF_HANDLE_LINUX)
{
auto ret = _fseeki64(hfd->handle->h, offset, SEEK_SET);
Expand All @@ -332,7 +337,7 @@ static int hdf_seek(struct hardfiledata *hfd, uae_u64 offset)
static void poscheck(struct hardfiledata *hfd, int len)
{
int ret;
uae_u64 pos = 0;
uae_u64 pos = -1;

if (hfd->handle_valid == HDF_HANDLE_LINUX)
{
Expand Down Expand Up @@ -399,7 +404,8 @@ static int hdf_read_2(struct hardfiledata *hfd, void *buffer, uae_u64 offset, in
hfd->cache_offset = offset;
if (offset + CACHE_SIZE > hfd->offset + (hfd->physsize - hfd->virtual_size))
hfd->cache_offset = hfd->offset + (hfd->physsize - hfd->virtual_size) - CACHE_SIZE;
hdf_seek(hfd, hfd->cache_offset);
if (hdf_seek(hfd, hfd->cache_offset))
return 0;
poscheck(hfd, CACHE_SIZE);
if (hfd->handle_valid == HDF_HANDLE_LINUX)
outlen = fread(hfd->cache, 1, CACHE_SIZE, hfd->handle->h);
Expand Down Expand Up @@ -428,16 +434,6 @@ int hdf_read_target(struct hardfiledata *hfd, void *buffer, uae_u64 offset, int
if (hfd->drive_empty)
return 0;

if (offset < hfd->virtual_size)
{
const auto len2 = offset + len <= hfd->virtual_size ? len : hfd->virtual_size - offset;
if (!hfd->virtual_rdb)
return 0;
memcpy(buffer, hfd->virtual_rdb + offset, len2);
return len2;
}
offset -= hfd->virtual_size;

while (len > 0)
{
int maxlen;
Expand Down Expand Up @@ -487,7 +483,8 @@ static int hdf_write_2(struct hardfiledata *hfd, void *buffer, uae_u64 offset, i
return 0;

hfd->cache_valid = 0;
hdf_seek(hfd, offset);
if (hdf_seek(hfd, offset))
return 0;
poscheck(hfd, len);
memcpy(hfd->cache, buffer, len);
if (hfd->handle_valid == HDF_HANDLE_LINUX)
Expand All @@ -500,10 +497,11 @@ static int hdf_write_2(struct hardfiledata *hfd, void *buffer, uae_u64 offset, i
auto* const tmp = (uae_u8*)xmalloc(uae_u8, tmplen);
if (tmp)
{
int cmplen = tmplen > len ? len : tmplen;
memset(tmp, 0xa1, tmplen);
hdf_seek(hfd, offset);
int outlen2 = fread(tmp, 1, tmplen, hfd->handle->h);
if (memcmp(hfd->cache, tmp, tmplen) != 0 || outlen != len)
if (memcmp(hfd->cache, tmp, cmplen) != 0 || outlen != len)
gui_message(_T("\"%s\"\n\nblock zero write failed!"), name);
xfree(tmp);
}
Expand All @@ -519,11 +517,9 @@ int hdf_write_target(struct hardfiledata *hfd, void *buffer, uae_u64 offset, int
auto got = 0;
auto* p = (uae_u8*)buffer;

if (hfd->drive_empty)
if (hfd->drive_empty || hfd->physsize == 0)
return 0;
if (offset < hfd->virtual_size)
return len;
offset -= hfd->virtual_size;

while (len > 0)
{
const auto maxlen = len > CACHE_SIZE ? CACHE_SIZE : len;
Expand Down
66 changes: 40 additions & 26 deletions src/osdep/gui/CreateFilesysHardfile.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -464,8 +464,6 @@ bool CreateFilesysHardfile()
if (size < 1)
size = 1;

const auto bp = tweakbootpri(atoi(txtBootPri->getText().c_str()), 1, 0);

char init_path[MAX_DPATH];
_tcsncpy(init_path, txtPath->getText().c_str(), MAX_DPATH - 1);
if (chkDynamic->isSelected()) {
Expand All @@ -475,7 +473,7 @@ bool CreateFilesysHardfile()
if (!result) {
ShowMessage("Create Hardfile", "Unable to create new VHD file.", "", "Ok", "");
ExitCreateFilesysHardfile();
return false;
dialogResult = false;
}
}
else {
Expand All @@ -496,32 +494,48 @@ bool CreateFilesysHardfile()
fclose(newFile);
ShowMessage("Create Hardfile", "Unable to create new file size.", "", "Ok", "");
ExitCreateFilesysHardfile();
return false;
dialogResult = false;
}
}

struct uaedev_config_info ci
{
};

uci_set_defaults(&ci, false);
strncpy(ci.devname, const_cast<char *>(txtDevice->getText().c_str()), MAX_DPATH);
strncpy(ci.rootdir, const_cast<char *>(init_path), MAX_DPATH);
ci.type = UAEDEV_HDF;
ci.surfaces = (size / 1024) + 1;
ci.bootpri = bp;

ci.controller_type = 0;
ci.controller_type_unit = 0;
ci.controller_unit = 0;
ci.unit_feature_level = 1;
ci.readonly = false;
auto* const uci = add_filesys_config(&changed_prefs, -1, &ci);
if (uci)
{
auto* const hfd = get_hardfile_data(uci->configoffset);
if (hfd)
hardfile_media_change(hfd, &ci, true, false);
if (dialogResult) {
struct uaedev_config_data* uci;
struct uaedev_config_info ci;

uci_set_defaults(&ci, false);
strncpy(ci.devname, (char*)txtDevice->getText().c_str(), MAX_DPATH - 1);
strncpy(ci.rootdir, (char*)init_path, MAX_DPATH - 1);
ci.type = UAEDEV_HDF;
ci.surfaces = (size / 1024) + 1;

ci.bootpri = atoi(txtBootPri->getText().c_str());
if (ci.bootpri < -127)
ci.bootpri = -127;
if (ci.bootpri > 127)
ci.bootpri = 127;
if (!chkAutoboot->isSelected()) {
ci.bootpri = BOOTPRI_NOAUTOBOOT;
}

ci.controller_type = 0;
ci.controller_type_unit = 0;
ci.controller_unit = 0;
ci.unit_feature_level = 1;
ci.readonly = 0;

int blocksize = 512;
uae_u64 bsize = size * 1024 * 1024;
bsize &= ~(blocksize - 1);

getchspgeometry(bsize, &ci.pcyls, &ci.pheads, &ci.psecs, false);
gethdfgeometry(bsize, &ci);

uci = add_filesys_config(&changed_prefs, -1, &ci);
if (uci) {
struct hardfiledata* hfd = get_hardfile_data(uci->configoffset);
if (hfd)
hardfile_media_change(hfd, &ci, true, false);
}
}
}

Expand Down

0 comments on commit 9573496

Please # to comment.