Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix an issue of (re)mounting fd in different type (2DD/2HD/1.44M). #4

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix an issue of (re)mounting fd in different type (2DD/2HD/1.44M). #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 38 additions & 21 deletions fdd/fdd_d88.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,11 +193,45 @@ static void drvflush(FDDFILE fdd) {
}
}


static BRESULT fdd_diskaccess_d88_exact(FDDFILE fdd) { // ver0.31 (fdd_diskaccess_d88)

UINT8 rpm;

rpm = fdc.rpm[fdc.us];
switch(fdd->inf.d88.fdtype_major) {
case DISKTYPE_2D:
case DISKTYPE_2DD:
if ((rpm) || (CTRL_FDMEDIA != DISKTYPE_2DD)) {
return(FAILURE);
}
break;

case DISKTYPE_2HD:
if (CTRL_FDMEDIA != DISKTYPE_2HD) {
return(FAILURE);
}
if ((fdd->inf.d88.fdtype_minor == 0) && (rpm)) {
return(FAILURE);
}
break;

default:
return(FAILURE);

}
return(SUCCESS);
}


static BRESULT trkseek(FDDFILE fdd, UINT track) {

D88TRK trk;
BOOL r;

if (fdd_diskaccess_d88_exact(fdd) == FAILURE) {
return(FAILURE);
}
trk = &d88trk;
if ((trk->fdd == fdd) && (trk->track == track) &&
(trk->type == CTRL_FDMEDIA)) {
Expand Down Expand Up @@ -309,34 +343,17 @@ BRESULT fddd88_eject(FDDFILE fdd) {
}


BRESULT fdd_diskaccess_d88(void) { // ver0.31
BRESULT fdd_diskaccess_d88(void) {

FDDFILE fdd = fddfile + fdc.us;
UINT8 rpm;

rpm = fdc.rpm[fdc.us];
switch(fdd->inf.d88.fdtype_major) {
if (fdd->type == DISKTYPE_D88) switch(fdd->inf.d88.fdtype_major) {
case DISKTYPE_2D:
case DISKTYPE_2DD:
if ((rpm) || (CTRL_FDMEDIA != DISKTYPE_2DD)) {
return(FAILURE);
}
break;

case DISKTYPE_2HD:
if (CTRL_FDMEDIA != DISKTYPE_2HD) {
return(FAILURE);
}
if ((fdd->inf.d88.fdtype_minor == 0) && (rpm)) {
return(FAILURE);
}
break;

default:
return(FAILURE);

return (SUCCESS);
}
return(SUCCESS);
return(FAILURE);
}

BRESULT fdd_seek_d88(void) {
Expand Down
8 changes: 6 additions & 2 deletions fdd/fdd_xdf.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@


static const _XDFINFO supportxdf[] = {
#if 1
{0, 160, 8, 2, DISKTYPE_2DD, 0},
{0, 160, 9, 2, DISKTYPE_2DD, 0},
#endif
#if 0
// 256
{0, 154, 26, 1, DISKTYPE_2HD, 0},
Expand Down Expand Up @@ -170,8 +174,7 @@ BRESULT fddxdf_eject(FDDFILE fdd) {

BRESULT fddxdf_diskaccess(FDDFILE fdd) {

if ((fdd->type != DISKTYPE_BETA) ||
(CTRL_FDMEDIA != fdd->inf.xdf.disktype)) {
if (fdd->type != DISKTYPE_BETA) {
return(FAILURE);
}
return(SUCCESS);
Expand Down Expand Up @@ -295,6 +298,7 @@ BRESULT fddxdf_readid(FDDFILE fdd) {

fddlasterror = 0x00;
if ((!fdc.mf) ||
(CTRL_FDMEDIA != fdd->inf.xdf.disktype) ||
(fdc.rpm[fdc.us] != fdd->inf.xdf.rpm) ||
(fdc.crcn >= fdd->inf.xdf.sectors)) {
fddlasterror = 0xe0;
Expand Down