vgabios: Unify code to generate the vbe mode list.

[seabios.git] / src / biosvar.h

diff --git a/src/biosvar.h b/src/biosvar.h
index db6783e07b2421c5e92d9ca5e719d7e7f1c45a8e..ad791ab66474c01e8c2ac6fd948d476dca68e353 100644 (file)
--- a/src/biosvar.h
+++ b/src/biosvar.h
@@ -1,6 +1,6 @@
 // Variable layouts of bios.
 //
-// Copyright (C) 2008,2009  Kevin O'Connor <kevin@koconnor.net>
+// Copyright (C) 2008-2010  Kevin O'Connor <kevin@koconnor.net>
 //
 // This file may be distributed under the terms of the GNU LGPLv3 license.
 #ifndef __BIOSVAR_H
@@ -25,6 +25,12 @@ struct rmode_IVT {
 #define SET_IVT(vector, segoff)                                         \
     SET_FARVAR(SEG_IVT, ((struct rmode_IVT *)0)->ivec[vector], segoff)
 
+#define FUNC16(func) ({                                 \
+        ASSERT32FLAT();                                 \
+        extern void func (void);                        \
+        SEGOFF(SEG_BIOS, (u32)func - BUILD_BIOS_ADDR);  \
+    })
+
 
 /****************************************************************
  * Bios Data Area (BDA)
@@ -106,7 +112,8 @@ struct bios_data_area_s {
     struct segoff_s video_savetable;
     u8 other_ac[4];
     // 40:B0
-    u8 other_b0[10];
+    u8 other_b0[9];
+    u8 vbe_flag;
     u16 vbe_mode;
 } PACKED;
 
@@ -160,7 +167,7 @@ struct dpte_s {
 
 // ElTorito Device Emulation data
 struct cdemu_s {
-    struct drive_s *emulated_drive;
+    struct drive_s *emulated_drive_gf;
     u32 ilba;
     u16 buffer_segment;
     u16 load_segment;
@@ -188,6 +195,17 @@ struct fdpt_s {
     u8 checksum;
 } PACKED;
 
+struct usbkeyinfo {
+    union {
+        struct {
+            u8 modifiers;
+            u8 repeatcount;
+            u8 keys[6];
+        };
+        u64 data;
+    };
+};
+
 struct extended_bios_data_area_s {
     u8 size;
     u8 reserved1[0x21];
@@ -206,6 +224,8 @@ struct extended_bios_data_area_s {
 
     // 0x121 - Begin custom storage.
     u8 ps2ctr;
+    struct usbkeyinfo usbkey_last;
+
     int RTCusers;
 
     // El Torito Emulation data
@@ -221,8 +241,6 @@ struct extended_bios_data_area_s {
 
     // Stack space available for code that needs it.
     u8 extra_stack[512] __aligned(8);
-
-    u8 cdemu_buf[2048 * !!CONFIG_CDROM_EMU];
 } PACKED;
 
 // The initial size and location of EBDA
@@ -232,11 +250,11 @@ struct extended_bios_data_area_s {
     FLATPTR_TO_SEG(BUILD_LOWRAM_END - EBDA_SIZE_START*1024)
 
 // Accessor functions
-static inline u16 get_ebda_seg() {
+static inline u16 get_ebda_seg(void) {
     return GET_BDA(ebda_seg);
 }
 static inline struct extended_bios_data_area_s *
-get_ebda_ptr()
+get_ebda_ptr(void)
 {
     ASSERT32FLAT();
     return MAKE_FLATPTR(get_ebda_seg(), 0);
@@ -279,7 +297,7 @@ static inline u32 __attribute_const get_global_offset(void) {
     return 0;
 }
 #endif
-static inline u16 get_global_seg() {
+static inline u16 get_global_seg(void) {
     return GET_SEG(GLOBAL_SEGREG);
 }
 #define GET_GLOBAL(var)                                                 \
@@ -290,10 +308,12 @@ static inline u16 get_global_seg() {
         (var) = (val);                          \
     } while (0)
 #if MODESEGMENT
-#define ADJUST_GLOBAL_PTR(var) (var)
+#define GLOBALFLAT2GLOBAL(var) ((typeof(var))((void*)(var) - BUILD_BIOS_ADDR))
 #else
-#define ADJUST_GLOBAL_PTR(var) ((typeof(var))((void*)var - BUILD_BIOS_ADDR))
+#define GLOBALFLAT2GLOBAL(var) (var)
 #endif
+// Access a "flat" pointer known to point to the f-segment.
+#define GET_GLOBALFLAT(var) GET_GLOBAL(*GLOBALFLAT2GLOBAL(&(var)))
 
 
 /****************************************************************