diff options
| author | Amlal El Mahrouss <amlal.elmahrouss@icloud.com> | 2024-04-26 08:13:03 +0200 |
|---|---|---|
| committer | Amlal El Mahrouss <amlal.elmahrouss@icloud.com> | 2024-04-26 08:13:03 +0200 |
| commit | 3b4a4a290b32fdb4a749b3e581afae450eb543c8 (patch) | |
| tree | fc9278f51212e73f75f02942ad05abfaee64ca68 /Private/HALKit | |
| parent | 9679735cb60011490c92fd8d3b13d337120a22ea (diff) | |
MHR-16: NewBoot - BDiskFormatter and QR.
Signed-off-by: Amlal El Mahrouss <amlal.elmahrouss@icloud.com>
Diffstat (limited to 'Private/HALKit')
| -rw-r--r-- | Private/HALKit/AMD64/HalNewBoot.asm | 14 | ||||
| -rw-r--r-- | Private/HALKit/AMD64/Storage/ATA-PIO.cxx | 2 | ||||
| -rw-r--r-- | Private/HALKit/POWER/HalStartSequence.s | 8 |
3 files changed, 9 insertions, 15 deletions
diff --git a/Private/HALKit/AMD64/HalNewBoot.asm b/Private/HALKit/AMD64/HalNewBoot.asm index 995a848c..11b11c0c 100644 --- a/Private/HALKit/AMD64/HalNewBoot.asm +++ b/Private/HALKit/AMD64/HalNewBoot.asm @@ -23,22 +23,16 @@ HandoverMagic: dq kHandoverMagic HandoverType: dw kTypeKernel HandoverArch: dw kArchAmd64 ;; This NewBootStart points to Main. -HandoverStart: dq Main +HandoverStart: dq __ImageStart section .text -global Main +global __ImageStart extern hal_init_platform ;; Just a simple setup, we'd also need to tell some before -Main: - push rax +__ImageStart: push rcx call hal_init_platform pop rcx - pop rax -;; Go to sleep. -MainLoop: - cli - hlt - jmp $ + ret diff --git a/Private/HALKit/AMD64/Storage/ATA-PIO.cxx b/Private/HALKit/AMD64/Storage/ATA-PIO.cxx index 3cbba6f7..652aa6f4 100644 --- a/Private/HALKit/AMD64/Storage/ATA-PIO.cxx +++ b/Private/HALKit/AMD64/Storage/ATA-PIO.cxx @@ -58,7 +58,7 @@ Void drv_std_select(UInt16 Bus) { Boolean drv_std_init(UInt16 Bus, UInt8 Drive, UInt16& OutBus, UInt8& OutMaster) { - if (drv_std_detected()) return false; + if (drv_std_detected()) return true; UInt16 IO = Bus; diff --git a/Private/HALKit/POWER/HalStartSequence.s b/Private/HALKit/POWER/HalStartSequence.s index f50a4d4f..fd018304 100644 --- a/Private/HALKit/POWER/HalStartSequence.s +++ b/Private/HALKit/POWER/HalStartSequence.s @@ -4,11 +4,11 @@ ------------------------------------------- */ -.globl Main -.extern HalKernelMain +.globl __ImageStart +.extern hal_init_platform .align 4 .text -Main: - bl HalKernelMain +__ImageStart: + bl hal_init_platform blr |