Move most of ATA and CDEMU from ebda to global variables.

The dpte, cdrom locks, and disk sector count remain in the ebda.
Also, enhance SET_GLOBAL macro to avoid unused variable warnings.

1 files changed, 2 insertions, 2 deletions

diff --git a/src/boot.c b/src/boot.c
index 48ad06a..ca1b980 100644
--- a/src/boot.c
+++ b/src/boot.c
@@ -151,8 +151,8 @@ try_boot(u16 seq_nr)
             return;
         }
 
-        bootdrv = GET_EBDA(cdemu.emulated_drive);
-        bootseg = GET_EBDA(cdemu.load_segment);
+        bootdrv = GET_GLOBAL(CDEMU.emulated_drive);
+        bootseg = GET_GLOBAL(CDEMU.load_segment);
         /* Canonicalize bootseg:bootip */
         bootip = (bootseg & 0x0fff) << 4;
         bootseg &= 0xf000;