Moved the contents of os.h to OSAlloc.h

Author: Zephiles

ttyd-tools/rel/include/gc/os.h renamed to ttyd-tools/rel/include/gc/OSAlloc.h

@@ -2,7 +2,7 @@
 
 #include <cstdint>
 
-namespace gc::os {
+namespace gc::OSAlloc {
 
 struct ChunkInfo
 {
@@ -20,6 +20,14 @@ struct HeapInfo
 
 extern "C" {
 
+// DLInsert
+// OSAllocFromHeap
+// OSFreeToHeap
+// OSSetCurrentHeap
+// OSInitAlloc
+// OSCreateHeap
+// OSDestroyHeap
+
 extern HeapInfo *HeapArray;
 extern int32_t NumHeaps;
 

ttyd-tools/rel/include/ttyd.eu.lst

@@ -1827,12 +1827,12 @@
 // OSAlloc.c
 // text
 // 8029A238:DLInsert
-8029A2E4:OSAllocFromHeap
-8029A3E0:OSFreeToHeap
-8029A45C:OSSetCurrentHeap
-8029A46C:OSInitAlloc
-8029A4DC:OSCreateHeap
-8029A548:OSDestroyHeap
+// 8029A2E4:OSAllocFromHeap
+// 8029A3E0:OSFreeToHeap
+// 8029A45C:OSSetCurrentHeap
+// 8029A46C:OSInitAlloc
+// 8029A4DC:OSCreateHeap
+// 8029A548:OSDestroyHeap
 // data
 8042B9E0:HeapArray
 8042B9E4:NumHeaps

ttyd-tools/rel/include/ttyd.jp.lst

@@ -1823,12 +1823,12 @@
 // OSAlloc.c
 // text
 // 802903E8:DLInsert
-80290494:OSAllocFromHeap
-80290590:OSFreeToHeap
-8029060C:OSSetCurrentHeap
-8029061C:OSInitAlloc
-8029068C:OSCreateHeap
-802906F8:OSDestroyHeap
+// 80290494:OSAllocFromHeap
+// 80290590:OSFreeToHeap
+// 8029060C:OSSetCurrentHeap
+// 8029061C:OSInitAlloc
+// 8029068C:OSCreateHeap
+// 802906F8:OSDestroyHeap
 // data
 80418EA0:HeapArray
 80418EA4:NumHeaps

ttyd-tools/rel/include/ttyd.us.lst

@@ -1824,12 +1824,12 @@
 // OSAlloc.c
 // text
 // 80296400:DLInsert
-802964AC:OSAllocFromHeap
-802965A8:OSFreeToHeap
-80296624:OSSetCurrentHeap
-80296634:OSInitAlloc
-802966A4:OSCreateHeap
-80296710:OSDestroyHeap
+// 802964AC:OSAllocFromHeap
+// 802965A8:OSFreeToHeap
+// 80296624:OSSetCurrentHeap
+// 80296634:OSInitAlloc
+// 802966A4:OSCreateHeap
+// 80296710:OSDestroyHeap
 // data
 8041F070:HeapArray
 8041F074:NumHeaps

ttyd-tools/rel/source/main.cpp

@@ -8,7 +8,7 @@
 #include "patch.h"
 
 #include <gc/OSCache.h>
-#include <gc/os.h>
+#include <gc/OSAlloc.h>
 #include <ttyd/item_data.h>
 #include <ttyd/seq_mapchange.h>
 #include <ttyd/seqdrv.h>
@@ -498,16 +498,16 @@ void checkHeaps()
 	char *tempDisplayBuffer = DisplayBuffer;
 
 	// Check the standard heaps
-	int32_t TotalHeaps = gc::os::NumHeaps;
-	gc::os::HeapInfo *HeapArray = gc::os::HeapArray;
+	int32_t TotalHeaps = gc::OSAlloc::NumHeaps;
+	gc::OSAlloc::HeapInfo *HeapArray = gc::OSAlloc::HeapArray;
 
 	for (int32_t i = 0; i < TotalHeaps; i++)
 	{
-		const gc::os::HeapInfo &heap = HeapArray[i];
+		const gc::OSAlloc::HeapInfo &heap = HeapArray[i];
 		bool valid = true;
 
-		gc::os::ChunkInfo *currentChunk = nullptr;
-		gc::os::ChunkInfo *prevChunk = nullptr;
+		gc::OSAlloc::ChunkInfo *currentChunk = nullptr;
+		gc::OSAlloc::ChunkInfo *prevChunk = nullptr;
 		for (currentChunk = heap.firstUsed; currentChunk; currentChunk = currentChunk->next)
 		{
 			// Check pointer sanity