From a7ddae1db88105e1d281cbd4ec401a3e901fc554 Mon Sep 17 00:00:00 2001
From: mterwoord_cp <7cd3fd84a0151ea055c2f79e4d2eef9576fe9afesxUZAwxD>
Date: Wed, 2 Jan 2008 18:22:53 +0000
Subject: [PATCH] Should run now
---
source/Cosmos/Cosmos.Hardware/DebugUtil.cs | 8 +-
source/Cosmos/Cosmos.Kernel/DebugUtil.cs | 596 +++++++++---------
source/Cosmos/Cosmos.Kernel/Serial.cs | 15 +-
.../Staging/Stages/MatthijsStage.cs | 38 +-
4 files changed, 326 insertions(+), 331 deletions(-)
diff --git a/source/Cosmos/Cosmos.Hardware/DebugUtil.cs b/source/Cosmos/Cosmos.Hardware/DebugUtil.cs
index 4716b4cb2..26ff9a449 100644
--- a/source/Cosmos/Cosmos.Hardware/DebugUtil.cs
+++ b/source/Cosmos/Cosmos.Hardware/DebugUtil.cs
@@ -225,10 +225,10 @@ namespace Cosmos.Hardware {
WriteSerialString("\"/>\r\n");
}
- private static void WriteSerialString(string aData) {
- for (int i = 0; i < aData.Length; i++) {
- Serial.WriteSerial(0, (byte)aData[i]);
- }
+ public static void WriteSerialString(string aData) {
+ //for (int i = 0; i < aData.Length; i++) {
+ // Serial.WriteSerial(0, (byte)aData[i]);
+ //}
}
}
}
\ No newline at end of file
diff --git a/source/Cosmos/Cosmos.Kernel/DebugUtil.cs b/source/Cosmos/Cosmos.Kernel/DebugUtil.cs
index 60ec8df94..c6fd9c488 100644
--- a/source/Cosmos/Cosmos.Kernel/DebugUtil.cs
+++ b/source/Cosmos/Cosmos.Kernel/DebugUtil.cs
@@ -15,724 +15,724 @@ namespace Cosmos.Kernel {
public static void SendNumber(string aModule, string aDescription, uint aNumber, byte aBits) {
StartLogging();
- Serial.Write(0, "\r\n");
+ Hardware.DebugUtil.WriteSerialString("\"/>\r\n");
EndLogging();
}
public static void SendDoubleNumber(string aModule, string aDescription, uint aNumber, byte aBits, uint aNumber2, byte aBits2) {
StartLogging();
- Serial.Write(0, "\r\n");
+ Hardware.DebugUtil.WriteSerialString("\"/>\r\n");
EndLogging();
}
public static void SendMessage(string aModule, string aData) {
StartLogging();
- Serial.Write(0, "\r\n");
+ Hardware.DebugUtil.WriteSerialString("\r\n");
EndLogging();
}
public static void SendKeyboardEvent(uint aScanCode, bool aReleased) {
StartLogging();
- Serial.Write(0, "\r\n");
+ Hardware.DebugUtil.WriteSerialString("\"/>\r\n");
EndLogging();
}
public static void SendError(string aModule, string aData) {
StartLogging();
- Serial.Write(0, "\r\n");
+ Hardware.DebugUtil.WriteSerialString("\r\n");
EndLogging();
}
public static void SendError(string aModule, string aDescription, uint aData, byte aBits) {
StartLogging();
- Serial.Write(0, "\r\n");
+ Hardware.DebugUtil.WriteSerialString("\"/>\r\n");
EndLogging();
}
public static void SendWarning(string aModule, string aData) {
StartLogging();
- Serial.Write(0, "\r\n");
+ Hardware.DebugUtil.WriteSerialString("\r\n");
EndLogging();
}
public static void SendMM_Alloc(uint aStartAddr, uint aLength) {
StartLogging();
- Serial.Write(0, "\r\n");
+ Hardware.DebugUtil.WriteSerialString("\"/>\r\n");
EndLogging();
}
public static void SendMM_Free(uint aStartAddr, uint aLength) {
StartLogging();
- Serial.Write(0, "\r\n");
+ Hardware.DebugUtil.WriteSerialString("\"/>\r\n");
EndLogging();
}
internal static unsafe void SendExt2_GroupDescriptor(string aDescription, uint aBlock, int aIndex, uint aAddresss, FileSystem.Ext2.GroupDescriptor* aDescriptor) {
StartLogging();
- Serial.Write(0, "BlockBitmap, 32);
- Serial.Write(0, "\" INodeBitmap=\"");
+ Hardware.DebugUtil.WriteSerialString("\" INodeBitmap=\"");
Hardware.DebugUtil.WriteNumber(aDescriptor->INodeBitmap, 32);
- Serial.Write(0, "\" INodeTable=\"");
+ Hardware.DebugUtil.WriteSerialString("\" INodeTable=\"");
Hardware.DebugUtil.WriteNumber(aDescriptor->INodeTable, 32);
- Serial.Write(0, "\" FreeBlocksCount=\"");
+ Hardware.DebugUtil.WriteSerialString("\" FreeBlocksCount=\"");
Hardware.DebugUtil.WriteNumber(aDescriptor->FreeBlocksCount, 32);
- Serial.Write(0, "\" FreeINodesCount=\"");
+ Hardware.DebugUtil.WriteSerialString("\" FreeINodesCount=\"");
Hardware.DebugUtil.WriteNumber(aDescriptor->FreeINodesCount, 32);
- Serial.Write(0, "\" UsedDirsCount=\"");
+ Hardware.DebugUtil.WriteSerialString("\" UsedDirsCount=\"");
Hardware.DebugUtil.WriteNumber(aDescriptor->UsedDirsCount, 32);
- Serial.Write(0, "\" Pad=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Pad=\"");
Hardware.DebugUtil.WriteNumber(aDescriptor->Pad, 32);
- Serial.WriteLine(0, "\"/>");
+ Hardware.DebugUtil.WriteSerialString("\"/>\r\n");
EndLogging();
}
internal static unsafe void SendExt2_SuperBlock(string aDescription, FileSystem.Ext2.SuperBlock* aSuperBlock) {
StartLogging();
- Serial.Write(0, "INodesCount, 32);
- Serial.Write(0, "\" BlockCount=\"");
+ Hardware.DebugUtil.WriteSerialString("\" BlockCount=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->BlockCount, 32);
- Serial.Write(0, "\" RBlocksCount=\"");
+ Hardware.DebugUtil.WriteSerialString("\" RBlocksCount=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->RBlocksCount, 32);
- Serial.Write(0, "\" FreeBlocksCount=\"");
+ Hardware.DebugUtil.WriteSerialString("\" FreeBlocksCount=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->FreeBlocksCount, 32);
- Serial.Write(0, "\" FreeINodesCount=\"");
+ Hardware.DebugUtil.WriteSerialString("\" FreeINodesCount=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->FreeINodesCount, 32);
- Serial.Write(0, "\" FirstDataBlock=\"");
+ Hardware.DebugUtil.WriteSerialString("\" FirstDataBlock=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->FirstDataBlock, 32);
- Serial.Write(0, "\" LogBlockSize=\"");
+ Hardware.DebugUtil.WriteSerialString("\" LogBlockSize=\"");
Hardware.DebugUtil.WriteNumber((uint)aSuperBlock->LogBlockSize, 32);
- Serial.Write(0, "\" LogFragSize=\"");
+ Hardware.DebugUtil.WriteSerialString("\" LogFragSize=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->LogFragSize, 32);
- Serial.Write(0, "\" BlocksPerGroup=\"");
+ Hardware.DebugUtil.WriteSerialString("\" BlocksPerGroup=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->BlocksPerGroup, 32);
- Serial.Write(0, "\" FragsPerGroup=\"");
+ Hardware.DebugUtil.WriteSerialString("\" FragsPerGroup=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->FragsPerGroup, 32);
- Serial.Write(0, "\" INodesPerGroup=\"");
+ Hardware.DebugUtil.WriteSerialString("\" INodesPerGroup=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->INodesPerGroup, 32);
- Serial.Write(0, "\" MTime=\"");
+ Hardware.DebugUtil.WriteSerialString("\" MTime=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->MTime, 32);
- Serial.Write(0, "\" WTime=\"");
+ Hardware.DebugUtil.WriteSerialString("\" WTime=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->WTime, 32);
- Serial.Write(0, "\" MntCount=\"");
+ Hardware.DebugUtil.WriteSerialString("\" MntCount=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->MntCount, 16);
- Serial.Write(0, "\" MaxMntCount=\"");
+ Hardware.DebugUtil.WriteSerialString("\" MaxMntCount=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->MaxMntCount, 16);
- Serial.Write(0, "\" Magic=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Magic=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Magic, 16);
- Serial.Write(0, "\" State=\"");
+ Hardware.DebugUtil.WriteSerialString("\" State=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->State, 16);
- Serial.Write(0, "\" Errors=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Errors=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Errors, 16);
- Serial.Write(0, "\" MinorRevLevel=\"");
+ Hardware.DebugUtil.WriteSerialString("\" MinorRevLevel=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->MinorRevLevel, 16);
- Serial.Write(0, "\" LastCheck=\"");
+ Hardware.DebugUtil.WriteSerialString("\" LastCheck=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->LastCheck, 32);
- Serial.Write(0, "\" CheckInterval=\"");
+ Hardware.DebugUtil.WriteSerialString("\" CheckInterval=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->CheckInterval, 32);
- Serial.Write(0, "\" CreatorOS=\"");
+ Hardware.DebugUtil.WriteSerialString("\" CreatorOS=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->CreatorOS, 32);
- Serial.Write(0, "\" RevLevel=\"");
+ Hardware.DebugUtil.WriteSerialString("\" RevLevel=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->RevLevel, 32);
- Serial.Write(0, "\" RefResUID=\"");
+ Hardware.DebugUtil.WriteSerialString("\" RefResUID=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->RefResUID, 16);
- Serial.Write(0, "\" DefResGID=\"");
+ Hardware.DebugUtil.WriteSerialString("\" DefResGID=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->DefResGID, 16);
- Serial.Write(0, "\" FirstINode=\"");
+ Hardware.DebugUtil.WriteSerialString("\" FirstINode=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->FirstINode, 32);
- Serial.Write(0, "\" Padding1=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding1=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding1, 32);
- Serial.Write(0, "\" Padding2=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding2=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding2, 32);
- Serial.Write(0, "\" Padding3=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding3=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding3, 32);
- Serial.Write(0, "\" Padding4=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding4=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding4, 32);
- Serial.Write(0, "\" Padding5=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding5=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding5, 32);
- Serial.Write(0, "\" Padding6=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding6=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding6, 32);
- Serial.Write(0, "\" Padding7=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding7=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding7, 32);
- Serial.Write(0, "\" Padding8=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding8=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding8, 32);
- Serial.Write(0, "\" Padding9=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding9=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding9, 32);
- Serial.Write(0, "\" Padding10=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding10=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding10, 32);
- Serial.Write(0, "\" Padding11=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding11=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding11, 32);
- Serial.Write(0, "\" Padding12=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding12=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding12, 32);
- Serial.Write(0, "\" Padding13=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding13=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding13, 32);
- Serial.Write(0, "\" Padding14=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding14=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding14, 32);
- Serial.Write(0, "\" Padding15=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding15=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding15, 32);
- Serial.Write(0, "\" Padding16=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding16=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding16, 32);
- Serial.Write(0, "\" Padding17=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding17=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding17, 32);
- Serial.Write(0, "\" Padding18=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding18=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding18, 32);
- Serial.Write(0, "\" Padding19=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding19=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding19, 32);
- Serial.Write(0, "\" Padding20=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding20=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding20, 32);
- Serial.Write(0, "\" Padding21=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding21=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding21, 32);
- Serial.Write(0, "\" Padding22=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding22=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding22, 32);
- Serial.Write(0, "\" Padding23=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding23=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding23, 32);
- Serial.Write(0, "\" Padding24=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding24=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding24, 32);
- Serial.Write(0, "\" Padding25=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding25=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding25, 32);
- Serial.Write(0, "\" Padding26=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding26=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding26, 32);
- Serial.Write(0, "\" Padding27=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding27=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding27, 32);
- Serial.Write(0, "\" Padding28=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding28=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding28, 32);
- Serial.Write(0, "\" Padding29=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding29=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding29, 32);
- Serial.Write(0, "\" Padding30=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding30=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding30, 32);
- Serial.Write(0, "\" Padding31=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding31=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding31, 32);
- Serial.Write(0, "\" Padding32=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding32=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding32, 32);
- Serial.Write(0, "\" Padding33=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding33=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding33, 32);
- Serial.Write(0, "\" Padding34=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding34=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding34, 32);
- Serial.Write(0, "\" Padding35=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding35=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding35, 32);
- Serial.Write(0, "\" Padding36=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding36=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding36, 32);
- Serial.Write(0, "\" Padding37=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding37=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding37, 32);
- Serial.Write(0, "\" Padding38=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding38=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding38, 32);
- Serial.Write(0, "\" Padding39=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding39=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding39, 32);
- Serial.Write(0, "\" Padding40=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding40=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding40, 32);
- Serial.Write(0, "\" Padding41=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding41=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding41, 32);
- Serial.Write(0, "\" Padding42=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding42=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding42, 32);
- Serial.Write(0, "\" Padding43=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding43=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding43, 32);
- Serial.Write(0, "\" Padding44=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding44=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding44, 32);
- Serial.Write(0, "\" Padding45=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding45=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding45, 32);
- Serial.Write(0, "\" Padding46=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding46=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding46, 32);
- Serial.Write(0, "\" Padding47=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding47=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding47, 32);
- Serial.Write(0, "\" Padding48=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding48=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding48, 32);
- Serial.Write(0, "\" Padding49=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding49=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding49, 32);
- Serial.Write(0, "\" Padding50=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding50=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding50, 32);
- Serial.Write(0, "\" Padding51=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding51=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding51, 32);
- Serial.Write(0, "\" Padding52=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding52=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding52, 32);
- Serial.Write(0, "\" Padding53=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding53=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding53, 32);
- Serial.Write(0, "\" Padding54=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding54=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding54, 32);
- Serial.Write(0, "\" Padding55=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding55=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding55, 32);
- Serial.Write(0, "\" Padding56=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding56=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding56, 32);
- Serial.Write(0, "\" Padding57=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding57=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding57, 32);
- Serial.Write(0, "\" Padding58=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding58=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding58, 32);
- Serial.Write(0, "\" Padding59=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding59=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding59, 32);
- Serial.Write(0, "\" Padding60=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding60=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding60, 32);
- Serial.Write(0, "\" Padding61=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding61=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding61, 32);
- Serial.Write(0, "\" Padding62=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding62=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding62, 32);
- Serial.Write(0, "\" Padding63=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding63=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding63, 32);
- Serial.Write(0, "\" Padding64=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding64=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding64, 32);
- Serial.Write(0, "\" Padding65=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding65=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding65, 32);
- Serial.Write(0, "\" Padding66=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding66=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding66, 32);
- Serial.Write(0, "\" Padding67=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding67=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding67, 32);
- Serial.Write(0, "\" Padding68=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding68=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding68, 32);
- Serial.Write(0, "\" Padding69=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding69=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding69, 32);
- Serial.Write(0, "\" Padding70=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding70=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding70, 32);
- Serial.Write(0, "\" Padding71=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding71=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding71, 32);
- Serial.Write(0, "\" Padding72=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding72=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding72, 32);
- Serial.Write(0, "\" Padding73=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding73=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding73, 32);
- Serial.Write(0, "\" Padding74=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding74=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding74, 32);
- Serial.Write(0, "\" Padding75=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding75=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding75, 32);
- Serial.Write(0, "\" Padding76=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding76=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding76, 32);
- Serial.Write(0, "\" Padding77=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding77=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding77, 32);
- Serial.Write(0, "\" Padding78=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding78=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding78, 32);
- Serial.Write(0, "\" Padding79=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding79=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding79, 32);
- Serial.Write(0, "\" Padding80=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding80=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding80, 32);
- Serial.Write(0, "\" Padding81=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding81=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding81, 32);
- Serial.Write(0, "\" Padding82=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding82=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding82, 32);
- Serial.Write(0, "\" Padding83=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding83=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding83, 32);
- Serial.Write(0, "\" Padding84=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding84=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding84, 32);
- Serial.Write(0, "\" Padding85=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding85=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding85, 32);
- Serial.Write(0, "\" Padding86=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding86=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding86, 32);
- Serial.Write(0, "\" Padding87=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding87=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding87, 32);
- Serial.Write(0, "\" Padding88=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding88=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding88, 32);
- Serial.Write(0, "\" Padding89=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding89=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding89, 32);
- Serial.Write(0, "\" Padding90=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding90=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding90, 32);
- Serial.Write(0, "\" Padding91=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding91=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding91, 32);
- Serial.Write(0, "\" Padding92=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding92=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding92, 32);
- Serial.Write(0, "\" Padding93=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding93=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding93, 32);
- Serial.Write(0, "\" Padding94=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding94=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding94, 32);
- Serial.Write(0, "\" Padding95=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding95=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding95, 32);
- Serial.Write(0, "\" Padding96=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding96=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding96, 32);
- Serial.Write(0, "\" Padding97=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding97=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding97, 32);
- Serial.Write(0, "\" Padding98=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding98=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding98, 32);
- Serial.Write(0, "\" Padding99=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding99=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding99, 32);
- Serial.Write(0, "\" Padding100=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding100=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding100, 32);
- Serial.Write(0, "\" Padding101=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding101=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding101, 32);
- Serial.Write(0, "\" Padding102=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding102=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding102, 32);
- Serial.Write(0, "\" Padding103=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding103=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding103, 32);
- Serial.Write(0, "\" Padding104=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding104=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding104, 32);
- Serial.Write(0, "\" Padding105=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding105=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding105, 32);
- Serial.Write(0, "\" Padding106=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding106=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding106, 32);
- Serial.Write(0, "\" Padding107=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Padding107=\"");
Hardware.DebugUtil.WriteNumber(aSuperBlock->Padding107, 32);
- Serial.Write(0, "\"/>\r\n");
+ Hardware.DebugUtil.WriteSerialString("\"/>\r\n");
EndLogging();
}
internal static void SendExt2_INodeMode(uint aIdentifier, ushort aMode) {
StartLogging();
- Serial.Write(0, "\r\n");
+ Hardware.DebugUtil.WriteSerialString("\"/>\r\n");
EndLogging();
}
internal static unsafe void SendExt2_INode(uint aIdentifier, FileSystem.Ext2.INode* aINode) {
StartLogging();
- Serial.Write(0, "Mode, 16);
- Serial.Write(0, "\" UID=\"");
+ Hardware.DebugUtil.WriteSerialString("\" UID=\"");
Hardware.DebugUtil.WriteNumber(aINode->UID, 16);
- Serial.Write(0, "\" Size=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Size=\"");
Hardware.DebugUtil.WriteNumber(aINode->Size, 32);
- Serial.Write(0, "\" ATime=\"");
+ Hardware.DebugUtil.WriteSerialString("\" ATime=\"");
Hardware.DebugUtil.WriteNumber(aINode->ATime, 32);
- Serial.Write(0, "\" CTime=\"");
+ Hardware.DebugUtil.WriteSerialString("\" CTime=\"");
Hardware.DebugUtil.WriteNumber(aINode->CTime, 32);
- Serial.Write(0, "\" MTime=\"");
+ Hardware.DebugUtil.WriteSerialString("\" MTime=\"");
Hardware.DebugUtil.WriteNumber(aINode->MTime, 32);
- Serial.Write(0, "\" DTime=\"");
+ Hardware.DebugUtil.WriteSerialString("\" DTime=\"");
Hardware.DebugUtil.WriteNumber(aINode->DTime, 32);
- Serial.Write(0, "\" GID=\"");
+ Hardware.DebugUtil.WriteSerialString("\" GID=\"");
Hardware.DebugUtil.WriteNumber(aINode->GID, 16);
- Serial.Write(0, "\" LinksCount=\"");
+ Hardware.DebugUtil.WriteSerialString("\" LinksCount=\"");
Hardware.DebugUtil.WriteNumber(aINode->LinksCount, 16);
- Serial.Write(0, "\" Blocks=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Blocks=\"");
Hardware.DebugUtil.WriteNumber(aINode->Blocks, 32);
- Serial.Write(0, "\" Flags=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Flags=\"");
Hardware.DebugUtil.WriteNumber(aINode->Flags, 32);
- Serial.Write(0, "\" OSD1=\"");
+ Hardware.DebugUtil.WriteSerialString("\" OSD1=\"");
Hardware.DebugUtil.WriteNumber(aINode->OSD1, 32);
- Serial.Write(0, "\" Block1=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Block1=\"");
Hardware.DebugUtil.WriteNumber(aINode->Block1, 32);
- Serial.Write(0, "\" Block2=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Block2=\"");
Hardware.DebugUtil.WriteNumber(aINode->Block2, 32);
- Serial.Write(0, "\" Block3=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Block3=\"");
Hardware.DebugUtil.WriteNumber(aINode->Block3, 32);
- Serial.Write(0, "\" Block4=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Block4=\"");
Hardware.DebugUtil.WriteNumber(aINode->Block4, 32);
- Serial.Write(0, "\" Block5=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Block5=\"");
Hardware.DebugUtil.WriteNumber(aINode->Block5, 32);
- Serial.Write(0, "\" Block6=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Block6=\"");
Hardware.DebugUtil.WriteNumber(aINode->Block6, 32);
- Serial.Write(0, "\" Block7=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Block7=\"");
Hardware.DebugUtil.WriteNumber(aINode->Block7, 32);
- Serial.Write(0, "\" Block8=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Block8=\"");
Hardware.DebugUtil.WriteNumber(aINode->Block8, 32);
- Serial.Write(0, "\" Block9=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Block9=\"");
Hardware.DebugUtil.WriteNumber(aINode->Block9, 32);
- Serial.Write(0, "\" Block10=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Block10=\"");
Hardware.DebugUtil.WriteNumber(aINode->Block10, 32);
- Serial.Write(0, "\" Block11=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Block11=\"");
Hardware.DebugUtil.WriteNumber(aINode->Block11, 32);
- Serial.Write(0, "\" Block12=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Block12=\"");
Hardware.DebugUtil.WriteNumber(aINode->Block12, 32);
- Serial.Write(0, "\" Block13=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Block13=\"");
Hardware.DebugUtil.WriteNumber(aINode->Block13, 32);
- Serial.Write(0, "\" Block14=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Block14=\"");
Hardware.DebugUtil.WriteNumber(aINode->Block14, 32);
- Serial.Write(0, "\" Block15=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Block15=\"");
Hardware.DebugUtil.WriteNumber(aINode->Block15, 32);
- Serial.Write(0, "\" Generation=\"");
+ Hardware.DebugUtil.WriteSerialString("\" Generation=\"");
Hardware.DebugUtil.WriteNumber(aINode->Generation, 32);
- Serial.Write(0, "\" FileACL=\"");
+ Hardware.DebugUtil.WriteSerialString("\" FileACL=\"");
Hardware.DebugUtil.WriteNumber(aINode->FileACL, 32);
- Serial.Write(0, "\" DirACL=\"");
+ Hardware.DebugUtil.WriteSerialString("\" DirACL=\"");
Hardware.DebugUtil.WriteNumber(aINode->DirACL, 32);
- Serial.Write(0, "\" FAddr=\"");
+ Hardware.DebugUtil.WriteSerialString("\" FAddr=\"");
Hardware.DebugUtil.WriteNumber(aINode->FAddr, 32);
- Serial.Write(0, "\" OSD2_1=\"");
+ Hardware.DebugUtil.WriteSerialString("\" OSD2_1=\"");
Hardware.DebugUtil.WriteNumber(aINode->OSD2_1, 32);
- Serial.Write(0, "\" OSD2_2=\"");
+ Hardware.DebugUtil.WriteSerialString("\" OSD2_2=\"");
Hardware.DebugUtil.WriteNumber(aINode->OSD2_2, 32);
- Serial.Write(0, "\" OSD2_3=\"");
+ Hardware.DebugUtil.WriteSerialString("\" OSD2_3=\"");
Hardware.DebugUtil.WriteNumber(aINode->OSD2_3, 32);
- Serial.Write(0, "\"/>\r\n");
+ Hardware.DebugUtil.WriteSerialString("\"/>\r\n");
EndLogging();
}
internal static unsafe void SendExt2_DirectoryEntry(FileSystem.Ext2.DirectoryEntry* aEntryPtr) {
StartLogging();
- Serial.Write(0, "INodeNumber, 32);
- Serial.Write(0, "\" RecordLength=\"");
+ Hardware.DebugUtil.WriteSerialString("\" RecordLength=\"");
Hardware.DebugUtil.WriteNumber(aEntryPtr->RecordLength, 16);
- Serial.Write(0, "\" NameLength=\"");
+ Hardware.DebugUtil.WriteSerialString("\" NameLength=\"");
Hardware.DebugUtil.WriteNumber(aEntryPtr->NameLength, 8);
- Serial.Write(0, "\" FileType=\"");
+ Hardware.DebugUtil.WriteSerialString("\" FileType=\"");
Hardware.DebugUtil.WriteNumber(aEntryPtr->FileType, 8);
- Serial.Write(0, "\" Name=\"0x");
+ Hardware.DebugUtil.WriteSerialString("\" Name=\"0x");
byte* xNameByte = &aEntryPtr->FirstNameChar;
for (int i = 0; i < aEntryPtr->NameLength; i++) {
Hardware.DebugUtil.WriteNumber(xNameByte[i], 8, false);
}
- Serial.Write(0, "\"/>\r\n");
+ Hardware.DebugUtil.WriteSerialString("\"/>\r\n");
EndLogging();
}
internal static void SendByteStream(string aModule, string aDescription, byte[] aContents) {
StartLogging();
- Serial.Write(0, "\r\n");
+ Hardware.DebugUtil.WriteSerialString("\"/>\r\n");
}
internal static unsafe void SendBytes(string aModule, string aDescription, byte* aContents, uint aIndex, uint aCount) {
StartLogging();
- Serial.Write(0, "\r\n");
+ Hardware.DebugUtil.WriteSerialString("\"/>\r\n");
}
}
}
\ No newline at end of file
diff --git a/source/Cosmos/Cosmos.Kernel/Serial.cs b/source/Cosmos/Cosmos.Kernel/Serial.cs
index 23ba974a8..e6d457aab 100644
--- a/source/Cosmos/Cosmos.Kernel/Serial.cs
+++ b/source/Cosmos/Cosmos.Kernel/Serial.cs
@@ -4,15 +4,10 @@ using System.Text;
namespace Cosmos.Kernel {
public class Serial {
- public static void Write(byte aSerialIdx, string aData) {
- for (int i = 0; i < aData.Length; i++) {
- Hardware.Serial.WriteSerial(aSerialIdx, (byte)aData[i]);
- }
- }
-
- public static void WriteLine(byte aSerialIndex, string aText) {
- Write(aSerialIndex, aText);
- Write(aSerialIndex, "\r\n");
- }
+ //public static void Write(byte aSerialIdx, string aData) {
+ // for (int i = 0; i < aData.Length; i++) {
+ // Hardware.Serial.WriteSerial(aSerialIdx, (byte)aData[i]);
+ // }
+ //}
}
}
\ No newline at end of file
diff --git a/source/Cosmos/Cosmos.Kernel/Staging/Stages/MatthijsStage.cs b/source/Cosmos/Cosmos.Kernel/Staging/Stages/MatthijsStage.cs
index 90b733042..62b9ce794 100644
--- a/source/Cosmos/Cosmos.Kernel/Staging/Stages/MatthijsStage.cs
+++ b/source/Cosmos/Cosmos.Kernel/Staging/Stages/MatthijsStage.cs
@@ -26,25 +26,25 @@ namespace Cosmos.Kernel.Staging.Stages {
Console.WriteLine("Ext2 Initialization failed!");
}
Stream xFileStream = xExt2.OpenFile(new string[] { "readme.txt" });
- if (xFileStream == null) {
- Console.WriteLine("Couldn't read file!");
- return;
- }
- Console.Write("File length = ");
- Hardware.Storage.ATAOld.WriteNumber((uint)xFileStream.Length, 32);
- Console.WriteLine(" bytes");
- byte[] xBytes = new byte[(int)xFileStream.Length];
- int xBytesRead = xFileStream.Read(xBytes, 0, (int)xFileStream.Length);
- DebugUtil.SendNumber("MatthijsStage", "Bytes Read", (uint)xBytesRead, 32);
- DebugUtil.SendByteStream("CPU", "Readme.txt contents", xBytes);
- char[] xChars = new char[xBytes.Length - 1];
- for (int i = 0; i < xChars.Length; i++) {
- xChars[i] = (char)xBytes[i];
- }
- String s = new String(xChars);
- Console.Write("Contents: '");
- Console.Write(s);
- Console.WriteLine("'");
+ //if (xFileStream == null) {
+ // Console.WriteLine("Couldn't read file!");
+ // return;
+ //}
+ //Console.Write("File length = ");
+ //Hardware.Storage.ATAOld.WriteNumber((uint)xFileStream.Length, 32);
+ //Console.WriteLine(" bytes");
+ //byte[] xBytes = new byte[(int)xFileStream.Length];
+ //int xBytesRead = xFileStream.Read(xBytes, 0, (int)xFileStream.Length);
+ //DebugUtil.SendNumber("MatthijsStage", "Bytes Read", (uint)xBytesRead, 32);
+ //DebugUtil.SendByteStream("CPU", "Readme.txt contents", xBytes);
+ //char[] xChars = new char[xBytes.Length - 1];
+ //for (int i = 0; i < xChars.Length; i++) {
+ // xChars[i] = (char)xBytes[i];
+ //}
+ //String s = new String(xChars);
+ //Console.Write("Contents: '");
+ //Console.Write(s);
+ //Console.WriteLine("'");
//Console.Write("Contents of root (");
//string[] xItems = xExt2.GetDirectoryEntries(new string[0]);
//Hardware.Storage.ATAOld.WriteNumber((uint)xItems.Length, 8);