Moved OS module back out. Renamed functions.

diff --git a/libctru/include/3ds/OS.h b/libctru/include/3ds/OS.h
deleted file mode 100644 (file)
index ba7d67e..0000000
--- a/libctru/include/3ds/OS.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef OS_H
-#define OS_H
-
-u32 OS_ConvertVaddr2Physaddr(u32 vaddr);
-
-#endif
-

diff --git a/libctru/include/3ds/os.h b/libctru/include/3ds/os.h
new file mode 100644 (file)
index 0000000..1031222
--- /dev/null
+++ b/libctru/include/3ds/os.h
@@ -0,0 +1,7 @@
+#ifndef OS_H
+#define OS_H
+
+u32 osConvertVirtToPhys(u32 vaddr);
+
+#endif
+

diff --git a/libctru/source/os.c b/libctru/source/os.c
new file mode 100644 (file)
index 0000000..7d546a9
--- /dev/null
+++ b/libctru/source/os.c
@@ -0,0 +1,14 @@
+#include <3ds/types.h>
+#include <3ds/svc.h>
+#include <3ds/os.h>
+
+u32 osConvertVirtToPhys(u32 vaddr)
+{
+    if(vaddr >= 0x14000000 && vaddr < 0x1c000000)
+        return vaddr + 0x0c000000; // LINEAR heap
+    if(vaddr >= 0x30000000 && vaddr < 0x40000000)
+        return vaddr - 0x10000000; // Only available under FIRM v8+ for certain processes.
+    if(vaddr >= 0x1F000000 && vaddr < 0x1F600000)
+        return vaddr - 0x07000000; // VRAM
+    return 0;
+}

diff --git a/libctru/source/services/csnd.c b/libctru/source/services/csnd.c
index eeb57912fe3e522da564f51a1177fdcf89449061..d1ce51283d4b3f40e33c144226fce18824228ca0 100644 (file)
--- a/libctru/source/services/csnd.c
+++ b/libctru/source/services/csnd.c
@@ -1,6 +1,6 @@
 #include <stdlib.h>
 #include <3ds/types.h>
-#include <3ds/OS.h>
+#include <3ds/os.h>
 #include <3ds/svc.h>
 #include <3ds/srv.h>
 #include <3ds/CSND.h>
@@ -283,8 +283,8 @@ Result CSND_playsound(u32 channel, u32 looping, u32 encoding, u32 samplerate, u3
        u32 physaddr0 = 0;
        u32 physaddr1 = 0;
 
-       physaddr0 = OS_ConvertVaddr2Physaddr((u32)vaddr0);
-       physaddr1 = OS_ConvertVaddr2Physaddr((u32)vaddr1);
+       physaddr0 = osConvertVirtToPhys((u32)vaddr0);
+       physaddr1 = osConvertVirtToPhys((u32)vaddr1);
 
        CSND_sharedmemtype0_cmde(channel, looping, encoding, samplerate, unk0, unk1, physaddr0, physaddr1, totalbytesize);
        CSND_sharedmemtype0_cmd8(channel, samplerate);

diff --git a/libctru/source/services/os.c b/libctru/source/services/os.c
deleted file mode 100644 (file)
index fe18d64..0000000
--- a/libctru/source/services/os.c
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <3ds/types.h>
-#include <3ds/svc.h>
-#include <3ds/OS.h>
-
-
-u32 OS_ConvertVaddr2Physaddr(u32 vaddr)
-{
-       if(vaddr >= 0x14000000 && vaddr<0x1c000000)return vaddr + 0x0c000000;//LINEAR memory
-       if(vaddr >= 0x30000000 && vaddr<0x40000000)return vaddr - 0x10000000;//Only available under system-version v8.0 for certain processes, see here: http://3dbrew.org/wiki/SVC#enum_MemoryOperation
-       if(vaddr >= 0x1F000000 && vaddr<0x1F600000)return vaddr - 0x07000000;//VRAM
-
-       return 0;
-}
-