Subversion Repositories shark

Compare Revisions

Ignore whitespace Rev 443 → Rev 444

/shark/trunk/drivers/grx/gd.c
88,17 → 88,17
}
/* VESA driver needs the V86 Mode... */
//vm86_init();
vm86_init();
 
/* First, check VESA... */
if (vbe_getinfo() == 1) {
type = VESA;
 
if (flags & NOLINEAR) {
trylinear = 0;
} else {
trylinear = 1;
}
return 1;
}
 
/* Then, the other graph cards... Override VESA!!! */
120,9 → 120,7
if (type == UNKNOWN) {
return -1;
}
if (type == VESA) {
return vbe_check_id();
}
 
return -2;
}
 
196,9 → 194,10
}
if (type == VESA) {
 
if (vbe_getmodeinfo(&vbemi, mode) < 0) {
return -1;
}
return -1;
}
 
app = mode;
if (trylinear) {
/shark/trunk/drivers/grx/drivers/gdvesa.c
288,9 → 288,6
BYTE p1, p2;
#endif
 
/* Se volessimo il Linear Frame Buffer, dovremmo fare
Vbe_Mode = Vbe_Mode | 0x4000;
*/
memset (&inregs, 0, sizeof(inregs));
/* Set Vesa Vbe mode */
inregs.x.ax = 0x4f02;
307,7 → 304,8
vm86_callBIOS(0x10, &inregs, &outregs, &sregs);
#endif
 
return vbe_check_status (outregs.x.ax);
return 1; //vbe_check_status (outregs.x.ax);
 
}
 
WORD vbe_getbpr(ModeInfoBlock *ModeInfo)
/shark/trunk/drivers/grx/glib.c
227,19 → 227,12
int mode;
int ret;
if ((ret = grx_init()) < 1) {
return -1;
}
cprintf("Ret: %d\n", ret);
mode = grx_getmode(x, y, depth);
cprintf("Modenum:%d %u %x\n", mode, mode, mode);
 
if (grx_setmode(mode) < 0) {
return -1;
}
 
cprintf("Modenum:%x\n", mode);
 
return 1;
}