From ab482e0d6c80e74be9b974b9b2e896ebf9a21e1c Mon Sep 17 00:00:00 2001 From: Kevin O'Connor Date: Wed, 11 Jun 2014 14:00:21 -0400 Subject: build: Get fixed address variables from 32bit compile pass (not 16bit) Update the layoutrom.py build script so that fixed address sections can come from the 32bit compiled C code. Update the C code so that all VAR16FIXED variables instead use the new VARFSEGFIXED which is defined in 32bit mode. Signed-off-by: Kevin O'Connor --- src/misc.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/misc.c') diff --git a/src/misc.c b/src/misc.c index 889064a..8caaf31 100644 --- a/src/misc.c +++ b/src/misc.c @@ -117,7 +117,7 @@ handle_75(void) // INT 16/AH=09h (keyboard functionality) supported #define CBT_F2_INT1609 (1<<6) -struct bios_config_table_s BIOS_CONFIG_TABLE VAR16FIXED(0xe6f5) = { +struct bios_config_table_s BIOS_CONFIG_TABLE VARFSEGFIXED(0xe6f5) = { .size = sizeof(BIOS_CONFIG_TABLE) - 2, .model = BUILD_MODEL_ID, .submodel = BUILD_SUBMODEL_ID, @@ -182,22 +182,22 @@ struct descloc_s rombios32_gdt_48 VARFSEG = { ****************************************************************/ // BIOS build date -char BiosDate[] VAR16FIXED(0xfff5) = "06/23/99"; +char BiosDate[] VARFSEGFIXED(0xfff5) = "06/23/99"; -u8 BiosModelId VAR16FIXED(0xfffe) = BUILD_MODEL_ID; +u8 BiosModelId VARFSEGFIXED(0xfffe) = BUILD_MODEL_ID; -u8 BiosChecksum VAR16FIXED(0xffff); +u8 BiosChecksum VARFSEGFIXED(0xffff); -struct floppy_dbt_s diskette_param_table VAR16FIXED(0xefc7); +struct floppy_dbt_s diskette_param_table VARFSEGFIXED(0xefc7); // Old Fixed Disk Parameter Table (newer tables are in the ebda). -struct fdpt_s OldFDPT VAR16FIXED(0xe401); +struct fdpt_s OldFDPT VARFSEGFIXED(0xe401); // XXX - Baud Rate Generator Table -u8 BaudTable[16] VAR16FIXED(0xe729); +u8 BaudTable[16] VARFSEGFIXED(0xe729); // XXX - Initial Interrupt Vector Offsets Loaded by POST -u8 InitVectors[13] VAR16FIXED(0xfef3); +u8 InitVectors[13] VARFSEGFIXED(0xfef3); // XXX - INT 1D - SYSTEM DATA - VIDEO PARAMETER TABLES -u8 VideoParams[88] VAR16FIXED(0xf0a4); +u8 VideoParams[88] VARFSEGFIXED(0xf0a4); -- cgit v1.1