summaryrefslogtreecommitdiff
path: root/userspace/xterm/vesa.c
diff options
context:
space:
mode:
Diffstat (limited to 'userspace/xterm/vesa.c')
-rw-r--r--userspace/xterm/vesa.c21
1 files changed, 4 insertions, 17 deletions
diff --git a/userspace/xterm/vesa.c b/userspace/xterm/vesa.c
index d38f3f2..e795cc8 100644
--- a/userspace/xterm/vesa.c
+++ b/userspace/xterm/vesa.c
@@ -2,6 +2,7 @@
#include <stdint.h>
#include <stdio.h>
#include "../newcalls.h"
+#include "vesa.h"
#define VMEM_USER_FRAMEBUFFER 0xfa000000
@@ -134,6 +135,9 @@ void vesa_set_physbase(uint32_t addr)
uint32_t vesa_init()
{
+
+ FILE *f=fopen("/doc/fonts/binfont.bin","r");
+ fread(deffont,10,95,f);
//inf->framebuffer_type
/*
@@ -351,20 +355,3 @@ void vesa_init_doublebuff()
VbeModeInfoBlock->physbase=buffer;
}
*/
-
-int main()
-{
- FILE *f=fopen("/doc/fonts/binfont.bin","r");
- fread(deffont,10,95,f);
-
- vesa_init();
-
- _gui_win();
-
- while(1)
- {
- vesa_console_put_char('X' ,15, 0, 5, 5);
- _gui_rect();
- }
-
-}