summaryrefslogtreecommitdiffhomepage
path: root/dev
diff options
context:
space:
mode:
Diffstat (limited to 'dev')
-rw-r--r--dev/zba/BootKit/Support.h2
-rw-r--r--dev/zba/amd64-efi.make2
-rw-r--r--dev/zba/src/Thread.cc4
-rw-r--r--dev/zka/CFKit/GUIDWizard.h6
-rw-r--r--dev/zka/CFKit/GUIDWrapper.h6
-rw-r--r--dev/zka/CFKit/LoaderUtils.h14
-rw-r--r--dev/zka/CFKit/Property.h17
-rw-r--r--dev/zka/KernelKit/HardwareThreadScheduler.h6
-rw-r--r--dev/zka/KernelKit/PCI/Iterator.h6
-rw-r--r--dev/zka/NetworkKit/NetworkDevice.h11
-rw-r--r--dev/zka/NewKit/Defines.h8
-rw-r--r--dev/zka/NewKit/Function.h6
-rw-r--r--dev/zka/src/CRuntimeLibrary.cc (renamed from dev/zka/src/CRuntime.cc)3
-rw-r--r--dev/zka/src/GUIDWizard.cc4
-rw-r--r--dev/zka/src/GUIDWrapper.cc2
-rw-r--r--dev/zka/src/Property.cc4
16 files changed, 59 insertions, 42 deletions
diff --git a/dev/zba/BootKit/Support.h b/dev/zba/BootKit/Support.h
index 99fe0cb0..a5061143 100644
--- a/dev/zba/BootKit/Support.h
+++ b/dev/zba/BootKit/Support.h
@@ -6,6 +6,8 @@
#pragma once
+#include <cstddef>
+
/// @file Support.h
/// @brief Purpose of this file is to help port libs into the bootloader.
diff --git a/dev/zba/amd64-efi.make b/dev/zba/amd64-efi.make
index aa071913..4c3e56dc 100644
--- a/dev/zba/amd64-efi.make
+++ b/dev/zba/amd64-efi.make
@@ -61,7 +61,7 @@ invalid-recipe:
.PHONY: all
all: compile-amd64
mkdir -p src/Root/EFI/BOOT
- $(LD_GNU) $(OBJ) $(LD_FLAGS) -o src/$(BOOT_LOADER)
+ $(LD_GNU) $(OBJ) $(LD_FLAGS) -o src/$(BOOTLOADER)
$(COPY) src/$(BOOTLOADER) src/Root/EFI/BOOT/BOOTX64.EFI
$(COPY) src/$(BOOTLOADER) src/Root/EFI/BOOT/ZBAOSLDR.EFI
$(COPY) ../zka/$(KERNEL) src/Root/$(KERNEL)
diff --git a/dev/zba/src/Thread.cc b/dev/zba/src/Thread.cc
index e1884dcb..d009a633 100644
--- a/dev/zba/src/Thread.cc
+++ b/dev/zba/src/Thread.cc
@@ -39,8 +39,8 @@ namespace Boot
if (blob_bytes[0] == kMagMz0 &&
blob_bytes[1] == kMagMz1)
{
- LDR_EXEC_HEADER_PTR header_ptr = ldr_find_exec_header(blob_bytes);
- LDR_OPTIONAL_HEADER_PTR opt_header_ptr = ldr_find_opt_exec_header(blob_bytes);
+ LDR_EXEC_HEADER_PTR header_ptr = CFKit::ldr_find_exec_header(blob_bytes);
+ LDR_OPTIONAL_HEADER_PTR opt_header_ptr = CFKit::ldr_find_opt_exec_header(blob_bytes);
if (!header_ptr || !opt_header_ptr)
return;
diff --git a/dev/zka/CFKit/GUIDWizard.h b/dev/zka/CFKit/GUIDWizard.h
index 74dab72b..4a41cf7f 100644
--- a/dev/zka/CFKit/GUIDWizard.h
+++ b/dev/zka/CFKit/GUIDWizard.h
@@ -15,8 +15,10 @@
#include <NewKit/Stream.h>
#include <NewKit/String.h>
-namespace Kernel::XRN::Version1
+namespace CFKit::XRN::Version1
{
+ using namespace Kernel;
+
Ref<GUIDSequence> cf_make_sequence(const ArrayList<UInt32>& seq);
ErrorOr<Ref<Kernel::StringView>> cf_try_guid_to_string(Ref<GUIDSequence>& guid);
-} // namespace Kernel::XRN::Version1
+} // namespace CFKit::XRN::Version1
diff --git a/dev/zka/CFKit/GUIDWrapper.h b/dev/zka/CFKit/GUIDWrapper.h
index ee51e065..a3af5a0d 100644
--- a/dev/zka/CFKit/GUIDWrapper.h
+++ b/dev/zka/CFKit/GUIDWrapper.h
@@ -15,8 +15,10 @@
#define kXRNNil "@{........-....-M...-N...-............}"
// eXtensible Resource Information
-namespace Kernel::XRN
+namespace CFKit::XRN
{
+ using namespace Kernel;
+
union GUIDSequence {
alignas(8) UShort u8[16];
alignas(8) UShort u16[8];
@@ -55,4 +57,4 @@ namespace Kernel::XRN
private:
GUIDSequence fUUID;
};
-} // namespace Kernel::XRN
+} // namespace CFKit::XRN
diff --git a/dev/zka/CFKit/LoaderUtils.h b/dev/zka/CFKit/LoaderUtils.h
index b438de2a..edaa38d0 100644
--- a/dev/zka/CFKit/LoaderUtils.h
+++ b/dev/zka/CFKit/LoaderUtils.h
@@ -4,9 +4,11 @@
#include <KernelKit/PE.h>
#include <KernelKit/MSDOS.h>
-namespace Kernel
+namespace CFKit
{
- /// @brief Find the PE header inside the blob.
+ using namespace Kernel;
+
+ /// @brief Finds the PE header inside the blob.
inline auto ldr_find_exec_header(DosHeaderPtr ptrDos) -> LDR_EXEC_HEADER_PTR
{
if (!ptrDos)
@@ -21,7 +23,7 @@ namespace Kernel
return (LDR_EXEC_HEADER_PTR)(VoidPtr)(&ptrDos->eLfanew + 1);
}
- /// @brief Find the PE optional header inside the blob.
+ /// @brief Finds the PE optional header inside the blob.
inline auto ldr_find_opt_exec_header(DosHeaderPtr ptrDos) -> LDR_OPTIONAL_HEADER_PTR
{
if (!ptrDos)
@@ -35,19 +37,19 @@ namespace Kernel
return (LDR_OPTIONAL_HEADER_PTR)(VoidPtr)(&exec->mCharacteristics + 1);
}
- /// @brief Find the PE header inside the blob.
+ /// @brief Finds the PE header inside the blob.
/// @note overloaded function.
inline auto ldr_find_exec_header(const Char* ptrDos) -> LDR_EXEC_HEADER_PTR
{
return ldr_find_exec_header((DosHeaderPtr)ptrDos);
}
- /// @brief Find the PE header inside the blob.
+ /// @brief Finds the PE header inside the blob.
/// @note overloaded function.
inline auto ldr_find_opt_exec_header(const Char* ptrDos) -> LDR_OPTIONAL_HEADER_PTR
{
return ldr_find_opt_exec_header((DosHeaderPtr)ptrDos);
}
-} // namespace Kernel
+} // namespace CFKit
#endif // ifndef __CFKIT_LOADER_UTILS_H__
diff --git a/dev/zka/CFKit/Property.h b/dev/zka/CFKit/Property.h
index 56829165..0628e1c2 100644
--- a/dev/zka/CFKit/Property.h
+++ b/dev/zka/CFKit/Property.h
@@ -4,8 +4,8 @@
------------------------------------------- */
-#ifndef __INC_PROPS_HPP__
-#define __INC_PROPS_HPP__
+#ifndef __INC_PROPS_H__
+#define __INC_PROPS_H__
#include <NewKit/Array.h>
#include <NewKit/Defines.h>
@@ -14,8 +14,10 @@
#define cMaxPropLen 4096
-namespace Kernel
+namespace CFKit
{
+ using namespace Kernel;
+
/// @brief handle to anything (number, ptr, string...)
using PropertyId = UIntPtr;
@@ -42,6 +44,11 @@ namespace Kernel
template <SizeT N>
using PropertyArray = Array<Property, N>;
-} // namespace Kernel
+} // namespace CFKit
+
+namespace Kernel
+{
+ using namespace CFKit;
+}
-#endif // !__INC_PROPS_HPP__
+#endif // !__INC_PROPS_H__
diff --git a/dev/zka/KernelKit/HardwareThreadScheduler.h b/dev/zka/KernelKit/HardwareThreadScheduler.h
index a11665cf..38672843 100644
--- a/dev/zka/KernelKit/HardwareThreadScheduler.h
+++ b/dev/zka/KernelKit/HardwareThreadScheduler.h
@@ -4,8 +4,8 @@
------------------------------------------- */
-#ifndef __INC_MP_MANAGER_HPP__
-#define __INC_MP_MANAGER_HPP__
+#ifndef __INC_MP_MANAGER_H__
+#define __INC_MP_MANAGER_H__
#include <ArchKit/ArchKit.h>
#include <CompilerKit/CompilerKit.h>
@@ -146,4 +146,4 @@ namespace Kernel
Void mp_hang_thread(HAL::StackFramePtr stack);
} // namespace Kernel
-#endif // !__INC_MP_MANAGER_HPP__
+#endif // !__INC_MP_MANAGER_H__
diff --git a/dev/zka/KernelKit/PCI/Iterator.h b/dev/zka/KernelKit/PCI/Iterator.h
index 232a4671..8c20d8f2 100644
--- a/dev/zka/KernelKit/PCI/Iterator.h
+++ b/dev/zka/KernelKit/PCI/Iterator.h
@@ -4,8 +4,8 @@
------------------------------------------- */
-#ifndef __PCI_ITERATOR_HPP__
-#define __PCI_ITERATOR_HPP__
+#ifndef __PCI_ITERATOR_H__
+#define __PCI_ITERATOR_H__
#include <KernelKit/PCI/Database.h>
#include <KernelKit/PCI/Device.h>
@@ -40,4 +40,4 @@ namespace Kernel::PCI
};
} // namespace Kernel::PCI
-#endif // __PCI_ITERATOR_HPP__
+#endif // __PCI_ITERATOR_H__
diff --git a/dev/zka/NetworkKit/NetworkDevice.h b/dev/zka/NetworkKit/NetworkDevice.h
index 2692b14e..d043d0d2 100644
--- a/dev/zka/NetworkKit/NetworkDevice.h
+++ b/dev/zka/NetworkKit/NetworkDevice.h
@@ -4,8 +4,8 @@
------------------------------------------- */
-#ifndef __INC_NETWORK_DEVICE_HPP__
-#define __INC_NETWORK_DEVICE_HPP__
+#ifndef __INC_NETWORK_DEVICE_H__
+#define __INC_NETWORK_DEVICE_H__
#include <KernelKit/DeviceMgr.h>
#include <NetworkKit/IP.h>
@@ -35,7 +35,7 @@ namespace Kernel
public:
const Char* Name() const override;
- Boolean Name(const Char* strView);
+ Boolean Name(const Char* newStr);
private:
static constexpr auto cNetworkNameLen = 512;
@@ -71,10 +71,13 @@ namespace Kernel
/// @brief GSM device.
using GSMNetworkDevice = NetworkDevice;
+ /// @brief Bluetooth device.
+ using BTNetworkDevice = NetworkDevice;
+
/// @brief LTE device.
using LTENetworkDevice = NetworkDevice;
} // namespace Kernel
#include <NetworkKit/NetworkDevice.inl>
-#endif // !__INC_NETWORK_DEVICE_HPP__
+#endif // !__INC_NETWORK_DEVICE_H__
diff --git a/dev/zka/NewKit/Defines.h b/dev/zka/NewKit/Defines.h
index f1a82e99..83cc7338 100644
--- a/dev/zka/NewKit/Defines.h
+++ b/dev/zka/NewKit/Defines.h
@@ -8,12 +8,8 @@
#include <NewKit/Macros.h>
-#define NEWKIT_VERSION "1.01"
-#define NEWKIT_VERSION_CB 0x0101
-
-#if !defined(_INC_NO_STDC_HEADERS) && defined(__GNUC__)
-#include <crt/defines.h>
-#endif
+#define NEWKIT_VERSION "1.1.0"
+#define NEWKIT_VERSION_CB 0x01100
#ifdef __has_feature
#if !__has_feature(cxx_nullptr)
diff --git a/dev/zka/NewKit/Function.h b/dev/zka/NewKit/Function.h
index ae298db5..9fa218af 100644
--- a/dev/zka/NewKit/Function.h
+++ b/dev/zka/NewKit/Function.h
@@ -1,5 +1,5 @@
-#ifndef _INC_FUNCTION_HPP__
-#define _INC_FUNCTION_HPP__
+#ifndef _INC_FUNCTION_H__
+#define _INC_FUNCTION_H__
#include <NewKit/Defines.h>
@@ -50,4 +50,4 @@ namespace Kernel
};
} // namespace Kernel
-#endif // !_INC_FUNCTION_HPP__
+#endif // !_INC_FUNCTION_H__
diff --git a/dev/zka/src/CRuntime.cc b/dev/zka/src/CRuntimeLibrary.cc
index 10d47a8d..efdc4b33 100644
--- a/dev/zka/src/CRuntime.cc
+++ b/dev/zka/src/CRuntimeLibrary.cc
@@ -6,6 +6,9 @@
#include <KernelKit/DebugOutput.h>
+#include <stdint.h>
+#include <stddef.h>
+
using namespace Kernel;
/// @brief memset definition in C++.
diff --git a/dev/zka/src/GUIDWizard.cc b/dev/zka/src/GUIDWizard.cc
index 77635979..a904696f 100644
--- a/dev/zka/src/GUIDWizard.cc
+++ b/dev/zka/src/GUIDWizard.cc
@@ -17,7 +17,7 @@
// @brief Size of UUID.
#define kUUIDSize 37
-namespace Kernel::XRN::Version1
+namespace CFKit::XRN::Version1
{
auto cf_make_sequence(const ArrayList<UInt32>& uuidSeq) -> Ref<GUIDSequence>
{
@@ -69,4 +69,4 @@ namespace Kernel::XRN::Version1
return ErrorOr<Ref<StringView>>{-1};
}
-} // namespace Kernel::XRN::Version1
+} // namespace CFKit::XRN::Version1
diff --git a/dev/zka/src/GUIDWrapper.cc b/dev/zka/src/GUIDWrapper.cc
index 53d983a1..9cb3c6fd 100644
--- a/dev/zka/src/GUIDWrapper.cc
+++ b/dev/zka/src/GUIDWrapper.cc
@@ -6,6 +6,6 @@
#include <CFKit/GUIDWrapper.h>
-namespace Kernel::XRN
+namespace CFKit::XRN
{
}
diff --git a/dev/zka/src/Property.cc b/dev/zka/src/Property.cc
index 084616a4..9ee17b74 100644
--- a/dev/zka/src/Property.cc
+++ b/dev/zka/src/Property.cc
@@ -6,7 +6,7 @@
#include <CFKit/Property.h>
-namespace Kernel
+namespace CFKit
{
Property::~Property() = default;
@@ -24,4 +24,4 @@ namespace Kernel
{
return fAction;
}
-} // namespace Kernel
+} // namespace CFKit
generated by cgit v1.2.3 (git 2.39.1) at 2026-03-14 14:45:18 +0000