diff options
| author | Amlal El Mahrouss <amlal@nekernel.org> | 2025-11-16 14:37:12 +0100 |
|---|---|---|
| committer | Amlal El Mahrouss <amlal@nekernel.org> | 2025-11-16 14:37:12 +0100 |
| commit | 86e5bd89ecbe6e3a204ab816b9f7e48eb9a7fee7 (patch) | |
| tree | 95d358f0e844d6e8dc1077f0322c0020c4c5f395 | |
| parent | 1c6e979cf8f19b6b7359f4c9fc34baeb42f05a5c (diff) | |
feat: launch: design of ne_launch done.
Signed-off-by: Amlal El Mahrouss <amlal@nekernel.org>
| -rw-r--r-- | dev/boot/src/BootFileReader.cc | 2 | ||||
| -rw-r--r-- | dev/launch/src/AppMain.cc | 2 | ||||
| -rw-r--r-- | dev/libMsg/MsgKit/Server.h | 2 | ||||
| -rw-r--r-- | dev/modules/CoreGfx/CoreGfx.h | 2 | ||||
| -rw-r--r-- | dev/modules/NVME/NVME.h | 2 | ||||
| -rw-r--r-- | dev/modules/Power/PowerFactory.h | 6 | ||||
| -rw-r--r-- | dev/modules/SCSI/SCSI.h | 5 | ||||
| -rw-r--r-- | dev/modules/XHCI/XHCI.h | 4 | ||||
| -rw-r--r-- | docs/drawio/LAUNCH_DESIGN.drawio | 13 |
9 files changed, 23 insertions, 15 deletions
diff --git a/dev/boot/src/BootFileReader.cc b/dev/boot/src/BootFileReader.cc index 5aadd608..c95623b6 100644 --- a/dev/boot/src/BootFileReader.cc +++ b/dev/boot/src/BootFileReader.cc @@ -75,7 +75,7 @@ Boot::BootFileReader::BootFileReader(const CharacterTypeUTF16* path, EfiHandlePt mWriter.Write(L"BootZ: Fetch-Protocol: No-Such-Path: ").Write(mPath).Write(L"\r"); this->mErrorCode = kNotSupported; - fb_render_string("BootZ: PLEASE RECOVER YOUR MINKRNL INSTALL.", 40, 10, RGB(0xFF, 0xFF, 0xFF)); + fb_render_string("BootZ: PLEASE RECOVER YOUR NEKERNEL INSTALL.", 40, 10, RGB(0xFF, 0xFF, 0xFF)); mRootFs->Close(mRootFs); diff --git a/dev/launch/src/AppMain.cc b/dev/launch/src/AppMain.cc index eef95fba..ae9917bc 100644 --- a/dev/launch/src/AppMain.cc +++ b/dev/launch/src/AppMain.cc @@ -10,7 +10,7 @@ /// @note This called by _NeMain from its own runtime. extern "C" SInt32 nelaunch_startup_fn(Void) { - /// @todo Start LaunchServices.fwrk services, make the launcher manageable too (via mgmt.launch) + /// @todo Start LaunchHelpers.fwrk services, make the launcher manageable too (via mgmt.launch) NELAUNCH_INFO("Turning on launcher..."); diff --git a/dev/libMsg/MsgKit/Server.h b/dev/libMsg/MsgKit/Server.h index 5bc9617d..86bf6549 100644 --- a/dev/libMsg/MsgKit/Server.h +++ b/dev/libMsg/MsgKit/Server.h @@ -24,7 +24,7 @@ struct LIBMSG_EXPR final { CF::CFString* l_key{nullptr}; CF::CFString* l_value{nullptr}; #else - // if we use C< we won't know about CF, so let's make those private. + // if we use C, we won't know about CF, so let's make those private. VoidPtr l_private_data[2]{nullptr}; #endif diff --git a/dev/modules/CoreGfx/CoreGfx.h b/dev/modules/CoreGfx/CoreGfx.h index 7d23c17e..d5cfa5a3 100644 --- a/dev/modules/CoreGfx/CoreGfx.h +++ b/dev/modules/CoreGfx/CoreGfx.h @@ -12,7 +12,7 @@ #define fb_color(R, G, B) RGB(R, G, B) -#define fb_get_clear_clr() RGB(0x20, 0x20, 0x20) +#define fb_get_clear_clr() RGB(0, 0, 0x80) #define fb_clear() kCGCursor = 0UL diff --git a/dev/modules/NVME/NVME.h b/dev/modules/NVME/NVME.h index c0894194..21f5323e 100644 --- a/dev/modules/NVME/NVME.h +++ b/dev/modules/NVME/NVME.h @@ -93,7 +93,7 @@ inline Bool nvme_create_io_command(HAL_NVME_QUEUE* entry, UInt64 baseAddress, entry->CommandSpecific[9] = identify; if (namespaceIdentify) { - entry->CommandSpecific[0] = 1; + entry->CommandSpecific[0] = YES; } } diff --git a/dev/modules/Power/PowerFactory.h b/dev/modules/Power/PowerFactory.h index b7c13280..770c7076 100644 --- a/dev/modules/Power/PowerFactory.h +++ b/dev/modules/Power/PowerFactory.h @@ -15,8 +15,6 @@ #define NE_POWER_FACTORY : public PowerFactory namespace Kernel { -class PowerFactory; - class PowerFactory { public: explicit PowerFactory() = default; @@ -26,7 +24,7 @@ class PowerFactory { PowerFactory(const PowerFactory&) = default; public: - Bool Shutdown() { return NO; }; // shutdown - Void Reboot(){}; // soft-reboot + virtual Bool Shutdown() { return NO; } // shutdown + virtual Void Reboot() {} // soft-reboot }; } // namespace Kernel
\ No newline at end of file diff --git a/dev/modules/SCSI/SCSI.h b/dev/modules/SCSI/SCSI.h index d9ede8b4..88a47ed8 100644 --- a/dev/modules/SCSI/SCSI.h +++ b/dev/modules/SCSI/SCSI.h @@ -12,9 +12,10 @@ /// @brief Small Computer System Interface device. namespace Kernel { -template <int PacketBitLen> +template <Int32 PacketBitLen> using scsi_packet_type = Kernel::UInt16[PacketBitLen]; + using scsi_packet_type_12 = scsi_packet_type<12>; -extern const scsi_packet_type<12> kCDRomPacketTemplate; +extern const scsi_packet_type_12 kCDRomPacketTemplate; } // namespace Kernel
\ No newline at end of file diff --git a/dev/modules/XHCI/XHCI.h b/dev/modules/XHCI/XHCI.h index 8829d29b..55b1623e 100644 --- a/dev/modules/XHCI/XHCI.h +++ b/dev/modules/XHCI/XHCI.h @@ -16,8 +16,6 @@ #include <NeKit/Defines.h> -using namespace Kernel; - #define kUSBCommand (UInt16) 0x0 #define kUSBStatus (UInt16) 0x2 #define kUSBInterruptEnable (UInt16) 0x4 @@ -27,6 +25,7 @@ using namespace Kernel; #define kUSBPort1StatusCtrl (UInt16) 0x10 #define kUSBPort2StatusCtrl (UInt16) 0x12 +namespace Kernel { typedef struct USBCommandRegister final { UInt8 mReserved[8]; // Reserved UInt8 mMaxPacket; // 0 = Max packet size 32 bits 1 = Max packet size 64 bits @@ -64,3 +63,4 @@ typedef struct USBInterruptEnableRegister final { 32-bit physical adress of Frame List. Remember that first 12 bytes are always 0. The Frame List must contain 1024 entries. */ +} // namespace Kernel
\ No newline at end of file diff --git a/docs/drawio/LAUNCH_DESIGN.drawio b/docs/drawio/LAUNCH_DESIGN.drawio index a1cfc8cc..32fe8eda 100644 --- a/docs/drawio/LAUNCH_DESIGN.drawio +++ b/docs/drawio/LAUNCH_DESIGN.drawio @@ -4,8 +4,17 @@ <root> <mxCell id="0"/> <mxCell id="1" parent="0"/> - <mxCell id="2" value="LaunchKit" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1"> - <mxGeometry x="240" y="170" width="255" height="60" as="geometry"/> + <mxCell id="2" value="LaunchHelpers" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1"> + <mxGeometry x="250" y="100" width="255" height="60" as="geometry"/> + </mxCell> + <mxCell id="3" value="ne_launch" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1"> + <mxGeometry x="250" y="170" width="255" height="60" as="geometry"/> + </mxCell> + <mxCell id="4" value="ne_kernel" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1"> + <mxGeometry x="250" y="240" width="540" height="60" as="geometry"/> + </mxCell> + <mxCell id="5" value="libSystem" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1"> + <mxGeometry x="520" y="170" width="270" height="60" as="geometry"/> </mxCell> </root> </mxGraphModel> |
