From: Kevin O'Connor <kevin@koconnor.net>
Date: Fri, 24 Jul 2015 17:17:38 +0000 (-0400)
Subject: Minor - move declaration of CDRom_locks to code that uses it
X-Git-Tag: rel-1.9.0~83
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=8c76bd6811d5a4ccbc7a5863f7842818eb1c2373;p=seabios.git

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 00e9e09..a4f31ad 100644
--- 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 0e0af24..91d939a 100644
--- 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 cea844f..8ea0ba0 100644
--- 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;