summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaurice Henke <maurice@henke.gg>2021-09-05 20:14:58 +0200
committerMaurice Henke <maurice@henke.gg>2021-09-05 20:14:58 +0200
commitae891d8b1c9866924f779ea51b501b7513c9e4f0 (patch)
treed992ec9656f04ded9816186294af067122570d05
parent152d38271ee9c72bdd6b665c4cdf886194572901 (diff)
Renamed gc namespace into gc_wii for future compability
-rw-r--r--include/gc_wii/OSCache.h (renamed from include/gc/OSCache.h)8
-rw-r--r--include/gc_wii/OSModule.h (renamed from include/gc/OSModule.h)8
-rw-r--r--include/gc_wii/card.h (renamed from include/gc/card.h)8
-rw-r--r--include/tp/dynamic_link.h4
-rw-r--r--source/gc_wii/card.cpp (renamed from source/gc/card.cpp)6
-rw-r--r--source/memory.cpp6
-rw-r--r--source/tools.cpp4
7 files changed, 22 insertions, 22 deletions
diff --git a/include/gc/OSCache.h b/include/gc_wii/OSCache.h
index f6a9d2d..c26a394 100644
--- a/include/gc/OSCache.h
+++ b/include/gc_wii/OSCache.h
@@ -6,12 +6,12 @@
* @author Zephiles
* @bug No known bugs.
*/
-#ifndef GC_OSCACHE_H
-#define GC_OSCACHE_H
+#ifndef GC_WII_OSCACHE_H
+#define GC_WII_OSCACHE_H
#include <cstdint>
-namespace libtp::gc::os_cache
+namespace libtp::gc_wii::os_cache
{
extern "C"
{
@@ -35,5 +35,5 @@ namespace libtp::gc::os_cache
// DMAErrorHandler
// __OSCacheInit
}
-} // namespace libtp::gc::os_cache
+} // namespace libtp::gc_wii::os_cache
#endif \ No newline at end of file
diff --git a/include/gc/OSModule.h b/include/gc_wii/OSModule.h
index 834242a..b08b5d9 100644
--- a/include/gc/OSModule.h
+++ b/include/gc_wii/OSModule.h
@@ -6,12 +6,12 @@
* @author Zephiles
* @bug No known bugs.
*/
-#ifndef GC_OSMODULE_H
-#define GC_OSMODULE_H
+#ifndef GC_WII_OSMODULE_H
+#define GC_WII_OSMODULE_H
#include <cstdint>
-namespace libtp::gc::os_module
+namespace libtp::gc_wii::os_module
{
struct OSModuleInfo
{
@@ -25,5 +25,5 @@ namespace libtp::gc::os_module
uint32_t version;
} __attribute__( ( __packed__ ) );
-} // namespace libtp::gc::os_module
+} // namespace libtp::gc_wii::os_module
#endif \ No newline at end of file
diff --git a/include/gc/card.h b/include/gc_wii/card.h
index d5e322d..ea1a36a 100644
--- a/include/gc/card.h
+++ b/include/gc_wii/card.h
@@ -6,8 +6,8 @@
* @author AECX
* @bug No known bugs.
*/
-#ifndef GC_CARD_H
-#define GC_CARD_H
+#ifndef GC_WII_CARD_H
+#define GC_WII_CARD_H
#include <cstdint>
@@ -49,7 +49,7 @@
#define CARD_READ_SIZE 512
-namespace libtp::gc::card
+namespace libtp::gc_wii::card
{
struct CARDFileInfo
{
@@ -339,6 +339,6 @@ namespace libtp::gc::card
* @param fileName Internal name for the desired file on the memory card
*/
int32_t CARDDelete( int32_t chan, const char* fileName );
-} // namespace libtp::gc::card
+} // namespace libtp::gc_wii::card
#endif \ No newline at end of file
diff --git a/include/tp/dynamic_link.h b/include/tp/dynamic_link.h
index 28a3ac1..8353ae7 100644
--- a/include/tp/dynamic_link.h
+++ b/include/tp/dynamic_link.h
@@ -9,7 +9,7 @@
#include <cstdint>
-#include "gc/OSModule.h"
+#include "gc_wii/OSModule.h"
namespace libtp::tp::dynamic_link
{
@@ -17,7 +17,7 @@ namespace libtp::tp::dynamic_link
struct DynamicModuleControl
{
uint8_t unk_0[0x10];
- gc::os_module::OSModuleInfo* moduleInfo;
+ gc_wii::os_module::OSModuleInfo* moduleInfo;
uint8_t unk_10[0x18];
} __attribute__( ( __packed__ ) );
diff --git a/source/gc/card.cpp b/source/gc_wii/card.cpp
index 9343c63..30ba2fc 100644
--- a/source/gc/card.cpp
+++ b/source/gc_wii/card.cpp
@@ -1,8 +1,8 @@
-#include "gc/card.h"
+#include "gc_wii/card.h"
#include <cstring>
-namespace libtp::gc::card
+namespace libtp::gc_wii::card
{
int32_t __CARDFreeBlock( int32_t chan, uint16_t block, CARDCallback callback )
{
@@ -150,4 +150,4 @@ namespace libtp::gc::card
}
return ret;
}
-} // namespace libtp::gc::card \ No newline at end of file
+} // namespace libtp::gc_wii::card \ No newline at end of file
diff --git a/source/memory.cpp b/source/memory.cpp
index 40f1db5..b233b70 100644
--- a/source/memory.cpp
+++ b/source/memory.cpp
@@ -3,7 +3,7 @@
#include <cstring>
-#include "gc/OSCache.h"
+#include "gc_wii/OSCache.h"
namespace libtp::memory
{
@@ -11,7 +11,7 @@ namespace libtp::memory
void clear_DC_IC_Cache( void* ptr, uint32_t size )
{
- gc::os_cache::DCFlushRange( ptr, size );
- gc::os_cache::ICInvalidateRange( ptr, size );
+ gc_wii::os_cache::DCFlushRange( ptr, size );
+ gc_wii::os_cache::ICInvalidateRange( ptr, size );
}
} // namespace libtp::memory \ No newline at end of file
diff --git a/source/tools.cpp b/source/tools.cpp
index 08f519f..96ada2b 100644
--- a/source/tools.cpp
+++ b/source/tools.cpp
@@ -6,7 +6,7 @@
#include <cstring>
#include "display/console.h"
-#include "gc/card.h"
+#include "gc_wii/card.h"
#include "memory.h"
#include "tp/JFWSystem.h"
#include "tp/d_com_inf_game.h"
@@ -75,7 +75,7 @@ namespace libtp::tools
int32_t ReadGCI( int32_t chan, const char* fileName, int32_t length, int32_t offset, void* buffer )
{
- using namespace libtp::gc::card;
+ using namespace libtp::gc_wii::card;
CARDFileInfo* fileInfo = new CARDFileInfo();
uint8_t* workArea = new uint8_t[CARD_WORKAREA_SIZE];