diff options
| author | Amlal El Mahrouss <amlal@nekernel.org> | 2025-04-05 06:34:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-04-05 06:34:10 +0200 |
| commit | b18c5e09961d8bc0b2368176d9fb23789afebb87 (patch) | |
| tree | 0f29fbbe829f4d276b0bc3088138c81157fc4c73 /dev/boot/modules | |
| parent | f085fd23cd23edfac585d326786b9a42b04da344 (diff) | |
| parent | 9b7a2a6461a463b08a120c660fcc64b46b65d417 (diff) | |
Merge pull request #11 from amlel-el-mahrouss/dev
pr: a big commit regarding MBCI, AHCI, and others.
Diffstat (limited to 'dev/boot/modules')
| -rw-r--r-- | dev/boot/modules/BootNet/BootNet.cc | 4 | ||||
| -rw-r--r-- | dev/boot/modules/BootNet/BootNetStartup.S | 2 | ||||
| -rw-r--r-- | dev/boot/modules/BootNet/amd64.json | 2 | ||||
| -rw-r--r-- | dev/boot/modules/SysChk/SysChk.cc | 2 | ||||
| -rw-r--r-- | dev/boot/modules/SysChk/SysChkStartup.S | 2 | ||||
| -rw-r--r-- | dev/boot/modules/SysChk/amd64.json | 2 |
6 files changed, 9 insertions, 5 deletions
diff --git a/dev/boot/modules/BootNet/BootNet.cc b/dev/boot/modules/BootNet/BootNet.cc index a877b9a1..47129d38 100644 --- a/dev/boot/modules/BootNet/BootNet.cc +++ b/dev/boot/modules/BootNet/BootNet.cc @@ -11,11 +11,11 @@ #include <BootKit/BootKit.h> #include <BootKit/BootThread.h> -EfiGUID kEfiIP4ProtoGUID; +STATIC EfiGUID kEfiIP4ProtoGUID = {}; STATIC Void bootnet_read_udp_packet(BOOTNET_INTERNET_HEADER&); -EXTERN_C Int32 ModuleMain(Kernel::HEL::BootInfoHeader* handover) +EXTERN_C Int32 BootNetModuleMain(Kernel::HEL::BootInfoHeader* handover) { BOOTNET_INTERNET_HEADER inet{}; diff --git a/dev/boot/modules/BootNet/BootNetStartup.S b/dev/boot/modules/BootNet/BootNetStartup.S index 976c5e88..d8113bd7 100644 --- a/dev/boot/modules/BootNet/BootNetStartup.S +++ b/dev/boot/modules/BootNet/BootNetStartup.S @@ -20,3 +20,5 @@ .quad kHandoverMagic .word kTypeDriver +.word 0 +.word kArchAmd64
\ No newline at end of file diff --git a/dev/boot/modules/BootNet/amd64.json b/dev/boot/modules/BootNet/amd64.json index 112cf9f1..86143e6a 100644 --- a/dev/boot/modules/BootNet/amd64.json +++ b/dev/boot/modules/BootNet/amd64.json @@ -10,7 +10,7 @@ "-fPIC", "-fno-rtti", "-fno-exceptions", - "-Wl,--subsystem=17,--image-base,0x1000000,-e,ModuleMain" + "-Wl,--subsystem=17,--image-base,0x1000000,-e,BootNetModuleMain" ], "cpp_macros": [ "__NEOSKRNL__", diff --git a/dev/boot/modules/SysChk/SysChk.cc b/dev/boot/modules/SysChk/SysChk.cc index 51b247a5..f9af8517 100644 --- a/dev/boot/modules/SysChk/SysChk.cc +++ b/dev/boot/modules/SysChk/SysChk.cc @@ -21,7 +21,7 @@ #include <BootKit/BootThread.h> #include <modules/CoreGfx/CoreGfx.h> -EXTERN_C Int32 ModuleMain(Kernel::HEL::BootInfoHeader* handover) +EXTERN_C Int32 SysChkModuleMain(Kernel::HEL::BootInfoHeader* handover) { #ifdef __NE_AMD64__ Boot::BDiskFormatFactory<BootDeviceATA> partition_factory; diff --git a/dev/boot/modules/SysChk/SysChkStartup.S b/dev/boot/modules/SysChk/SysChkStartup.S index 976c5e88..d8113bd7 100644 --- a/dev/boot/modules/SysChk/SysChkStartup.S +++ b/dev/boot/modules/SysChk/SysChkStartup.S @@ -20,3 +20,5 @@ .quad kHandoverMagic .word kTypeDriver +.word 0 +.word kArchAmd64
\ No newline at end of file diff --git a/dev/boot/modules/SysChk/amd64.json b/dev/boot/modules/SysChk/amd64.json index d995bde2..3b5bab6f 100644 --- a/dev/boot/modules/SysChk/amd64.json +++ b/dev/boot/modules/SysChk/amd64.json @@ -10,7 +10,7 @@ "-fPIC", "-fno-rtti", "-fno-exceptions", - "-Wl,--subsystem=17,--image-base,0x1000000,-e,ModuleMain" + "-Wl,--subsystem=17,--image-base,0x1000000,-e,SysChkModuleMain" ], "cpp_macros": [ "__NEOSKRNL__", |