From 6d019e7d9d3279bf19dc80b4cc1cddb31c6d0351 Mon Sep 17 00:00:00 2001 From: Jeff Parsons Date: Sat, 17 Jun 2017 21:30:03 -0700 Subject: [PATCH 1/2] Fixed autoMount overrides (formerly, machines that wanted to override the diskette autoMount settings for a machine would set "autoMount: ''", but that was a sledgehammer solution, especially when the goal was merely to prevent a diskette from being loaded in drive A; the preferred solution now is to set "autoMount: A: None", allowing the rest of the machine's autoMount settings, if any, to remain intact) --- disks/pcx86/windows/2.0x/README.md | 4 +++- disks/pcx86/windows/3.00/README.md | 4 +++- disks/pcx86/windows/3.10/README.md | 4 +++- disks/pcx86/windows/win95/4.00.950/README.md | 4 +++- .../pcx86/windows/win95/4.00.950/debugger/README.md | 4 +++- docs/pcx86/examples/pcx86-dbg.js | 4 ++-- docs/pcx86/examples/pcx86.js | 4 ++-- modules/pcx86/lib/fdc.js | 12 +++++------- versions/pcx86/1.35.0/pcx86-dbg.js | 4 ++-- versions/pcx86/1.35.0/pcx86.js | 4 ++-- 10 files changed, 28 insertions(+), 20 deletions(-) diff --git a/disks/pcx86/windows/2.0x/README.md b/disks/pcx86/windows/2.0x/README.md index cf5e88558..6d2cce20c 100644 --- a/disks/pcx86/windows/2.0x/README.md +++ b/disks/pcx86/windows/2.0x/README.md @@ -8,7 +8,9 @@ machines: state: deskpro386.json config: /devices/pcx86/machine/compaq/deskpro386/vga/2048kb/machine.xml drives: '[{name:"20Mb Hard Disk",type:2,path:"http://archive.pcjs.org/disks/pcx86/fixed/20mb/COMPAQ310-WIN386201-VGA.json"}]' - autoMount: '' + autoMount: + A: + name: None --- Microsoft Windows/386 2.0 existed as the following "point releases": diff --git a/disks/pcx86/windows/3.00/README.md b/disks/pcx86/windows/3.00/README.md index 2546cf195..4e384cde8 100644 --- a/disks/pcx86/windows/3.00/README.md +++ b/disks/pcx86/windows/3.00/README.md @@ -7,7 +7,9 @@ machines: id: ibm5170-win300 config: /devices/pcx86/machine/5170/ega/1152kb/rev3/machine.xml drives: '[{name:"20Mb Hard Disk",type:2,path:"http://archive.pcjs.org/disks/pcx86/fixed/20mb/PCDOS320-WIN300-EGA.json"}]' - autoMount: '' + autoMount: + A: + name: None --- Microsoft Windows 3.00 diff --git a/disks/pcx86/windows/3.10/README.md b/disks/pcx86/windows/3.10/README.md index 61436062b..5b5087aee 100644 --- a/disks/pcx86/windows/3.10/README.md +++ b/disks/pcx86/windows/3.10/README.md @@ -9,7 +9,9 @@ machines: id: ibm5170-win310 config: /devices/pcx86/machine/5170/vga/2048kb/machine.xml drives: '[{name:"20Mb Hard Disk",type:2,path:"http://archive.pcjs.org/disks/pcx86/fixed/20mb/PCDOS330-WIN310-VGA.json"}]' - autoMount: '' + autoMount: + A: + name: None --- Microsoft Windows 3.10 diff --git a/disks/pcx86/windows/win95/4.00.950/README.md b/disks/pcx86/windows/win95/4.00.950/README.md index 6296bd896..ec70e0e93 100644 --- a/disks/pcx86/windows/win95/4.00.950/README.md +++ b/disks/pcx86/windows/win95/4.00.950/README.md @@ -8,7 +8,9 @@ machines: state: deskpro386.json config: /devices/pcx86/machine/compaq/deskpro386/vga/4096kb/machine.xml drives: '[{name:"68Mb Hard Disk",type:4,path:"http://archive.pcjs.org/disks/pcx86/fixed/68mb/win95.json"}]' - autoMount: '' + autoMount: + A: + name: None --- Microsoft Windows 95 (First Retail Release) diff --git a/disks/pcx86/windows/win95/4.00.950/debugger/README.md b/disks/pcx86/windows/win95/4.00.950/debugger/README.md index 4a0a6bd62..72137de83 100644 --- a/disks/pcx86/windows/win95/4.00.950/debugger/README.md +++ b/disks/pcx86/windows/win95/4.00.950/debugger/README.md @@ -9,7 +9,9 @@ machines: state: /disks/pcx86/windows/win95/4.00.950/deskpro386.json config: /devices/pcx86/machine/compaq/deskpro386/vga/4096kb/debugger/machine.xml drives: '[{name:"68Mb Hard Disk",type:4,path:"http://archive.pcjs.org/disks/pcx86/fixed/68mb/win95.json"}]' - autoMount: '' + autoMount: + A: + name: None --- Microsoft Windows 95 (First Retail Release) with Debugger diff --git a/docs/pcx86/examples/pcx86-dbg.js b/docs/pcx86/examples/pcx86-dbg.js index 872e3a6a1..2fea25761 100644 --- a/docs/pcx86/examples/pcx86-dbg.js +++ b/docs/pcx86/examples/pcx86-dbg.js @@ -658,7 +658,7 @@ function Hv(a){mb.call(this,"FDC",a,524288);this.dmaRead=Hv.prototype.kl;this.dm l.Cb=function(a,b,c){var d=this;switch(b){case "listDisks":this.na[b]=c;if(this.J){b=[];for(a=0;a'+b+"");a.innerHTML=b}};return!0;case "descDisk":case "listDrives":return this.na[b]=c,c.onchange=function(){var a=oa(c.value,10);null!=a&&Jv(d,a)},!0;case "loadDisk":return this.na[b]=c,c.onclick=function(){var a=d.na.listDisks;a&&Kv(d,a.options[a.selectedIndex].text,a.value)},!0;case "saveDisk":if(!this.M){c.parentNode.removeChild(c);break}this.na[b]=c;c.onclick=function(){var a=d.na.listDrives;a&&a.options&&d.A&&((a=d.A[oa(a.value, 10)||0])?(a=a.sa)?(a=Wa(Fv(a),"octet-stream",!0,a.Kg.replace(".json",".img")),gb(a)):d.Fa("No diskette loaded in drive."):d.Fa("No diskette drive selected."))};return!0;case "mountDisk":if(this.M)return this.na[b]=c,c.addEventListener("change",function(){var a=c.children[0];a.children[1].disabled=!a.children[0].files.length}),c.onsubmit=function(a){if(a=a.currentTarget[1].files[0]){var b=a.name;Kv(d,ta(b,!0),b,a)}return!1},!0;c.parentNode.removeChild(c)}return!1}; -l.uc=function(a,b,c,d){this.ka=b;this.H=c;this.ba=d;this.pa=a;this.W=Wb(a,"ChipSet");Iv(yd(this.pa,"autoMount"),this.L);Lv(this);Nc(b,this,Mv);Rc(b,this,Nv);Ov(this,"None","",!0);this.M&&Ov(this,"Local Disk","?");Ov(this,"Remote Disk","??");Pv(this)||Ib(this)};function Iv(a,b){if(a){if("string"==typeof a)try{a=eval("("+a+")")}catch(d){gb("FDC auto-mount error: "+d.message+" ("+a+")"),a={}}}else a={};if(b)for(var c in a)b[c]=a[c];return a} +l.uc=function(a,b,c,d){this.ka=b;this.H=c;this.ba=d;this.pa=a;this.W=Wb(a,"ChipSet");Iv(yd(this.pa,"autoMount"),this.L);Lv(this);Nc(b,this,Mv);Rc(b,this,Nv);Ov(this,"None","",!0);this.M&&Ov(this,"Local Disk","?");Ov(this,"Remote Disk","??");Pv(this)||Ib(this)};function Iv(a,b){if(a){if("string"==typeof a)try{a=eval("("+a+")")}catch(d){gb("FDC auto-mount error: "+d.message+" ("+a+")"),a={}}}else a={};for(var c in a)b&&(b[c]=a[c]);return a} l.Xb=function(a,b){if(!b){if(!a){if(this.reset(),this.pa.O){this.C=[];for(a=0;ag.sa.restore(E)&&(h=!1);h&&g.sa&&void 0!==g.Sa&&(g.cb=g.sa.seek(g.Gb,g.Za,g.mb));h||(e=!1)}a.G=b[c++]||0;a.Zb=b[c]||Xv;return e} function Rv(a){var b=0,c=[];c[b++]=a.Ua;c[b++]=0;c[b++]=a.fa;c[b++]=a.F;c[b++]=a.D;c[b++]=a.B;c[b++]=a.I;for(var d=b++,e=0,f=[],g=0;gVv(a,e,b,c,!1,d)&&window.confirm("Click OK to reload the original disk.\n(WARNING: All disk changes will be discarded)");){var f=a,g=c,h;for(h=0;ha.qb||f[1]>a.kb)&&(this.Fa('Diskette "'+c+'" too large for drive '+String.fromCharCode(65+a.Ua)),b=null);b?(a.sa=b,a.$k=c,a.ue=d,Wv(this,c,d,b),f=b.info(),this.G|=$v,this.Fa('Mounted diskette "'+c+'" in drive '+String.fromCharCode(65+a.Ua),a.le||e),a.vg=f[0],a.Bf=f[1],a.Cf=f[2],this.pa&&this.pa.md()):a.Oe=!1;a.le&&(a.le=!1,--this.K||Ib(this));Jv(this,a.Ua)}; diff --git a/docs/pcx86/examples/pcx86.js b/docs/pcx86/examples/pcx86.js index f52ccb34c..0d76e69fa 100644 --- a/docs/pcx86/examples/pcx86.js +++ b/docs/pcx86/examples/pcx86.js @@ -605,14 +605,14 @@ function rs(a){var b=a.data,c=b.length;if(c<<2==a.length){for(var d=c-1,e=b[d],f k.wb=function(a,b,c){var d=this;switch(b){case "listDisks":this.ia[b]=c;if(this.K){b=[];for(a=0;a'+b+"");a.innerHTML=b}};return!0;case "descDisk":case "listDrives":return this.ia[b]=c,c.onchange=function(){var a=na(c.value,10);null!=a&&us(d,a)},!0;case "loadDisk":return this.ia[b]=c,c.onclick=function(){var a=d.ia.listDisks;a&&vs(d,a.options[a.selectedIndex].text,a.value)},!0;case "saveDisk":if(!this.M){c.parentNode.removeChild(c);break}this.ia[b]=c;c.onclick=function(){var a=d.ia.listDrives;a&&a.options&&d.A&&((a=d.A[na(a.value, 10)||0])?(a=a.sa)?(a=Ka(qs(a),"octet-stream",!0,a.qh.replace(".json",".img")),r(a)):d.Aa("No diskette loaded in drive."):d.Aa("No diskette drive selected."))};return!0;case "mountDisk":if(this.M)return this.ia[b]=c,c.addEventListener("change",function(){var a=c.children[0];a.children[1].disabled=!a.children[0].files.length}),c.onsubmit=function(a){if(a=a.currentTarget[1].files[0]){var b=a.name;vs(d,pa(b,!0),b,a)}return!1},!0;c.parentNode.removeChild(c)}return!1}; -k.hc=function(a,b,c,d){this.ma=b;this.U=c;this.Ea=d;this.oa=a;this.V=vb(a,"ChipSet");ts(Mc(this.oa,"autoMount"),this.L);ws(this);kc(b,this,xs);mc(b,this,ys);zs(this,"None","",!0);this.M&&zs(this,"Local Disk","?");zs(this,"Remote Disk","??");As(this)||mb(this)};function ts(a,b){if(a){if("string"==typeof a)try{a=eval("("+a+")")}catch(d){r("FDC auto-mount error: "+d.message+" ("+a+")"),a={}}}else a={};if(b)for(var c in a)b[c]=a[c];return a} +k.hc=function(a,b,c,d){this.ma=b;this.U=c;this.Ea=d;this.oa=a;this.V=vb(a,"ChipSet");ts(Mc(this.oa,"autoMount"),this.L);ws(this);kc(b,this,xs);mc(b,this,ys);zs(this,"None","",!0);this.M&&zs(this,"Local Disk","?");zs(this,"Remote Disk","??");As(this)||mb(this)};function ts(a,b){if(a){if("string"==typeof a)try{a=eval("("+a+")")}catch(d){r("FDC auto-mount error: "+d.message+" ("+a+")"),a={}}}else a={};for(var c in a)b&&(b[c]=a[c]);return a} k.Ob=function(a,b){if(!b){if(!a){if(this.reset(),this.oa.O){this.B=[];for(a=0;ag.sa.restore(z)&&(h=!1);h&&g.sa&&void 0!==g.Oa&&(g.Ra=g.sa.seek(g.ub,g.Sa,g.kb));h||(e=!1)}a.H=b[c++]||0;a.F=b[c]||Is;return e} function Cs(a){var b=0,c=[];c[b++]=a.La;c[b++]=0;c[b++]=a.Y;c[b++]=a.G;c[b++]=a.D;c[b++]=a.C;c[b++]=a.I;for(var d=b++,e=0,f=[],g=0;gGs(a,e,b,c,!1,d)&&window.confirm("Click OK to reload the original disk.\n(WARNING: All disk changes will be discarded)");){var f=a,g=c,h;for(h=0;ha.fb||f[1]>a.gb)&&(this.Aa('Diskette "'+c+'" too large for drive '+String.fromCharCode(65+a.La)),b=null);b?(a.sa=b,a.Rj=c,a.Sd=d,Hs(this,c,d,b),f=b.info(),this.H|=Ks,this.Aa('Mounted diskette "'+c+'" in drive '+String.fromCharCode(65+a.La),a.Gd||e),a.Mf=f[0],a.Re=f[1],a.Se=f[2],this.oa&&Zc(this.oa)):a.me=!1;a.Gd&&(a.Gd=!1,--this.J||mb(this));us(this,a.La)}; diff --git a/modules/pcx86/lib/fdc.js b/modules/pcx86/lib/fdc.js index 3f582940d..54a652e13 100644 --- a/modules/pcx86/lib/fdc.js +++ b/modules/pcx86/lib/fdc.js @@ -465,10 +465,8 @@ class FDC extends Component { } else { config = {}; } - if (configMerge) { - for (var drive in config) { - configMerge[drive] = config[drive]; - } + for (var sDrive in config) { + if (configMerge) configMerge[sDrive] = config[sDrive]; } return config; } @@ -1087,21 +1085,21 @@ class FDC extends Component { for (var sDrive in this.configMount) { var configDrive = this.configMount[sDrive]; var sDiskettePath = configDrive['path'] || ""; - var sDisketteName = configDrive['name'] || this.findDiskette(sDiskettePath); - if (sDiskettePath && sDisketteName) { + if (sDiskettePath) { /* * 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) { + var sDisketteName = configDrive['name'] || this.findDiskette(sDiskettePath) || "Unknown"; if (!this.loadDrive(iDrive, sDisketteName, sDiskettePath, true) && fRemount) { this.setReady(false); } continue; } + this.notice("Incorrect auto-mount settings for drive " + sDrive + " (" + JSON.stringify(configDrive) + ")"); } - this.notice("Incorrect auto-mount settings for drive " + sDrive + " (" + JSON.stringify(configDrive) + ")"); } return !!this.cAutoMount; } diff --git a/versions/pcx86/1.35.0/pcx86-dbg.js b/versions/pcx86/1.35.0/pcx86-dbg.js index 872e3a6a1..2fea25761 100644 --- a/versions/pcx86/1.35.0/pcx86-dbg.js +++ b/versions/pcx86/1.35.0/pcx86-dbg.js @@ -658,7 +658,7 @@ function Hv(a){mb.call(this,"FDC",a,524288);this.dmaRead=Hv.prototype.kl;this.dm l.Cb=function(a,b,c){var d=this;switch(b){case "listDisks":this.na[b]=c;if(this.J){b=[];for(a=0;a'+b+"");a.innerHTML=b}};return!0;case "descDisk":case "listDrives":return this.na[b]=c,c.onchange=function(){var a=oa(c.value,10);null!=a&&Jv(d,a)},!0;case "loadDisk":return this.na[b]=c,c.onclick=function(){var a=d.na.listDisks;a&&Kv(d,a.options[a.selectedIndex].text,a.value)},!0;case "saveDisk":if(!this.M){c.parentNode.removeChild(c);break}this.na[b]=c;c.onclick=function(){var a=d.na.listDrives;a&&a.options&&d.A&&((a=d.A[oa(a.value, 10)||0])?(a=a.sa)?(a=Wa(Fv(a),"octet-stream",!0,a.Kg.replace(".json",".img")),gb(a)):d.Fa("No diskette loaded in drive."):d.Fa("No diskette drive selected."))};return!0;case "mountDisk":if(this.M)return this.na[b]=c,c.addEventListener("change",function(){var a=c.children[0];a.children[1].disabled=!a.children[0].files.length}),c.onsubmit=function(a){if(a=a.currentTarget[1].files[0]){var b=a.name;Kv(d,ta(b,!0),b,a)}return!1},!0;c.parentNode.removeChild(c)}return!1}; -l.uc=function(a,b,c,d){this.ka=b;this.H=c;this.ba=d;this.pa=a;this.W=Wb(a,"ChipSet");Iv(yd(this.pa,"autoMount"),this.L);Lv(this);Nc(b,this,Mv);Rc(b,this,Nv);Ov(this,"None","",!0);this.M&&Ov(this,"Local Disk","?");Ov(this,"Remote Disk","??");Pv(this)||Ib(this)};function Iv(a,b){if(a){if("string"==typeof a)try{a=eval("("+a+")")}catch(d){gb("FDC auto-mount error: "+d.message+" ("+a+")"),a={}}}else a={};if(b)for(var c in a)b[c]=a[c];return a} +l.uc=function(a,b,c,d){this.ka=b;this.H=c;this.ba=d;this.pa=a;this.W=Wb(a,"ChipSet");Iv(yd(this.pa,"autoMount"),this.L);Lv(this);Nc(b,this,Mv);Rc(b,this,Nv);Ov(this,"None","",!0);this.M&&Ov(this,"Local Disk","?");Ov(this,"Remote Disk","??");Pv(this)||Ib(this)};function Iv(a,b){if(a){if("string"==typeof a)try{a=eval("("+a+")")}catch(d){gb("FDC auto-mount error: "+d.message+" ("+a+")"),a={}}}else a={};for(var c in a)b&&(b[c]=a[c]);return a} l.Xb=function(a,b){if(!b){if(!a){if(this.reset(),this.pa.O){this.C=[];for(a=0;ag.sa.restore(E)&&(h=!1);h&&g.sa&&void 0!==g.Sa&&(g.cb=g.sa.seek(g.Gb,g.Za,g.mb));h||(e=!1)}a.G=b[c++]||0;a.Zb=b[c]||Xv;return e} function Rv(a){var b=0,c=[];c[b++]=a.Ua;c[b++]=0;c[b++]=a.fa;c[b++]=a.F;c[b++]=a.D;c[b++]=a.B;c[b++]=a.I;for(var d=b++,e=0,f=[],g=0;gVv(a,e,b,c,!1,d)&&window.confirm("Click OK to reload the original disk.\n(WARNING: All disk changes will be discarded)");){var f=a,g=c,h;for(h=0;ha.qb||f[1]>a.kb)&&(this.Fa('Diskette "'+c+'" too large for drive '+String.fromCharCode(65+a.Ua)),b=null);b?(a.sa=b,a.$k=c,a.ue=d,Wv(this,c,d,b),f=b.info(),this.G|=$v,this.Fa('Mounted diskette "'+c+'" in drive '+String.fromCharCode(65+a.Ua),a.le||e),a.vg=f[0],a.Bf=f[1],a.Cf=f[2],this.pa&&this.pa.md()):a.Oe=!1;a.le&&(a.le=!1,--this.K||Ib(this));Jv(this,a.Ua)}; diff --git a/versions/pcx86/1.35.0/pcx86.js b/versions/pcx86/1.35.0/pcx86.js index f52ccb34c..0d76e69fa 100644 --- a/versions/pcx86/1.35.0/pcx86.js +++ b/versions/pcx86/1.35.0/pcx86.js @@ -605,14 +605,14 @@ function rs(a){var b=a.data,c=b.length;if(c<<2==a.length){for(var d=c-1,e=b[d],f k.wb=function(a,b,c){var d=this;switch(b){case "listDisks":this.ia[b]=c;if(this.K){b=[];for(a=0;a'+b+"");a.innerHTML=b}};return!0;case "descDisk":case "listDrives":return this.ia[b]=c,c.onchange=function(){var a=na(c.value,10);null!=a&&us(d,a)},!0;case "loadDisk":return this.ia[b]=c,c.onclick=function(){var a=d.ia.listDisks;a&&vs(d,a.options[a.selectedIndex].text,a.value)},!0;case "saveDisk":if(!this.M){c.parentNode.removeChild(c);break}this.ia[b]=c;c.onclick=function(){var a=d.ia.listDrives;a&&a.options&&d.A&&((a=d.A[na(a.value, 10)||0])?(a=a.sa)?(a=Ka(qs(a),"octet-stream",!0,a.qh.replace(".json",".img")),r(a)):d.Aa("No diskette loaded in drive."):d.Aa("No diskette drive selected."))};return!0;case "mountDisk":if(this.M)return this.ia[b]=c,c.addEventListener("change",function(){var a=c.children[0];a.children[1].disabled=!a.children[0].files.length}),c.onsubmit=function(a){if(a=a.currentTarget[1].files[0]){var b=a.name;vs(d,pa(b,!0),b,a)}return!1},!0;c.parentNode.removeChild(c)}return!1}; -k.hc=function(a,b,c,d){this.ma=b;this.U=c;this.Ea=d;this.oa=a;this.V=vb(a,"ChipSet");ts(Mc(this.oa,"autoMount"),this.L);ws(this);kc(b,this,xs);mc(b,this,ys);zs(this,"None","",!0);this.M&&zs(this,"Local Disk","?");zs(this,"Remote Disk","??");As(this)||mb(this)};function ts(a,b){if(a){if("string"==typeof a)try{a=eval("("+a+")")}catch(d){r("FDC auto-mount error: "+d.message+" ("+a+")"),a={}}}else a={};if(b)for(var c in a)b[c]=a[c];return a} +k.hc=function(a,b,c,d){this.ma=b;this.U=c;this.Ea=d;this.oa=a;this.V=vb(a,"ChipSet");ts(Mc(this.oa,"autoMount"),this.L);ws(this);kc(b,this,xs);mc(b,this,ys);zs(this,"None","",!0);this.M&&zs(this,"Local Disk","?");zs(this,"Remote Disk","??");As(this)||mb(this)};function ts(a,b){if(a){if("string"==typeof a)try{a=eval("("+a+")")}catch(d){r("FDC auto-mount error: "+d.message+" ("+a+")"),a={}}}else a={};for(var c in a)b&&(b[c]=a[c]);return a} k.Ob=function(a,b){if(!b){if(!a){if(this.reset(),this.oa.O){this.B=[];for(a=0;ag.sa.restore(z)&&(h=!1);h&&g.sa&&void 0!==g.Oa&&(g.Ra=g.sa.seek(g.ub,g.Sa,g.kb));h||(e=!1)}a.H=b[c++]||0;a.F=b[c]||Is;return e} function Cs(a){var b=0,c=[];c[b++]=a.La;c[b++]=0;c[b++]=a.Y;c[b++]=a.G;c[b++]=a.D;c[b++]=a.C;c[b++]=a.I;for(var d=b++,e=0,f=[],g=0;gGs(a,e,b,c,!1,d)&&window.confirm("Click OK to reload the original disk.\n(WARNING: All disk changes will be discarded)");){var f=a,g=c,h;for(h=0;ha.fb||f[1]>a.gb)&&(this.Aa('Diskette "'+c+'" too large for drive '+String.fromCharCode(65+a.La)),b=null);b?(a.sa=b,a.Rj=c,a.Sd=d,Hs(this,c,d,b),f=b.info(),this.H|=Ks,this.Aa('Mounted diskette "'+c+'" in drive '+String.fromCharCode(65+a.La),a.Gd||e),a.Mf=f[0],a.Re=f[1],a.Se=f[2],this.oa&&Zc(this.oa)):a.me=!1;a.Gd&&(a.Gd=!1,--this.J||mb(this));us(this,a.La)}; From 935ece2c266ec91110cb8fec02d1c2cd2c2a2b16 Mon Sep 17 00:00:00 2001 From: Jeff Parsons Date: Sat, 17 Jun 2017 22:05:07 -0700 Subject: [PATCH 2/2] For those machines that don't need to autoMount a diskette either in drive A or drive B, explicitly indicate so (it will also save a tiny bit of load time) --- disks/pcx86/windows/2.0x/README.md | 2 ++ disks/pcx86/windows/3.00/README.md | 2 ++ disks/pcx86/windows/3.10/README.md | 2 ++ disks/pcx86/windows/win95/4.00.950/README.md | 2 ++ disks/pcx86/windows/win95/4.00.950/debugger/README.md | 2 ++ 5 files changed, 10 insertions(+) diff --git a/disks/pcx86/windows/2.0x/README.md b/disks/pcx86/windows/2.0x/README.md index 6d2cce20c..a665db977 100644 --- a/disks/pcx86/windows/2.0x/README.md +++ b/disks/pcx86/windows/2.0x/README.md @@ -11,6 +11,8 @@ machines: autoMount: A: name: None + B: + name: None --- Microsoft Windows/386 2.0 existed as the following "point releases": diff --git a/disks/pcx86/windows/3.00/README.md b/disks/pcx86/windows/3.00/README.md index 4e384cde8..ffa234cfd 100644 --- a/disks/pcx86/windows/3.00/README.md +++ b/disks/pcx86/windows/3.00/README.md @@ -10,6 +10,8 @@ machines: autoMount: A: name: None + B: + name: None --- Microsoft Windows 3.00 diff --git a/disks/pcx86/windows/3.10/README.md b/disks/pcx86/windows/3.10/README.md index 5b5087aee..300442f9a 100644 --- a/disks/pcx86/windows/3.10/README.md +++ b/disks/pcx86/windows/3.10/README.md @@ -12,6 +12,8 @@ machines: autoMount: A: name: None + B: + name: None --- Microsoft Windows 3.10 diff --git a/disks/pcx86/windows/win95/4.00.950/README.md b/disks/pcx86/windows/win95/4.00.950/README.md index ec70e0e93..73e8f808b 100644 --- a/disks/pcx86/windows/win95/4.00.950/README.md +++ b/disks/pcx86/windows/win95/4.00.950/README.md @@ -11,6 +11,8 @@ machines: autoMount: A: name: None + B: + name: None --- Microsoft Windows 95 (First Retail Release) diff --git a/disks/pcx86/windows/win95/4.00.950/debugger/README.md b/disks/pcx86/windows/win95/4.00.950/debugger/README.md index 72137de83..6605de110 100644 --- a/disks/pcx86/windows/win95/4.00.950/debugger/README.md +++ b/disks/pcx86/windows/win95/4.00.950/debugger/README.md @@ -12,6 +12,8 @@ machines: autoMount: A: name: None + B: + name: None --- Microsoft Windows 95 (First Retail Release) with Debugger