vgabios: Rename vbe_flags to flags

Allow the custom bda field vbe_flags to be used for flags outside of
vbe.

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

diff --git a/vgasrc/vbe.c b/vgasrc/vbe.c
index 06ec22ef690b14abb3d020cd0e2f2f2648fc6ef5..e2aeced9487fe6e8e0d1524d8582360804795cef 100644 (file)
--- a/vgasrc/vbe.c
+++ b/vgasrc/vbe.c
@@ -381,11 +381,12 @@ vbe_104f10(struct bregs *regs)
     case 0x00:
         regs->bx = 0x0f30;
         break;
-    case 0x01:
-        SET_BDA_EXT(vbe_flag, regs->bh);
+    case 0x01: ;
+        u8 flags = GET_BDA_EXT(flags);
+        SET_BDA_EXT(flags, (flags & ~BF_PM_MASK) | (regs->bh & BF_PM_MASK));
         break;
     case 0x02:
-        regs->bh = GET_BDA_EXT(vbe_flag);
+        regs->bh = GET_BDA_EXT(flags) & BF_PM_MASK;
         break;
     default:
         regs->ax = 0x014f;

diff --git a/vgasrc/vgabios.h b/vgasrc/vgabios.h
index fc8d45a57530101e6b2364b2e0e894003ce44b40..0ec4a8e4e7ea0f341adc9df5b2606dbf835caf70 100644 (file)
--- a/vgasrc/vgabios.h
+++ b/vgasrc/vgabios.h
@@ -79,11 +79,13 @@ struct gfx_op {
 #define VGA_CUSTOM_BDA 0xb9
 
 struct vga_bda_s {
-    u8 vbe_flag;
+    u8 flags;
     u16 vbe_mode;
     u16 vgamode_offset;
 } PACKED;
 
+#define BF_PM_MASK 0x0f
+
 #define GET_BDA_EXT(var) \
     GET_FARVAR(SEG_BDA, ((struct vga_bda_s *)VGA_CUSTOM_BDA)->var)
 #define SET_BDA_EXT(var, val) \