Reorganize includes

diff --git a/libctru/include/3ds.h b/libctru/include/3ds.h
index 5b51a17c7db4d0412549226dab00ddb2b3cfd380..6628e69d113f75c79712ac8850cf171f6675df9c 100644 (file)
--- 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 e3c78c42e6fdada95584867f56789b068e702ccc..0f7596ba3ac8a5f12019d78615a685ecb0a580ba 100644 (file)
--- a/libctru/source/gfx.c
+++ b/libctru/source/gfx.c
@@ -1,12 +1,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-
-#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 e9e8067016a2e42b0ca68d68d2165c458b1f19e1..5c995f8f09dd978e2f151ac896275f1782a65bca 100644 (file)
--- a/libctru/source/gpu/gpu.c
+++ b/libctru/source/gpu/gpu.c
@@ -4,11 +4,7 @@
 
 #include <stdlib.h>
 #include <string.h>
-#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 542f60b5b16dbb280b8ae84782a4ffed6387062a..bab41664c0d379f1f9c8c6e627438f9ece9d4893 100644 (file)
--- a/libctru/source/gpu/shdr.c
+++ b/libctru/source/gpu/shdr.c
@@ -4,12 +4,7 @@
 
 #include <stdlib.h>
 #include <string.h>
-#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 0e89d638620334d1324cda17e0625f4a2a81bbee..b1ad1468c412273566f15a8b372aeb28f8f4be89 100644 (file)
--- a/libctru/source/initSystem.c
+++ b/libctru/source/initSystem.c
@@ -1,7 +1,6 @@
 #include <sys/iosupport.h>
-#include <3ds/types.h>
-#include <3ds/svc.h>
 #include <string.h>
+#include <3ds.h>
 
 // System globals we define here
 int __system_argc;

diff --git a/libctru/source/os.c b/libctru/source/os.c
index b8d828fd28112f166301a12922ee99c296f5010a..f09bf24d6da05cb92f7d4bc8b96c4ba5347e0252 100644 (file)
--- 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 1b382d8f967d14b61e360307c31a1b79cc5434cd..e99db11f4f07f018abf6a89d1fd0cb9fd89a5f7e 100644 (file)
--- a/libctru/source/services/ac.c
+++ b/libctru/source/services/ac.c
@@ -1,8 +1,5 @@
 #include <stdlib.h>
-#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 9fe25c327a4ced292e1653e86f7844ba6d7faf05..bda13b6396059b3ba7f561ca191bb363b3a2ee66 100644 (file)
--- a/libctru/source/services/apt.c
+++ b/libctru/source/services/apt.c
@@ -4,11 +4,7 @@
 
 #include <stdlib.h>
 #include <string.h>
-#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 45aa4e342d0268aba5fe3d7a359e5b04571f434d..2041b99c37cd15402e062530254c6b21fe4e5a44 100644 (file)
--- a/libctru/source/services/cfgnor.c
+++ b/libctru/source/services/cfgnor.c
@@ -1,8 +1,5 @@
 #include <stdlib.h>
-#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 3663ab64edf29199ee931564ed92cb427020f2da..9eb11bb50ce795b65810e0afec5b4e595dd3f936 100644 (file)
--- a/libctru/source/services/csnd.c
+++ b/libctru/source/services/csnd.c
@@ -1,10 +1,6 @@
 #include <stdlib.h>
 #include <string.h>
-#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 377547a7ac7d2652d16568530392df930242cae4..d92d7ea01e891feb607aa8e542c131e7042ea5b3 100644 (file)
--- a/libctru/source/services/gsp.c
+++ b/libctru/source/services/gsp.c
@@ -4,10 +4,7 @@
 
 #include <stdlib.h>
 #include <string.h>
-#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 5b42eb1e1270174ec01e856fb552163ed55cd196..c4fd8a173ec8df89c6b87d156eb454db116c9ef5 100644 (file)
--- a/libctru/source/services/gx.c
+++ b/libctru/source/services/gx.c
@@ -3,10 +3,7 @@
 */
 
 #include <stdlib.h>
-#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 b85ce9a9d921a1a3688e2811a0faabc92fc75e1b..e67e60dab3e4ccb85cb8589a5f6150072da5c88b 100644 (file)
--- a/libctru/source/services/hid.c
+++ b/libctru/source/services/hid.c
@@ -3,10 +3,7 @@
 */
 #include <stdlib.h>
 #include <string.h>
-#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 ce61824ad2e35ceeb1b29a3c65f68d15a428157b..d9e7ec730b2c103875e6a9fd409702e889318fef 100644 (file)
--- a/libctru/source/services/httpc.c
+++ b/libctru/source/services/httpc.c
@@ -1,7 +1,5 @@
 #include <string.h>
-#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 b2e4078bd417a776199aff9ea88c71f5e1fc3f22..22ec39ac7818bc3d3cf4912fa5a11c4ee850f612 100644 (file)
--- a/libctru/source/services/ir.c
+++ b/libctru/source/services/ir.c
@@ -1,9 +1,6 @@
 #include <stdlib.h>
 #include <string.h>
-#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 136c51254caea3751d9e18d0431133581b87f3e1..8fa21fc6b8997f57b84fb09625b0851956498c34 100644 (file)
--- a/libctru/source/services/ptm.c
+++ b/libctru/source/services/ptm.c
@@ -1,8 +1,5 @@
 #include <stdlib.h>
-#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 3e488c6ddb2432015ed958d2f26c67a58fe461c1..3791b9faab98263130ec03591e30fe2eab9f4d7b 100644 (file)
--- 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 <sys/socket.h>
 #include <netinet/in.h>
 #include <netdb.h>
@@ -10,6 +5,7 @@
 #include <stdarg.h>
 #include <errno.h>
 #include <string.h>
+#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 40f98d6a66ddaabd3188a5674b20398689c9f969..06f3d8bdc6f9bcdd6ff80aa3f31157a505db58a9 100644 (file)
--- a/libctru/source/srv.c
+++ b/libctru/source/srv.c
@@ -3,9 +3,7 @@
 */
 
 #include <string.h>
-#include <3ds/types.h>
-#include <3ds/srv.h>
-#include <3ds/svc.h>
+#include <3ds.h>
 
 
 /*