Move most of the VAR16FIXED() defs to misc.c.

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

6 files changed, 12 insertions, 11 deletions

diff --git a/src/disk.c b/src/disk.c
index 2aadd8a..fe2e2c3 100644
--- a/src/disk.c
+++ b/src/disk.c
@@ -744,6 +744,3 @@ handle_76(void)
     SET_BDA(disk_interrupt_flag, 0xff);
     pic_eoi2();
 }
-
-// Old Fixed Disk Parameter Table (newer tables are in the ebda).
-struct fdpt_s OldFDPT VAR16FIXED(0xe401);
diff --git a/src/hw/floppy.c b/src/hw/floppy.c
index f4d7c01..aa8583d 100644
--- a/src/hw/floppy.c
+++ b/src/hw/floppy.c
@@ -58,8 +58,6 @@ struct floppy_ext_dbt_s diskette_param_table2 VARFSEG = {
     .drive_type     = 4,    // drive type in cmos
 };
 
-struct floppy_dbt_s diskette_param_table VAR16FIXED(0xefc7);
-
 struct floppyinfo_s {
     struct chs_s chs;
     u8 floppy_size;
diff --git a/src/misc.c b/src/misc.c
index 21693fc..889064a 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -188,6 +188,14 @@ u8 BiosModelId VAR16FIXED(0xfffe) = BUILD_MODEL_ID;
 
 u8 BiosChecksum VAR16FIXED(0xffff);
 
+struct floppy_dbt_s diskette_param_table VAR16FIXED(0xefc7);
+
+// Old Fixed Disk Parameter Table (newer tables are in the ebda).
+struct fdpt_s OldFDPT VAR16FIXED(0xe401);
+
+// XXX - Baud Rate Generator Table
+u8 BaudTable[16] VAR16FIXED(0xe729);
+
 // XXX - Initial Interrupt Vector Offsets Loaded by POST
 u8 InitVectors[13] VAR16FIXED(0xfef3);
 
diff --git a/src/romlayout.S b/src/romlayout.S
index 55179bf..68c4323 100644
--- a/src/romlayout.S
+++ b/src/romlayout.S
@@ -674,7 +674,7 @@ entry_post:
 entry_13_official:
         jmp entry_13
 
-        // 0xe401 - OldFDPT in disk.c
+        // 0xe401 - OldFDPT in misc.c
 
         ORG 0xe6f2
         .global entry_19_official
@@ -683,7 +683,7 @@ entry_19_official:
 
         // 0xe6f5 - BIOS_CONFIG_TABLE in misc.c
 
-        // 0xe729 - BaudTable in serial.c
+        // 0xe729 - BaudTable in misc.c
 
         ORG 0xe739
         IRQ_ENTRY_ARG 14
@@ -700,7 +700,7 @@ entry_19_official:
         ORG 0xef57
         IRQ_ENTRY 0e
 
-        // 0xefc7 - diskette_param_table in floppy.c
+        // 0xefc7 - diskette_param_table in misc.c
 
         ORG 0xefd2
         IRQ_ENTRY_ARG 17
diff --git a/src/serial.c b/src/serial.c
index 00c6eb7..88349c8 100644
--- a/src/serial.c
+++ b/src/serial.c
@@ -181,9 +181,6 @@ handle_14(struct bregs *regs)
     }
 }
 
-// XXX - Baud Rate Generator Table
-u8 BaudTable[16] VAR16FIXED(0xe729);
-
 
 /****************************************************************
  * LPT ports
diff --git a/src/util.h b/src/util.h
index e7c9ff9..8b078e8 100644
--- a/src/util.h
+++ b/src/util.h
@@ -176,6 +176,7 @@ void process_key(u8 key);
 
 // misc.c
 extern struct bios_config_table_s BIOS_CONFIG_TABLE __aligned(1);
+extern struct floppy_dbt_s diskette_param_table __aligned(1);
 extern u8 BiosChecksum;
 int in_post(void);
 void mathcp_setup(void);