From eb5974322fd126a9e00a79ca1dfadf1ca24684ca Mon Sep 17 00:00:00 2001
From: Nekotekina <nekotekina@gmail.com>
Date: Fri, 31 Jul 2015 02:11:43 +0300
Subject: [PATCH] cellStorage.cpp, cellVideo(Export|Upload) modules

---
 rpcs3/Emu/SysCalls/ModuleManager.cpp          |  6 ++-
 rpcs3/Emu/SysCalls/Modules/cellStorage.cpp    | 28 +++++++++++
 rpcs3/Emu/SysCalls/Modules/cellSysutil.cpp    |  2 +
 .../Emu/SysCalls/Modules/cellVideoExport.cpp  | 46 +++++++++++++++++++
 .../Emu/SysCalls/Modules/cellVideoUpload.cpp  | 15 ++++++
 rpcs3/emucore.vcxproj                         |  3 ++
 rpcs3/emucore.vcxproj.filters                 |  9 ++++
 7 files changed, 107 insertions(+), 2 deletions(-)
 create mode 100644 rpcs3/Emu/SysCalls/Modules/cellStorage.cpp
 create mode 100644 rpcs3/Emu/SysCalls/Modules/cellVideoExport.cpp
 create mode 100644 rpcs3/Emu/SysCalls/Modules/cellVideoUpload.cpp

diff --git a/rpcs3/Emu/SysCalls/ModuleManager.cpp b/rpcs3/Emu/SysCalls/ModuleManager.cpp
index d203afa439..c59084acdc 100644
--- a/rpcs3/Emu/SysCalls/ModuleManager.cpp
+++ b/rpcs3/Emu/SysCalls/ModuleManager.cpp
@@ -73,6 +73,8 @@ extern Module cellUsbd;
 extern Module cellUsbPspcm;
 extern Module cellUserInfo;
 extern Module cellVdec;
+extern Module cellVideoExport;
+extern Module cellVideoUpload;
 extern Module cellVoice;
 extern Module cellVpost;
 extern Module libmixer;
@@ -163,7 +165,7 @@ const g_module_list[] =
 	{ 0x0033, "cellSaveData", &cellSaveData },
 	{ 0x0034, "cellSubDisplay", &cellSubdisplay },
 	{ 0x0035, "cellRec", &cellRec },
-	{ 0x0036, "cellVideoExport", nullptr },
+	{ 0x0036, "cellVideoExportUtility", &cellVideoExport },
 	{ 0x0037, "cellGameExec", &cellGameExec },
 	{ 0x0038, "sceNp2", &sceNp2 },
 	{ 0x0039, "cellSysutilAp", &cellSysutilAp },
@@ -174,7 +176,7 @@ const g_module_list[] =
 	{ 0x003e, "cellGame", &cellGame },
 	{ 0x003f, "cellBGDLUtility", &cellBGDL },
 	{ 0x0040, "cell_FreeType2", nullptr },
-	{ 0x0041, "cellSysutilVideoUpload", nullptr },
+	{ 0x0041, "cellVideoUpload", &cellVideoUpload },
 	{ 0x0042, "cellSysconfExtUtility", &cellSysconf },
 	{ 0x0043, "cellFiber", &cellFiber },
 	{ 0x0044, "sceNpCommerce2", &sceNpCommerce2 },
diff --git a/rpcs3/Emu/SysCalls/Modules/cellStorage.cpp b/rpcs3/Emu/SysCalls/Modules/cellStorage.cpp
new file mode 100644
index 0000000000..90a49f9f81
--- /dev/null
+++ b/rpcs3/Emu/SysCalls/Modules/cellStorage.cpp
@@ -0,0 +1,28 @@
+#include "stdafx.h"
+#include "Emu/Memory/Memory.h"
+#include "Emu/SysCalls/Modules.h"
+
+extern Module cellSysutil;
+
+s32 cellStorageDataImportMove()
+{
+	throw EXCEPTION("");
+}
+
+s32 cellStorageDataImport()
+{
+	throw EXCEPTION("");
+}
+
+s32 cellStorageDataExport()
+{
+	throw EXCEPTION("");
+}
+
+
+void cellSysutil_Storage_init()
+{
+	REG_FUNC(cellSysutil, cellStorageDataImportMove);
+	REG_FUNC(cellSysutil, cellStorageDataImport);
+	REG_FUNC(cellSysutil, cellStorageDataExport);
+}
diff --git a/rpcs3/Emu/SysCalls/Modules/cellSysutil.cpp b/rpcs3/Emu/SysCalls/Modules/cellSysutil.cpp
index bc35a39fc3..05f029828c 100644
--- a/rpcs3/Emu/SysCalls/Modules/cellSysutil.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/cellSysutil.cpp
@@ -711,6 +711,7 @@ extern void cellSysutil_SaveData_init();
 extern void cellSysutil_GameData_init();
 extern void cellSysutil_MsgDialog_init();
 extern void cellSysutil_OskDialog_init();
