empathicqubit/AppleWin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add option to create missing floppy disks.

Browse source 
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
This commit is contained in:
Andrea Odetti 2017-06-27 20:55:54 +01:00
parent eba2cea5ca
commit c9a6d7688e
1 changed files with 47 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

79
source/frontends/ncurses/main.cpp
View file

@ -31,6 +31,7 @@ namespace
{
std::string disk1;
std::string disk2;
bool createMissingDisks;
std::string snapshot;
int memclear;
bool benchmark;
@ -47,7 +48,8 @@ namespace
po::options_description diskDesc("Disk");
diskDesc.add_options()
("d1,1", po::value<std::string>(), "Mount disk image in first drive")
("d2,2", po::value<std::string>(), "Mount disk image in second drive");
("d2,2", po::value<std::string>(), "Mount disk image in second drive")
("create,c", "Create missing disks");
desc.add(diskDesc);
po::options_description snapshotDesc("Snapshot");
@ -86,6 +88,8 @@ namespace
options.disk2 = vm["d2"].as<std::string>();
}
options.createMissingDisks = vm.count("create") > 0;
if (vm.count("load-state"))
{
options.snapshot = vm["load-state"].as<std::string>();
@ -188,7 +192,7 @@ namespace
}
}
bool DoDiskInsert(const int nDrive, const std::string & fileName)
bool DoDiskInsert(const int nDrive, const std::string & fileName, const bool createMissingDisk)
{
std::string strPathName;
@ -214,7 +218,7 @@ namespace
strPathName.append(fileName);
}
ImageError_e Error = DiskInsert(nDrive, strPathName.c_str(), IMAGE_USE_FILES_WRITE_PROTECT_STATUS, IMAGE_DONT_CREATE);
ImageError_e Error = DiskInsert(nDrive, strPathName.c_str(), IMAGE_USE_FILES_WRITE_PROTECT_STATUS, createMissingDisk);
return Error == eIMAGE_ERROR_NONE;
}
@ -239,56 +243,67 @@ namespace
ImageInitialize();
DiskInitialize();
bool disksOk = true;
if (!options.disk1.empty())
{
const bool ok = DoDiskInsert(DRIVE_1, options.disk1);
const bool ok = DoDiskInsert(DRIVE_1, options.disk1, options.createMissingDisks);
disksOk = disksOk && ok;
LogFileOutput("Init: DoDiskInsert(D1), res=%d\n", ok);
}
if (!options.disk2.empty())
{
const bool ok = DoDiskInsert(DRIVE_2, options.disk2);
const bool ok = DoDiskInsert(DRIVE_2, options.disk2, options.createMissingDisks);
disksOk = disksOk && ok;
LogFileOutput("Init: DoDiskInsert(D2), res=%d\n", ok);
}
// AFTER a restart
do
if (disksOk)
{
LoadConfiguration();
FrameRefreshStatus(DRAW_LEDS | DRAW_BUTTON_DRIVES);
MemInitialize();
VideoInitialize();
DiskReset();
if (!options.snapshot.empty())
// AFTER a restart
do
{
Snapshot_SetFilename(options.snapshot.c_str());
Snapshot_LoadState();
}
LoadConfiguration();
if (options.benchmark)
{
VideoBenchmark();
g_bRestart = false;
}
else
{
EnterMessageLoop();
FrameRefreshStatus(DRAW_LEDS | DRAW_BUTTON_DRIVES);
MemInitialize();
VideoInitialize();
DiskReset();
if (!options.snapshot.empty())
{
Snapshot_SetFilename(options.snapshot.c_str());
Snapshot_LoadState();
}
if (options.benchmark)
{
VideoBenchmark();
g_bRestart = false;
}
else
{
EnterMessageLoop();
}
}
while (g_bRestart);
VideoUninitialize();
}
else
{
LogOutput("Disk error.");
}
while (g_bRestart);
VideoUninitialize();
DiskDestroy();
ImageDestroy();
HD_Destroy();
PrintDestroy();
CpuDestroy();
MemDestroy();
DiskDestroy();
ImageDestroy();
return 0;
}