From 9b370c7eff8d58de2cc0d1bf8b770be0f3d2c6f6 Mon Sep 17 00:00:00 2001 From: fincs Date: Tue, 26 Aug 2014 23:18:14 +0200 Subject: [PATCH] Reorganize includes --- libctru/include/3ds.h | 30 ++++++++++--------- libctru/include/3ds/{GPU.h => gpu/gpu.h} | 0 libctru/include/3ds/{GX.h => gpu/gx.h} | 0 libctru/include/3ds/{SHDR.h => gpu/shdr.h} | 0 libctru/include/3ds/{AC.h => services/ac.h} | 0 libctru/include/3ds/{APT.h => services/apt.h} | 0 .../3ds/{CFGNOR.h => services/cfgnor.h} | 0 .../include/3ds/{CSND.h => services/csnd.h} | 0 libctru/include/3ds/{FS.h => services/fs.h} | 0 libctru/include/3ds/{GSP.h => services/gsp.h} | 0 libctru/include/3ds/{HID.h => services/hid.h} | 0 .../include/3ds/{HTTPC.h => services/httpc.h} | 0 libctru/include/3ds/{IR.h => services/ir.h} | 0 libctru/include/3ds/{PTM.h => services/ptm.h} | 0 libctru/include/3ds/{SOC.h => services/soc.h} | 0 libctru/source/gfx.c | 7 +---- libctru/source/gpu/gpu.c | 6 +--- libctru/source/gpu/shdr.c | 7 +---- libctru/source/initSystem.c | 3 +- libctru/source/os.c | 4 +-- libctru/source/services/ac.c | 5 +--- libctru/source/services/apt.c | 6 +--- libctru/source/services/cfgnor.c | 5 +--- libctru/source/services/csnd.c | 6 +--- libctru/source/services/gsp.c | 5 +--- libctru/source/services/gx.c | 5 +--- libctru/source/services/hid.c | 5 +--- libctru/source/services/httpc.c | 4 +-- libctru/source/services/ir.c | 5 +--- libctru/source/services/ptm.c | 5 +--- libctru/source/services/soc.c | 6 +--- libctru/source/srv.c | 4 +-- 32 files changed, 33 insertions(+), 85 deletions(-) rename libctru/include/3ds/{GPU.h => gpu/gpu.h} (100%) rename libctru/include/3ds/{GX.h => gpu/gx.h} (100%) rename libctru/include/3ds/{SHDR.h => gpu/shdr.h} (100%) rename libctru/include/3ds/{AC.h => services/ac.h} (100%) rename libctru/include/3ds/{APT.h => services/apt.h} (100%) rename libctru/include/3ds/{CFGNOR.h => services/cfgnor.h} (100%) rename libctru/include/3ds/{CSND.h => services/csnd.h} (100%) rename libctru/include/3ds/{FS.h => services/fs.h} (100%) rename libctru/include/3ds/{GSP.h => services/gsp.h} (100%) rename libctru/include/3ds/{HID.h => services/hid.h} (100%) rename libctru/include/3ds/{HTTPC.h => services/httpc.h} (100%) rename libctru/include/3ds/{IR.h => services/ir.h} (100%) rename libctru/include/3ds/{PTM.h => services/ptm.h} (100%) rename libctru/include/3ds/{SOC.h => services/soc.h} (100%) diff --git a/libctru/include/3ds.h b/libctru/include/3ds.h index 5b51a17..6628e69 100644 --- a/libctru/include/3ds.h +++ b/libctru/include/3ds.h @@ -9,21 +9,23 @@ extern "C" { #include <3ds/svc.h> #include <3ds/srv.h> #include <3ds/os.h> -#include <3ds/AC.h> -#include <3ds/APT.h> -#include <3ds/CFGNOR.h> -#include <3ds/CSND.h> -#include <3ds/FS.h> #include <3ds/gfx.h> -#include <3ds/GSP.h> -#include <3ds/GX.h> -#include <3ds/GPU.h> -#include <3ds/HID.h> -#include <3ds/HTTPC.h> -#include <3ds/IR.h> -#include <3ds/PTM.h> -#include <3ds/SHDR.h> -#include <3ds/SOC.h> + +#include <3ds/services/ac.h> +#include <3ds/services/apt.h> +#include <3ds/services/cfgnor.h> +#include <3ds/services/csnd.h> +#include <3ds/services/fs.h> +#include <3ds/services/gsp.h> +#include <3ds/services/hid.h> +#include <3ds/services/httpc.h> +#include <3ds/services/ir.h> +#include <3ds/services/ptm.h> +#include <3ds/services/soc.h> + +#include <3ds/gpu/gx.h> +#include <3ds/gpu/gpu.h> +#include <3ds/gpu/shdr.h> #ifdef __cplusplus } diff --git a/libctru/include/3ds/GPU.h b/libctru/include/3ds/gpu/gpu.h similarity index 100% rename from libctru/include/3ds/GPU.h rename to libctru/include/3ds/gpu/gpu.h diff --git a/libctru/include/3ds/GX.h b/libctru/include/3ds/gpu/gx.h similarity index 100% rename from libctru/include/3ds/GX.h rename to libctru/include/3ds/gpu/gx.h diff --git a/libctru/include/3ds/SHDR.h b/libctru/include/3ds/gpu/shdr.h similarity index 100% rename from libctru/include/3ds/SHDR.h rename to libctru/include/3ds/gpu/shdr.h diff --git a/libctru/include/3ds/AC.h b/libctru/include/3ds/services/ac.h similarity index 100% rename from libctru/include/3ds/AC.h rename to libctru/include/3ds/services/ac.h diff --git a/libctru/include/3ds/APT.h b/libctru/include/3ds/services/apt.h similarity index 100% rename from libctru/include/3ds/APT.h rename to libctru/include/3ds/services/apt.h diff --git a/libctru/include/3ds/CFGNOR.h b/libctru/include/3ds/services/cfgnor.h similarity index 100% rename from libctru/include/3ds/CFGNOR.h rename to libctru/include/3ds/services/cfgnor.h diff --git a/libctru/include/3ds/CSND.h b/libctru/include/3ds/services/csnd.h similarity index 100% rename from libctru/include/3ds/CSND.h rename to libctru/include/3ds/services/csnd.h diff --git a/libctru/include/3ds/FS.h b/libctru/include/3ds/services/fs.h similarity index 100% rename from libctru/include/3ds/FS.h rename to libctru/include/3ds/services/fs.h diff --git a/libctru/include/3ds/GSP.h b/libctru/include/3ds/services/gsp.h similarity index 100% rename from libctru/include/3ds/GSP.h rename to libctru/include/3ds/services/gsp.h diff --git a/libctru/include/3ds/HID.h b/libctru/include/3ds/services/hid.h similarity index 100% rename from libctru/include/3ds/HID.h rename to libctru/include/3ds/services/hid.h diff --git a/libctru/include/3ds/HTTPC.h b/libctru/include/3ds/services/httpc.h similarity index 100% rename from libctru/include/3ds/HTTPC.h rename to libctru/include/3ds/services/httpc.h diff --git a/libctru/include/3ds/IR.h b/libctru/include/3ds/services/ir.h similarity index 100% rename from libctru/include/3ds/IR.h rename to libctru/include/3ds/services/ir.h diff --git a/libctru/include/3ds/PTM.h b/libctru/include/3ds/services/ptm.h similarity index 100% rename from libctru/include/3ds/PTM.h rename to libctru/include/3ds/services/ptm.h diff --git a/libctru/include/3ds/SOC.h b/libctru/include/3ds/services/soc.h similarity index 100% rename from libctru/include/3ds/SOC.h rename to libctru/include/3ds/services/soc.h diff --git a/libctru/source/gfx.c b/libctru/source/gfx.c index e3c78c4..0f7596b 100644 --- a/libctru/source/gfx.c +++ b/libctru/source/gfx.c @@ -1,12 +1,7 @@ #include #include #include - -#include <3ds/types.h> -#include <3ds/GSP.h> -#include <3ds/GX.h> -#include <3ds/svc.h> -#include <3ds/gfx.h> +#include <3ds.h> GSP_FramebufferInfo topFramebufferInfo, bottomFramebufferInfo; diff --git a/libctru/source/gpu/gpu.c b/libctru/source/gpu/gpu.c index e9e8067..5c995f8 100644 --- a/libctru/source/gpu/gpu.c +++ b/libctru/source/gpu/gpu.c @@ -4,11 +4,7 @@ #include #include -#include <3ds/types.h> -#include <3ds/GSP.h> -#include <3ds/GX.h> -#include <3ds/GPU.h> -#include <3ds/svc.h> +#include <3ds.h> u32* gpuCmdBuf; u32 gpuCmdBufSize; diff --git a/libctru/source/gpu/shdr.c b/libctru/source/gpu/shdr.c index 542f60b..bab4166 100644 --- a/libctru/source/gpu/shdr.c +++ b/libctru/source/gpu/shdr.c @@ -4,12 +4,7 @@ #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> +#include <3ds.h> //please don't feed this an invalid SHBIN diff --git a/libctru/source/initSystem.c b/libctru/source/initSystem.c index 0e89d63..b1ad146 100644 --- a/libctru/source/initSystem.c +++ b/libctru/source/initSystem.c @@ -1,7 +1,6 @@ #include -#include <3ds/types.h> -#include <3ds/svc.h> #include +#include <3ds.h> // System globals we define here int __system_argc; diff --git a/libctru/source/os.c b/libctru/source/os.c index b8d828f..f09bf24 100644 --- a/libctru/source/os.c +++ b/libctru/source/os.c @@ -1,6 +1,4 @@ -#include <3ds/types.h> -#include <3ds/svc.h> -#include <3ds/os.h> +#include <3ds.h> u32 osConvertVirtToPhys(u32 vaddr) { diff --git a/libctru/source/services/ac.c b/libctru/source/services/ac.c index 1b382d8..e99db11 100644 --- a/libctru/source/services/ac.c +++ b/libctru/source/services/ac.c @@ -1,8 +1,5 @@ #include -#include <3ds/types.h> -#include <3ds/AC.h> -#include <3ds/svc.h> -#include <3ds/srv.h> +#include <3ds.h> static Handle acHandle; diff --git a/libctru/source/services/apt.c b/libctru/source/services/apt.c index 9fe25c3..bda13b6 100644 --- a/libctru/source/services/apt.c +++ b/libctru/source/services/apt.c @@ -4,11 +4,7 @@ #include #include -#include <3ds/types.h> -#include <3ds/srv.h> -#include <3ds/APT.h> -#include <3ds/GSP.h> -#include <3ds/svc.h> +#include <3ds.h> #define APT_HANDLER_STACKSIZE (0x1000) diff --git a/libctru/source/services/cfgnor.c b/libctru/source/services/cfgnor.c index 45aa4e3..2041b99 100644 --- a/libctru/source/services/cfgnor.c +++ b/libctru/source/services/cfgnor.c @@ -1,8 +1,5 @@ #include -#include <3ds/types.h> -#include <3ds/svc.h> -#include <3ds/srv.h> -#include <3ds/CFGNOR.h> +#include <3ds.h> Handle CFGNOR_handle = 0; diff --git a/libctru/source/services/csnd.c b/libctru/source/services/csnd.c index 3663ab6..9eb11bb 100644 --- a/libctru/source/services/csnd.c +++ b/libctru/source/services/csnd.c @@ -1,10 +1,6 @@ #include #include -#include <3ds/types.h> -#include <3ds/os.h> -#include <3ds/svc.h> -#include <3ds/srv.h> -#include <3ds/CSND.h> +#include <3ds.h> //See here regarding CSND shared-mem commands, etc: http://3dbrew.org/wiki/CSND_Shared_Memory diff --git a/libctru/source/services/gsp.c b/libctru/source/services/gsp.c index 377547a..d92d7ea 100644 --- a/libctru/source/services/gsp.c +++ b/libctru/source/services/gsp.c @@ -4,10 +4,7 @@ #include #include -#include <3ds/types.h> -#include <3ds/GSP.h> -#include <3ds/svc.h> -#include <3ds/srv.h> +#include <3ds.h> #define GSP_EVENT_STACK_SIZE 0x1000 diff --git a/libctru/source/services/gx.c b/libctru/source/services/gx.c index 5b42eb1..c4fd8a1 100644 --- a/libctru/source/services/gx.c +++ b/libctru/source/services/gx.c @@ -3,10 +3,7 @@ */ #include -#include <3ds/types.h> -#include <3ds/GSP.h> -#include <3ds/GX.h> -#include <3ds/svc.h> +#include <3ds.h> Result GX_RequestDma(u32* gxbuf, u32* src, u32* dst, u32 length) { diff --git a/libctru/source/services/hid.c b/libctru/source/services/hid.c index b85ce9a..e67e60d 100644 --- a/libctru/source/services/hid.c +++ b/libctru/source/services/hid.c @@ -3,10 +3,7 @@ */ #include #include -#include <3ds/types.h> -#include <3ds/HID.h> -#include <3ds/srv.h> -#include <3ds/svc.h> +#include <3ds.h> Handle hidHandle; Handle hidMemHandle; diff --git a/libctru/source/services/httpc.c b/libctru/source/services/httpc.c index ce61824..d9e7ec7 100644 --- a/libctru/source/services/httpc.c +++ b/libctru/source/services/httpc.c @@ -1,7 +1,5 @@ #include -#include <3ds/types.h> -#include <3ds/HTTPC.h> -#include <3ds/svc.h> +#include <3ds.h> Result HTTPC_Initialize(Handle handle) { diff --git a/libctru/source/services/ir.c b/libctru/source/services/ir.c index b2e4078..22ec39a 100644 --- a/libctru/source/services/ir.c +++ b/libctru/source/services/ir.c @@ -1,9 +1,6 @@ #include #include -#include <3ds/types.h> -#include <3ds/svc.h> -#include <3ds/srv.h> -#include <3ds/IR.h> +#include <3ds.h> static Handle iru_handle=0; static Handle iru_sharedmem_handle=0; diff --git a/libctru/source/services/ptm.c b/libctru/source/services/ptm.c index 136c512..8fa21fc 100644 --- a/libctru/source/services/ptm.c +++ b/libctru/source/services/ptm.c @@ -1,8 +1,5 @@ #include -#include <3ds/types.h> -#include <3ds/svc.h> -#include <3ds/srv.h> -#include <3ds/PTM.h> +#include <3ds.h> static Handle ptmHandle; diff --git a/libctru/source/services/soc.c b/libctru/source/services/soc.c index 3e488c6..3791b9f 100644 --- a/libctru/source/services/soc.c +++ b/libctru/source/services/soc.c @@ -1,8 +1,3 @@ -#include <3ds/types.h> -#include <3ds/svc.h> -#include <3ds/srv.h> -#include <3ds/SOC.h> - #include #include #include @@ -10,6 +5,7 @@ #include #include #include +#include <3ds.h> Handle SOCU_handle = 0; static int SOCU_errno = 0; diff --git a/libctru/source/srv.c b/libctru/source/srv.c index 40f98d6..06f3d8b 100644 --- a/libctru/source/srv.c +++ b/libctru/source/srv.c @@ -3,9 +3,7 @@ */ #include -#include <3ds/types.h> -#include <3ds/srv.h> -#include <3ds/svc.h> +#include <3ds.h> /*