tristan/ZealOS
1
0
Fork 0
mirror of https://github.com/Zeal-Operating-System/ZealOS.git synced 2024-12-26 15:26:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Put framebuffer members in SYS_KERNEL to match previous commit adding them to CKernel.

Browse source
This commit is contained in:
TomAwezome 2022-08-20 12:29:04 -04:00
parent ddccc7d7ff
commit 402fa603a6
3 changed files with 21 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/Kernel/KMain.ZC
View file

@ -110,6 +110,7 @@ U0 SysGrInit()
text.buffer_size = text.screen_size * 4; //buffer for 32-bit, but only 16 colors now.
text.raw_screen = CAlloc(text.buffer_size);
text.fb_alias = sys_vbe_mode.framebuffer;
// text.fb_alias = sys_framebuffer_addr;
MemSetU32(text.fb_alias, BLACK32, text.screen_size);
text.vga_alias = CAlloc(text.rows * text.cols * 8);

17
src/Kernel/KStart16.ZC
View file

@ -52,6 +52,23 @@ GDT_TR_RING3: DU8 MP_PROCESSORS_NUM * 16 DUP(0);
SYS_FONT_PTR:: DU32 0;
SYS_FRAMEBUFFER::
SYS_FRAMEBUFFER_ADDR: DU8 sizeof(U8 *);
SYS_FRAMEBUFFER_WIDTH: DU64 0;
SYS_FRAMEBUFFER_HEIGHT: DU64 0;
SYS_FRAMEBUFFER_PITCH: DU64 0;
SYS_FRAMEBUFFER_BPP: DU16 0;
SYS_FRAMEBUFFER_MEMORY_MODEL: DU8 0;
SYS_FRAMEBUFFER_RED_MASK_SIZE: DU8 0;
SYS_FRAMEBUFFER_RED_MASK_SHIFT: DU8 0;
SYS_FRAMEBUFFER_GREEN_MASK_SIZE: DU8 0;
SYS_FRAMEBUFFER_GREEN_MASK_SHIFT: DU8 0;
SYS_FRAMEBUFFER_BLUE_MASK_SIZE: DU8 0;
SYS_FRAMEBUFFER_BLUE_MASK_SHIFT: DU8 0;
SYS_FRAMEBUFFER_UNUSED: DU8 0,0,0,0,0,0,0;
SYS_FRAMEBUFFER_EDID_SIZE: DU64 0;
SYS_FRAMEBUFFER_EDID_ADDR: DU8 sizeof(U8 *);
SYS_VBE_INFO:: DU8 sizeof(CVBEInfo) DUP(0);
SYS_VBE_MODES:: DU8 sizeof(CVBEModeShort) * VBE_MODES_NUM DUP(0);
SYS_VBE_FINAL_MODE:: DU8 sizeof(CVBEMode) DUP(0);

3
src/Kernel/KernelB.HH
View file

@ -243,6 +243,9 @@ public _intern IC_FS CTask *Fs(); //FS segment register points to the current $L
#help_file "::/Doc/TimeCycles"
public _intern IC_RDTSC I64 TSCGet(); //Get time stamp counter.
//#help_index "Graphics/Framebuffer"
//public _extern SYS_FRAMEBUFFER_ADDR U8 *sys_framebuffer_addr;
#help_index "Graphics/VBE"
public _extern SYS_VBE_INFO CVBEInfo sys_vbe_info;
public _extern SYS_VBE_FINAL_MODE CVBEMode sys_vbe_mode;