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
Replace rand() implementation - fixes threading lockups
[tpg/acess2.git]
/
Kernel
/
drv
/
vga.c
diff --git
a/Kernel/drv/vga.c
b/Kernel/drv/vga.c
index
11c799c
..
ac00c78
100644
(file)
--- a/
Kernel/drv/vga.c
+++ b/
Kernel/drv/vga.c
@@
-1,6
+1,7
@@
/*
* Acess2 VGA Controller Driver
*/
/*
* Acess2 VGA Controller Driver
*/
+#define DEBUG 0
#include <acess.h>
#include <fs_devfs.h>
#include <tpl_drv_video.h>
#include <acess.h>
#include <fs_devfs.h>
#include <tpl_drv_video.h>
@@
-50,7
+51,7
@@
int VGA_Install(char **Arguments)
// Install DevFS
DevFS_AddDevice( &gVGA_DevInfo );
// Install DevFS
DevFS_AddDevice( &gVGA_DevInfo );
- return
1
;
+ return
MODULE_ERR_OK
;
}
/**
}
/**
@@
-98,6
+99,10
@@
int VGA_IOCtl(tVFS_Node *Node, int Id, void *Data)
((tVideo_IOCtl_Mode*)Data)->height = VGA_HEIGHT;
((tVideo_IOCtl_Mode*)Data)->bpp = 4;
return 1;
((tVideo_IOCtl_Mode*)Data)->height = VGA_HEIGHT;
((tVideo_IOCtl_Mode*)Data)->bpp = 4;
return 1;
+
+ case VIDEO_IOCTL_SETBUFFORMAT:
+ return 0;
+
case VIDEO_IOCTL_SETCURSOR:
VGA_int_SetCursor( ((tVideo_IOCtl_Pos*)Data)->x, ((tVideo_IOCtl_Pos*)Data)->y );
return 1;
case VIDEO_IOCTL_SETCURSOR:
VGA_int_SetCursor( ((tVideo_IOCtl_Pos*)Data)->x, ((tVideo_IOCtl_Pos*)Data)->y );
return 1;
@@
-118,7
+123,6
@@
Uint8 VGA_int_GetColourNibble(Uint16 col)
col = ((col>>2)&3) | ((col>>4)&0xC) | ((col>>6)&0x30);
bright = ( (col & 2 ? 1 : 0) + (col & 8 ? 1 : 0) + (col & 32 ? 1 : 0) ) / 2;
col = ((col>>2)&3) | ((col>>4)&0xC) | ((col>>6)&0x30);
bright = ( (col & 2 ? 1 : 0) + (col & 8 ? 1 : 0) + (col & 32 ? 1 : 0) ) / 2;
-
switch(col)
{
// Black
switch(col)
{
// Black
UCC
git Repository :: git.ucc.asn.au