tristan/ZealOS
1
0
Fork 0
mirror of https://github.com/Zeal-Operating-System/ZealOS.git synced 2025-01-13 16:16:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix sys_framebuffer_bpp size and assignment in KStart16.

Browse source
This commit is contained in:
TomAwezome 2022-08-28 02:10:37 -04:00
parent 5a4351d10c
commit 14515d7a19
5 changed files with 9 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
build/AUTO.ISO
View file

Binary file not shown.

6
src/Kernel/KStart16.ZC
View file

@ -54,7 +54,7 @@ SYS_FRAMEBUFFER_ADDR:: DU64 0;
SYS_FRAMEBUFFER_WIDTH:: DU64 0; SYS_FRAMEBUFFER_WIDTH:: DU64 0;
SYS_FRAMEBUFFER_HEIGHT:: DU64 0; SYS_FRAMEBUFFER_HEIGHT:: DU64 0;
SYS_FRAMEBUFFER_PITCH:: DU64 0; SYS_FRAMEBUFFER_PITCH:: DU64 0;
SYS_FRAMEBUFFER_BPP:: DU16 0; SYS_FRAMEBUFFER_BPP:: DU8 0;
SYS_SMBIOS_ENTRY:: DU64 0; SYS_SMBIOS_ENTRY:: DU64 0;
@ -222,8 +222,8 @@ GET_IP: POP BX
MOV U16 [SYS_FRAMEBUFFER_WIDTH], AX MOV U16 [SYS_FRAMEBUFFER_WIDTH], AX
MOV AX, CVBEMode.pitch[DI] MOV AX, CVBEMode.pitch[DI]
MOV U16 [SYS_FRAMEBUFFER_PITCH], AX MOV U16 [SYS_FRAMEBUFFER_PITCH], AX
MOV AX, CVBEMode.bpp[DI] MOV AL, CVBEMode.bpp[DI]
MOV U16 [SYS_FRAMEBUFFER_BPP], AX MOV U8 [SYS_FRAMEBUFFER_BPP], AL
BTS U32 [SYS_RUN_LEVEL], RLf_VESA BTS U32 [SYS_RUN_LEVEL], RLf_VESA
@@35: @@35:

10
src/Kernel/KernelA.HH
View file

@ -536,14 +536,6 @@ class CVBEMode
}; };
#assert sizeof(CVBEMode) == 256 #assert sizeof(CVBEMode) == 256
class CVBEModeShort
{
U16 width,
height,
mode_num;
U32 max_pixel_clock; //TODO refresh rates.
};
#help_index "Boot" #help_index "Boot"
class CKernel class CKernel
{//Must match $LK,"OSStartUp",A="FF:::/Kernel/KStart16.ZC,MEM_BOOT_BASE"$ {//Must match $LK,"OSStartUp",A="FF:::/Kernel/KStart16.ZC,MEM_BOOT_BASE"$
@ -568,7 +560,7 @@ class CKernel
U64 sys_framebuffer_width; U64 sys_framebuffer_width;
U64 sys_framebuffer_height; U64 sys_framebuffer_height;
U64 sys_framebuffer_pitch; U64 sys_framebuffer_pitch;
U16 sys_framebuffer_bpp; U8 sys_framebuffer_bpp;
U64 sys_smbios_entry; U64 sys_smbios_entry;
U64 sys_disk_uuid[2]; U64 sys_disk_uuid[2];
}; };

2
src/Kernel/KernelB.HH
View file

@ -248,7 +248,7 @@ public _extern SYS_FRAMEBUFFER_ADDR U8 *sys_framebuffer_addr;
public _extern SYS_FRAMEBUFFER_WIDTH U64 sys_framebuffer_width; public _extern SYS_FRAMEBUFFER_WIDTH U64 sys_framebuffer_width;
public _extern SYS_FRAMEBUFFER_HEIGHT U64 sys_framebuffer_height; public _extern SYS_FRAMEBUFFER_HEIGHT U64 sys_framebuffer_height;
public _extern SYS_FRAMEBUFFER_PITCH U64 sys_framebuffer_pitch; public _extern SYS_FRAMEBUFFER_PITCH U64 sys_framebuffer_pitch;
public _extern SYS_FRAMEBUFFER_BPP U16 sys_framebuffer_bpp; public _extern SYS_FRAMEBUFFER_BPP U8 sys_framebuffer_bpp;
#help_index "Processor/SMBIOS" #help_index "Processor/SMBIOS"
public _extern SYS_SMBIOS_ENTRY U8 *sys_smbios_entry; public _extern SYS_SMBIOS_ENTRY U8 *sys_smbios_entry;

2
zealbooter/zealbooter.c
View file

@ -105,7 +105,7 @@ struct CKernel {
uint64_t sys_framebuffer_width; uint64_t sys_framebuffer_width;
uint64_t sys_framebuffer_height; uint64_t sys_framebuffer_height;
uint64_t sys_framebuffer_pitch; uint64_t sys_framebuffer_pitch;
uint16_t sys_framebuffer_bpp; uint8_t sys_framebuffer_bpp;
uint64_t sys_smbios_entry; uint64_t sys_smbios_entry;
uint32_t sys_disk_uuid_a; uint32_t sys_disk_uuid_a;
uint16_t sys_disk_uuid_b; uint16_t sys_disk_uuid_b;