Enhance e820 memory map generation.

[seabios.git] / src / biosvar.h

diff --git a/src/biosvar.h b/src/biosvar.h
index 6cf59804271b43866628d8ce10d11974d48aebd5..177656e666eeb13fcc7a7e61b24db08cad495fed 100644 (file)
--- a/src/biosvar.h
+++ b/src/biosvar.h
@@ -48,11 +48,11 @@ struct bios_data_area_s {
     u8 floppy_motor_counter;
     u8 floppy_last_status;
     u8 floppy_return_status[7];
-    u8 other1[0x7];
+    u8 other_49[0x7];
     // 40:50
-    u8 other2[0x10];
+    u8 other_50[0x10];
     // 40:60
-    u8 other3[0x7];
+    u8 other_60[0x7];
     u32 jump_cs_ip;
     u8 dummy;
     u32 timer_counter;
@@ -69,7 +69,7 @@ struct bios_data_area_s {
     // 40:80
     u16 kbd_buf_start_offset;
     u16 kbd_buf_end_offset;
-    u8 other5[7];
+    u8 other_84[7];
     u8 floppy_last_data_rate;
     u8 disk_status_controller;
     u8 disk_error_controller;
@@ -102,9 +102,9 @@ struct bios_data_area_s {
 
 // Accessor functions
 #define GET_BDA(var) \
-    GET_FARVAR(0x0000, ((struct bios_data_area_s *)0)->var)
+    GET_FARVAR(SEG_BDA, ((struct bios_data_area_s *)0)->var)
 #define SET_BDA(var, val) \
-    SET_FARVAR(0x0000, ((struct bios_data_area_s *)0)->var, (val))
+    SET_FARVAR(SEG_BDA, ((struct bios_data_area_s *)0)->var, (val))
 #define CLEARBITS_BDA(var, val) do {                                    \
         typeof(((struct bios_data_area_s *)0)->var) __val = GET_BDA(var); \
         SET_BDA(var, (__val & ~(val)));                                 \
@@ -119,21 +119,6 @@ struct bios_data_area_s {
  * Hard drive info
  ****************************************************************/
 
-struct fdpt_s {
-    u16 cylinders;
-    u8 heads;
-    u8 a0h_signature;
-    u8 phys_sectors;
-    u16 precompensation;
-    u8 reserved;
-    u8 drive_control_byte;
-    u16 phys_cylinders;
-    u8 phys_heads;
-    u16 landing_zone;
-    u8 sectors;
-    u8 checksum;
-} PACKED;
-
 struct chs_s {
     u16 heads;      // # heads
     u16 cylinders;  // # cylinders
@@ -161,7 +146,7 @@ struct ata_channel_s {
     u16 iobase1;      // IO Base 1
     u16 iobase2;      // IO Base 2
     u8  irq;          // IRQ
-} PACKED;
+};
 
 struct ata_device_s {
     u8  type;         // Detected type of ata (ata/atapi/none/unknown)
@@ -175,8 +160,8 @@ struct ata_device_s {
     struct chs_s  lchs;         // Logical CHS
     struct chs_s  pchs;         // Physical CHS
 
-    u32 sectors;      // Total sectors count
-} PACKED;
+    u64 sectors;      // Total sectors count
+};
 
 struct ata_s {
     // ATA channels info
@@ -194,7 +179,7 @@ struct ata_s {
 
     // Count of transferred sectors and bytes
     u16 trsfsectors;
-} PACKED;
+};
 
 // ElTorito Device Emulation data
 struct cdemu_s {
@@ -210,13 +195,53 @@ struct cdemu_s {
 
     // Virtual device
     struct chs_s  vdevice;
-} PACKED;
+};
+
+
+/****************************************************************
+ * Initial Program Load (IPL)
+ ****************************************************************/
+
+struct ipl_entry_s {
+    u16 type;
+    u16 flags;
+    u32 vector;
+    u32 description;
+};
+
+struct ipl_s {
+    struct ipl_entry_s table[8];
+    u16 count;
+    u16 sequence;
+    u32 bootorder;
+    u8 checkfloppysig;
+};
+
+#define IPL_TYPE_FLOPPY      0x01
+#define IPL_TYPE_HARDDISK    0x02
+#define IPL_TYPE_CDROM       0x03
+#define IPL_TYPE_BEV         0x80
 
 
 /****************************************************************
  * Extended Bios Data Area (EBDA)
  ****************************************************************/
 
+struct fdpt_s {
+    u16 cylinders;
+    u8 heads;
+    u8 a0h_signature;
+    u8 phys_sectors;
+    u16 precompensation;
+    u8 reserved;
+    u8 drive_control_byte;
+    u16 phys_cylinders;
+    u8 phys_heads;
+    u16 landing_zone;
+    u8 sectors;
+    u8 checksum;
+} PACKED;
+
 struct extended_bios_data_area_s {
     u8 size;
     u8 reserved1[0x21];
@@ -228,56 +253,31 @@ struct extended_bios_data_area_s {
     u8 other1[0x0d];
 
     // 0x3d
-    struct fdpt_s fdpt0;
-    struct fdpt_s fdpt1;
+    struct fdpt_s fdpt[2];
 
+    // 0x5d
     u8 other2[0xC4];
 
+    // Physical memory available.
+    u32 ram_size;
+    u16 e820_count;
+    u32 e820_loc;
+
     // ATA Driver data
     struct ata_s   ata;
 
     // El Torito Emulation data
     struct cdemu_s cdemu;
+
+    // Initial program load
+    struct ipl_s ipl;
 } PACKED;
 
 // Accessor functions
 #define GET_EBDA(var) \
-    GET_FARVAR(EBDA_SEG, ((struct extended_bios_data_area_s *)0)->var)
+    GET_FARVAR(SEG_EBDA, ((struct extended_bios_data_area_s *)0)->var)
 #define SET_EBDA(var, val) \
-    SET_FARVAR(EBDA_SEG, ((struct extended_bios_data_area_s *)0)->var, (val))
-
-
-/****************************************************************
- * Initial Program Load (IPL)
- ****************************************************************/
-
-// XXX - is this a standard, or just a bochs bios thing?
-
-struct ipl_entry_s {
-    u16 type;
-    u16 flags;
-    u32 vector;
-    u32 description;
-    u32 reserved;
-};
-
-struct ipl_s {
-    struct ipl_entry_s table[8];
-    u16 count;
-    u16 sequence;
-    u8 pad[124];
-};
-
-#define IPL_TYPE_FLOPPY      0x01
-#define IPL_TYPE_HARDDISK    0x02
-#define IPL_TYPE_CDROM       0x03
-#define IPL_TYPE_BEV         0x80
-
-// Accessor functions
-#define GET_IPL(var) \
-    GET_FARVAR(IPL_SEG, ((struct ipl_s *)0)->var)
-#define SET_IPL(var, val) \
-    SET_FARVAR(IPL_SEG, ((struct ipl_s *)0)->var, (val))
+    SET_FARVAR(SEG_EBDA, ((struct extended_bios_data_area_s *)0)->var, (val))
 
 
 /****************************************************************
@@ -337,10 +337,10 @@ extern struct bios_config_table_s BIOS_CONFIG_TABLE;
  ****************************************************************/
 
 #define SEG_BIOS     0xf000
+#define SEG_EBDA     0x9fc0
+#define SEG_BDA      0x0000
 
-#define EBDA_SEG           0x9FC0
-#define IPL_SEG            0x9FF0
-#define EBDA_SIZE          1              // In KiB
-#define BASE_MEM_IN_K   (640 - EBDA_SIZE)
+#define EBDA_SIZE DIV_ROUND_UP(sizeof(struct extended_bios_data_area_s), 1024)
+#define BASE_MEM_IN_K (640 - EBDA_SIZE)
 
 #endif // __BIOSVAR_H