vgabios: Use standard naming for cirrus memmodel.

[seabios.git] / vgasrc / bochsvga.c

diff --git a/vgasrc/bochsvga.c b/vgasrc/bochsvga.c
index 7ea1a1fe21c7888bb7299e7fec66fcea5d1e5824..70ac449e16706200c6a4ff658c6c2faba4ea2a80 100644 (file)
--- a/vgasrc/bochsvga.c
+++ b/vgasrc/bochsvga.c
@@ -1,17 +1,18 @@
-#include "vgatables.h"
-#include "vbe.h"
-#include "bochsvga.h"
-#include "util.h"
-#include "config.h" // CONFIG_
+#include "vgabios.h" // struct vbe_modeinfo
+#include "vbe.h" // VBE_MODE_VESA_DEFINED
+#include "bochsvga.h" // bochsvga_set_mode
+#include "util.h" // dprintf
+#include "config.h" // CONFIG_*
 #include "biosvar.h" // SET_BDA
+#include "stdvga.h" // VGAREG_SEQU_ADDRESS
 
-struct mode
+static struct mode
 {
     u16 mode;
     u16 width;
     u16 height;
     u8 depth;
-} vbe_modes[] VAR16 = {
+} bochsvga_modes[] VAR16 = {
     /* standard modes */
     { 0x100, 640,  400,  8  },
     { 0x101, 640,  480,  8  },
@@ -82,11 +83,10 @@ struct mode
 
 u32 pci_lfb_addr VAR16;
 
-static inline u32 pci_config_readl(u8 bus, u8 devfn, u16 addr)
+static inline u32 pci_config_readl(u16 bdf, u16 addr)
 {
     int status;
     u32 val;
-    u16 bdf = (bus << 16) | devfn;
 
     addr &= ~3;
 
@@ -135,12 +135,11 @@ static u16 dispi_get_max_bpp(void)
 
 /* Called only during POST */
 int
-vbe_init(u8 bus, u8 devfn)
+bochsvga_init(void)
 {
-    u32 lfb_addr;
-
-    if (!CONFIG_VGA_BOCHS)
-        return -1;
+    int ret = stdvga_init();
+    if (ret)
+        return ret;
 
     /* Sanity checks */
     dispi_write(VBE_DISPI_INDEX_ID, VBE_DISPI_ID0);
@@ -152,8 +151,9 @@ vbe_init(u8 bus, u8 devfn)
     SET_BDA(vbe_flag, 0x1);
     dispi_write(VBE_DISPI_INDEX_ID, VBE_DISPI_ID5);
 
+    u32 lfb_addr;
     if (CONFIG_VGA_PCI)
-        lfb_addr = pci_config_readl(bus, devfn, 0x10) & ~0xf;
+        lfb_addr = pci_config_readl(GET_GLOBAL(VgaBDF), 0x10) & ~0xf;
     else
         lfb_addr = VBE_DISPI_LFB_PHYSICAL_ADDRESS;
 
@@ -165,13 +165,13 @@ vbe_init(u8 bus, u8 devfn)
 }
 
 int
-vbe_enabled(void)
+bochsvga_enabled(void)
 {
     return GET_BDA(vbe_flag);
 }
 
 u16
-vbe_total_mem(void)
+bochsvga_total_mem(void)
 {
     return dispi_read(VBE_DISPI_INDEX_VIDEO_MEMORY_64K);
 }
@@ -180,7 +180,7 @@ static struct mode *find_mode_entry(u16 mode)
 {
     struct mode *m;
 
-    for (m = vbe_modes; GET_GLOBAL(m->mode); m++) {
+    for (m = bochsvga_modes; GET_GLOBAL(m->mode); m++) {
         if (GET_GLOBAL(m->mode) == mode)
             return m;
     }
@@ -192,7 +192,7 @@ static int mode_valid(struct mode *m)
 {
     u16 max_xres = dispi_get_max_xres();
     u16 max_bpp = dispi_get_max_bpp();
-    u32 max_mem = vbe_total_mem() * 64 * 1024;
+    u32 max_mem = bochsvga_total_mem() * 64 * 1024;
 
     u32 mem = GET_GLOBAL(m->width) * GET_GLOBAL(m->height) *
               BYTES_PER_PIXEL(m);
@@ -206,13 +206,13 @@ static int mode_valid(struct mode *m)
 }
 
 int
-vbe_list_modes(u16 seg, u16 ptr)
+bochsvga_list_modes(u16 seg, u16 ptr)
 {
     int count = 0;
     u16 *dest = (u16 *)(u32)ptr;
     struct mode *m;
 
-    for (m = vbe_modes; GET_GLOBAL(m->mode); m++) {
+    for (m = bochsvga_modes; GET_GLOBAL(m->mode); m++) {
         if (!mode_valid(m))
             continue;
 
@@ -228,7 +228,7 @@ vbe_list_modes(u16 seg, u16 ptr)
 }
 
 int
-vbe_mode_info(u16 mode, struct vbe_modeinfo *info)
+bochsvga_mode_info(u16 mode, struct vbe_modeinfo *info)
 {
     struct mode *m;
 
@@ -242,13 +242,13 @@ vbe_mode_info(u16 mode, struct vbe_modeinfo *info)
 
     info->linesize = info->width * ((info->depth + 7) / 8);
     info->phys_base = GET_GLOBAL(pci_lfb_addr);
-    info->vram_size = vbe_total_mem() * 64 * 1024;
+    info->vram_size = bochsvga_total_mem() * 64 * 1024;
 
     return 0;
 }
 
 void
-vbe_hires_enable(int enable)
+bochsvga_hires_enable(int enable)
 {
     u16 flags = enable ?
         VBE_DISPI_ENABLED |
@@ -258,11 +258,26 @@ vbe_hires_enable(int enable)
     dispi_write(VBE_DISPI_INDEX_ENABLE, flags);
 }
 
-void
-vbe_set_mode(u16 mode, struct vbe_modeinfo *info)
+int
+bochsvga_set_mode(int mode, int flags)
 {
+    if (!(mode & VBE_MODE_VESA_DEFINED)) {
+        dprintf(1, "set VGA mode %x\n", mode);
+
+        bochsvga_hires_enable(0);
+        return stdvga_set_mode(mode, flags);
+    }
+
+    struct vbe_modeinfo modeinfo, *info = &modeinfo;
+    int ret = bochsvga_mode_info(mode, &modeinfo);
+    if (ret) {
+        dprintf(1, "VBE mode %x not found\n", mode);
+        return VBE_RETURN_STATUS_FAILED;
+    }
+    bochsvga_hires_enable(1);
+
     if (info->depth == 4)
-        vga_set_mode(0x6a, 0);
+        stdvga_set_mode(0x6a, 0);
     if (info->depth == 8)
         // XXX load_dac_palette(3);
         ;
@@ -314,10 +329,20 @@ vbe_set_mode(u16 mode, struct vbe_modeinfo *info)
     }
 
     SET_BDA(vbe_mode, mode);
+
+    if (flags & MF_LINEARFB) {
+        /* Linear frame buffer */
+        /* XXX: ??? */
+    }
+    if (!(mode & MF_NOCLEARMEM)) {
+        bochsvga_clear_scr();
+    }
+
+    return 0;
 }
 
 void
-vbe_clear_scr(void)
+bochsvga_clear_scr(void)
 {
     u16 en;
 
@@ -327,14 +352,13 @@ vbe_clear_scr(void)
 }
 
 int
-vbe_hires_enabled(void)
+bochsvga_hires_enabled(void)
 {
     return dispi_read(VBE_DISPI_INDEX_ENABLE) & VBE_DISPI_ENABLED;
 }
 
 u16
-vbe_curr_mode(void)
+bochsvga_curr_mode(void)
 {
     return GET_BDA(vbe_mode);
 }
-