Moved header files from ctr/ to 3ds/.

diff --git a/examples/arm11u/source/main.c b/examples/arm11u/source/main.c
index b320ac8511ed0ef6890de773165d0a236a7e4fd7..9b3536975f5b694d0f621d042a7d8b9d4461a236 100644 (file)
--- a/examples/arm11u/source/main.c
+++ b/examples/arm11u/source/main.c
@@ -1,13 +1,10 @@
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <ctr/types.h>
-#include <ctr/srv.h>
-#include <ctr/APT.h>
-#include <ctr/GSP.h>
-#include <ctr/GX.h>
-#include <ctr/HID.h>
-#include <ctr/svc.h>
+#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 ce0237c5bf081a1b146bc943a90e133d84e4ff8d..749041769a9ca26f85d4fab619a6857330c75381 100644 (file)
--- a/examples/gpu/source/main.c
+++ b/examples/gpu/source/main.c
@@ -1,15 +1,12 @@
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <ctr/types.h>
-#include <ctr/srv.h>
-#include <ctr/APT.h>
-#include <ctr/GSP.h>
-#include <ctr/GX.h>
-#include <ctr/GPU.h>
-#include <ctr/HID.h>
-#include <ctr/SHDR.h>
-#include <ctr/svc.h>
+#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 a6e88e0249e56a7d1ea3b072278287b9d764a701..c6dacf30f9e5984223270989ebf45aecde47b9c0 100644 (file)
--- a/examples/sdmc/source/main.c
+++ b/examples/sdmc/source/main.c
@@ -1,14 +1,11 @@
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <ctr/types.h>
-#include <ctr/srv.h>
-#include <ctr/APT.h>
-#include <ctr/GSP.h>
-#include <ctr/GX.h>
-#include <ctr/HID.h>
-#include <ctr/FS.h>
-#include <ctr/svc.h>
+#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 d7254229be523f58b85559e883614c3534abcc8d..0a9175ceecd4b1cd0224b7f1e9053d596e20af9f 100644 (file)
--- a/libctru/source/AC.c
+++ b/libctru/source/AC.c
@@ -1,11 +1,8 @@
 #include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <ctr/types.h>
-
-#include <ctr/AC.h>
-#include <ctr/svc.h>
-#include <ctr/srv.h>
+#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 12972eb307957d8c79d6fca35d63a76d2c893362..a224c6877216f4187881d131ac35c3a5e1ca8fd2 100644 (file)
--- a/libctru/source/APT.c
+++ b/libctru/source/APT.c
@@ -1,11 +1,9 @@
 #include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <ctr/types.h>
-#include <ctr/srv.h>
-#include <ctr/APT.h>
-#include <ctr/GSP.h>
-#include <ctr/svc.h>
+#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 c96fbde35217d7bcdb8491440dae5f4cf9704909..417825fc253895a3458bf4275426578fce4f0086 100644 (file)
--- a/libctru/source/CFGNOR.c
+++ b/libctru/source/CFGNOR.c
@@ -1,12 +1,8 @@
 #include <stdlib.h>
-#include <stdint.h>
-#include <string.h>
-
-#include <ctr/types.h>
-#include <ctr/svc.h>
-#include <ctr/srv.h>
-
-#include <ctr/CFGNOR.h>
+#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 c7c265f7699f52a4e69e28fc1e4b4ae816b2fddf..eeb57912fe3e522da564f51a1177fdcf89449061 100644 (file)
--- a/libctru/source/CSND.c
+++ b/libctru/source/CSND.c
@@ -1,13 +1,9 @@
 #include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <ctr/types.h>
-
-#include <ctr/OS.h>
-#include <ctr/svc.h>
-#include <ctr/srv.h>
-
-#include <ctr/CSND.h>
+#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 065e158799367dfff513622061b07f5106b29832..8dc707374c93e06307373379f890120e705f5541 100644 (file)
--- a/libctru/source/FS.c
+++ b/libctru/source/FS.c
@@ -1,9 +1,7 @@
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <ctr/types.h>
-#include <ctr/FS.h>
-#include <ctr/svc.h>
+#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 6d4ac47d0eac54439834b6ec45e3ac84c57c71b5..e459eb4baff6605f1d991a8c0d928fcfd1edd62a 100644 (file)
--- a/libctru/source/GPU.c
+++ b/libctru/source/GPU.c
@@ -1,11 +1,9 @@
 #include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <ctr/types.h>
-#include <ctr/GSP.h>
-#include <ctr/GX.h>
-#include <ctr/GPU.h>
-#include <ctr/svc.h>
+#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 afed4cbd29d0674c4207dff0471b03fb81f2949c..7d74407c158b545b19f7f1f13599810fe44074d0 100644 (file)
--- a/libctru/source/GSP.c
+++ b/libctru/source/GSP.c
@@ -1,10 +1,8 @@
 #include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <ctr/types.h>
