X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=KernelLand%2FModules%2Fx86%2FVGAText%2Fvga.c;h=d7ab474a58718dc09e799ccd4900d3663fe55134;hb=11dbd684e9a3d907d43d71a3145205f1a86992fb;hp=41f0bd010f1c8d440834fe024d1d9ba9af112b13;hpb=51ab5f489bc356940c95cc936fd0508e8f07ea97;p=tpg%2Facess2.git diff --git a/KernelLand/Modules/x86/VGAText/vga.c b/KernelLand/Modules/x86/VGAText/vga.c index 41f0bd01..d7ab474a 100644 --- a/KernelLand/Modules/x86/VGAText/vga.c +++ b/KernelLand/Modules/x86/VGAText/vga.c @@ -13,7 +13,7 @@ // === PROTOTYPES === int VGA_Install(char **Arguments); -Uint64 VGA_Write(tVFS_Node *Node, Uint64 Offset, Uint64 Length, const void *Buffer); +size_t VGA_Write(tVFS_Node *Node, off_t Offset, size_t Length, const void *Buffer); int VGA_IOCtl(tVFS_Node *Node, int Id, void *Data); Uint8 VGA_int_GetColourNibble(Uint16 col); Uint16 VGA_int_GetWord(const tVT_Char *Char); @@ -70,7 +70,7 @@ int VGA_Install(char **Arguments) /** * \brief Writes a string of bytes to the VGA controller */ -Uint64 VGA_Write(tVFS_Node *Node, Uint64 Offset, Uint64 Length, const void *Buffer) +size_t VGA_Write(tVFS_Node *Node, off_t Offset, size_t Length, const void *Buffer) { if( giVGA_BufferFormat == VIDEO_BUFFMT_TEXT ) { @@ -252,6 +252,7 @@ void VGA_2D_Fill(void *Ent, Uint16 X, Uint16 Y, Uint16 W, Uint16 H, Uint32 Colou ch.BGCol = (Colour & 0x0F0000) >> (16-8); ch.BGCol |= (Colour & 0x000F00) >> (8-4); ch.BGCol |= (Colour & 0x00000F); + ch.FGCol = 0; word = VGA_int_GetWord(&ch); Log("Fill (%i,%i) %ix%i with 0x%x", X, Y, W, H, word);