+extern void cellSysutil_Storage_init();
 
 Module cellSysutil("cellSysutil", []()
 {
@@ -724,6 +725,7 @@ Module cellSysutil("cellSysutil", []()
 	cellSysutil_GameData_init(); // cellGameData, cellHddGame functions
 	cellSysutil_MsgDialog_init(); // cellMsgDialog functions
 	cellSysutil_OskDialog_init(); // cellOskDialog functions
+	cellSysutil_Storage_init(); // cellStorage functions
 
 	REG_FUNC(cellSysutil, cellSysutilGetSystemParamInt);
 	REG_FUNC(cellSysutil, cellSysutilGetSystemParamString);
diff --git a/rpcs3/Emu/SysCalls/Modules/cellVideoExport.cpp b/rpcs3/Emu/SysCalls/Modules/cellVideoExport.cpp
new file mode 100644
index 0000000000..b87d560c82
--- /dev/null
+++ b/rpcs3/Emu/SysCalls/Modules/cellVideoExport.cpp
@@ -0,0 +1,46 @@
+#include "stdafx.h"
+#include "Emu/Memory/Memory.h"
+#include "Emu/SysCalls/Modules.h"
+
+extern Module cellVideoExport;
+
+s32 cellVideoExportProgress()
+{
+	throw EXCEPTION("");
+}
+
+s32 cellVideoExportInitialize2()
+{
+	throw EXCEPTION("");
+}
+
+s32 cellVideoExportInitialize()
+{
+	throw EXCEPTION("");
+}
+
+s32 cellVideoExportFromFileWithCopy()
+{
+	throw EXCEPTION("");
+}
+
+s32 cellVideoExportFromFile()
+{
+	throw EXCEPTION("");
+}
+
+s32 cellVideoExportFinalize()
+{
+	throw EXCEPTION("");
+}
+
+
+Module cellVideoExport("cellVideoExport", []()
+{
+	REG_FUNC(cellVideoExport, cellVideoExportProgress);
+	REG_FUNC(cellVideoExport, cellVideoExportInitialize2);
+	REG_FUNC(cellVideoExport, cellVideoExportInitialize);
+	REG_FUNC(cellVideoExport, cellVideoExportFromFileWithCopy);
+	REG_FUNC(cellVideoExport, cellVideoExportFromFile);
+	REG_FUNC(cellVideoExport, cellVideoExportFinalize);
+});
diff --git a/rpcs3/Emu/SysCalls/Modules/cellVideoUpload.cpp b/rpcs3/Emu/SysCalls/Modules/cellVideoUpload.cpp
new file mode 100644
index 0000000000..3bf7b3ce30
--- /dev/null
+++ b/rpcs3/Emu/SysCalls/Modules/cellVideoUpload.cpp
@@ -0,0 +1,15 @@
+#include "stdafx.h"
+#include "Emu/Memory/Memory.h"
+#include "Emu/SysCalls/Modules.h"
+
+extern Module cellVideoUpload;
+
+s32 cellVideoUploadInitialize()
+{
+	throw EXCEPTION("");
+}
+
+Module cellVideoUpload("cellVideoUpload", []()
+{
+	REG_FUNC(cellVideoUpload, cellVideoUploadInitialize);
+});
diff --git a/rpcs3/emucore.vcxproj b/rpcs3/emucore.vcxproj
index 40480e7501..ec58768991 100644
--- a/rpcs3/emucore.vcxproj
+++ b/rpcs3/emucore.vcxproj
@@ -259,6 +259,7 @@
     <ClCompile Include="Emu\SysCalls\Modules\cellSpurs.cpp" />
     <ClCompile Include="Emu\SysCalls\Modules\cellSpursJq.cpp" />
     <ClCompile Include="Emu\SysCalls\Modules\cellSsl.cpp" />
+    <ClCompile Include="Emu\SysCalls\Modules\cellStorage.cpp" />
     <ClCompile Include="Emu\SysCalls\Modules\cellSubdisplay.cpp" />
     <ClCompile Include="Emu\SysCalls\Modules\cellSync.cpp" />
     <ClCompile Include="Emu\SysCalls\Modules\cellSync2.cpp" />
@@ -273,6 +274,7 @@
     <ClCompile Include="Emu\SysCalls\Modules\cellUsbpspcm.cpp" />
     <ClCompile Include="Emu\SysCalls\Modules\cellUserInfo.cpp" />
     <ClCompile Include="Emu\SysCalls\Modules\cellVdec.cpp" />
+    <ClCompile Include="Emu\SysCalls\Modules\cellVideoExport.cpp" />
     <ClCompile Include="Emu\SysCalls\Modules\cellVoice.cpp" />
     <ClCompile Include="Emu\SysCalls\Modules\cellVpost.cpp" />
     <ClCompile Include="Emu\SysCalls\Modules\libmixer.cpp" />
@@ -289,6 +291,7 @@
     <ClCompile Include="Emu\SysCalls\Modules\cellMouse.cpp" />
     <ClCompile Include="Emu\SysCalls\Modules\cellPad.cpp" />
     <ClCompile Include="Emu\SysCalls\Modules\sceNpUtil.cpp" />
+    <ClCompile Include="Emu\SysCalls\Modules\cellVideoUpload.cpp" />
     <ClCompile Include="Emu\SysCalls\Modules\sysPrxForUser.cpp" />
     <ClCompile Include="Emu\SysCalls\Modules\sys_lv2dbg.cpp" />
     <ClCompile Include="Emu\SysCalls\Modules\cellHttp.cpp" />
diff --git a/rpcs3/emucore.vcxproj.filters b/rpcs3/emucore.vcxproj.filters
index 190785f8f3..957f563d7c 100644
--- a/rpcs3/emucore.vcxproj.filters
+++ b/rpcs3/emucore.vcxproj.filters
@@ -917,6 +917,15 @@
     <ClCompile Include="Emu\SysCalls\Modules\cellSysconf.cpp">
       <Filter>Emu\SysCalls\Modules</Filter>
     </ClCompile>
+    <ClCompile Include="Emu\SysCalls\Modules\cellVideoExport.cpp">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\Modules\cellVideoUpload.cpp">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\Modules\cellStorage.cpp">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Crypto\aes.h">