diff --git a/KernelLand/Modules/Display/VESA/common.h b/KernelLand/Modules/Display/VESA/common.h
index c81fe1a818cea8831933ffb9dc262ef65b4fae62..94fd8e2da7c2be51033950d94792a0cb3a39437c 100644
--- a/KernelLand/Modules/Display/VESA/common.h
+++ b/KernelLand/Modules/Display/VESA/common.h
@@ -1,15 +1,28 @@
/**
+ * Acess2 Kernel VBE Driver
+ * - By John Hodge (thePowersGang)
+ *
+ * common.h
+ * - Driver-internal definitions
*/
#ifndef _COMMON_H_
#define _COMMON_H_
-// === TYPES ===
-typedef struct sFarPtr
-{
- Uint16 ofs;
- Uint16 seg;
-} tFarPtr;
+#include "vbe.h"
+
+/**
+ * \name Mode Flags
+ * \{
+ */
+#define FLAG_LFB 0x01 //!< Framebuffer is a linear framebufer
+#define FLAG_POPULATED 0x02 //!< Mode information is populated
+#define FLAG_VALID 0x04 //!< Mode is valid (usable)
+#define FLAG_GRAPHICS 0x08 //!< Graphics mode
+/**
+ * \}
+ */
+// === TYPES ===
typedef struct sVesa_Mode
{
Uint16 code;
@@ -19,65 +32,4 @@ typedef struct sVesa_Mode
Uint32 fbSize;
Uint32 framebuffer;
} tVesa_Mode;
-
-typedef struct sVesa_CallModeInfo
-{
- /**
- * 0 : Mode is supported
- * 1 : Optional information avaliable (Xres onwards)
- * 2 : BIOS Output Supported
- * 3 : Colour Mode?
- * 4 : Graphics mode?
- * -- VBE v2.0+
- * 5 : Mode is not VGA compatible
- * 6 : Bank switched mode supported
- * 7 : Linear framebuffer mode supported
- * 8 : Double-scan mode avaliable
- */
- Uint16 attributes;
- /**
- * 0 : Window exists
- * 1 : Window is readable
- * 2 : Window is writable
- */
- Uint8 winA,winB;
- Uint16 granularity;
- Uint16 winsize;
- Uint16 segmentA, segmentB;
- tFarPtr realFctPtr;
- Uint16 pitch; // Bytes per scanline
-
- Uint16 Xres, Yres;
- Uint8 Wchar, Ychar, planes, bpp, banks;
- Uint8 memory_model, bank_size, image_pages;
- Uint8 reserved0;
-
- // -- VBE v1.2+
- Uint8 red_mask, red_position;
- Uint8 green_mask, green_position;
- Uint8 blue_mask, blue_position;
- Uint8 rsv_mask, rsv_position;
- Uint8 directcolor_attributes;
-
- // -- VBE v2.0+
- Uint32 physbase;
- Uint32 offscreen_ptr; // Start of offscreen memory
- Uint16 offscreen_size_kb; // Size of offscreen memory
-
- // -- VBE v3.0
- Uint16 lfb_pitch;
- Uint8 image_count_banked;
- Uint8 image_count_lfb;
-} tVesa_CallModeInfo;
-
-typedef struct sVesa_CallInfo
-{
- char signature[4]; // == "VESA"
- Uint16 Version; // == 0x0300 for Vesa 3.0
- tFarPtr OEMString; // isa vbeFarPtr
- Uint8 Capabilities[4];
- tFarPtr VideoModes; // isa vbeParPtr
- Uint16 TotalMemory; // as # of 64KB blocks
-} tVesa_CallInfo;
-
#endif
diff --git a/KernelLand/Modules/Display/VESA/main.c b/KernelLand/Modules/Display/VESA/main.c
index 51c80e1a56ef8eddeda32ce2bb441e3f2c5994a9..3422d0e6b5a0768650bf9f07cbc0659e2fe05860 100644
--- a/KernelLand/Modules/Display/VESA/main.c
+++ b/KernelLand/Modules/Display/VESA/main.c
@@ -15,9 +15,7 @@
#include <timers.h>
// === CONSTANTS ===
-#define FLAG_LFB 0x1
-#define FLAG_POPULATED 0x2
-#define FLAG_VALID 0x4
+#define USE_BIOS 1
#define VESA_DEFAULT_FRAMEBUFFER (KERNEL_BASE|0xA0000)
#define BLINKING_CURSOR 0
#if BLINKING_CURSOR
@@ -83,8 +81,6 @@ bool gbVesa_DisableBIOSCalls; // Disables calls to the BIOS
// === CODE ===
int Vesa_Install(char **Arguments)
{
- int rv;
-
for( int i = 0; Arguments && Arguments[i]; i ++ )
{
if( strcmp(Arguments[i], "nobios") == 0 )
@@ -96,13 +92,15 @@ int Vesa_Install(char **Arguments)
}
}
+ #if USE_BIOS
if( !gbVesa_DisableBIOSCalls )
{
gpVesa_BiosState = VM8086_Init();
- if( (rv = VBE_int_GetModeList()) )
- return rv;
+ int rv = VBE_int_GetModeList();
+ if(rv) return rv;
}
+ #endif
#if BLINKING_CURSOR
// Create blink timer
@@ -116,6 +114,7 @@ int Vesa_Install(char **Arguments)
return MODULE_ERR_OK;
}
+#if USE_BIOS
int VBE_int_GetModeList(void)
{
tVesa_CallInfo *info;
@@ -174,6 +173,7 @@ int VBE_int_GetModeInfo(Uint16 Code, tFarPtr *BufPtr)
}
return 0;
}
+#endif
void VBE_int_FillMode_Int(tVesa_Mode *Mode, const tVesa_CallModeInfo *vbeinfo)
@@ -220,8 +220,9 @@ void VBE_int_FillMode_Int(tVesa_Mode *Mode, const tVesa_CallModeInfo *vbeinfo)
S_LOG(*vbeinfo, image_count_lfb, "%i");
LOG("}");
#endif
-
+
Mode->flags = FLAG_POPULATED;
+ // Check if this mode is supported by hardware
if( !(vbeinfo->attributes & 1) )
{
#if DEBUG
@@ -245,7 +246,7 @@ void VBE_int_FillMode_Int(tVesa_Mode *Mode, const tVesa_CallModeInfo *vbeinfo)
Mode->bpp = 0;
return ;
case 0x90:
- Mode->flags |= FLAG_LFB;
+ Mode->flags |= FLAG_LFB|FLAG_GRAPHICS;
Mode->framebuffer = vbeinfo->physbase;
Mode->fbSize = vbeinfo->Yres*vbeinfo->pitch;
break;
@@ -271,6 +272,7 @@ void VBE_int_SetBootMode(Uint16 ModeID, const void *ModeInfo)
void Vesa_int_FillModeList(void)
{
+ #if USE_BIOS
if( !gbVesaModesChecked && !gbVesa_DisableBIOSCalls )
{
tVesa_CallModeInfo *modeinfo;
@@ -288,6 +290,7 @@ void Vesa_int_FillModeList(void)
gbVesaModesChecked = 1;
}
+ #endif
}
/**
@@ -295,35 +298,43 @@ void Vesa_int_FillModeList(void)
*/
size_t Vesa_Write(tVFS_Node *Node, off_t Offset, size_t Length, const void *Buffer, Uint Flags)
{
- // Framebuffer modes - just pass on
- if( gpVesaCurMode->flags & FLAG_LFB )
- return DrvUtil_Video_WriteLFB(&gVesa_BufInfo, Offset, Length, Buffer);
-
- // EGA text mode translation
- switch( gVesa_BufInfo.BufferFormat )
+ switch( gpVesaCurMode->flags & (FLAG_LFB|FLAG_GRAPHICS) )
{
- case VIDEO_BUFFMT_TEXT: {
- int num = Length / sizeof(tVT_Char);
- int ofs = Offset / sizeof(tVT_Char);
- int i = 0;
- const tVT_Char *chars = Buffer;
- Uint16 word;
-
- for( ; num--; i ++, ofs ++)
+ case 0:
+ // EGA text mode translation
+ switch( gVesa_BufInfo.BufferFormat )
{
- word = VBE_int_GetWord( &chars[i] );
- ((Uint16*)gVesa_BufInfo.Framebuffer)[ ofs ] = word;
+ case VIDEO_BUFFMT_TEXT: {
+ int num = Length / sizeof(tVT_Char);
+ int ofs = Offset / sizeof(tVT_Char);
+ int i = 0;
+ const tVT_Char *chars = Buffer;
+
+ for( ; num--; i ++, ofs ++)
+ {
+ Uint16 word = VBE_int_GetWord( &chars[i] );
+ ((Uint16*)gVesa_BufInfo.Framebuffer)[ ofs ] = word;
+ }
+
+ return Length; }
+ case VIDEO_BUFFMT_2DSTREAM:
+ return DrvUtil_Video_2DStream(NULL, Buffer, Length,
+ &gVBE_Text2DFunctions, sizeof(gVBE_Text2DFunctions));
+ default:
+ Log_Warning("VBE", "TODO: Alternate modes in EGA text mode");
+ return 0;
}
-
- return Length; }
- case VIDEO_BUFFMT_2DSTREAM:
- return DrvUtil_Video_2DStream(NULL, Buffer, Length,
- &gVBE_Text2DFunctions, sizeof(gVBE_Text2DFunctions));
+ return 0;
+ case FLAG_LFB|FLAG_GRAPHICS:
+ // Framebuffer modes - use DrvUtil Video
+ return DrvUtil_Video_WriteLFB(&gVesa_BufInfo, Offset, Length, Buffer);
default:
- Log_Warning("VBE", "TODO: Alternate modes in EGA text mode");
+ Log_Warning("VBE", "TODO: _Write %s%s",
+ (gpVesaCurMode->flags & FLAG_LFB ? "FLAG_LFB" : ""),
+ (gpVesaCurMode->flags & FLAG_GRAPHICS ? "FLAG_GRAPHICS" : "")
+ );
return 0;
}
-
}
const char *csaVESA_IOCtls[] = {DRV_IOCTLNAMES, DRV_VIDEO_IOCTLNAMES, NULL};
@@ -394,7 +405,8 @@ int Vesa_Int_SetMode(int mode)
#endif
Mutex_Acquire( &glVesa_Lock );
-
+
+ #if USE_BIOS
if( gbVesa_DisableBIOSCalls )
{
ASSERT(mode == -1);
@@ -413,6 +425,9 @@ int Vesa_Int_SetMode(int mode)
LOG("Out: AX = %04x", gpVesa_BiosState->AX);
}
+ #else
+ ASSERT(mode == -1);
+ #endif
// Map Framebuffer
if( gpVesaCurMode )
diff --git a/KernelLand/Modules/Display/VESA/vbe.h b/KernelLand/Modules/Display/VESA/vbe.h
new file mode 100644
index 0000000000000000000000000000000000000000..ace7496a4d25a14041ea6aa8761c45cfccf0c06b
--- /dev/null
+++ b/KernelLand/Modules/Display/VESA/vbe.h
@@ -0,0 +1,79 @@
+/*
+ * Acess2 Kernel VBE Driver
+ * - By John Hodge (thePowersGang)
+ *
+ * vbe.h
+ * - Definitions for VBE structures
+ */
+#ifndef _VBE_H_
+#define _VBE_H_
+
+typedef struct sFarPtr
+{
+ Uint16 ofs;
+ Uint16 seg;
+} tFarPtr;
+
+typedef struct sVesa_CallModeInfo
+{
+ /**
+ * 0 : Mode is supported
+ * 1 : Optional information avaliable (Xres onwards)
+ * 2 : BIOS Output Supported
+ * 3 : Colour Mode?
+ * 4 : Graphics mode?
+ * -- VBE v2.0+
+ * 5 : Mode is not VGA compatible
+ * 6 : Bank switched mode supported
+ * 7 : Linear framebuffer mode supported
+ * 8 : Double-scan mode avaliable
+ */
+ Uint16 attributes;
+ /**
+ * 0 : Window exists
+ * 1 : Window is readable
+ * 2 : Window is writable
+ */
+ Uint8 winA,winB;
+ Uint16 granularity;
+ Uint16 winsize;
+ Uint16 segmentA, segmentB;
+ tFarPtr realFctPtr;
+ Uint16 pitch; // Bytes per scanline
+
+ Uint16 Xres, Yres;
+ Uint8 Wchar, Ychar, planes, bpp, banks;
+ Uint8 memory_model, bank_size, image_pages;
+ Uint8 reserved0;
+
+ // -- VBE v1.2+
+ Uint8 red_mask, red_position;
+ Uint8 green_mask, green_position;
+ Uint8 blue_mask, blue_position;
+ Uint8 rsv_mask, rsv_position;
+ Uint8 directcolor_attributes;
+
+ // -- VBE v2.0+
+ Uint32 physbase;
+ Uint32 offscreen_ptr; // Start of offscreen memory
+ Uint16 offscreen_size_kb; // Size of offscreen memory
+
+ // -- VBE v3.0
+ Uint16 lfb_pitch;
+ Uint8 image_count_banked;
+ Uint8 image_count_lfb;
+} PACKED tVesa_CallModeInfo;
+
+typedef struct sVesa_CallInfo
+{
+ char signature[4]; // == "VESA"
+ Uint16 Version; // == 0x0300 for Vesa 3.0
+ tFarPtr OEMString; // isa vbeFarPtr
+ Uint8 Capabilities[4];
+ tFarPtr VideoModes; // isa vbeParPtr
+ Uint16 TotalMemory; // as # of 64KB blocks
+} PACKED tVesa_CallInfo;
+
+
+#endif
+