ethonion10/v86
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Exposing the option to specify the second hard disk as a slave

Browse source
This commit is contained in:
Andrew Au 2020-06-27 10:20:55 -07:00 committed by Fabian
parent 20469fe4ef
commit 6ab0fa85a9
4 changed files with 24 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
debug.html
View file

@ -57,8 +57,13 @@
</tr>
<tr>
<td>Hard drive disk image</td>
<td><input type="file" id="hd_image"><br></td>
<td>Master Hard drive disk image</td>
<td><input type="file" id="hda_image"><br></td>
</tr>
<tr>
<td>Slave Hard drive disk image</td>
<td><input type="file" id="hdb_image"><br></td>
</tr>
<tr>

16
src/browser/main.js
View file

@ -151,11 +151,18 @@
settings.cdrom = { buffer: cd_file };
}
var hd_file = $("hd_image").files[0];
if(hd_file)
var hda_file = $("hda_image").files[0];
if(hda_file)
{
last_file = hd_file;
settings.hda = { buffer: hd_file };
last_file = hda_file;
settings.hda = { buffer: hda_file };
}
var hdb_file = $("hdb_image").files[0];
if(hdb_file)
{
last_file = hdb_file;
settings.hdb = { buffer: hdb_file };
}
if($("multiboot_image"))
@ -704,6 +711,7 @@
"fda": settings.fda,
"hda": settings.hda,
"hdb": settings.hdb,
"cdrom": settings.cdrom,
"multiboot": settings.multiboot,

9
src/cpu.js
View file

@ -760,17 +760,12 @@ CPU.prototype.init = function(settings, device_bus)
if(settings.hda)
{
this.devices.hda = new IDEDevice(this, settings.hda, false, ide_device_count++, device_bus);
this.devices.hda = new IDEDevice(this, settings.hda, settings.hdb, false, ide_device_count++, device_bus);
}
if(settings.cdrom)
{
this.devices.cdrom = new IDEDevice(this, settings.cdrom, true, ide_device_count++, device_bus);
}
if(settings.hdb)
{
this.devices.hdb = new IDEDevice(this, settings.hdb, false, ide_device_count++, device_bus);
this.devices.cdrom = new IDEDevice(this, settings.cdrom, undefined, true, ide_device_count++, device_bus);
}
this.devices.pit = new PIT(this, device_bus);

6
src/ide.js
View file

@ -44,10 +44,10 @@ var HD_SECTOR_SIZE = 512;
* @param {number} nr
* @param {BusConnector} bus
* */
function IDEDevice(cpu, buffer, is_cd, nr, bus)
function IDEDevice(cpu, masterBuffer, slaveBuffer, is_cd, nr, bus)
{
this.master = new IDEInterface(this, cpu, buffer, is_cd, nr, 0, bus);
this.slave = new IDEInterface(this, cpu, undefined, false, nr, 1, bus);
this.master = new IDEInterface(this, cpu, masterBuffer, is_cd, nr, 0, bus);
this.slave = new IDEInterface(this, cpu, slaveBuffer, is_cd, nr, 1, bus);
this.current_interface = this.master;