Move pir table offset from ebda to a global variable.

[seabios.git] / src / biosvar.h

diff --git a/src/biosvar.h b/src/biosvar.h
index d2d7b9fdbde86ffab9894542c9e36f8fcc440c0b..bac978c28071d1e4c209aa2d9a9c5515fcc97e71 100644 (file)
--- a/src/biosvar.h
+++ b/src/biosvar.h
@@ -7,7 +7,7 @@
 #define __BIOSVAR_H
 
 #include "types.h" // u8
-#include "farptr.h" // SET_SEG
+#include "farptr.h" // GET_FARVAR
 #include "config.h" // CONFIG_*
 
 
@@ -48,13 +48,21 @@ struct bios_data_area_s {
     u8 floppy_motor_counter;
     u8 floppy_last_status;
     u8 floppy_return_status[7];
-    u8 other1[0x7];
+    u8 video_mode;
+    u16 video_cols;
+    u16 video_pagesize;
+    u16 video_pagestart;
     // 40:50
-    u8 other2[0x10];
+    u16 cursor_pos[8];
     // 40:60
-    u8 other3[0x7];
-    u32 jump_cs_ip;
-    u8 dummy;
+    u16 cursor_type;
+    u8 video_page;
+    u16 crtc_address;
+    u8 video_msr;
+    u8 video_pal;
+    u16 jump_ip;
+    u16 jump_cs;
+    u8 other_6b;
     u32 timer_counter;
     // 40:70
     u8 timer_rollover;
@@ -69,7 +77,12 @@ struct bios_data_area_s {
     // 40:80
     u16 kbd_buf_start_offset;
     u16 kbd_buf_end_offset;
-    u8 other5[7];
+    u8 video_rows;
+    u16 char_height;
+    u8 video_ctl;
+    u8 video_switches;
+    u8 modeset_ctl;
+    u8 dcc_index;
     u8 floppy_last_data_rate;
     u8 disk_status_controller;
     u8 disk_error_controller;
@@ -142,9 +155,9 @@ struct dpte_s {
 };
 
 struct ata_channel_s {
-    u8  iface;        // ISA or PCI
     u16 iobase1;      // IO Base 1
     u16 iobase2;      // IO Base 2
+    u16 pci_bdf;
     u8  irq;          // IRQ
 };
 
@@ -206,14 +219,15 @@ struct ipl_entry_s {
     u16 type;
     u16 flags;
     u32 vector;
-    u32 description;
+    char *description;
 };
 
 struct ipl_s {
     struct ipl_entry_s table[8];
     u16 count;
     u16 sequence;
-    u16 bootfirst;
+    u32 bootorder;
+    u8 checkfloppysig;
 };
 
 #define IPL_TYPE_FLOPPY      0x01
@@ -257,61 +271,55 @@ struct extended_bios_data_area_s {
     // 0x5d
     u8 other2[0xC4];
 
+    // 0x121 - Begin custom storage.
+    u8 ps2ctr;
+
     // Physical memory available.
-    u32 ram_size;
+    u32 ram_size;        // Amount of continuous ram under 4Gig
+    u64 ram_size_over4G; // Amount of continuous ram >4Gig
 
     // ATA Driver data
-    struct ata_s   ata;
+    struct ata_s ata;
 
     // El Torito Emulation data
     struct cdemu_s cdemu;
 
     // Initial program load
     struct ipl_s ipl;
+
+    // Resume stack
+    u8 resume_stack[128] __aligned(8);
 } PACKED;
 
 // Accessor functions
 #define GET_EBDA(var) \
-    GET_FARVAR(SEG_EBDA, ((struct extended_bios_data_area_s *)0)->var)
+    GET_FARVAR(GET_BDA(ebda_seg), ((struct extended_bios_data_area_s *)0)->var)
 #define SET_EBDA(var, val) \
-    SET_FARVAR(SEG_EBDA, ((struct extended_bios_data_area_s *)0)->var, (val))
+    SET_FARVAR(GET_BDA(ebda_seg), ((struct extended_bios_data_area_s *)0)->var, (val))
+static inline struct extended_bios_data_area_s *
+get_ebda_ptr()
+{
+    extern void *__force_link_error__get_ebda_ptr_only_in_32bit();
+    if (MODE16)
+        return __force_link_error__get_ebda_ptr_only_in_32bit();
+    return (void*)MAKE_FARPTR(GET_BDA(ebda_seg), 0);
+}
 
 
 /****************************************************************
- * Registers saved/restored in romlayout.S
+ * Global variables
  ****************************************************************/
 
-#define UREG(ER, R, RH, RL) union { u32 ER; struct { u16 R; u16 R ## _hi; }; struct { u8 RL; u8 RH; u8 R ## _hilo; u8 R ## _hihi; }; }
-
-// Layout of registers passed in to irq handlers.  Note that this
-// layout corresponds to code in romlayout.S - don't change it here
-// without also updating the assembler code.
-struct bregs {
-    u16 ds;
-    u16 es;
-    UREG(edi, di, di_hi, di_lo);
-    UREG(esi, si, si_hi, si_lo);
-    UREG(ebx, bx, bh, bl);
-    UREG(edx, dx, dh, dl);
-    UREG(ecx, cx, ch, cl);
-    UREG(eax, ax, ah, al);
-    u16 ip;
-    u16 cs;
-    u16 flags;
-} PACKED;
-
-// bregs flags bitdefs
-#define F_ZF (1<<6)
-#define F_CF (1<<0)
-
-static inline void
-set_cf(struct bregs *regs, int cond)
-{
-    if (cond)
-        regs->flags |= F_CF;
-    else
-        regs->flags &= ~F_CF;
-}
+#define GET_GLOBAL(var) \
+    GET_VAR(CS, (var))
+#if MODE16
+extern void __force_link_error__set_global_only_in_32bit();
+#define SET_GLOBAL(var, val)                            \
+    __force_link_error__set_global_only_in_32bit()
+#else
+#define SET_GLOBAL(var, val)                    \
+    do { (var) = (val); } while (0)
+#endif
 
 
 /****************************************************************
@@ -328,16 +336,4 @@ struct bios_config_table_s {
 
 extern struct bios_config_table_s BIOS_CONFIG_TABLE;
 
-
-/****************************************************************
- * Memory layout info
- ****************************************************************/
-
-#define SEG_BIOS     0xf000
-#define SEG_EBDA     0x9fc0
-#define SEG_BDA      0x0000
-
-#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