summaryrefslogtreecommitdiffhomepage
path: root/dev
diff options
context:
space:
mode:
Diffstat (limited to 'dev')
-rw-r--r--dev/zba/Modules/SysChk/Module.cxx2
-rw-r--r--dev/zka/KernelKit/DriveMgr.hxx2
-rw-r--r--dev/zka/NewKit/Macros.hxx6
-rw-r--r--dev/zka/src/DriveMgr.cxx16
-rw-r--r--dev/zka/src/FS/NeFS.cxx30
-rw-r--r--dev/zka/src/String.cxx4
6 files changed, 34 insertions, 26 deletions
diff --git a/dev/zba/Modules/SysChk/Module.cxx b/dev/zba/Modules/SysChk/Module.cxx
index 0fe6bc9a..13473202 100644
--- a/dev/zba/Modules/SysChk/Module.cxx
+++ b/dev/zba/Modules/SysChk/Module.cxx
@@ -15,7 +15,7 @@ EXTERN_C Int32 ModuleMain(Kernel::HEL::HANDOVER_INFO_HEADER* Handover)
cST->ConOut->ClearScreen(cST->ConOut);
- cST->ConOut->OutputString(cST->ConOut, L"SYSCHK: CHECKING FOR VALID NEWFS OR HPFS PARTITIONS...\r\n");
+ cST->ConOut->OutputString(cST->ConOut, L"SYSCHK: CHECKING FOR VALID NEFS OR HPFS PARTITIONS...\r\n");
cST->ConOut->OutputString(cST->ConOut, L"SYSCHK: GOOD TO GO!\r\n");
return kEfiOk;
diff --git a/dev/zka/KernelKit/DriveMgr.hxx b/dev/zka/KernelKit/DriveMgr.hxx
index 000020e1..7221abdb 100644
--- a/dev/zka/KernelKit/DriveMgr.hxx
+++ b/dev/zka/KernelKit/DriveMgr.hxx
@@ -140,7 +140,7 @@ namespace Kernel
/// @brief Gets the drive kind (ATA, SCSI, AHCI...)
/// @param
/// @return the drive kind (ATA, Flash, NVM)
- const Char* io_drive_kind(Void);
+ const Char* io_drv_kind(Void);
/// @brief Makes a new drive.
/// @return the new drive as a trait.
diff --git a/dev/zka/NewKit/Macros.hxx b/dev/zka/NewKit/Macros.hxx
index ca33cb16..01dcaeec 100644
--- a/dev/zka/NewKit/Macros.hxx
+++ b/dev/zka/NewKit/Macros.hxx
@@ -86,9 +86,9 @@
#define END_STRING_ENUM() }
#endif
-#ifndef ALLOCA
-#define ALLOCA(Sz) __builtin_alloca(Sz)
-#endif // #ifndef ALLOCA
+#ifndef cAlloca
+#define cAlloca(Sz) __builtin_alloca(Sz)
+#endif // #ifndef cAlloca
#ifndef CANT_REACH
#define CANT_REACH() __builtin_unreachable()
diff --git a/dev/zka/src/DriveMgr.cxx b/dev/zka/src/DriveMgr.cxx
index b5edb2b1..cf2bb948 100644
--- a/dev/zka/src/DriveMgr.cxx
+++ b/dev/zka/src/DriveMgr.cxx
@@ -12,8 +12,10 @@
#include <modules/AHCI/AHCI.hxx>
#include <modules/NVME/NVME.hxx>
+/***********************************************************************************/
/// @file DriveMgr.cxx
-/// @brief Drive manager.
+/// @brief Drive Manager API.
+/***********************************************************************************/
namespace Kernel
{
@@ -103,12 +105,18 @@ namespace Kernel
#ifdef __ZKA_MINIMAL_OS__
const Char* io_drv_kind(Void)
{
- return "Unknown";
+ return "Not Loaded";
+ }
+#endif
+#ifdef __ZKA_ED__
+ const Char* io_drv_kind(Void)
+ {
+ return "C++ Code Editor";
}
#endif
- /// @brief Unimplemented drive.
- /// @param pckt
+ /// @brief Unimplemented drive function.
+ /// @param pckt the packet to read.
/// @return
Void io_drv_unimplemented(DriveTrait::DrivePacket* pckt)
{
diff --git a/dev/zka/src/FS/NeFS.cxx b/dev/zka/src/FS/NeFS.cxx
index 455f894d..0c8627c6 100644
--- a/dev/zka/src/FS/NeFS.cxx
+++ b/dev/zka/src/FS/NeFS.cxx
@@ -77,8 +77,8 @@ _Output NFS_FORK_STRUCT* NeFSParser::CreateFork(_Input NFS_CATALOG_STRUCT* catal
auto drv = sMountpointInterface.A();
/// special treatment.
- rt_copy_memory((VoidPtr) "fs/newfs-packet", drv.fPacket.fPacketMime,
- rt_string_len("fs/newfs-packet"));
+ rt_copy_memory((VoidPtr) "fs/nefs-packet", drv.fPacket.fPacketMime,
+ rt_string_len("fs/nefs-packet"));
NFS_FORK_STRUCT curFork{0};
NFS_FORK_STRUCT prevFork{0};
@@ -187,7 +187,7 @@ _Output NFS_FORK_STRUCT* NeFSParser::FindFork(_Input NFS_CATALOG_STRUCT* catalog
drv.fPacket.fPacketSize = sizeof(NFS_FORK_STRUCT);
drv.fPacket.fPacketContent = (VoidPtr)the_fork;
- rt_copy_memory((VoidPtr) "fs/newfs-packet", drv.fPacket.fPacketMime, 16);
+ rt_copy_memory((VoidPtr) "fs/nefs-packet", drv.fPacket.fPacketMime, 16);
if (auto res =
fs_newfs_read(&sMountpointInterface, drv, this->fDriveIndex);
@@ -351,8 +351,8 @@ _Output NFS_CATALOG_STRUCT* NeFSParser::CreateCatalog(_Input const Char* name,
Lba start_free = out_lba;
- rt_copy_memory((VoidPtr) "fs/newfs-packet", drive.fPacket.fPacketMime,
- rt_string_len("fs/newfs-packet"));
+ rt_copy_memory((VoidPtr) "fs/nefs-packet", drive.fPacket.fPacketMime,
+ rt_string_len("fs/nefs-packet"));
drive.fPacket.fPacketContent = &temporary_catalog;
drive.fPacket.fPacketSize = kNeFSSectorSz;
@@ -477,8 +477,8 @@ bool NeFSParser::Format(_Input _Output DriveTrait* drive, _Input const Lba endLb
// verify disk.
drive->fVerify(&drive->fPacket);
- rt_copy_memory((VoidPtr) "fs/newfs-packet", drive->fPacket.fPacketMime,
- rt_string_len("fs/newfs-packet"));
+ rt_copy_memory((VoidPtr) "fs/nefs-packet", drive->fPacket.fPacketMime,
+ rt_string_len("fs/nefs-packet"));
// if disk isn't good, then error out.
if (false == drive->fPacket.fPacketGood)
@@ -647,8 +647,8 @@ bool NeFSParser::WriteCatalog(_Input _Output NFS_CATALOG_STRUCT* catalog, Bool i
auto drive = sMountpointInterface.A();
- rt_copy_memory((VoidPtr) "fs/newfs-packet", drive.fPacket.fPacketMime,
- rt_string_len("fs/newfs-packet"));
+ rt_copy_memory((VoidPtr) "fs/nefs-packet", drive.fPacket.fPacketMime,
+ rt_string_len("fs/nefs-packet"));
auto startFork = (!is_rsrc_fork) ? catalog->DataFork
: catalog->ResourceFork;
@@ -730,8 +730,8 @@ _Output NFS_CATALOG_STRUCT* NeFSParser::FindCatalog(_Input const Char* catalogNa
NFS_ROOT_PARTITION_BLOCK fs_buf{0};
auto drive = sMountpointInterface.A();
- rt_copy_memory((VoidPtr) "fs/newfs-packet", drive.fPacket.fPacketMime,
- rt_string_len("fs/newfs-packet"));
+ rt_copy_memory((VoidPtr) "fs/nefs-packet", drive.fPacket.fPacketMime,
+ rt_string_len("fs/nefs-packet"));
drive.fPacket.fPacketContent = &fs_buf;
drive.fPacket.fPacketSize = sizeof(NFS_ROOT_PARTITION_BLOCK);
@@ -892,8 +892,8 @@ Boolean NeFSParser::RemoveCatalog(_Input const Char* catalogName)
auto drive = sMountpointInterface.A();
- rt_copy_memory((VoidPtr) "fs/newfs-packet", drive.fPacket.fPacketMime,
- rt_string_len("fs/newfs-packet"));
+ rt_copy_memory((VoidPtr) "fs/nefs-packet", drive.fPacket.fPacketMime,
+ rt_string_len("fs/nefs-packet"));
drive.fPacket.fLba = out_lba; // the catalog position.
drive.fPacket.fPacketSize =
@@ -958,8 +958,8 @@ VoidPtr NeFSParser::ReadCatalog(_Input _Output NFS_CATALOG_STRUCT* catalog,
NFS_FORK_STRUCT* fs_buf = new NFS_FORK_STRUCT();
auto drive = sMountpointInterface.A();
- rt_copy_memory((VoidPtr) "fs/newfs-packet", drive.fPacket.fPacketMime,
- rt_string_len("fs/newfs-packet"));
+ rt_copy_memory((VoidPtr) "fs/nefs-packet", drive.fPacket.fPacketMime,
+ rt_string_len("fs/nefs-packet"));
NFS_FORK_STRUCT* fs_fork_data = nullptr;
diff --git a/dev/zka/src/String.cxx b/dev/zka/src/String.cxx
index 520e42f3..0c907c68 100644
--- a/dev/zka/src/String.cxx
+++ b/dev/zka/src/String.cxx
@@ -98,7 +98,7 @@ namespace Kernel
return ("?");
const Char* boolean_expr = i ? "True" : "False";
- char* ret = (char*)ALLOCA((sizeof(char) * i) ? 4 : 5 + rt_string_len(fmt));
+ char* ret = (char*)cAlloca((sizeof(char) * i) ? 4 : 5 + rt_string_len(fmt));
if (!ret)
return ("?");
@@ -158,7 +158,7 @@ namespace Kernel
return ("?");
char* ret =
- (char*)ALLOCA(sizeof(char) * rt_string_len(fmt2) + rt_string_len(fmt));
+ (char*)cAlloca(sizeof(char) * rt_string_len(fmt2) + rt_string_len(fmt));
if (!ret)
return ("?");
generated by cgit v1.2.3 (git 2.39.1) at 2026-03-14 19:00:58 +0000