tweaks to ordering in initialization

copy · Sep 1, 2023 · 60a2f9d · 60a2f9d
1 parent 2ce5d16
commit 60a2f9d
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 6 deletions.
diff --git a/src/browser/main.js b/src/browser/main.js
@@ -354,6 +354,27 @@
                 },
                 name: "FreeDOS",
             },
+            {
+                id: "freedos13",
+                hda: {
+                    url: host + "freedos13.img",
+                    async: true,
+                },
+                wants_cdrom: true,
+                name: "FreeDOS 13",
+            },
+            {
+                id: "freedos13-with-cd",
+                hda: {
+                    url: host + "freedos13.img",
+                    async: true,
+                },
+                cdrom: {
+                    url: host + "FD13LIVE.iso",
+                    async: true
+                },
+                name: "FreeDOS 13 (with CD)",
+            },
             {
                 id: "psychdos",
                 hda: {

diff --git a/src/browser/starter.js b/src/browser/starter.js
@@ -1044,7 +1044,7 @@ V86Starter.prototype.set_cdrom = async function(file)
  */
 V86Starter.prototype.eject_cdrom = function()
 {
-    this.v86.cpu.devices.cdrom.master.eject_cdrom();
+    this.v86.cpu.devices.cdrom.master.eject();
 };
 
 /**

diff --git a/src/ide.js b/src/ide.js
@@ -477,11 +477,6 @@ function IDEInterface(device, cpu, buffer, is_cd, device_nr, interface_nr, bus)
     /** @type {number} */
     this.cylinder_count = 0;
 
-    if(buffer)
-    {
-        this.set_cdrom(buffer);
-    }
-
     /** @const */
     this.stats = {
         sectors_read: 0,
@@ -554,6 +549,11 @@ function IDEInterface(device, cpu, buffer, is_cd, device_nr, interface_nr, bus)
     this.in_progress_io_ids = new Set();
     this.cancelled_io_ids = new Set();
 
+    if(buffer)
+    {
+        this.set_cdrom(buffer);
+    }
+
     Object.seal(this);
 }
 
@@ -564,6 +564,7 @@ IDEInterface.prototype.eject = function()
     {
         this.status = 0x59;
         this.error = 0x60;
+        this.push_irq();
     }
 }
 
@@ -633,6 +634,9 @@ IDEInterface.prototype.set_cdrom = function(buffer)
         rtc.cmos_write(reg + 8, this.sectors_per_track & 0xFF);
         //rtc.cmos_write(CMOS_BIOS_DISKTRANSFLAG,
         //    rtc.cmos_read(CMOS_BIOS_DISKTRANSFLAG) | 1 << (nr * 4 + 2)
+        if(this.device.cpu) {
+            this.push_irq();
+        }
     }
 }