Class-ify disk.cpp into DiskIIInterfaceCard

This commit is contained in:
tomcw
2019-04-07 14:22:05 +01:00
parent 4db23c10dc
commit e7d6eac04d
14 changed files with 243 additions and 206 deletions

View File

@@ -3727,15 +3727,15 @@ Update_t CmdDisk ( int nArgs)
if (nArgs > 2)
goto _Help;
int drive = DiskGetCurrentDrive() + 1;
int drive = sg_DiskIICard.DiskGetCurrentDrive() + 1;
char buffer[200] = "";
ConsoleBufferPushFormat(buffer, "D%d at T$%X (%d), phase $%X, offset $%X, %s",
drive,
DiskGetCurrentTrack(),
DiskGetCurrentTrack(),
DiskGetCurrentPhase(),
DiskGetCurrentOffset(),
DiskGetCurrentState());
sg_DiskIICard.DiskGetCurrentTrack(),
sg_DiskIICard.DiskGetCurrentTrack(),
sg_DiskIICard.DiskGetCurrentPhase(),
sg_DiskIICard.DiskGetCurrentOffset(),
sg_DiskIICard.DiskGetCurrentState());
return ConsoleUpdate();
}
@@ -3762,7 +3762,7 @@ Update_t CmdDisk ( int nArgs)
if (nArgs > 2)
goto _Help;
DiskEject( iDrive );
sg_DiskIICard.DiskEject( iDrive );
FrameRefreshStatus(DRAW_LEDS | DRAW_BUTTON_DRIVES);
}
else
@@ -3776,7 +3776,7 @@ Update_t CmdDisk ( int nArgs)
if (nArgs == 3)
bProtect = g_aArgs[ 3 ].nValue ? true : false;
DiskSetProtect( iDrive, bProtect );
sg_DiskIICard.DiskSetProtect( iDrive, bProtect );
FrameRefreshStatus(DRAW_LEDS | DRAW_BUTTON_DRIVES);
}
else
@@ -3787,7 +3787,7 @@ Update_t CmdDisk ( int nArgs)
LPCTSTR pDiskName = g_aArgs[ 3 ].sArg;
// DISK # "Diskname"
DiskInsert( iDrive, pDiskName, IMAGE_FORCE_WRITE_PROTECTED, IMAGE_DONT_CREATE );
sg_DiskIICard.DiskInsert( iDrive, pDiskName, IMAGE_FORCE_WRITE_PROTECTED, IMAGE_DONT_CREATE );
FrameRefreshStatus(DRAW_LEDS | DRAW_BUTTON_DRIVES);
}