git.ucc.asn.au
/
tpg
/
acess2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.ucc.asn.au/tpg/acess2
[tpg/acess2.git]
/
KernelLand
/
Modules
/
Display
/
BochsGA
/
bochsvbe.c
diff --git
a/KernelLand/Modules/Display/BochsGA/bochsvbe.c
b/KernelLand/Modules/Display/BochsGA/bochsvbe.c
index
70f0c91
..
50e76d3
100644
(file)
--- a/
KernelLand/Modules/Display/BochsGA/bochsvbe.c
+++ b/
KernelLand/Modules/Display/BochsGA/bochsvbe.c
@@
-47,8
+47,6
@@
enum {
VBE_DISPI_INDEX_Y_OFFSET
\r
};
\r
\r
VBE_DISPI_INDEX_Y_OFFSET
\r
};
\r
\r
-extern void MM_DumpTables(tVAddr Start, tVAddr End);
\r
-
\r
// === PROTOTYPES ===
\r
// Driver
\r
int BGA_Install(char **Arguments);
\r
// === PROTOTYPES ===
\r
// Driver
\r
int BGA_Install(char **Arguments);
\r
@@
-84,6
+82,7
@@
Uint *gBGA_Framebuffer;
const tBGA_Mode *gpBGA_CurrentMode;
\r
const tBGA_Mode gBGA_Modes[] = {
\r
{640,480,32, 640*480*4},
\r
const tBGA_Mode *gpBGA_CurrentMode;
\r
const tBGA_Mode gBGA_Modes[] = {
\r
{640,480,32, 640*480*4},
\r
+ {800,480,32, 800*480*4}, // Nice mode for VM testing
\r
{800,600,32, 800*600*4},
\r
{1024,768,32, 1024*768*4}
\r
};
\r
{800,600,32, 800*600*4},
\r
{1024,768,32, 1024*768*4}
\r
};
\r
@@
-221,6
+220,10
@@
int BGA_IOCtl(tVFS_Node *Node, int ID, void *Data)
gBGA_CursorPos.x, gBGA_CursorPos.y
\r
);
\r
break;
\r
gBGA_CursorPos.x, gBGA_CursorPos.y
\r
);
\r
break;
\r
+
\r
+ case VIDEO_IOCTL_SETCURSORBITMAP:
\r
+ DrvUtil_Video_SetCursor( &gBGA_DrvUtil_BufInfo, Data );
\r
+ return 0;
\r
\r
default:
\r
LEAVE('i', -2);
\r
\r
default:
\r
LEAVE('i', -2);
\r
UCC
git Repository :: git.ucc.asn.au