-#include <ctr/GSP.h>
-#include <ctr/svc.h>
-#include <ctr/srv.h>
+#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 4af70e334b3985d34150a7c7d20c0c5033beff7a..d21af48104ae3f063565848947a378ea57345bde 100644 (file)
--- a/libctru/source/GX.c
+++ b/libctru/source/GX.c
@@ -1,10 +1,8 @@
 #include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <ctr/types.h>
-#include <ctr/GSP.h>
-#include <ctr/GX.h>
-#include <ctr/svc.h>
+#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 6de817aebc38bba6110927e635c874164685cb13..4a709f4c4d323889a6a640299c0d6a66a0a266ce 100644 (file)
--- a/libctru/source/HID.c
+++ b/libctru/source/HID.c
@@ -1,10 +1,8 @@
 #include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <ctr/types.h>
-#include <ctr/HID.h>
-#include <ctr/srv.h>
-#include <ctr/svc.h>
+#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 b53c503e7aac73dfcff096943a936733520098fb..ce61824ad2e35ceeb1b29a3c65f68d15a428157b 100644 (file)
--- a/libctru/source/HTTPC.c
+++ b/libctru/source/HTTPC.c
@@ -1,9 +1,7 @@
-#include <stdlib.h>
-#include <stdio.h>
 #include <string.h>
-#include <ctr/types.h>
-#include <ctr/HTTPC.h>
-#include <ctr/svc.h>
+#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 06c830951a1ea83c245b6ba0a8718cb51fc65928..40624bf5a7c1c3dee7082cbd379094c76bae3d2b 100644 (file)
--- a/libctru/source/IR.c
+++ b/libctru/source/IR.c
@@ -1,12 +1,9 @@
 #include <stdlib.h>
-#include <stdint.h>
 #include <string.h>
-
-#include <ctr/types.h>
-#include <ctr/svc.h>
-#include <ctr/srv.h>
-
-#include <ctr/IR.h>
+#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 252f234550c569165fba60138203005471e5cc19..fe18d646845bb515b1e30954a1236044ff642a13 100644 (file)
--- a/libctru/source/OS.c
+++ b/libctru/source/OS.c
@@ -1,9 +1,7 @@
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <ctr/types.h>
-#include <ctr/svc.h>
-#include <ctr/OS.h>
+#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 a1b241bef0ad1a593cc324a427018e1e3bdff3f5..a5e053f638a95b9a266ab77b758f8a1f59855e83 100644 (file)
--- a/libctru/source/SHDR.c
+++ b/libctru/source/SHDR.c
@@ -1,12 +1,11 @@
 #include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <ctr/types.h>
-#include <ctr/GSP.h>
-#include <ctr/GX.h>
-#include <ctr/GPU.h>
-#include <ctr/SHDR.h>
-#include <ctr/svc.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>
+
 
 //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 c140d2b79ab503fa2b05efcc224acc94f5bdbb04..9be4fe0a9d400111c2150a63dbd9fe1d663de6a6 100644 (file)
--- a/libctru/source/SOC.c
+++ b/libctru/source/SOC.c
@@ -1,11 +1,7 @@
-#include <unistd.h>
-#include <stdlib.h>
-#include <stdint.h>
-#include <string.h>
-#include <ctr/types.h>
-#include <ctr/svc.h>
-#include <ctr/srv.h>
-#include <ctr/SOC.h>
+#include <3ds/types.h>
+#include <3ds/svc.h>
+#include <3ds/srv.h>
+#include <3ds/SOC.h>
 
 #include <sys/socket.h>
 #include <netinet/in.h>

diff --git a/libctru/source/gpuResetSequence.c b/libctru/source/gpuResetSequence.c
index 1d3eb34e3d8cb63dbc36570b42d82f1b4c7946bb..1b79eee740cd38ec8f1521f289fad3aba502f563 100644 (file)
--- a/libctru/source/gpuResetSequence.c
+++ b/libctru/source/gpuResetSequence.c
@@ -1,7 +1,4 @@
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <ctr/types.h>
+#include <3ds/types.h>
 
 u32 gpuResetSequence[]=
        {0x000F01D4, 0x00000001,

diff --git a/libctru/source/srv.c b/libctru/source/srv.c
index 52741122639742c0a3381151cb14b327a84651fb..23a1f357524efa136ae11dc589def7e77afdcd0d 100644 (file)
--- a/libctru/source/srv.c
+++ b/libctru/source/srv.c
@@ -1,9 +1,6 @@
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <ctr/types.h>
-#include <ctr/srv.h>
-#include <ctr/svc.h>
+#include <3ds/types.h>
+#include <3ds/srv.h>
+#include <3ds/svc.h>
 
 Handle srvHandle=0;