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
Fixed Proc_ReturnToUser's dependence on the structure of tThread
[tpg/acess2.git]
/
Modules
/
Display
/
VESA
/
main.c
diff --git
a/Modules/Display/VESA/main.c
b/Modules/Display/VESA/main.c
index
c21ae6b
..
506a8b5
100644
(file)
--- a/
Modules/Display/VESA/main.c
+++ b/
Modules/Display/VESA/main.c
@@
-16,7
+16,7
@@
// === CONSTANTS ===
\r
#define FLAG_LFB 0x1
\r
#define VESA_DEFAULT_FRAMEBUFFER (KERNEL_BASE|0xA0000)
\r
// === CONSTANTS ===
\r
#define FLAG_LFB 0x1
\r
#define VESA_DEFAULT_FRAMEBUFFER (KERNEL_BASE|0xA0000)
\r
-#define BLINKING_CURSOR
0
\r
+#define BLINKING_CURSOR
1
\r
#if BLINKING_CURSOR
\r
# define VESA_CURSOR_PERIOD 1000
\r
#endif
\r
#if BLINKING_CURSOR
\r
# define VESA_CURSOR_PERIOD 1000
\r
#endif
\r
@@
-44,7
+44,7
@@
tDevFS_Driver gVesa_DriverStruct = {
.IOCtl = Vesa_Ioctl
\r
}
\r
};
\r
.IOCtl = Vesa_Ioctl
\r
}
\r
};
\r
-t
Spinlock
glVesa_Lock;
\r
+t
Mutex
glVesa_Lock;
\r
tVM8086 *gpVesa_BiosState;
\r
int giVesaDriverId = -1;
\r
// --- Video Modes ---
\r
tVM8086 *gpVesa_BiosState;
\r
int giVesaDriverId = -1;
\r
// --- Video Modes ---
\r
@@
-367,7
+367,7
@@
int Vesa_Ioctl(tVFS_Node *Node, int ID, void *Data)
\r
case VIDEO_IOCTL_SETCURSOR: // Set cursor position
\r
#if !BLINKING_CURSOR
\r
\r
case VIDEO_IOCTL_SETCURSOR: // Set cursor position
\r
#if !BLINKING_CURSOR
\r
- if(giVesaCursorX > 0
&& giVesaCursorY
)
\r
+ if(giVesaCursorX > 0)
\r
Vesa_FlipCursor(Node);
\r
#endif
\r
giVesaCursorX = ((tVideo_IOCtl_Pos*)Data)->x;
\r
Vesa_FlipCursor(Node);
\r
#endif
\r
giVesaCursorX = ((tVideo_IOCtl_Pos*)Data)->x;
\r
@@
-421,7
+421,7
@@
int Vesa_Int_SetMode(int mode)
Time_RemoveTimer(giVesaCursorTimer);
\r
giVesaCursorTimer = -1;
\r
\r
Time_RemoveTimer(giVesaCursorTimer);
\r
giVesaCursorTimer = -1;
\r
\r
-
LOCK
( &glVesa_Lock );
\r
+
Mutex_Acquire
( &glVesa_Lock );
\r
\r
gpVesa_BiosState->AX = 0x4F02;
\r
gpVesa_BiosState->BX = gVesa_Modes[mode].code;
\r
\r
gpVesa_BiosState->AX = 0x4F02;
\r
gpVesa_BiosState->BX = gVesa_Modes[mode].code;
\r
@@
-446,7
+446,7
@@
int Vesa_Int_SetMode(int mode)
giVesaCurrentMode = mode;
\r
gpVesaCurMode = &gVesa_Modes[giVesaCurrentMode];
\r
\r
giVesaCurrentMode = mode;
\r
gpVesaCurMode = &gVesa_Modes[giVesaCurrentMode];
\r
\r
-
RELEASE
( &glVesa_Lock );
\r
+
Mutex_Release
( &glVesa_Lock );
\r
\r
return 1;
\r
}
\r
\r
return 1;
\r
}
\r
UCC
git Repository :: git.ucc.asn.au