//
// This file may be distributed under the terms of the GNU LGPLv3 license.
-#include "vgabios.h" // cirrus_init
+#include "clext.h" // clext_init
+#include "vgabios.h" // VBE_VENDOR_STRING
#include "biosvar.h" // GET_GLOBAL
#include "util.h" // dprintf
#include "bregs.h" // struct bregs
}
int
-cirrus_set_video_mode(u8 mode, u8 noclearmem)
+clext_set_mode(int mode, int flags)
{
dprintf(1, "cirrus mode %d\n", mode);
SET_BDA(vbe_mode, 0);
struct cirrus_mode_s *table_g = cirrus_get_modeentry(mode);
if (table_g) {
cirrus_switch_mode(table_g);
- if (!noclearmem)
+ if (!(flags & MF_NOCLEARMEM))
cirrus_clear_vram(0xffff);
SET_BDA(video_mode, mode);
- return 1;
+ return 0;
}
table_g = cirrus_get_modeentry(0xfe);
cirrus_switch_mode(table_g);
dprintf(1, "cirrus mode switch regular\n");
- return 0;
+ return stdvga_set_mode(mode, flags);
}
static int
* init
****************************************************************/
-void
-cirrus_init(void)
+int
+clext_init(void)
{
+ int ret = stdvga_init();
+ if (ret)
+ return ret;
+
dprintf(1, "cirrus init\n");
if (! cirrus_check())
- return;
+ return -1;
dprintf(1, "cirrus init 2\n");
// memory setup
// reset bitblt
outw(0x0431, VGAREG_GRDC_ADDRESS);
outw(0x0031, VGAREG_GRDC_ADDRESS);
+
+ return 0;
}