diff options
| -rw-r--r-- | dev/Kernel/FSKit/NeFS.h | 4 | ||||
| -rw-r--r-- | dev/Kernel/HALKit/AMD64/Storage/SATA-DMA.cc | 30 | ||||
| -rw-r--r-- | dev/Kernel/HALKit/ARM64/HalKernelMain.cc | 1 | ||||
| -rw-r--r-- | dev/Kernel/KernelKit/User.h | 2 | ||||
| -rw-r--r-- | dev/Kernel/src/KernelMain.cc | 6 |
5 files changed, 21 insertions, 22 deletions
diff --git a/dev/Kernel/FSKit/NeFS.h b/dev/Kernel/FSKit/NeFS.h index cddd09f0..b9babad8 100644 --- a/dev/Kernel/FSKit/NeFS.h +++ b/dev/Kernel/FSKit/NeFS.h @@ -412,11 +412,13 @@ namespace Kernel parser->CreateFork(mNode, new_fork); + kcout << "Commit: " << xml_data.Data() << "\r\nTo: " << journal_name.Data() << endl; + return parser->WriteCatalog(mNode, YES, xml_data.Data(), xml_data.Length(), journal_name.CData()); } private: - Char mStamp[255] = {"/Boot/Journal" kNeFSJournalExt}; + Char mStamp[255] = {"/system/zka_journal" kNeFSJournalExt}; }; namespace Detail diff --git a/dev/Kernel/HALKit/AMD64/Storage/SATA-DMA.cc b/dev/Kernel/HALKit/AMD64/Storage/SATA-DMA.cc index db97f19b..3f96ba71 100644 --- a/dev/Kernel/HALKit/AMD64/Storage/SATA-DMA.cc +++ b/dev/Kernel/HALKit/AMD64/Storage/SATA-DMA.cc @@ -15,8 +15,6 @@ * */ -#include "KernelKit/DebugOutput.h" -#include "NewKit/Defines.h" #include <KernelKit/UserProcessScheduler.h> #include <KernelKit/LPC.h> @@ -28,11 +26,11 @@ #ifdef __AHCI__ -#define HBA_ERR_TFE (1 << 30) -#define HBA_PxCMD_ST 0x0001 -#define HBA_PxCMD_FRE 0x0010 -#define HBA_PxCMD_FR 0x4000 -#define HBA_PxCMD_CR 0x8000 +#define kHBAErrTaskFile (1 << 30) +#define kHBAPxCmdST 0x0001 +#define kHBAPxCmdFre 0x0010 +#define kHBAPxCmdFR 0x4000 +#define kHBAPxCmdCR 0x8000 #define kSataLBAMode (1 << 6) @@ -122,14 +120,14 @@ Kernel::Boolean drv_std_init(Kernel::UInt16& PortsImplemented) kSATAPortIdx = ahci_index; kSATAPort = mem_ahci; - kSATAPort->Ports[kSATAPortIdx].Cmd &= ~HBA_PxCMD_ST; - kSATAPort->Ports[kSATAPortIdx].Cmd &= ~HBA_PxCMD_FRE; + kSATAPort->Ports[kSATAPortIdx].Cmd &= ~kHBAPxCmdST; + kSATAPort->Ports[kSATAPortIdx].Cmd &= ~kHBAPxCmdFre; while (YES) { - if (kSATAPort->Ports[kSATAPortIdx].Cmd & HBA_PxCMD_FR) + if (kSATAPort->Ports[kSATAPortIdx].Cmd & kHBAPxCmdFR) continue; - if (kSATAPort->Ports[kSATAPortIdx].Cmd & HBA_PxCMD_CR) + if (kSATAPort->Ports[kSATAPortIdx].Cmd & kHBAPxCmdCR) continue; break; @@ -159,12 +157,12 @@ Kernel::Boolean drv_std_init(Kernel::UInt16& PortsImplemented) rt_set_memory((VoidPtr)(UIntPtr)cmdheader[i].Ctba, 0, 256); } - while (kSATAPort->Ports[kSATAPortIdx].Cmd & HBA_PxCMD_CR) + while (kSATAPort->Ports[kSATAPortIdx].Cmd & kHBAPxCmdCR) { } - kSATAPort->Ports[kSATAPortIdx].Cmd |= HBA_PxCMD_FRE; - kSATAPort->Ports[kSATAPortIdx].Cmd |= HBA_PxCMD_ST; + kSATAPort->Ports[kSATAPortIdx].Cmd |= kHBAPxCmdFre; + kSATAPort->Ports[kSATAPortIdx].Cmd |= kHBAPxCmdST; drv_calculate_disk_geometry(); @@ -284,14 +282,14 @@ static Kernel::Void drv_std_input_output(Kernel::UInt64 lba, Kernel::UInt8* buff kcout << "waiting for slot to be ready\r\n"; } - kSATAPort->Is = 0xFFFFFFFF; + kSATAPort->Is = -1; kSATAPort->Ports[kSATAPortIdx].Ci |= 1 << slot; while (kSATAPort->Ports[kSATAPortIdx].Ci & (1 << slot)) { kcout << Kernel::number(slot) << endl; - if (kSATAPort->Is & (1 << 30)) // check for task file error. + if (kSATAPort->Is & kHBAErrTaskFile) // check for task file error. { Kernel::ke_panic(RUNTIME_CHECK_BAD_BEHAVIOR, "AHCI Read disk failure, faulty component."); return; diff --git a/dev/Kernel/HALKit/ARM64/HalKernelMain.cc b/dev/Kernel/HALKit/ARM64/HalKernelMain.cc index 1a520994..3def788f 100644 --- a/dev/Kernel/HALKit/ARM64/HalKernelMain.cc +++ b/dev/Kernel/HALKit/ARM64/HalKernelMain.cc @@ -4,7 +4,6 @@ ------------------------------------------- */ -#include "HALKit/ARM64/ApplicationProcessor.h" #include <ArchKit/ArchKit.h> #include <Mod/CoreGfx/FBMgr.h> #include <FirmwareKit/Handover.h> diff --git a/dev/Kernel/KernelKit/User.h b/dev/Kernel/KernelKit/User.h index c0d095d1..7cf26e1e 100644 --- a/dev/Kernel/KernelKit/User.h +++ b/dev/Kernel/KernelKit/User.h @@ -17,7 +17,7 @@ #define kGuestUser "OS AUTHORITY/GUEST/%s" #define kFmtUser "OS AUTHORITY/STD/%s" -#define kUsersDir "/Users/" +#define kUsersDir "/usr/" #define kMaxUserNameLen (255U) #define kMaxUserTokenLen (255U) diff --git a/dev/Kernel/src/KernelMain.cc b/dev/Kernel/src/KernelMain.cc index 993f066a..06223ff9 100644 --- a/dev/Kernel/src/KernelMain.cc +++ b/dev/Kernel/src/KernelMain.cc @@ -44,8 +44,8 @@ namespace Kernel::Detail { const SizeT kFolderCount = 8; const Char* kFolderStr[kFolderCount] = { - "/", "/Boot/", "/System/", "/Support/", "/Applications/", - "/Users/", "/Library/", "/Mount/"}; + "/", "/boot/", "/sys/", "/apps_support/", "/apps/", + "/usr/", "/lib/", "/mnt/"}; for (Kernel::SizeT dir_index = 0UL; dir_index < kFolderCount; ++dir_index) { @@ -75,7 +75,7 @@ namespace Kernel::Detail xml += "<LOG_XML>Formatted Filesystem</LOG_XML>"; KString name; - name += "FORMAT"; + name += "NeFS Format System"; mJournal.CommitJournal(mNeFS, xml, name); mJournal.ReleaseJournal(); |