From 884df0ba757b4435c72b4f0737f1d1953fec404d Mon Sep 17 00:00:00 2001 From: plutoo Date: Mon, 28 Jul 2014 21:41:48 +0200 Subject: [PATCH] Moved header files from ctr/ to 3ds/. --- examples/arm11u/source/main.c | 17 +++++++---------- examples/gpu/source/main.c | 21 +++++++++------------ examples/sdmc/source/main.c | 19 ++++++++----------- libctru/include/{ctr => 3ds}/AC.h | 0 libctru/include/{ctr => 3ds}/APT.h | 0 libctru/include/{ctr => 3ds}/CFGNOR.h | 0 libctru/include/{ctr => 3ds}/CSND.h | 0 libctru/include/{ctr => 3ds}/FS.h | 0 libctru/include/{ctr => 3ds}/GPU.h | 0 libctru/include/{ctr => 3ds}/GSP.h | 0 libctru/include/{ctr => 3ds}/GX.h | 0 libctru/include/{ctr => 3ds}/HID.h | 0 libctru/include/{ctr => 3ds}/HTTPC.h | 0 libctru/include/{ctr => 3ds}/IR.h | 0 libctru/include/{ctr => 3ds}/OS.h | 0 libctru/include/{ctr => 3ds}/SHDR.h | 0 libctru/include/{ctr => 3ds}/SOC.h | 0 libctru/include/{ctr => 3ds}/srv.h | 0 libctru/include/{ctr => 3ds}/svc.h | 0 libctru/include/{ctr => 3ds}/types.h | 0 libctru/source/AC.c | 11 ++++------- libctru/source/APT.c | 12 +++++------- libctru/source/CFGNOR.c | 12 ++++-------- libctru/source/CSND.c | 14 +++++--------- libctru/source/FS.c | 10 ++++------ libctru/source/GPU.c | 12 +++++------- libctru/source/GSP.c | 10 ++++------ libctru/source/GX.c | 10 ++++------ libctru/source/HID.c | 10 ++++------ libctru/source/HTTPC.c | 8 +++----- libctru/source/IR.c | 11 ++++------- libctru/source/OS.c | 10 ++++------ libctru/source/SHDR.c | 15 +++++++-------- libctru/source/SOC.c | 12 ++++-------- libctru/source/gpuResetSequence.c | 5 +---- libctru/source/srv.c | 9 +++------ 36 files changed, 89 insertions(+), 139 deletions(-) rename libctru/include/{ctr => 3ds}/AC.h (100%) rename libctru/include/{ctr => 3ds}/APT.h (100%) rename libctru/include/{ctr => 3ds}/CFGNOR.h (100%) rename libctru/include/{ctr => 3ds}/CSND.h (100%) rename libctru/include/{ctr => 3ds}/FS.h (100%) rename libctru/include/{ctr => 3ds}/GPU.h (100%) rename libctru/include/{ctr => 3ds}/GSP.h (100%) rename libctru/include/{ctr => 3ds}/GX.h (100%) rename libctru/include/{ctr => 3ds}/HID.h (100%) rename libctru/include/{ctr => 3ds}/HTTPC.h (100%) rename libctru/include/{ctr => 3ds}/IR.h (100%) rename libctru/include/{ctr => 3ds}/OS.h (100%) rename libctru/include/{ctr => 3ds}/SHDR.h (100%) rename libctru/include/{ctr => 3ds}/SOC.h (100%) rename libctru/include/{ctr => 3ds}/srv.h (100%) rename libctru/include/{ctr => 3ds}/svc.h (100%) rename libctru/include/{ctr => 3ds}/types.h (100%) diff --git a/examples/arm11u/source/main.c b/examples/arm11u/source/main.c index b320ac8..9b35369 100644 --- a/examples/arm11u/source/main.c +++ b/examples/arm11u/source/main.c @@ -1,13 +1,10 @@ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include <3ds/types.h> +#include <3ds/srv.h> +#include <3ds/APT.h> +#include <3ds/GSP.h> +#include <3ds/GX.h> +#include <3ds/HID.h> +#include <3ds/svc.h> #include "costable.h" u8* gspHeap; diff --git a/examples/gpu/source/main.c b/examples/gpu/source/main.c index ce0237c..7490417 100644 --- a/examples/gpu/source/main.c +++ b/examples/gpu/source/main.c @@ -1,15 +1,12 @@ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include <3ds/types.h> +#include <3ds/srv.h> +#include <3ds/APT.h> +#include <3ds/GSP.h> +#include <3ds/GX.h> +#include <3ds/GPU.h> +#include <3ds/HID.h> +#include <3ds/SHDR.h> +#include <3ds/svc.h> #include "costable.h" #include "test_shbin.h" diff --git a/examples/sdmc/source/main.c b/examples/sdmc/source/main.c index a6e88e0..c6dacf3 100644 --- a/examples/sdmc/source/main.c +++ b/examples/sdmc/source/main.c @@ -1,14 +1,11 @@ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include <3ds/types.h> +#include <3ds/srv.h> +#include <3ds/APT.h> +#include <3ds/GSP.h> +#include <3ds/GX.h> +#include <3ds/HID.h> +#include <3ds/FS.h> +#include <3ds/svc.h> #include "costable.h" u8* gspHeap; diff --git a/libctru/include/ctr/AC.h b/libctru/include/3ds/AC.h similarity index 100% rename from libctru/include/ctr/AC.h rename to libctru/include/3ds/AC.h diff --git a/libctru/include/ctr/APT.h b/libctru/include/3ds/APT.h similarity index 100% rename from libctru/include/ctr/APT.h rename to libctru/include/3ds/APT.h diff --git a/libctru/include/ctr/CFGNOR.h b/libctru/include/3ds/CFGNOR.h similarity index 100% rename from libctru/include/ctr/CFGNOR.h rename to libctru/include/3ds/CFGNOR.h diff --git a/libctru/include/ctr/CSND.h b/libctru/include/3ds/CSND.h similarity index 100% rename from libctru/include/ctr/CSND.h rename to libctru/include/3ds/CSND.h diff --git a/libctru/include/ctr/FS.h b/libctru/include/3ds/FS.h similarity index 100% rename from libctru/include/ctr/FS.h rename to libctru/include/3ds/FS.h diff --git a/libctru/include/ctr/GPU.h b/libctru/include/3ds/GPU.h similarity index 100% rename from libctru/include/ctr/GPU.h rename to libctru/include/3ds/GPU.h diff --git a/libctru/include/ctr/GSP.h b/libctru/include/3ds/GSP.h similarity index 100% rename from libctru/include/ctr/GSP.h rename to libctru/include/3ds/GSP.h diff --git a/libctru/include/ctr/GX.h b/libctru/include/3ds/GX.h similarity index 100% rename from libctru/include/ctr/GX.h rename to libctru/include/3ds/GX.h diff --git a/libctru/include/ctr/HID.h b/libctru/include/3ds/HID.h similarity index 100% rename from libctru/include/ctr/HID.h rename to libctru/include/3ds/HID.h diff --git a/libctru/include/ctr/HTTPC.h b/libctru/include/3ds/HTTPC.h similarity index 100% rename from libctru/include/ctr/HTTPC.h rename to libctru/include/3ds/HTTPC.h diff --git a/libctru/include/ctr/IR.h b/libctru/include/3ds/IR.h similarity index 100% rename from libctru/include/ctr/IR.h rename to libctru/include/3ds/IR.h diff --git a/libctru/include/ctr/OS.h b/libctru/include/3ds/OS.h similarity index 100% rename from libctru/include/ctr/OS.h rename to libctru/include/3ds/OS.h diff --git a/libctru/include/ctr/SHDR.h b/libctru/include/3ds/SHDR.h similarity index 100% rename from libctru/include/ctr/SHDR.h rename to libctru/include/3ds/SHDR.h diff --git a/libctru/include/ctr/SOC.h b/libctru/include/3ds/SOC.h similarity index 100% rename from libctru/include/ctr/SOC.h rename to libctru/include/3ds/SOC.h diff --git a/libctru/include/ctr/srv.h b/libctru/include/3ds/srv.h similarity index 100% rename from libctru/include/ctr/srv.h rename to libctru/include/3ds/srv.h diff --git a/libctru/include/ctr/svc.h b/libctru/include/3ds/svc.h similarity index 100% rename from libctru/include/ctr/svc.h rename to libctru/include/3ds/svc.h diff --git a/libctru/include/ctr/types.h b/libctru/include/3ds/types.h similarity index 100% rename from libctru/include/ctr/types.h rename to libctru/include/3ds/types.h diff --git a/libctru/source/AC.c b/libctru/source/AC.c index d725422..0a9175c 100644 --- a/libctru/source/AC.c +++ b/libctru/source/AC.c @@ -1,11 +1,8 @@ #include -#include -#include -#include - -#include -#include -#include +#include <3ds/types.h> +#include <3ds/AC.h> +#include <3ds/svc.h> +#include <3ds/srv.h> Result ACU_cmd1(Handle servhandle, u32 *ptr)//Unknown what this cmd does at the time of writing. (ptr=0x200-byte outbuf) { diff --git a/libctru/source/APT.c b/libctru/source/APT.c index 12972eb..a224c68 100644 --- a/libctru/source/APT.c +++ b/libctru/source/APT.c @@ -1,11 +1,9 @@ #include -#include -#include -#include -#include -#include -#include -#include +#include <3ds/types.h> +#include <3ds/srv.h> +#include <3ds/APT.h> +#include <3ds/GSP.h> +#include <3ds/svc.h> #define APT_HANDLER_STACKSIZE (0x1000) diff --git a/libctru/source/CFGNOR.c b/libctru/source/CFGNOR.c index c96fbde..417825f 100644 --- a/libctru/source/CFGNOR.c +++ b/libctru/source/CFGNOR.c @@ -1,12 +1,8 @@ #include -#include -#include - -#include -#include -#include - -#include +#include <3ds/types.h> +#include <3ds/svc.h> +#include <3ds/srv.h> +#include <3ds/CFGNOR.h> Handle CFGNOR_handle = 0; diff --git a/libctru/source/CSND.c b/libctru/source/CSND.c index c7c265f..eeb5791 100644 --- a/libctru/source/CSND.c +++ b/libctru/source/CSND.c @@ -1,13 +1,9 @@ #include -#include -#include -#include - -#include -#include -#include - -#include +#include <3ds/types.h> +#include <3ds/OS.h> +#include <3ds/svc.h> +#include <3ds/srv.h> +#include <3ds/CSND.h> //See here regarding CSND shared-mem commands, etc: http://3dbrew.org/wiki/CSND_Shared_Memory diff --git a/libctru/source/FS.c b/libctru/source/FS.c index 065e158..8dc7073 100644 --- a/libctru/source/FS.c +++ b/libctru/source/FS.c @@ -1,9 +1,7 @@ -#include -#include -#include -#include -#include -#include +#include <3ds/types.h> +#include <3ds/FS.h> +#include <3ds/svc.h> + Result FSUSER_Initialize(Handle handle) { diff --git a/libctru/source/GPU.c b/libctru/source/GPU.c index 6d4ac47..e459eb4 100644 --- a/libctru/source/GPU.c +++ b/libctru/source/GPU.c @@ -1,11 +1,9 @@ #include -#include -#include -#include -#include -#include -#include -#include +#include <3ds/types.h> +#include <3ds/GSP.h> +#include <3ds/GX.h> +#include <3ds/GPU.h> +#include <3ds/svc.h> u32* gpuCmdBuf; u32 gpuCmdBufSize; diff --git a/libctru/source/GSP.c b/libctru/source/GSP.c index afed4cb..7d74407 100644 --- a/libctru/source/GSP.c +++ b/libctru/source/GSP.c @@ -1,10 +1,8 @@ #include -#include -#include -#include -#include -#include -#include +#include <3ds/types.h> +#include <3ds/GSP.h> +#include <3ds/svc.h> +#include <3ds/srv.h> Handle gspGpuHandle=0; diff --git a/libctru/source/GX.c b/libctru/source/GX.c index 4af70e3..d21af48 100644 --- a/libctru/source/GX.c +++ b/libctru/source/GX.c @@ -1,10 +1,8 @@ #include -#include -#include -#include -#include -#include -#include +#include <3ds/types.h> +#include <3ds/GSP.h> +#include <3ds/GX.h> +#include <3ds/svc.h> Result GX_RequestDma(u32* gxbuf, u32* src, u32* dst, u32 length) { diff --git a/libctru/source/HID.c b/libctru/source/HID.c index 6de817a..4a709f4 100644 --- a/libctru/source/HID.c +++ b/libctru/source/HID.c @@ -1,10 +1,8 @@ #include -#include -#include -#include -#include -#include -#include +#include <3ds/types.h> +#include <3ds/HID.h> +#include <3ds/srv.h> +#include <3ds/svc.h> Handle hidHandle; Handle hidMemHandle; diff --git a/libctru/source/HTTPC.c b/libctru/source/HTTPC.c index b53c503..ce61824 100644 --- a/libctru/source/HTTPC.c +++ b/libctru/source/HTTPC.c @@ -1,9 +1,7 @@ -#include -#include #include -#include -#include -#include +#include <3ds/types.h> +#include <3ds/HTTPC.h> +#include <3ds/svc.h> Result HTTPC_Initialize(Handle handle) { diff --git a/libctru/source/IR.c b/libctru/source/IR.c index 06c8309..40624bf 100644 --- a/libctru/source/IR.c +++ b/libctru/source/IR.c @@ -1,12 +1,9 @@ #include -#include #include - -#include -#include -#include - -#include +#include <3ds/types.h> +#include <3ds/svc.h> +#include <3ds/srv.h> +#include <3ds/IR.h> static Handle iru_handle=0; static Handle iru_sharedmem_handle=0; diff --git a/libctru/source/OS.c b/libctru/source/OS.c index 252f234..fe18d64 100644 --- a/libctru/source/OS.c +++ b/libctru/source/OS.c @@ -1,9 +1,7 @@ -#include -#include -#include -#include -#include -#include +#include <3ds/types.h> +#include <3ds/svc.h> +#include <3ds/OS.h> + u32 OS_ConvertVaddr2Physaddr(u32 vaddr) { diff --git a/libctru/source/SHDR.c b/libctru/source/SHDR.c index a1b241b..a5e053f 100644 --- a/libctru/source/SHDR.c +++ b/libctru/source/SHDR.c @@ -1,12 +1,11 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include +#include <3ds/types.h> +#include <3ds/GSP.h> +#include <3ds/GX.h> +#include <3ds/GPU.h> +#include <3ds/SHDR.h> +#include <3ds/svc.h> + //please don't feed this an invalid SHBIN DVLB_s* SHDR_ParseSHBIN(u32* shbinData, u32 shbinSize) diff --git a/libctru/source/SOC.c b/libctru/source/SOC.c index c140d2b..9be4fe0 100644 --- a/libctru/source/SOC.c +++ b/libctru/source/SOC.c @@ -1,11 +1,7 @@ -#include -#include -#include -#include -#include -#include -#include -#include +#include <3ds/types.h> +#include <3ds/svc.h> +#include <3ds/srv.h> +#include <3ds/SOC.h> #include #include diff --git a/libctru/source/gpuResetSequence.c b/libctru/source/gpuResetSequence.c index 1d3eb34..1b79eee 100644 --- a/libctru/source/gpuResetSequence.c +++ b/libctru/source/gpuResetSequence.c @@ -1,7 +1,4 @@ -#include -#include -#include -#include +#include <3ds/types.h> u32 gpuResetSequence[]= {0x000F01D4, 0x00000001, diff --git a/libctru/source/srv.c b/libctru/source/srv.c index 5274112..23a1f35 100644 --- a/libctru/source/srv.c +++ b/libctru/source/srv.c @@ -1,9 +1,6 @@ -#include -#include -#include -#include -#include -#include +#include <3ds/types.h> +#include <3ds/srv.h> +#include <3ds/svc.h> Handle srvHandle=0;