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

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

diff --git a/src/disk.c b/src/disk.c
index 2aadd8a4663652b34140e0f65d3fa7d7f10e6ac4..fe2e2c3165d7e8c2c05c3ac1aaab3f89eb9e5370 100644 (file)
--- 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 f4d7c01f4fa6fbffb0e3483e32764e45d81f10e7..aa8583d6660304d00258efd1848c9c39d2c2bcff 100644 (file)
--- 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 21693fc3cd5548a017d59531cb92925c5eef2939..889064a6e49b94fc3f384258dd2f6f755cc4a0a5 100644 (file)
--- 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 55179bf852e8111d9ecdfa2b5f8ddc054af4c145..68c43235bb7edfd7002e7043dda402224541a0ef 100644 (file)
--- 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 00c6eb7db7a02f329a0de91474ae8a04da7c2e6c..88349c8a9267686d2df2308210f0cc3b7d454415 100644 (file)
--- 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 e7c9ff9bff4c42e1e96567027fa95ae3b59c383b..8b078e841bc03022563ac320a4e16942ae0bb809 100644 (file)
--- 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);