Retro/pcjs
Watch
1
0
Fork
You've already forked pcjs
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

README updates, including some Windows directory listings (and corrections)

Browse source
This commit is contained in:
Jeff Parsons 2016-01-30 13:08:16 -08:00
commit 676449279e
53 changed files with 1778 additions and 207 deletions
Download patch file Download diff file Expand all files Collapse all files

30
modules/pcjs/lib/fdc.js
View file

@ -1170,20 +1170,22 @@ FDC.prototype.autoMount = function(fRemount)
if (this.configMount) {
for (var sDrive in this.configMount) {
var configDrive = this.configMount[sDrive];
if (configDrive['name'] && configDrive['path']) {
var sDiskettePath = configDrive['path'];
var sDisketteName = configDrive['name'] || this.findDiskette(sDiskettePath);
if (sDiskettePath && sDisketteName) {
/*
* WARNING: This conversion of drive letter to drive number, starting with A:, is very simplistic
* and is not guaranteed to match the drive mapping that DOS ultimately uses.
*/
var iDrive = sDrive.charCodeAt(0) - 0x41;
if (iDrive >= 0 && iDrive < this.aDrives.length) {
if (!this.loadDiskette(iDrive, configDrive['name'], configDrive['path'], true) && fRemount) {
if (!this.loadDiskette(iDrive, sDisketteName, sDiskettePath, true) && fRemount) {
this.setReady(false);
}
continue;
}
}
this.notice("Unrecognized auto-mount specification for drive " + sDrive);
this.notice("Incorrect auto-mount settings for drive " + sDrive + " (" + JSON.stringify(configDrive) + ")");
}
}
return !!this.cAutoMount;
@ -1420,6 +1422,28 @@ FDC.prototype.addDiskette = function(sName, sPath)
}
};
/**
* findDiskette(sPath)
*
* This is used to deal with mount requests (eg, autoMount) that supply a path without a name;
* if we can find the path in the "listDisks" control, then we return the associated disk name.
*
* @param {string} sPath
* @return {string|null}
*/
FDC.prototype.findDiskette = function(sPath)
{
var controlDisks = this.bindings["listDisks"];
if (controlDisks && controlDisks.options) {
for (var i = 0; i < controlDisks.options.length; i++) {
if (controlDisks.options[i].value == sPath) {
return controlDisks.options[i].innerText;
}
}
}
return null;
};
/**
* displayDiskette(iDrive, fUpdateDrive)
*