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

ZealBooter: Move sys_pci_buses assignment to zealbooter.c

Browse source
This commit is contained in:
mintsuki 2022-08-21 19:13:48 +02:00
parent d7f72e3aa9
commit ee265c8767
4 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/Kernel/KStart16.ZC
View file

@ -33,7 +33,7 @@ MEM_E820:: DU8 MEM_E820_ENTRIES_NUM * sizeof(CMemE820) DUP (0);
MEM_PHYSICAL_SPACE:: DU64 0; MEM_PHYSICAL_SPACE:: DU64 0;
SYS_GDT_PTR:: DU16 sizeof(CGDT) - 1; SYS_GDT_PTR:: DU16 sizeof(CGDT) - 1;
DU64 0; DU64 0;
SYS_PCI_BUSES:: DU16 256; SYS_PCI_BUSES:: DU16 0;
ALIGN 16, OC_NOP ALIGN 16, OC_NOP
@ -54,7 +54,6 @@ SYS_FONT_PTR:: DU32 0;
SYS_VBE_INFO:: DU8 sizeof(CVBEInfo) DUP(0); SYS_VBE_INFO:: DU8 sizeof(CVBEInfo) DUP(0);
SYS_VBE_MODES:: DU8 sizeof(CVBEModeShort) * VBE_MODES_NUM DUP(0); SYS_VBE_MODES:: DU8 sizeof(CVBEModeShort) * VBE_MODES_NUM DUP(0);
SYS_VBE_FINAL_MODE:: DU8 sizeof(CVBEMode) DUP(0); SYS_VBE_FINAL_MODE:: DU8 sizeof(CVBEMode) DUP(0);
SYS_VBE_FINAL_MODE_NUM::DU16 0; //mode number of final mode set SYS_VBE_FINAL_MODE_NUM::DU16 0; //mode number of final mode set
#assert $$ - SYS_KERNEL == sizeof(CKernel) - sizeof(CZXE) #assert $$ - SYS_KERNEL == sizeof(CKernel) - sizeof(CZXE)

1
src/Kernel/KStart32.ZC
View file

@ -105,7 +105,6 @@ CORE0_32BIT_INIT:: //Entry point for $LK,"BootRAM",A="MN:BootRAM"$.
//Patch abs addresses //Patch abs addresses
MOV ECX, U32 CPatchTableAbsAddr.abs_address_count[ESI] MOV ECX, U32 CPatchTableAbsAddr.abs_address_count[ESI]
LEA ESI, U32 CPatchTableAbsAddr.abs_address[ESI] LEA ESI, U32 CPatchTableAbsAddr.abs_address[ESI]
@@05: LODSD @@05: LODSD
ADD EAX, EDI ADD EAX, EDI
ADD U32 [EAX], EDI ADD U32 [EAX], EDI

1
src/Kernel/MultiProc.ZC
View file

@ -193,7 +193,6 @@ U0 MPAPICInit()
RAXSet(Gs->tss->tr); RAXSet(Gs->tss->tr);
LTR AX LTR AX
if (Gs->num) if (Gs->num)
{ {
IntInit1; IntInit1;

2
zealbooter/zealbooter.c
View file

@ -215,6 +215,8 @@ void _start(void) {
CKernel->sys_gdt_ptr.base = (void *)&CKernel->sys_gdt - (uintptr_t)kernel->address; CKernel->sys_gdt_ptr.base = (void *)&CKernel->sys_gdt - (uintptr_t)kernel->address;
CKernel->sys_gdt_ptr.base += final_address; CKernel->sys_gdt_ptr.base += final_address;
CKernel->sys_pci_buses = 256;
struct E801 E801 = get_E801(); struct E801 E801 = get_E801();
CKernel->mem_E801[0] = E801.lowermem; CKernel->mem_E801[0] = E801.lowermem;
CKernel->mem_E801[1] = E801.uppermem; CKernel->mem_E801[1] = E801.uppermem;