projects
/
dosdemo
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
foo
[dosdemo]
/
src
/
dos
/
gfx.c
diff --git
a/src/dos/gfx.c
b/src/dos/gfx.c
index
8818ab9
..
5252cbc
100644
(file)
--- a/
src/dos/gfx.c
+++ b/
src/dos/gfx.c
@@
-1,16
+1,10
@@
#include <stdio.h>
#include <stdio.h>
+#include <string.h>
#include "gfx.h"
#include "vbe.h"
#include "vga.h"
#include "cdpmi.h"
#include "gfx.h"
#include "vbe.h"
#include "vga.h"
#include "cdpmi.h"
-#ifdef __DJGPP__
-#include <sys/nearptr.h>
-#define REALPTR(s, o) (void*)(((uint32_t)(s) << 4) - __djgpp_base_address + ((uint32_t)(o)))
-#else
-#define REALPTR(s, o) (void*)(((uint32_t)(s) << 4) + ((uint32_t)(o)))
-#endif
-
#define SAME_BPP(a, b) \
((a) == (b) || ((a) == 16 && (b) == 15) || ((a) == 15 && (b) == 16) || \
((a) == 32 && (b) == 24) || ((a) == 24 && (b) == 32))
#define SAME_BPP(a, b) \
((a) == (b) || ((a) == 16 && (b) == 15) || ((a) == 15 && (b) == 16) || \
((a) == 32 && (b) == 24) || ((a) == 24 && (b) == 32))
@@
-71,7
+65,7
@@
void *set_video_mode(int xsz, int ysz, int bpp, int nbuf)
mode = -1;
nmodes = vbe_num_modes(&vbe);
for(i=0; i<nmodes; i++) {
mode = -1;
nmodes = vbe_num_modes(&vbe);
for(i=0; i<nmodes; i++) {
- if(vbe_mode_info(vbe.modes[i] | VBE_MODE_LFB, &minf) == -1) {
+ if(vbe_mode_info(vbe.modes[i], &minf) == -1) {
continue;
}
if(minf.xres != xsz || minf.yres != ysz) continue;
continue;
}
if(minf.xres != xsz || minf.yres != ysz) continue;