diff options
Diffstat (limited to 'dev')
| -rw-r--r-- | dev/sci/sci_base.h | 5 | ||||
| -rw-r--r-- | dev/zka/HALKit/AMD64/HalCoreInterruptHandlerAMD64.cc | 8 | ||||
| -rw-r--r-- | dev/zka/HALKit/AMD64/PCI/Iterator.cc | 2 | ||||
| -rw-r--r-- | dev/zka/src/CRuntime.cc | 3 | ||||
| -rw-r--r-- | dev/zka/src/DriveMgr.cc | 4 | ||||
| -rw-r--r-- | dev/zka/src/FileMgr.cc | 6 |
6 files changed, 13 insertions, 15 deletions
diff --git a/dev/sci/sci_base.h b/dev/sci/sci_base.h index f9babe13..c225c966 100644 --- a/dev/sci/sci_base.h +++ b/dev/sci/sci_base.h @@ -13,11 +13,9 @@ Purpose: SCI core header file (C++ only). #include <sci/sci_hint.h>
#define ATTRIBUTE(X) __attribute__((X))
-
#define IMPORT_XPCOM extern "XPCOM"
#define IMPORT_CXX extern "C++"
#define IMPORT_C extern "C"
-
typedef bool Bool;
typedef void Void;
@@ -36,7 +34,6 @@ typedef __INT8_TYPE__ SInt8; typedef void* VoidPtr;
typedef __UINTPTR_TYPE__ UIntPtr;
typedef char Char;
-
#include <sci/sci_lpc.h>
#ifdef __XPCOM_IMPL__
@@ -45,7 +42,6 @@ typedef char Char; class IUnknown; // Refrenced from an IDB entry.
class ICLSID; // From the IDB, the constructor of the object, e.g: IAppCLSID.
class UUID;
-
class ATTRIBUTE(uuid("d7c144b6-0792-44b8-b06b-02b227b547df")) IUnknown
{
public:
@@ -60,7 +56,6 @@ public: virtual IUnknown* AddRef() = 0;
virtual VoidPtr QueryClass(UUID* p_uuid) = 0;
};
-
template <typename FnSign, typename ClsID>
class IEventListener : public ClsID
{
diff --git a/dev/zka/HALKit/AMD64/HalCoreInterruptHandlerAMD64.cc b/dev/zka/HALKit/AMD64/HalCoreInterruptHandlerAMD64.cc index 7dd0b68e..b8a84075 100644 --- a/dev/zka/HALKit/AMD64/HalCoreInterruptHandlerAMD64.cc +++ b/dev/zka/HALKit/AMD64/HalCoreInterruptHandlerAMD64.cc @@ -71,12 +71,12 @@ EXTERN_C Kernel::Void hal_system_call_enter(Kernel::UIntPtr rcx_syscall_index, K } else { - kcout << "syscall: syscall isn't valid at all! (is nullptr)\r"; + kcout << "syscall: syscall isn't valid at all! (is nullptr)\r"; } } else { - kcout << "syscall: syscall isn't hooked at all! (is set to false)\r"; + kcout << "syscall: syscall isn't hooked at all! (is set to false)\r"; } kcout << "syscall: Exit Syscall.\r"; @@ -100,12 +100,12 @@ EXTERN_C Kernel::Void hal_kernel_call_enter(Kernel::UIntPtr rcx_kerncall_index, } else { - kcout << "kerncall: syscall isn't valid at all! (is nullptr)\r"; + kcout << "kerncall: syscall isn't valid at all! (is nullptr)\r"; } } else { - kcout << "kerncall: syscall isn't hooked at all! (is set to false)\r"; + kcout << "kerncall: syscall isn't hooked at all! (is set to false)\r"; } kcout << "kerncall: Exit Kcall.\r"; diff --git a/dev/zka/HALKit/AMD64/PCI/Iterator.cc b/dev/zka/HALKit/AMD64/PCI/Iterator.cc index edafe07b..d7e6f7d8 100644 --- a/dev/zka/HALKit/AMD64/PCI/Iterator.cc +++ b/dev/zka/HALKit/AMD64/PCI/Iterator.cc @@ -17,7 +17,7 @@ namespace Kernel::PCI { for (int function = 0; function < ZKA_FUNCTION_COUNT; ++function) { - auto bar = 0x00; + auto bar = 0x00; Device dev(bus, device, function, bar); diff --git a/dev/zka/src/CRuntime.cc b/dev/zka/src/CRuntime.cc index 4a1de1d7..10d47a8d 100644 --- a/dev/zka/src/CRuntime.cc +++ b/dev/zka/src/CRuntime.cc @@ -39,6 +39,9 @@ EXTERN_C VoidPtr memcpy(void* dst, const void* src, long long unsigned int len) /// @brief strlen definition in C++. EXTERN_C size_t strlen(const char* whatToCheck) { + if (!whatToCheck) + return 0; + SizeT len = 0; while (whatToCheck[len] != 0) diff --git a/dev/zka/src/DriveMgr.cc b/dev/zka/src/DriveMgr.cc index 9f5201d9..16e3c12d 100644 --- a/dev/zka/src/DriveMgr.cc +++ b/dev/zka/src/DriveMgr.cc @@ -73,13 +73,13 @@ namespace Kernel kATAIO = ATA_PRIMARY_IO; if (!drv_std_init(kATAIO, kATAMaster, kATAIO, kATAMaster)) - return; + return; #elif defined(__AHCI__) UInt16 pi = 0; if (!drv_std_init(pi)) - return; + return; #endif // if defined(__ATA_PIO__) || defined (__ATA_DMA__) pckt->fPacketGood = true; diff --git a/dev/zka/src/FileMgr.cc b/dev/zka/src/FileMgr.cc index c9591bf0..40819568 100644 --- a/dev/zka/src/FileMgr.cc +++ b/dev/zka/src/FileMgr.cc @@ -39,14 +39,14 @@ namespace Kernel /// @brief Mount filesystem. /// @param mount_ptr The filesystem to mount. /// @return if it succeeded true, otherwise false. - bool IFilesystemMgr::Mount(_Input IFilesystemMgr* mount_ptr) + _Output Bool IFilesystemMgr::Mount(_Input IFilesystemMgr* mount_ptr) { if (mount_ptr != nullptr) { kMountedFilesystem = mount_ptr; - return true; + return Yes; } - return false; + return No; } } // namespace Kernel |
