Minor - move declaration of CDRom_locks to code that uses it

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>

diff --git a/src/cdrom.c b/src/cdrom.c
index 00e9e09ea1534bfe27b268317a7a05f0726550b6..a4f31adde2ab994fbacc6e0aa6af49afc5399d38 100644 (file)
--- a/src/cdrom.c
+++ b/src/cdrom.c
@@ -17,9 +17,6 @@
 #include "util.h" // cdrom_prepboot
 #include "tcgbios.h" // tpm_*
 
-// Locks for removable devices
-u8 CDRom_locks[BUILD_MAX_EXTDRIVE] VARLOW;
-
 
 /****************************************************************
  * CD emulation

diff --git a/src/disk.c b/src/disk.c
index 0e0af24b3bd56e8584582e9953e769116fa17e25..91d939aa4d99c399ab5b8105df74f0380bdef8ee 100644 (file)
--- a/src/disk.c
+++ b/src/disk.c
@@ -407,6 +407,9 @@ disk_1344(struct bregs *regs, struct drive_s *drive_gf)
     extended_access(regs, drive_gf, CMD_VERIFY);
 }
 
+// Locks for removable devices
+u8 CDRom_locks[BUILD_MAX_EXTDRIVE] VARLOW;
+
 // lock
 static void
 disk_134500(struct bregs *regs, struct drive_s *drive_gf)

diff --git a/src/util.h b/src/util.h
index cea844f9fda2a807d8ffe955c684c65994ad907f..8ea0ba0ab95213acf88be0021fbb0ee121437709 100644 (file)
--- a/src/util.h
+++ b/src/util.h
@@ -43,7 +43,6 @@ void enable_bootsplash(void);
 void disable_bootsplash(void);
 
 // cdrom.c
-extern u8 CDRom_locks[];
 extern struct eltorito_s CDEmu;
 extern struct drive_s *cdemu_drive_gf;
 struct disk_op_s;