cellHttp, cellHttpUtil, cellSsl, cellBGDL added

rpcs3/Emu/SysCalls/ModuleManager.cpp

@@ -7,6 +7,7 @@ extern Module cellAtrac;
 extern Module cellAtracMulti;
 extern Module cellAudio;
 extern Module cellAvconfExt;
+extern Module cellBGDL;
 extern Module cellCamera;
 extern Module cellCelp8Enc;
 extern Module cellCelpEnc;
@@ -19,6 +20,9 @@ extern Module cellGame;
 extern Module cellGcmSys;
 extern Module cellGem;
 extern Module cellGifDec;
+extern Module cellHttp;
+extern Module cellHttps;
+extern Module cellHttpUtil;
 extern Module cellJpgDec;
 extern Module cellL10n;
 extern Module cellMic;
@@ -36,6 +40,7 @@ extern Module cellScreenshot;
 extern Module cellSearch;
 extern Module cellSpurs;
 extern Module cellSpursJq;
+extern Module cellSsl;
 extern Module cellSubdisplay;
 extern Module cellSync;
 extern Module cellSync2;
@@ -71,10 +76,10 @@ struct ModuleInfo
 static const g_module_list[] =
 {
 	{ 0x0000, "sys_net", &sys_net },
-	{ 0x0001, "sys_http", nullptr },
+	{ 0x0001, "cellHttp", &cellHttp },
-	{ 0x0002, "cellHttpUtil", nullptr },
+	{ 0x0002, "cellHttpUtil", &cellHttpUtil },
-	{ 0x0003, "cellSsl", nullptr },
+	{ 0x0003, "cellSsl", &cellSsl },
-	{ 0x0004, "cellHttps", nullptr },
+	{ 0x0004, "cellHttps", &cellHttps },
 	{ 0x0005, "libvdec", &cellVdec },
 	{ 0x0006, "cellAdec", &cellAdec },
 	{ 0x0007, "cellDmux", &cellDmux },
@@ -129,7 +134,7 @@ static const g_module_list[] =
 	{ 0x003c, "cellVdecDivx", nullptr },
 	{ 0x003d, "cellJpgEnc", nullptr },
 	{ 0x003e, "cellGame", &cellGame },
-	{ 0x003f, "cellBgdl", nullptr },
+	{ 0x003f, "cellBGDLUtility", &cellBGDL },
 	{ 0x0040, "cellFreetypeTT", nullptr },
 	{ 0x0041, "cellSysutilVideoUpload", nullptr },
 	{ 0x0042, "cellSysutilSysconfExt", nullptr },

rpcs3/Emu/SysCalls/Modules/cellBgdl.cpp

@@ -1,8 +1,9 @@
 #include "stdafx.h"
-#if 0
+#include "Emu/Memory/Memory.h"
+#include "Emu/System.h"
+#include "Emu/SysCalls/Modules.h"
 
-void cellBgdl_init();
+extern Module cellBGDL;
-Module cellBgdl(0x003f, cellBgdl_init);
 
 // Return Codes
 enum
@@ -15,35 +16,34 @@ enum
 	CELL_BGDL_UTIL_ERROR_INITIALIZE   = 0x8002ce05,
 };
 
-int cellBGDLGetInfo()
+s32 cellBGDLGetInfo()
 {
-	UNIMPLEMENTED_FUNC(cellBgdl);
+	UNIMPLEMENTED_FUNC(cellBGDL);
 	return CELL_OK;
 }
 
-int cellBGDLGetInfo2()
+s32 cellBGDLGetInfo2()
 {
-	UNIMPLEMENTED_FUNC(cellBgdl);
+	UNIMPLEMENTED_FUNC(cellBGDL);
 	return CELL_OK;
 }
 
-int cellBGDLSetMode()
+s32 cellBGDLSetMode()
 {
-	UNIMPLEMENTED_FUNC(cellBgdl);
+	UNIMPLEMENTED_FUNC(cellBGDL);
 	return CELL_OK;
 }
 
-int cellBGDLGetMode()
+s32 cellBGDLGetMode()
 {
-	UNIMPLEMENTED_FUNC(cellBgdl);
+	UNIMPLEMENTED_FUNC(cellBGDL);
 	return CELL_OK;
 }
 
-void cellBgdl_init()
+Module cellBGDL("cellBGDL", []()
 {
-	REG_FUNC(cellBgdl, cellBGDLGetInfo);
+	REG_FUNC(cellBGDL, cellBGDLGetInfo);
-	REG_FUNC(cellBgdl, cellBGDLGetInfo2);
+	REG_FUNC(cellBGDL, cellBGDLGetInfo2);
-	REG_FUNC(cellBgdl, cellBGDLSetMode);
+	REG_FUNC(cellBGDL, cellBGDLSetMode);
-	REG_FUNC(cellBgdl, cellBGDLGetMode);
+	REG_FUNC(cellBGDL, cellBGDLGetMode);
-}
+});
-#endif

rpcs3/Emu/SysCalls/Modules/cellHttp.cpp

@@ -0,0 +1,719 @@
+#include "stdafx.h"
+#include "Emu/Memory/Memory.h"
+#include "Emu/SysCalls/Modules.h"
+
+extern Module cellHttp;
+extern Module cellHttps;
+
+s32 cellHttpInit()
+{
+	UNIMPLEMENTED_FUNC(cellHttp);
+	return CELL_OK;
+}
+
+s32 cellHttpEnd()
+{
+	UNIMPLEMENTED_FUNC(cellHttp);
+	return CELL_OK;
+}
+
+s32 cellHttpsInit()
+{
+	UNIMPLEMENTED_FUNC(cellHttp);
+	return CELL_OK;
+}
+
+s32 cellHttpsEnd()
+{
+	UNIMPLEMENTED_FUNC(cellHttp);
+	return CELL_OK;
+}
+
+s32 cellHttpSetProxy()
+{
+	UNIMPLEMENTED_FUNC(cellHttp);
+	return CELL_OK;
+}
+
+s32 cellHttpGetProxy()
+{
+	UNIMPLEMENTED_FUNC(cellHttp);
+	return CELL_OK;
+}
+
+s32 cellHttpInitCookie()
+{
+	UNIMPLEMENTED_FUNC(cellHttp);
+	return CELL_OK;
+}
+
+s32 cellHttpEndCookie()
+{
+	UNIMPLEMENTED_FUNC(cellHttp);
+	return CELL_OK;
+}
+
+s32 cellHttpAddCookieWithClientId()
+{
+	UNIMPLEMENTED_FUNC(cellHttp);
+	return CELL_OK;
+}
+
+s32 cellHttpSessionCookieFlush()
+{
+	UNIMPLEMENTED_FUNC(cellHttp);
+	return CELL_OK;
+}
+
+s32 cellHttpCookieExportWithClientId()
+{
+	UNIMPLEMENTED_FUNC(cellHttp);
+	return CELL_OK;
+}
+
+s32 cellHttpCookieImportWithClientId()
+{
+	UNIMPLEMENTED_FUNC(cellHttp);
+	return CELL_OK;
+}
+
+s32 cellHttpClientSetCookieSendCallback()
+{
+	UNIMPLEMENTED_FUNC(cellHttp);
+	return CELL_OK;
+}
+
+s32 cellHttpClientSetCookieRecvCallback()
+{
+	UNIMPLEMENTED_FUNC(cellHttp);
+	return CELL_OK;
+}
+
+s32 cellHttpCreateClient()
+{
+	UNIMPLEMENTED_FUNC(cellHttp);
+	return CELL_OK;
+}
+
+s32 cellHttpDestroyClient()
+{
+	UNIMPLEMENTED_FUNC(cellHttp);
+	return CELL_OK;
+}
+
+s32 cellHttpClientSetAuthenticationCallback()
+{
+	UNIMPLEMENTED_FUNC(cellHttp);
+	return CELL_OK;
+}
+
+s32 cellHttpClientSetTransactionStateCallback()
+{
+	UNIMPLEMENTED_FUNC(cellHttp);
+	return CELL_OK;
+}
+
+s32 cellHttpClientSetRedirectCallback()
+{
+	UNIMPLEMENTED_FUNC(cellHttp);
+	return CELL_OK;
+}
+
+s32 cellHttpClientSetProxy()
+{
+	UNIMPLEMENTED_FUNC(cellHttp);
+	return CELL_OK;
+}
+
+s32 cellHttpClientGetProxy()
+{
+	UNIMPLEMENTED_FUNC(cellHttp);
+	return CELL_OK;
+}
+
+s32 cellHttpClientSetVersion()
+{
+	UNIMPLEMENTED_FUNC(cellHttp);
+	return CELL_OK;
+}
+
+s32 cellHttpClientGetVersion()
+{
+	UNIMPLEMENTED_FUNC(cellHttp);
+	return CELL_OK;
+}
+
+s32 cellHttpClientSetPipeline()
+{
+	UNIMPLEMENTED_FUNC(cellHttp);
+	return CELL_OK;
+}
+
+s32 cellHttpClientGetPipeline()
+{
+	UNIMPLEMENTED_FUNC(cellHttp);
+	return CELL_OK;
+}
+
+s32 cellHttpClientSetKeepAlive()
+{
+	UNIMPLEMENTED_FUNC(cellHttp);
+	return CELL_OK;
+}
+
+s32 cellHttpClientGetKeepAlive()
+{
+	UNIMPLEMENTED_FUNC(cellHttp);
+	return CELL_OK;
+}
+
+s32 cellHttpClientSetAutoRedirect()
+{
+	UNIMPLEMENTED_FUNC(cellHttp);
+	return CELL_OK;
+}
+
+s32 cellHttpClientGetAutoRedirect()
+{
+	UNIMPLEMENTED_FUNC(cellHttp);
+	return CELL_OK;
+}
+
+s32 cellHttpClientSetAutoAuthentication()
+{
+	UNIMPLEMENTED_FUNC(cellHttp);
+	return CELL_OK;
+}
+
+s32 cellHttpClientGetAutoAuthentication()
+{
+	UNIMPLEMENTED_FUNC(cellHttp);
+	return CELL_OK;
+}
+
+s32 cellHttpClientSetAuthenticationCacheStatus()
+{
+	UNIMPLEMENTED_FUNC(cellHttp);
+	return CELL_OK;
+}
+
+s32 cellHttpClientGetAuthenticationCacheStatus()
+{
+	UNIMPLEMENTED_FUNC(cellHttp);
+	return CELL_OK;
+}
+
+s32 cellHttpClientSetCookieStatus()
+{
+	UNIMPLEMENTED_FUNC(cellHttp);
+	return CELL_OK;
+}
+
+s32 cellHttpClientGetCookieStatus()
+{
+	UNIMPLEMENTED_FUNC(cellHttp);
+	return CELL_OK;
+}
+
+s32 cellHttpClientSetUserAgent()
+{
+	UNIMPLEMENTED_FUNC(cellHttp);
+	return CELL_OK;
+}
+
+s32 cellHttpClientGetUserAgent()
+{
+	UNIMPLEMENTED_FUNC(cellHttp);
+	return CELL_OK;
+}
+
+s32 cellHttpClientSetResponseBufferMax()
+{
+	UNIMPLEMENTED_FUNC(cellHttp);
+	return CELL_OK;
+}
+
+s32 cellHttpClientGetResponseBufferMax()
+{
+	UNIMPLEMENTED_FUNC(cellHttp);
+	return CELL_OK;
+}
+
+s32 cellHttpClientCloseAllConnections()
+{
+	UNIMPLEMENTED_FUNC(cellHttp);
+	return CELL_OK;
+}
+
+s32 cellHttpClientCloseConnections()
+{
+	UNIMPLEMENTED_FUNC(cellHttp);
+	return CELL_OK;
+}
+
+s32 cellHttpClientPollConnections()
+{
+	UNIMPLEMENTED_FUNC(cellHttp);
+	return CELL_OK;
+}
+
+s32 cellHttpClientSetRecvTimeout()
+{
+	UNIMPLEMENTED_FUNC(cellHttp);
+	return CELL_OK;
+}
+
+s32 cellHttpClientGetRecvTimeout()
+{
+	UNIMPLEMENTED_FUNC(cellHttp);
+	return CELL_OK;
+}
+
+s32 cellHttpClientSetSendTimeout()
+{
+	UNIMPLEMENTED_FUNC(cellHttp);
+	return CELL_OK;
+}
+
+s32 cellHttpClientGetSendTimeout()
+{
+	UNIMPLEMENTED_FUNC(cellHttp);
+	return CELL_OK;
+}
+
+s32 cellHttpClientSetConnTimeout()
+{
+	UNIMPLEMENTED_FUNC(cellHttp);
+	return CELL_OK;
+}
+
+s32 cellHttpClientGetConnTimeout()
+{
+	UNIMPLEMENTED_FUNC(cellHttp);
+	return CELL_OK;
+}
+
+s32 cellHttpClientSetTotalPoolSize()
+{
+	UNIMPLEMENTED_FUNC(cellHttp);
+	return CELL_OK;
+}
+
+s32 cellHttpClientGetTotalPoolSize()
+{
+	UNIMPLEMENTED_FUNC(cellHttp);
+	return CELL_OK;
+}
+
+s32 cellHttpClientSetPerHostPoolSize()
+{
+	UNIMPLEMENTED_FUNC(cellHttp);
+	return CELL_OK;
+}
+
+s32 cellHttpClientGetPerHostPoolSize()
+{
+	UNIMPLEMENTED_FUNC(cellHttp);
+	return CELL_OK;
+}
+
+s32 cellHttpClientSetPerHostKeepAliveMax()
+{
+	UNIMPLEMENTED_FUNC(cellHttp);
+	return CELL_OK;
+}
+
+s32 cellHttpClientGetPerHostKeepAliveMax()
+{
+	UNIMPLEMENTED_FUNC(cellHttp);
+	return CELL_OK;
+}
+
+s32 cellHttpClientSetPerPipelineMax()
+{
+	UNIMPLEMENTED_FUNC(cellHttp);
+	return CELL_OK;
+}
+
+s32 cellHttpClientGetPerPipelineMax()
+{
+	UNIMPLEMENTED_FUNC(cellHttp);
+	return CELL_OK;
+}
+
+s32 cellHttpClientSetRecvBufferSize()
+{
+	UNIMPLEMENTED_FUNC(cellHttp);
+	return CELL_OK;
+}
+
+s32 cellHttpClientGetRecvBufferSize()
+{
+	UNIMPLEMENTED_FUNC(cellHttp);
+	return CELL_OK;
+}
+
+s32 cellHttpClientSetSendBufferSize()
+{
+	UNIMPLEMENTED_FUNC(cellHttp);
+	return CELL_OK;
+}
+
+s32 cellHttpClientGetSendBufferSize()
+{
+	UNIMPLEMENTED_FUNC(cellHttp);
+	return CELL_OK;
+}
+
+s32 cellHttpClientGetAllHeaders()
+{
+	UNIMPLEMENTED_FUNC(cellHttp);
+	return CELL_OK;
+}
+
+s32 cellHttpClientSetHeader()
+{
+	UNIMPLEMENTED_FUNC(cellHttp);
+	return CELL_OK;
+}
+
+s32 cellHttpClientGetHeader()
+{
+	UNIMPLEMENTED_FUNC(cellHttp);
+	return CELL_OK;
+}
+
+s32 cellHttpClientAddHeader()
+{
+	UNIMPLEMENTED_FUNC(cellHttp);
+	return CELL_OK;
+}
+
+s32 cellHttpClientDeleteHeader()
+{
+	UNIMPLEMENTED_FUNC(cellHttp);
+	return CELL_OK;
+}
+
+s32 cellHttpClientSetSslCallback()
+{
+	UNIMPLEMENTED_FUNC(cellHttp);
+	return CELL_OK;
+}
+
+s32 cellHttpClientSetSslClientCertificate()
+{
+	UNIMPLEMENTED_FUNC(cellHttp);
+	return CELL_OK;
+}
+
+s32 cellHttpCreateTransaction()
+{
+	UNIMPLEMENTED_FUNC(cellHttp);
+	return CELL_OK;
+}
+
+s32 cellHttpDestroyTransaction()
+{
+	UNIMPLEMENTED_FUNC(cellHttp);
+	return CELL_OK;
+}
+
+s32 cellHttpTransactionGetUri()
+{
+	UNIMPLEMENTED_FUNC(cellHttp);
+	return CELL_OK;
+}
+
+s32 cellHttpTransactionCloseConnection()
+{
+	UNIMPLEMENTED_FUNC(cellHttp);
+	return CELL_OK;
+}
+
+s32 cellHttpTransactionReleaseConnection()
+{
+	UNIMPLEMENTED_FUNC(cellHttp);
+	return CELL_OK;
+}
+
+s32 cellHttpTransactionAbortConnection()
+{
+	UNIMPLEMENTED_FUNC(cellHttp);
+	return CELL_OK;
+}
+
+s32 cellHttpSendRequest()
+{
+	UNIMPLEMENTED_FUNC(cellHttp);
+	return CELL_OK;
+}
+
+s32 cellHttpRequestSetContentLength()
+{
+	UNIMPLEMENTED_FUNC(cellHttp);
+	return CELL_OK;
+}
+
+s32 cellHttpRequestGetContentLength()
+{
+	UNIMPLEMENTED_FUNC(cellHttp);
+	return CELL_OK;
+}
+
+s32 cellHttpRequestSetChunkedTransferStatus()
+{
+	UNIMPLEMENTED_FUNC(cellHttp);
+	return CELL_OK;
+}
+
+s32 cellHttpRequestGetChunkedTransferStatus()
+{
+	UNIMPLEMENTED_FUNC(cellHttp);
+	return CELL_OK;
+}
+
+s32 cellHttpRequestGetAllHeaders()
+{
+	UNIMPLEMENTED_FUNC(cellHttp);
+	return CELL_OK;
+}
+
+s32 cellHttpRequestSetHeader()
+{
+	UNIMPLEMENTED_FUNC(cellHttp);
+	return CELL_OK;
+}
+
+s32 cellHttpRequestGetHeader()
+{
+	UNIMPLEMENTED_FUNC(cellHttp);
+	return CELL_OK;
+}
+
+s32 cellHttpRequestAddHeader()
+{
+	UNIMPLEMENTED_FUNC(cellHttp);
+	return CELL_OK;
+}
+
+s32 cellHttpRequestDeleteHeader()
+{
+	UNIMPLEMENTED_FUNC(cellHttp);
+	return CELL_OK;
+}
+
+s32 cellHttpRecvResponse()
+{
+	UNIMPLEMENTED_FUNC(cellHttp);
+	return CELL_OK;
+}
+
+s32 cellHttpResponseGetAllHeaders()
+{
+	UNIMPLEMENTED_FUNC(cellHttp);
+	return CELL_OK;
+}
+
+s32 cellHttpResponseGetHeader()
+{
+	UNIMPLEMENTED_FUNC(cellHttp);
+	return CELL_OK;
+}
+
+s32 cellHttpResponseGetContentLength()
+{
+	UNIMPLEMENTED_FUNC(cellHttp);
+	return CELL_OK;
+}
+
+s32 cellHttpResponseGetStatusCode()
+{
+	UNIMPLEMENTED_FUNC(cellHttp);
+	return CELL_OK;
+}
+
+s32 cellHttpResponseGetStatusLine()
+{
+	UNIMPLEMENTED_FUNC(cellHttp);
+	return CELL_OK;
+}
+
+s32 cellHttpTransactionGetSslCipherName()
+{
+	UNIMPLEMENTED_FUNC(cellHttp);
+	return CELL_OK;
+}
+
+s32 cellHttpTransactionGetSslCipherId()
+{
+	UNIMPLEMENTED_FUNC(cellHttp);
+	return CELL_OK;
+}
+
+s32 cellHttpTransactionGetSslCipherVersion()
+{
+	UNIMPLEMENTED_FUNC(cellHttp);
+	return CELL_OK;
+}
+
+s32 cellHttpTransactionGetSslCipherBits()
+{
+	UNIMPLEMENTED_FUNC(cellHttp);
+	return CELL_OK;
+}
+
+s32 cellHttpTransactionGetSslCipherString()
+{
+	UNIMPLEMENTED_FUNC(cellHttp);
+	return CELL_OK;
+}
+
+s32 cellHttpTransactionGetSslVersion()
+{
+	UNIMPLEMENTED_FUNC(cellHttp);
+	return CELL_OK;
+}
+
+s32 cellHttpTransactionGetSslId()
+{
+	UNIMPLEMENTED_FUNC(cellHttp);
+	return CELL_OK;
+}
+
+s32 cellHttpClientSetSslVersion()
+{
+	UNIMPLEMENTED_FUNC(cellHttp);
+	return CELL_OK;
+}
+
+s32 cellHttpClientGetSslVersion()
+{
+	UNIMPLEMENTED_FUNC(cellHttp);
+	return CELL_OK;
+}
+
+s32 cellHttpClientSetSslIdDestroyCallback()
+{
+	UNIMPLEMENTED_FUNC(cellHttp);
+	return CELL_OK;
+}
+
+Module cellHttp("cellHttp", []()
+{
+	REG_FUNC(cellHttp, cellHttpInit);
+	REG_FUNC(cellHttp, cellHttpEnd);
+	REG_FUNC(cellHttp, cellHttpsInit);
+	REG_FUNC(cellHttp, cellHttpsEnd);
+	REG_FUNC(cellHttp, cellHttpSetProxy);
+	REG_FUNC(cellHttp, cellHttpGetProxy);
+
+	REG_FUNC(cellHttp, cellHttpInitCookie);
+	REG_FUNC(cellHttp, cellHttpEndCookie);
+	REG_FUNC(cellHttp, cellHttpAddCookieWithClientId);
+	REG_FUNC(cellHttp, cellHttpSessionCookieFlush);
+	REG_FUNC(cellHttp, cellHttpCookieExportWithClientId);
+	REG_FUNC(cellHttp, cellHttpCookieImportWithClientId);
+	REG_FUNC(cellHttp, cellHttpClientSetCookieSendCallback);
+	REG_FUNC(cellHttp, cellHttpClientSetCookieRecvCallback);
+
+	REG_FUNC(cellHttp, cellHttpCreateClient);
+	REG_FUNC(cellHttp, cellHttpDestroyClient);
+	REG_FUNC(cellHttp, cellHttpClientSetAuthenticationCallback);
+	REG_FUNC(cellHttp, cellHttpClientSetTransactionStateCallback);
+	REG_FUNC(cellHttp, cellHttpClientSetRedirectCallback);
+
+	REG_FUNC(cellHttp, cellHttpClientSetProxy);
+	REG_FUNC(cellHttp, cellHttpClientGetProxy);
+	REG_FUNC(cellHttp, cellHttpClientSetVersion);
+	REG_FUNC(cellHttp, cellHttpClientGetVersion);
+	REG_FUNC(cellHttp, cellHttpClientSetPipeline);
+	REG_FUNC(cellHttp, cellHttpClientGetPipeline);
+	REG_FUNC(cellHttp, cellHttpClientSetKeepAlive);
+	REG_FUNC(cellHttp, cellHttpClientGetKeepAlive);
+	REG_FUNC(cellHttp, cellHttpClientSetAutoRedirect);
+	REG_FUNC(cellHttp, cellHttpClientGetAutoRedirect);
+	REG_FUNC(cellHttp, cellHttpClientSetAutoAuthentication);
+	REG_FUNC(cellHttp, cellHttpClientGetAutoAuthentication);
+	REG_FUNC(cellHttp, cellHttpClientSetAuthenticationCacheStatus);
+	REG_FUNC(cellHttp, cellHttpClientGetAuthenticationCacheStatus);
+	REG_FUNC(cellHttp, cellHttpClientSetCookieStatus);
+	REG_FUNC(cellHttp, cellHttpClientGetCookieStatus);
+	REG_FUNC(cellHttp, cellHttpClientSetUserAgent);
+	REG_FUNC(cellHttp, cellHttpClientGetUserAgent);
+	REG_FUNC(cellHttp, cellHttpClientSetResponseBufferMax);
+	REG_FUNC(cellHttp, cellHttpClientGetResponseBufferMax);
+
+	REG_FUNC(cellHttp, cellHttpClientCloseAllConnections);
+	REG_FUNC(cellHttp, cellHttpClientCloseConnections);
+	REG_FUNC(cellHttp, cellHttpClientPollConnections);
+	REG_FUNC(cellHttp, cellHttpClientSetRecvTimeout);
+	REG_FUNC(cellHttp, cellHttpClientGetRecvTimeout);
+	REG_FUNC(cellHttp, cellHttpClientSetSendTimeout);
+	REG_FUNC(cellHttp, cellHttpClientGetSendTimeout);
+	REG_FUNC(cellHttp, cellHttpClientSetConnTimeout);
+	REG_FUNC(cellHttp, cellHttpClientGetConnTimeout);
+	REG_FUNC(cellHttp, cellHttpClientSetTotalPoolSize);
+	REG_FUNC(cellHttp, cellHttpClientGetTotalPoolSize);
+	REG_FUNC(cellHttp, cellHttpClientSetPerHostPoolSize);
+	REG_FUNC(cellHttp, cellHttpClientGetPerHostPoolSize);
+	REG_FUNC(cellHttp, cellHttpClientSetPerHostKeepAliveMax);
+	REG_FUNC(cellHttp, cellHttpClientGetPerHostKeepAliveMax);
+	REG_FUNC(cellHttp, cellHttpClientSetPerPipelineMax);
+	REG_FUNC(cellHttp, cellHttpClientGetPerPipelineMax);
+	REG_FUNC(cellHttp, cellHttpClientSetRecvBufferSize);
+	REG_FUNC(cellHttp, cellHttpClientGetRecvBufferSize);
+	REG_FUNC(cellHttp, cellHttpClientSetSendBufferSize);
+	REG_FUNC(cellHttp, cellHttpClientGetSendBufferSize);
+
+	REG_FUNC(cellHttp, cellHttpClientGetAllHeaders);
+	REG_FUNC(cellHttp, cellHttpClientSetHeader);
+	REG_FUNC(cellHttp, cellHttpClientGetHeader);
+	REG_FUNC(cellHttp, cellHttpClientAddHeader);
+	REG_FUNC(cellHttp, cellHttpClientDeleteHeader);
+
+	REG_FUNC(cellHttp, cellHttpClientSetSslCallback);
+	REG_FUNC(cellHttp, cellHttpClientSetSslClientCertificate);
+
+	REG_FUNC(cellHttp, cellHttpCreateTransaction);
+	REG_FUNC(cellHttp, cellHttpDestroyTransaction);
+	REG_FUNC(cellHttp, cellHttpTransactionGetUri);
+	REG_FUNC(cellHttp, cellHttpTransactionCloseConnection);
+	REG_FUNC(cellHttp, cellHttpTransactionReleaseConnection);
+	REG_FUNC(cellHttp, cellHttpTransactionAbortConnection);
+
+	REG_FUNC(cellHttp, cellHttpSendRequest);
+	REG_FUNC(cellHttp, cellHttpRequestSetContentLength);
+	REG_FUNC(cellHttp, cellHttpRequestGetContentLength);
+	REG_FUNC(cellHttp, cellHttpRequestSetChunkedTransferStatus);
+	REG_FUNC(cellHttp, cellHttpRequestGetChunkedTransferStatus);
+	REG_FUNC(cellHttp, cellHttpRequestGetAllHeaders);
+	REG_FUNC(cellHttp, cellHttpRequestSetHeader);
+	REG_FUNC(cellHttp, cellHttpRequestGetHeader);
+	REG_FUNC(cellHttp, cellHttpRequestAddHeader);
+	REG_FUNC(cellHttp, cellHttpRequestDeleteHeader);
+
+	REG_FUNC(cellHttp, cellHttpRecvResponse);
+	REG_FUNC(cellHttp, cellHttpResponseGetAllHeaders);
+	REG_FUNC(cellHttp, cellHttpResponseGetHeader);
+	REG_FUNC(cellHttp, cellHttpResponseGetContentLength);
+	REG_FUNC(cellHttp, cellHttpResponseGetStatusCode);
+	REG_FUNC(cellHttp, cellHttpResponseGetStatusLine);
+
+	REG_FUNC(cellHttp, cellHttpTransactionGetSslCipherName);
+	REG_FUNC(cellHttp, cellHttpTransactionGetSslCipherId);
+	REG_FUNC(cellHttp, cellHttpTransactionGetSslCipherVersion);
+	REG_FUNC(cellHttp, cellHttpTransactionGetSslCipherBits);
+	REG_FUNC(cellHttp, cellHttpTransactionGetSslCipherString);
+	REG_FUNC(cellHttp, cellHttpTransactionGetSslVersion);
+	REG_FUNC(cellHttp, cellHttpTransactionGetSslId);
+
+	REG_FUNC(cellHttp, cellHttpClientSetSslVersion);
+	REG_FUNC(cellHttp, cellHttpClientGetSslVersion);
+	REG_FUNC(cellHttp, cellHttpClientSetSslIdDestroyCallback);
+});
+
+Module cellHttps("cellHttps", []()
+{
+	// cellHttps doesn't have functions (cellHttpsInit belongs to cellHttp, for example)
+});

rpcs3/Emu/SysCalls/Modules/cellHttpUtil.cpp

@@ -1,130 +1,130 @@
 #include "stdafx.h"
-#if 0
+#include "Emu/Memory/Memory.h"
+#include "Emu/SysCalls/Modules.h"
 
-void cellHttpUtil_init();
+extern Module cellHttpUtil;
-Module cellHttpUtil(0x0002, cellHttpUtil_init);
 
-int cellHttpUtilParseUri()
+s32 cellHttpUtilParseUri()
 {
 	UNIMPLEMENTED_FUNC(cellHttpUtil);
 	return CELL_OK;
 }
 
-int cellHttpUtilParseUriPath()
+s32 cellHttpUtilParseUriPath()
 {
 	UNIMPLEMENTED_FUNC(cellHttpUtil);
 	return CELL_OK;
 }
 
-int cellHttpUtilParseProxy()
+s32 cellHttpUtilParseProxy()
 {
 	UNIMPLEMENTED_FUNC(cellHttpUtil);
 	return CELL_OK;
 }
 
-int cellHttpUtilParseStatusLine()
+s32 cellHttpUtilParseStatusLine()
 {
 	UNIMPLEMENTED_FUNC(cellHttpUtil);
 	return CELL_OK;
 }
 
-int cellHttpUtilParseHeader()
+s32 cellHttpUtilParseHeader()
 {
 	UNIMPLEMENTED_FUNC(cellHttpUtil);
 	return CELL_OK;
 }
 
-int cellHttpUtilBuildRequestLine()
+s32 cellHttpUtilBuildRequestLine()
 {
 	UNIMPLEMENTED_FUNC(cellHttpUtil);
 	return CELL_OK;
 }
 
-int cellHttpUtilBuildHeader()
+s32 cellHttpUtilBuildHeader()
 {
 	UNIMPLEMENTED_FUNC(cellHttpUtil);
 	return CELL_OK;
 }
 
-int cellHttpUtilBuildUri()
+s32 cellHttpUtilBuildUri()
 {
 	UNIMPLEMENTED_FUNC(cellHttpUtil);
 	return CELL_OK;
 }
 
-int cellHttpUtilCopyUri()
+s32 cellHttpUtilCopyUri()
 {
 	UNIMPLEMENTED_FUNC(cellHttpUtil);
 	return CELL_OK;
 }
 
-int cellHttpUtilMergeUriPath()
+s32 cellHttpUtilMergeUriPath()
 {
 	UNIMPLEMENTED_FUNC(cellHttpUtil);
 	return CELL_OK;
 }
 
-int cellHttpUtilSweepPath()
+s32 cellHttpUtilSweepPath()
 {
 	UNIMPLEMENTED_FUNC(cellHttpUtil);
 	return CELL_OK;
 }
 
-int cellHttpUtilCopyStatusLine()
+s32 cellHttpUtilCopyStatusLine()
 {
 	UNIMPLEMENTED_FUNC(cellHttpUtil);
 	return CELL_OK;
 }
 
-int cellHttpUtilCopyHeader()
+s32 cellHttpUtilCopyHeader()
 {
 	UNIMPLEMENTED_FUNC(cellHttpUtil);
 	return CELL_OK;
 }
 
-int cellHttpUtilAppendHeaderValue()
+s32 cellHttpUtilAppendHeaderValue()
 {
 	UNIMPLEMENTED_FUNC(cellHttpUtil);
 	return CELL_OK;
 }
 
-int cellHttpUtilEscapeUri()
+s32 cellHttpUtilEscapeUri()
 {
 	UNIMPLEMENTED_FUNC(cellHttpUtil);
 	return CELL_OK;
 }
 
-int cellHttpUtilUnescapeUri()
+s32 cellHttpUtilUnescapeUri()
 {
 	UNIMPLEMENTED_FUNC(cellHttpUtil);
 	return CELL_OK;
 }
 
-int cellHttpUtilFormUrlEncode()
+s32 cellHttpUtilFormUrlEncode()
 {
 	UNIMPLEMENTED_FUNC(cellHttpUtil);
 	return CELL_OK;
 }
 
-int cellHttpUtilFormUrlDecode()
+s32 cellHttpUtilFormUrlDecode()
 {
 	UNIMPLEMENTED_FUNC(cellHttpUtil);
 	return CELL_OK;
 }
 
-int cellHttpUtilBase64Encoder()
+s32 cellHttpUtilBase64Encoder()
 {
 	UNIMPLEMENTED_FUNC(cellHttpUtil);
 	return CELL_OK;
 }
 
-int cellHttpUtilBase64Decoder()
+s32 cellHttpUtilBase64Decoder()
 {
 	UNIMPLEMENTED_FUNC(cellHttpUtil);
 	return CELL_OK;
 }
 
-void cellHttpUtil_init()
+Module cellHttpUtil("cellHttpUtil", []()
 {
 	REG_FUNC(cellHttpUtil, cellHttpUtilParseUri);
 	REG_FUNC(cellHttpUtil, cellHttpUtilParseUriPath);
@@ -149,5 +149,4 @@ void cellHttpUtil_init()
 	REG_FUNC(cellHttpUtil, cellHttpUtilFormUrlDecode);
 	REG_FUNC(cellHttpUtil, cellHttpUtilBase64Encoder);
 	REG_FUNC(cellHttpUtil, cellHttpUtilBase64Decoder);
-}
+});
-#endif

rpcs3/Emu/SysCalls/Modules/cellSsl.cpp

@@ -1,94 +1,94 @@
 #include "stdafx.h"
-#if 0
+#include "Emu/Memory/Memory.h"
+#include "Emu/SysCalls/Modules.h"
 
-void cellSsl_init();
+extern Module cellSsl;
-Module cellSsl(0x0003, cellSsl_init);
 
-int cellSslInit()
+s32 cellSslInit()
 {
 	UNIMPLEMENTED_FUNC(cellSsl);
 	return CELL_OK;
 }
 
-int cellSslEnd()
+s32 cellSslEnd()
 {
 	UNIMPLEMENTED_FUNC(cellSsl);
 	return CELL_OK;
 }
 
-int cellSslCertificateLoader()
+s32 cellSslCertificateLoader()
 {
 	UNIMPLEMENTED_FUNC(cellSsl);
 	return CELL_OK;
 }
 
-int cellSslCertGetSerialNumber()
+s32 cellSslCertGetSerialNumber()
 {
 	UNIMPLEMENTED_FUNC(cellSsl);
 	return CELL_OK;
 }
 
-int cellSslCertGetPublicKey()
+s32 cellSslCertGetPublicKey()
 {
 	UNIMPLEMENTED_FUNC(cellSsl);
 	return CELL_OK;
 }
 
-int cellSslCertGetRsaPublicKeyModulus()
+s32 cellSslCertGetRsaPublicKeyModulus()
 {
 	UNIMPLEMENTED_FUNC(cellSsl);
 	return CELL_OK;
 }
 
-int cellSslCertGetRsaPublicKeyExponent()
+s32 cellSslCertGetRsaPublicKeyExponent()
 {
 	UNIMPLEMENTED_FUNC(cellSsl);
 	return CELL_OK;
 }
 
-int cellSslCertGetNotBefore()
+s32 cellSslCertGetNotBefore()
 {
 	UNIMPLEMENTED_FUNC(cellSsl);
 	return CELL_OK;
 }
 
-int cellSslCertGetNotAfter()
+s32 cellSslCertGetNotAfter()
 {
 	UNIMPLEMENTED_FUNC(cellSsl);
 	return CELL_OK;
 }
 
-int cellSslCertGetSubjectName()
+s32 cellSslCertGetSubjectName()
 {
 	UNIMPLEMENTED_FUNC(cellSsl);
 	return CELL_OK;
 }
 
-int cellSslCertGetIssuerName()
+s32 cellSslCertGetIssuerName()
 {
 	UNIMPLEMENTED_FUNC(cellSsl);
 	return CELL_OK;
 }
 
-int cellSslCertGetNameEntryCount()
+s32 cellSslCertGetNameEntryCount()
 {
 	UNIMPLEMENTED_FUNC(cellSsl);
 	return CELL_OK;
 }
 
-int cellSslCertGetNameEntryInfo()
+s32 cellSslCertGetNameEntryInfo()
 {
 	UNIMPLEMENTED_FUNC(cellSsl);
 	return CELL_OK;
 }
 
-int cellSslCertGetMd5Fingerprint()
+s32 cellSslCertGetMd5Fingerprint()
 {
 	UNIMPLEMENTED_FUNC(cellSsl);
 	return CELL_OK;
 }
 
-void cellSsl_init()
+Module cellSsl("cellSsl", []()
 {
 	REG_FUNC(cellSsl, cellSslInit);
 	REG_FUNC(cellSsl, cellSslEnd);
@@ -106,5 +106,4 @@ void cellSsl_init()
 	REG_FUNC(cellSsl, cellSslCertGetNameEntryCount);
 	REG_FUNC(cellSsl, cellSslCertGetNameEntryInfo);
 	REG_FUNC(cellSsl, cellSslCertGetMd5Fingerprint);
-}
+});
-#endif

rpcs3/Emu/SysCalls/Modules/cellSysmodule.cpp

@@ -18,124 +18,113 @@ enum
 	CELL_SYSMODULE_ERROR_FATAL                = 0x800120ff,
 };
 
-const char *getModuleName(int id) {
+const char* get_module_id(u16 id)
-	struct
+{
+	switch (id)
 	{
-		const char *name;
+	case 0x0000: return "CELL_SYSMODULE_NET";
-		int id;
+	case 0x0001: return "CELL_SYSMODULE_HTTP";
-	} static const entries[] = {
+	case 0x0002: return "CELL_SYSMODULE_HTTP_UTIL";
-		{"CELL_SYSMODULE_INVALID", 0x0000ffff},
+	case 0x0003: return "CELL_SYSMODULE_SSL";
-		{"CELL_SYSMODULE_NET", 0x00000000},
+	case 0x0004: return "CELL_SYSMODULE_HTTPS";
-		{"CELL_SYSMODULE_HTTP", 0x00000001},
+	case 0x0005: return "CELL_SYSMODULE_VDEC";
-		{"CELL_SYSMODULE_HTTP_UTIL", 0x00000002},
+	case 0x0006: return "CELL_SYSMODULE_ADEC";
-		{"CELL_SYSMODULE_SSL", 0x00000003},
+	case 0x0007: return "CELL_SYSMODULE_DMUX";
-		{"CELL_SYSMODULE_HTTPS", 0x00000004},
+	case 0x0008: return "CELL_SYSMODULE_VPOST";
-		{"CELL_SYSMODULE_VDEC", 0x00000005},
+	case 0x0009: return "CELL_SYSMODULE_RTC";
-		{"CELL_SYSMODULE_ADEC", 0x00000006},
+	case 0x000a: return "CELL_SYSMODULE_SPURS";
-		{"CELL_SYSMODULE_DMUX", 0x00000007},
+	case 0x000b: return "CELL_SYSMODULE_OVIS";
-		{"CELL_SYSMODULE_VPOST", 0x00000008},
+	case 0x000c: return "CELL_SYSMODULE_SHEAP";
-		{"CELL_SYSMODULE_RTC", 0x00000009},
+	case 0x000d: return "CELL_SYSMODULE_SYNC";
-		{"CELL_SYSMODULE_SPURS", 0x0000000a},
+	case 0x000e: return "CELL_SYSMODULE_FS";
-		{"CELL_SYSMODULE_OVIS", 0x0000000b},
+	case 0x000f: return "CELL_SYSMODULE_JPGDEC";
-		{"CELL_SYSMODULE_SHEAP", 0x0000000c},
+	case 0x0010: return "CELL_SYSMODULE_GCM_SYS";
-		{"CELL_SYSMODULE_SYNC", 0x0000000d},
+	case 0x0011: return "CELL_SYSMODULE_AUDIO";
-		{"CELL_SYSMODULE_FS", 0x0000000e},
+	case 0x0012: return "CELL_SYSMODULE_PAMF";
-		{"CELL_SYSMODULE_JPGDEC", 0x0000000f},
+	case 0x0013: return "CELL_SYSMODULE_ATRAC3PLUS";
-		{"CELL_SYSMODULE_GCM_SYS", 0x00000010},
+	case 0x0014: return "CELL_SYSMODULE_NETCTL";
-		{"CELL_SYSMODULE_GCM", 0x00000010},
+	case 0x0015: return "CELL_SYSMODULE_SYSUTIL";
-		{"CELL_SYSMODULE_AUDIO", 0x00000011},
+	case 0x0016: return "CELL_SYSMODULE_SYSUTIL_NP";
-		{"CELL_SYSMODULE_PAMF", 0x00000012},
+	case 0x0017: return "CELL_SYSMODULE_IO";
-		{"CELL_SYSMODULE_ATRAC3PLUS", 0x00000013},
+	case 0x0018: return "CELL_SYSMODULE_PNGDEC";
-		{"CELL_SYSMODULE_NETCTL", 0x00000014},
+	case 0x0019: return "CELL_SYSMODULE_FONT";
-		{"CELL_SYSMODULE_SYSUTIL", 0x00000015},
+	case 0x001a: return "CELL_SYSMODULE_FONTFT";
-		{"CELL_SYSMODULE_SYSUTIL_NP", 0x00000016},
+	case 0x001b: return "CELL_SYSMODULE_FREETYPE";
-		{"CELL_SYSMODULE_IO", 0x00000017},
+	case 0x001c: return "CELL_SYSMODULE_USBD";
-		{"CELL_SYSMODULE_PNGDEC", 0x00000018},
+	case 0x001d: return "CELL_SYSMODULE_SAIL";
-		{"CELL_SYSMODULE_FONT", 0x00000019},
+	case 0x001e: return "CELL_SYSMODULE_L10N";
-		{"CELL_SYSMODULE_FONTFT", 0x0000001a},
+	case 0x001f: return "CELL_SYSMODULE_RESC";
-		{"CELL_SYSMODULE_FREETYPE", 0x0000001b},
+	case 0x0020: return "CELL_SYSMODULE_DAISY";
-		{"CELL_SYSMODULE_USBD", 0x0000001c},
+	case 0x0021: return "CELL_SYSMODULE_KEY2CHAR";
-		{"CELL_SYSMODULE_SAIL", 0x0000001d},
+	case 0x0022: return "CELL_SYSMODULE_MIC";
-		{"CELL_SYSMODULE_L10N", 0x0000001e},
+	case 0x0023: return "CELL_SYSMODULE_CAMERA";
-		{"CELL_SYSMODULE_RESC", 0x0000001f},
+	case 0x0024: return "CELL_SYSMODULE_VDEC_MPEG2";
-		{"CELL_SYSMODULE_DAISY", 0x00000020},
+	case 0x0025: return "CELL_SYSMODULE_VDEC_AVC";
-		{"CELL_SYSMODULE_KEY2CHAR", 0x00000021},
+	case 0x0026: return "CELL_SYSMODULE_ADEC_LPCM";
-		{"CELL_SYSMODULE_MIC", 0x00000022},
+	case 0x0027: return "CELL_SYSMODULE_ADEC_AC3";
-		{"CELL_SYSMODULE_CAMERA", 0x00000023},
+	case 0x0028: return "CELL_SYSMODULE_ADEC_ATX";
-		{"CELL_SYSMODULE_VDEC_MPEG2", 0x00000024},
+	case 0x0029: return "CELL_SYSMODULE_ADEC_AT3";
-		{"CELL_SYSMODULE_VDEC_AVC", 0x00000025},
+	case 0x002a: return "CELL_SYSMODULE_DMUX_PAMF";
-		{"CELL_SYSMODULE_ADEC_LPCM", 0x00000026},
+	case 0x002b: return "CELL_SYSMODULE_VDEC_AL";
-		{"CELL_SYSMODULE_ADEC_AC3", 0x00000027},
+	case 0x002c: return "CELL_SYSMODULE_ADEC_AL";
-		{"CELL_SYSMODULE_ADEC_ATX", 0x00000028},
+	case 0x002d: return "CELL_SYSMODULE_DMUX_AL";
-		{"CELL_SYSMODULE_ADEC_AT3", 0x00000029},
+	case 0x002e: return "CELL_SYSMODULE_LV2DBG";
-		{"CELL_SYSMODULE_DMUX_PAMF", 0x0000002a},
+	case 0x0030: return "CELL_SYSMODULE_USBPSPCM";
-		{"CELL_SYSMODULE_VDEC_AL", 0x0000002b},
+	case 0x0031: return "CELL_SYSMODULE_AVCONF_EXT";
-		{"CELL_SYSMODULE_ADEC_AL", 0x0000002c},
+	case 0x0032: return "CELL_SYSMODULE_SYSUTIL_USERINFO";
-		{"CELL_SYSMODULE_DMUX_AL", 0x0000002d},
+	case 0x0033: return "CELL_SYSMODULE_SYSUTIL_SAVEDATA";
-		{"CELL_SYSMODULE_LV2DBG", 0x0000002e},
+	case 0x0034: return "CELL_SYSMODULE_SUBDISPLAY";
-		{"CELL_SYSMODULE_USBPSPCM", 0x00000030},
+	case 0x0035: return "CELL_SYSMODULE_SYSUTIL_REC";
-		{"CELL_SYSMODULE_AVCONF_EXT", 0x00000031},
+	case 0x0036: return "CELL_SYSMODULE_VIDEO_EXPORT";
-		{"CELL_SYSMODULE_SYSUTIL_USERINFO", 0x00000032},
+	case 0x0037: return "CELL_SYSMODULE_SYSUTIL_GAME_EXEC";
-		{"CELL_SYSMODULE_SYSUTIL_SAVEDATA", 0x00000033},
+	case 0x0038: return "CELL_SYSMODULE_SYSUTIL_NP2";
-		{"CELL_SYSMODULE_SUBDISPLAY", 0x00000034},
+	case 0x0039: return "CELL_SYSMODULE_SYSUTIL_AP";
-		{"CELL_SYSMODULE_SYSUTIL_REC", 0x00000035},
+	case 0x003a: return "CELL_SYSMODULE_SYSUTIL_NP_CLANS";
-		{"CELL_SYSMODULE_VIDEO_EXPORT", 0x00000036},
+	case 0x003b: return "CELL_SYSMODULE_SYSUTIL_OSK_EXT";
-		{"CELL_SYSMODULE_SYSUTIL_GAME_EXEC", 0x00000037},
+	case 0x003c: return "CELL_SYSMODULE_VDEC_DIVX";
-		{"CELL_SYSMODULE_SYSUTIL_NP2", 0x00000038},
+	case 0x003d: return "CELL_SYSMODULE_JPGENC";
-		{"CELL_SYSMODULE_SYSUTIL_AP", 0x00000039},
+	case 0x003e: return "CELL_SYSMODULE_SYSUTIL_GAME";
-		{"CELL_SYSMODULE_SYSUTIL_NP_CLANS", 0x0000003a},
+	case 0x003f: return "CELL_SYSMODULE_BGDL";
-		{"CELL_SYSMODULE_SYSUTIL_OSK_EXT", 0x0000003b},
+	case 0x0040: return "CELL_SYSMODULE_FREETYPE_TT";
-		{"CELL_SYSMODULE_VDEC_DIVX", 0x0000003c},
+	case 0x0041: return "CELL_SYSMODULE_SYSUTIL_VIDEO_UPLOAD";
-		{"CELL_SYSMODULE_JPGENC", 0x0000003d},
+	case 0x0042: return "CELL_SYSMODULE_SYSUTIL_SYSCONF_EXT";
-		{"CELL_SYSMODULE_SYSUTIL_GAME", 0x0000003e},
+	case 0x0043: return "CELL_SYSMODULE_FIBER";
-		{"CELL_SYSMODULE_BGDL", 0x0000003f},
+	case 0x0044: return "CELL_SYSMODULE_SYSUTIL_NP_COMMERCE2";
-		{"CELL_SYSMODULE_FREETYPE_TT", 0x00000040},
+	case 0x0045: return "CELL_SYSMODULE_SYSUTIL_NP_TUS";
-		{"CELL_SYSMODULE_SYSUTIL_VIDEO_UPLOAD", 0x00000041},
+	case 0x0046: return "CELL_SYSMODULE_VOICE";
-		{"CELL_SYSMODULE_SYSUTIL_SYSCONF_EXT", 0x00000042},
+	case 0x0047: return "CELL_SYSMODULE_ADEC_CELP8";
-		{"CELL_SYSMODULE_FIBER", 0x00000043},
+	case 0x0048: return "CELL_SYSMODULE_CELP8ENC";
-		{"CELL_SYSMODULE_SYSUTIL_NP_COMMERCE2", 0x00000044},
+	case 0x0049: return "CELL_SYSMODULE_SYSUTIL_LICENSEAREA";
-		{"CELL_SYSMODULE_SYSUTIL_NP_TUS", 0x00000045},
+	case 0x004a: return "CELL_SYSMODULE_SYSUTIL_MUSIC2";
-		{"CELL_SYSMODULE_VOICE", 0x00000046},
+	case 0x004e: return "CELL_SYSMODULE_SYSUTIL_SCREENSHOT";
-		{"CELL_SYSMODULE_ADEC_CELP8", 0x00000047},
+	case 0x004f: return "CELL_SYSMODULE_SYSUTIL_MUSIC_DECODE";
-		{"CELL_SYSMODULE_CELP8ENC", 0x00000048},
+	case 0x0050: return "CELL_SYSMODULE_SPURS_JQ";
-		{"CELL_SYSMODULE_SYSUTIL_LICENSEAREA", 0x00000049},
+	case 0x0052: return "CELL_SYSMODULE_PNGENC";
-		{"CELL_SYSMODULE_SYSUTIL_MUSIC2", 0x0000004a},
+	case 0x0053: return "CELL_SYSMODULE_SYSUTIL_MUSIC_DECODE2";
-		{"CELL_SYSMODULE_SYSUTIL_SCREENSHOT", 0x0000004e},
+	case 0x0055: return "CELL_SYSMODULE_SYNC2";
-		{"CELL_SYSMODULE_SYSUTIL_MUSIC_DECODE", 0x0000004f},
+	case 0x0056: return "CELL_SYSMODULE_SYSUTIL_NP_UTIL";
-		{"CELL_SYSMODULE_SPURS_JQ", 0x00000050},
+	case 0x0057: return "CELL_SYSMODULE_RUDP";
-		{"CELL_SYSMODULE_PNGENC", 0x00000052},
+	case 0x0059: return "CELL_SYSMODULE_SYSUTIL_NP_SNS";
-		{"CELL_SYSMODULE_SYSUTIL_MUSIC_DECODE2", 0x00000053},
+	case 0x005a: return "CELL_SYSMODULE_GEM";
-		{"CELL_SYSMODULE_SYNC2", 0x00000055},
+	case 0xf00a: return "CELL_SYSMODULE_CELPENC";
-		{"CELL_SYSMODULE_SYSUTIL_NP_UTIL", 0x00000056},
+	case 0xf010: return "CELL_SYSMODULE_GIFDEC";
-		{"CELL_SYSMODULE_RUDP", 0x00000057},
+	case 0xf019: return "CELL_SYSMODULE_ADEC_CELP";
-		{"CELL_SYSMODULE_SYSUTIL_NP_SNS", 0x00000059},
+	case 0xf01b: return "CELL_SYSMODULE_ADEC_M2BC";
-		{"CELL_SYSMODULE_GEM", 0x0000005a},
+	case 0xf01d: return "CELL_SYSMODULE_ADEC_M4AAC";
-		{"CELL_SYSMODULE_CELPENC", 0x0000f00a},
+	case 0xf01e: return "CELL_SYSMODULE_ADEC_MP3";
-		{"CELL_SYSMODULE_GIFDEC", 0x0000f010},
+	case 0xf023: return "CELL_SYSMODULE_IMEJP";
-		{"CELL_SYSMODULE_ADEC_CELP", 0x0000f019},
+	case 0xf028: return "CELL_SYSMODULE_SYSUTIL_MUSIC";
-		{"CELL_SYSMODULE_ADEC_M2BC", 0x0000f01b},
+	case 0xf029: return "CELL_SYSMODULE_PHOTO_EXPORT";
-		{"CELL_SYSMODULE_ADEC_M4AAC", 0x0000f01d},
+	case 0xf02a: return "CELL_SYSMODULE_PRINT";
-		{"CELL_SYSMODULE_ADEC_MP3", 0x0000f01e},
+	case 0xf02b: return "CELL_SYSMODULE_PHOTO_IMPORT";
-		{"CELL_SYSMODULE_IMEJP", 0x0000f023},
+	case 0xf02c: return "CELL_SYSMODULE_MUSIC_EXPORT";
-		{"CELL_SYSMODULE_SYSUTIL_MUSIC", 0x0000f028},
+	case 0xf02e: return "CELL_SYSMODULE_PHOTO_DECODE";
-		{"CELL_SYSMODULE_PHOTO_EXPORT",	0x0000f029},
+	case 0xf02f: return "CELL_SYSMODULE_SYSUTIL_SEARCH";
-		{"CELL_SYSMODULE_PRINT", 0x0000f02a},
+	case 0xf030: return "CELL_SYSMODULE_SYSUTIL_AVCHAT2";
-		{"CELL_SYSMODULE_PHOTO_IMPORT", 0x0000f02b},
+	case 0xf034: return "CELL_SYSMODULE_SAIL_REC";
-		{"CELL_SYSMODULE_MUSIC_EXPORT", 0x0000f02c},
+	case 0xf035: return "CELL_SYSMODULE_SYSUTIL_NP_TROPHY";
-		{"CELL_SYSMODULE_PHOTO_DECODE", 0x0000f02e},
+	case 0xf054: return "CELL_SYSMODULE_LIBATRAC3MULTI";
-		{"CELL_SYSMODULE_SYSUTIL_SEARCH", 0x0000f02f},
+	case 0xffff: return "CELL_SYSMODULE_INVALID";
-		{"CELL_SYSMODULE_SYSUTIL_AVCHAT2", 0x0000f030},
-		{"CELL_SYSMODULE_SAIL_REC", 0x0000f034},
-		{"CELL_SYSMODULE_SYSUTIL_NP_TROPHY", 0x0000f035},
-		{"CELL_SYSMODULE_LIBATRAC3MULTI", 0x0000f054},
-	};
-
-	for (int i = 0; i < sizeof(entries) / sizeof(entries[0]); ++i)
-	{
-		if (entries[i].id == id)
-		{
-			return entries[i].name;
-		}
 	}
 
 	return "UNKNOWN MODULE";
@@ -161,11 +150,10 @@ s32 cellSysmoduleSetMemcontainer(u32 ct_id)
 
 s32 cellSysmoduleLoadModule(u16 id)
 {
-	cellSysmodule.Warning("cellSysmoduleLoadModule(id=0x%04x: %s)", id, getModuleName(id));
+	cellSysmodule.Warning("cellSysmoduleLoadModule(id=0x%04x: %s)", id, get_module_id(id));
 
 	if (!Emu.GetModuleManager().CheckModuleId(id))
 	{
-		cellSysmodule.Error("cellSysmoduleLoadModule() failed: unknown module (id=0x%04x)", id);
 		return CELL_SYSMODULE_ERROR_UNKNOWN;
 	}
 
@@ -180,11 +168,10 @@ s32 cellSysmoduleLoadModule(u16 id)
 
 s32 cellSysmoduleUnloadModule(u16 id)
 {
-	cellSysmodule.Warning("cellSysmoduleUnloadModule(id=0x%04x: %s)", id, getModuleName(id));
+	cellSysmodule.Warning("cellSysmoduleUnloadModule(id=0x%04x: %s)", id, get_module_id(id));
 
 	if (!Emu.GetModuleManager().CheckModuleId(id))
 	{
-		cellSysmodule.Error("cellSysmoduleUnloadModule() failed: unknown module (id=0x%04x)", id);
 		return CELL_SYSMODULE_ERROR_UNKNOWN;
 	}
 
@@ -204,11 +191,10 @@ s32 cellSysmoduleUnloadModule(u16 id)
 
 s32 cellSysmoduleIsLoaded(u16 id)
 {
-	cellSysmodule.Warning("cellSysmoduleIsLoaded(id=0x%04x: %s)", id, getModuleName(id));
+	cellSysmodule.Warning("cellSysmoduleIsLoaded(id=0x%04x: %s)", id, get_module_id(id));
 
 	if (!Emu.GetModuleManager().CheckModuleId(id))
 	{
-		cellSysmodule.Error("cellSysmoduleIsLoaded() failed: unknown module (id=0x%04x)", id);
 		return CELL_SYSMODULE_ERROR_UNKNOWN;
 	}
 

rpcs3/Emu/SysCalls/Modules/sys_http.cpp

@@ -1,704 +0,0 @@
-#include "stdafx.h"
-#if 0
-
-void sys_http_init();
-Module sys_http(0x0001, sys_http_init);
-
-int cellHttpInit()
-{
-	UNIMPLEMENTED_FUNC(sys_http);
-	return CELL_OK;
-}
-
-int cellHttpEnd()
-{
-	UNIMPLEMENTED_FUNC(sys_http);
-	return CELL_OK;
-}
-
-int cellHttpsInit()
-{
-	UNIMPLEMENTED_FUNC(sys_http);
-	return CELL_OK;
-}
-
-int cellHttpsEnd()
-{
-	UNIMPLEMENTED_FUNC(sys_http);
-	return CELL_OK;
-}
-
-int cellHttpSetProxy()
-{
-	UNIMPLEMENTED_FUNC(sys_http);
-	return CELL_OK;
-}
-
-int cellHttpGetProxy()
-{
-	UNIMPLEMENTED_FUNC(sys_http);
-	return CELL_OK;
-}
-
-int cellHttpInitCookie()
-{
-	UNIMPLEMENTED_FUNC(sys_http);
-	return CELL_OK;
-}
-
-int cellHttpEndCookie()
-{
-	UNIMPLEMENTED_FUNC(sys_http);
-	return CELL_OK;
-}
-
-int cellHttpAddCookieWithClientId()
-{
-	UNIMPLEMENTED_FUNC(sys_http);
-	return CELL_OK;
-}
-
-int cellHttpSessionCookieFlush()
-{
-	UNIMPLEMENTED_FUNC(sys_http);
-	return CELL_OK;
-}
-
-int cellHttpCookieExportWithClientId()
-{
-	UNIMPLEMENTED_FUNC(sys_http);
-	return CELL_OK;
-}
-
-int cellHttpCookieImportWithClientId()
-{
-	UNIMPLEMENTED_FUNC(sys_http);
-	return CELL_OK;
-}
-
-int cellHttpClientSetCookieSendCallback()
-{
-	UNIMPLEMENTED_FUNC(sys_http);
-	return CELL_OK;
-}
-
-int cellHttpClientSetCookieRecvCallback()
-{
-	UNIMPLEMENTED_FUNC(sys_http);
-	return CELL_OK;
-}
-
-int cellHttpCreateClient()
-{
-	UNIMPLEMENTED_FUNC(sys_http);
-	return CELL_OK;
-}
-
-int cellHttpDestroyClient()
-{
-	UNIMPLEMENTED_FUNC(sys_http);
-	return CELL_OK;
-}
-
-int cellHttpClientSetAuthenticationCallback()
-{
-	UNIMPLEMENTED_FUNC(sys_http);
-	return CELL_OK;
-}
-
-int cellHttpClientSetTransactionStateCallback()
-{
-	UNIMPLEMENTED_FUNC(sys_http);
-	return CELL_OK;
-}
-
-int cellHttpClientSetRedirectCallback()
-{
-	UNIMPLEMENTED_FUNC(sys_http);
-	return CELL_OK;
-}
-
-int cellHttpClientSetProxy()
-{
-	UNIMPLEMENTED_FUNC(sys_http);
-	return CELL_OK;
-}
-
-int cellHttpClientGetProxy()
-{
-	UNIMPLEMENTED_FUNC(sys_http);
-	return CELL_OK;
-}
-
-int cellHttpClientSetVersion()
-{
-	UNIMPLEMENTED_FUNC(sys_http);
-	return CELL_OK;
-}
-
-int cellHttpClientGetVersion()
-{
-	UNIMPLEMENTED_FUNC(sys_http);
-	return CELL_OK;
-}
-
-int cellHttpClientSetPipeline()
-{
-	UNIMPLEMENTED_FUNC(sys_http);
-	return CELL_OK;
-}
-
-int cellHttpClientGetPipeline()
-{
-	UNIMPLEMENTED_FUNC(sys_http);
-	return CELL_OK;
-}
-
-int cellHttpClientSetKeepAlive()
-{
-	UNIMPLEMENTED_FUNC(sys_http);
-	return CELL_OK;
-}
-
-int cellHttpClientGetKeepAlive()
-{
-	UNIMPLEMENTED_FUNC(sys_http);
-	return CELL_OK;
-}
-
-int cellHttpClientSetAutoRedirect()
-{
-	UNIMPLEMENTED_FUNC(sys_http);
-	return CELL_OK;
-}
-
-int cellHttpClientGetAutoRedirect()
-{
-	UNIMPLEMENTED_FUNC(sys_http);
-	return CELL_OK;
-}
-
-int cellHttpClientSetAutoAuthentication()
-{
-	UNIMPLEMENTED_FUNC(sys_http);
-	return CELL_OK;
-}
-
-int cellHttpClientGetAutoAuthentication()
-{
-	UNIMPLEMENTED_FUNC(sys_http);
-	return CELL_OK;
-}
-
-int cellHttpClientSetAuthenticationCacheStatus()
-{
-	UNIMPLEMENTED_FUNC(sys_http);
-	return CELL_OK;
-}
-
-int cellHttpClientGetAuthenticationCacheStatus()
-{
-	UNIMPLEMENTED_FUNC(sys_http);
-	return CELL_OK;
-}
-
-int cellHttpClientSetCookieStatus()
-{
-	UNIMPLEMENTED_FUNC(sys_http);
-	return CELL_OK;
-}
-
-int cellHttpClientGetCookieStatus()
-{
-	UNIMPLEMENTED_FUNC(sys_http);
-	return CELL_OK;
-}
-
-int cellHttpClientSetUserAgent()
-{
-	UNIMPLEMENTED_FUNC(sys_http);
-	return CELL_OK;
-}
-
-int cellHttpClientGetUserAgent()
-{
-	UNIMPLEMENTED_FUNC(sys_http);
-	return CELL_OK;
-}
-
-int cellHttpClientSetResponseBufferMax()
-{
-	UNIMPLEMENTED_FUNC(sys_http);
-	return CELL_OK;
-}
-
-int cellHttpClientGetResponseBufferMax()
-{
-	UNIMPLEMENTED_FUNC(sys_http);
-	return CELL_OK;
-}
-
-int cellHttpClientCloseAllConnections()
-{
-	UNIMPLEMENTED_FUNC(sys_http);
-	return CELL_OK;
-}
-
-int cellHttpClientCloseConnections()
-{
-	UNIMPLEMENTED_FUNC(sys_http);
-	return CELL_OK;
-}
-
-int cellHttpClientPollConnections()
-{
-	UNIMPLEMENTED_FUNC(sys_http);
-	return CELL_OK;
-}
-
-int cellHttpClientSetRecvTimeout()
-{
-	UNIMPLEMENTED_FUNC(sys_http);
-	return CELL_OK;
-}
-
-int cellHttpClientGetRecvTimeout()
-{
-	UNIMPLEMENTED_FUNC(sys_http);
-	return CELL_OK;
-}
-
-int cellHttpClientSetSendTimeout()
-{
-	UNIMPLEMENTED_FUNC(sys_http);
-	return CELL_OK;
-}
-
-int cellHttpClientGetSendTimeout()
-{
-	UNIMPLEMENTED_FUNC(sys_http);
-	return CELL_OK;
-}
-
-int cellHttpClientSetConnTimeout()
-{
-	UNIMPLEMENTED_FUNC(sys_http);
-	return CELL_OK;
-}
-
-int cellHttpClientGetConnTimeout()
-{
-	UNIMPLEMENTED_FUNC(sys_http);
-	return CELL_OK;
-}
-
-int cellHttpClientSetTotalPoolSize()
-{
-	UNIMPLEMENTED_FUNC(sys_http);
-	return CELL_OK;
-}
-
-int cellHttpClientGetTotalPoolSize()
-{
-	UNIMPLEMENTED_FUNC(sys_http);
-	return CELL_OK;
-}
-
-int cellHttpClientSetPerHostPoolSize()
-{
-	UNIMPLEMENTED_FUNC(sys_http);
-	return CELL_OK;
-}
-
-int cellHttpClientGetPerHostPoolSize()
-{
-	UNIMPLEMENTED_FUNC(sys_http);
-	return CELL_OK;
-}
-
-int cellHttpClientSetPerHostKeepAliveMax()
-{
-	UNIMPLEMENTED_FUNC(sys_http);
-	return CELL_OK;
-}
-
-int cellHttpClientGetPerHostKeepAliveMax()
-{
-	UNIMPLEMENTED_FUNC(sys_http);
-	return CELL_OK;
-}
-
-int cellHttpClientSetPerPipelineMax()
-{
-	UNIMPLEMENTED_FUNC(sys_http);
-	return CELL_OK;
-}
-
-int cellHttpClientGetPerPipelineMax()
-{
-	UNIMPLEMENTED_FUNC(sys_http);
-	return CELL_OK;
-}
-
-int cellHttpClientSetRecvBufferSize()
-{
-	UNIMPLEMENTED_FUNC(sys_http);
-	return CELL_OK;
-}
-
-int cellHttpClientGetRecvBufferSize()
-{
-	UNIMPLEMENTED_FUNC(sys_http);
-	return CELL_OK;
-}
-
-int cellHttpClientGetAllHeaders()
-{
-	UNIMPLEMENTED_FUNC(sys_http);
-	return CELL_OK;
-}
-
-int cellHttpClientSetHeader()
-{
-	UNIMPLEMENTED_FUNC(sys_http);
-	return CELL_OK;
-}
-
-int cellHttpClientGetHeader()
-{
-	UNIMPLEMENTED_FUNC(sys_http);
-	return CELL_OK;
-}
-
-int cellHttpClientAddHeader()
-{
-	UNIMPLEMENTED_FUNC(sys_http);
-	return CELL_OK;
-}
-
-int cellHttpClientDeleteHeader()
-{
-	UNIMPLEMENTED_FUNC(sys_http);
-	return CELL_OK;
-}
-
-int cellHttpClientSetSslCallback()
-{
-	UNIMPLEMENTED_FUNC(sys_http);
-	return CELL_OK;
-}
-
-int cellHttpClientSetSslClientCertificate()
-{
-	UNIMPLEMENTED_FUNC(sys_http);
-	return CELL_OK;
-}
-
-int cellHttpCreateTransaction()
-{
-	UNIMPLEMENTED_FUNC(sys_http);
-	return CELL_OK;
-}
-
-int cellHttpDestroyTransaction()
-{
-	UNIMPLEMENTED_FUNC(sys_http);
-	return CELL_OK;
-}
-
-int cellHttpTransactionGetUri()
-{
-	UNIMPLEMENTED_FUNC(sys_http);
-	return CELL_OK;
-}
-
-int cellHttpTransactionCloseConnection()
-{
-	UNIMPLEMENTED_FUNC(sys_http);
-	return CELL_OK;
-}
-
-int cellHttpTransactionReleaseConnection()
-{
-	UNIMPLEMENTED_FUNC(sys_http);
-	return CELL_OK;
-}
-
-int cellHttpTransactionAbortConnection()
-{
-	UNIMPLEMENTED_FUNC(sys_http);
-	return CELL_OK;
-}
-
-int cellHttpSendRequest()
-{
-	UNIMPLEMENTED_FUNC(sys_http);
-	return CELL_OK;
-}
-
-int cellHttpRequestSetContentLength()
-{
-	UNIMPLEMENTED_FUNC(sys_http);
-	return CELL_OK;
-}
-
-int cellHttpRequestGetContentLength()
-{
-	UNIMPLEMENTED_FUNC(sys_http);
-	return CELL_OK;
-}
-
-int cellHttpRequestSetChunkedTransferStatus()
-{
-	UNIMPLEMENTED_FUNC(sys_http);
-	return CELL_OK;
-}
-
-int cellHttpRequestGetChunkedTransferStatus()
-{
-	UNIMPLEMENTED_FUNC(sys_http);
-	return CELL_OK;
-}
-
-int cellHttpRequestGetAllHeaders()
-{
-	UNIMPLEMENTED_FUNC(sys_http);
-	return CELL_OK;
-}
-
-int cellHttpRequestSetHeader()
-{
-	UNIMPLEMENTED_FUNC(sys_http);
-	return CELL_OK;
-}
-
-int cellHttpRequestGetHeader()
-{
-	UNIMPLEMENTED_FUNC(sys_http);
-	return CELL_OK;
-}
-
-int cellHttpRequestAddHeader()
-{
-	UNIMPLEMENTED_FUNC(sys_http);
-	return CELL_OK;
-}
-
-int cellHttpRequestDeleteHeader()
-{
-	UNIMPLEMENTED_FUNC(sys_http);
-	return CELL_OK;
-}
-
-int cellHttpRecvResponse()
-{
-	UNIMPLEMENTED_FUNC(sys_http);
-	return CELL_OK;
-}
-
-int cellHttpResponseGetAllHeaders()
-{
-	UNIMPLEMENTED_FUNC(sys_http);
-	return CELL_OK;
-}
-
-int cellHttpResponseGetHeader()
-{
-	UNIMPLEMENTED_FUNC(sys_http);
-	return CELL_OK;
-}
-
-int cellHttpResponseGetContentLength()
-{
-	UNIMPLEMENTED_FUNC(sys_http);
-	return CELL_OK;
-}
-
-int cellHttpResponseGetStatusCode()
-{
-	UNIMPLEMENTED_FUNC(sys_http);
-	return CELL_OK;
-}
-
-int cellHttpResponseGetStatusLine()
-{
-	UNIMPLEMENTED_FUNC(sys_http);
-	return CELL_OK;
-}
-
-int cellHttpTransactionGetSslCipherName()
-{
-	UNIMPLEMENTED_FUNC(sys_http);
-	return CELL_OK;
-}
-
-int cellHttpTransactionGetSslCipherId()
-{
-	UNIMPLEMENTED_FUNC(sys_http);
-	return CELL_OK;
-}
-
-int cellHttpTransactionGetSslCipherVersion()
-{
-	UNIMPLEMENTED_FUNC(sys_http);
-	return CELL_OK;
-}
-
-int cellHttpTransactionGetSslCipherBits()
-{
-	UNIMPLEMENTED_FUNC(sys_http);
-	return CELL_OK;
-}
-
-int cellHttpTransactionGetSslCipherString()
-{
-	UNIMPLEMENTED_FUNC(sys_http);
-	return CELL_OK;
-}
-
-int cellHttpTransactionGetSslVersion()
-{
-	UNIMPLEMENTED_FUNC(sys_http);
-	return CELL_OK;
-}
-
-int cellHttpTransactionGetSslId()
-{
-	UNIMPLEMENTED_FUNC(sys_http);
-	return CELL_OK;
-}
-
-int cellHttpClientSetSslVersion()
-{
-	UNIMPLEMENTED_FUNC(sys_http);
-	return CELL_OK;
-}
-
-int cellHttpClientGetSslVersion()
-{
-	UNIMPLEMENTED_FUNC(sys_http);
-	return CELL_OK;
-}
-
-int cellHttpClientSetSslIdDestroyCallback()
-{
-	UNIMPLEMENTED_FUNC(sys_http);
-	return CELL_OK;
-}
-
-void sys_http_init()
-{
-	// (TODO: Find addresses for cellHttpClientSetSendBufferSize and cellHttpClientGetSendBufferSize)
-
-	REG_FUNC(sys_http, cellHttpInit);
-	REG_FUNC(sys_http, cellHttpEnd);
-	REG_FUNC(sys_http, cellHttpsInit);
-	REG_FUNC(sys_http, cellHttpsEnd);
-	REG_FUNC(sys_http, cellHttpSetProxy);
-	REG_FUNC(sys_http, cellHttpGetProxy);
-
-	REG_FUNC(sys_http, cellHttpInitCookie);
-	REG_FUNC(sys_http, cellHttpEndCookie);
-	REG_FUNC(sys_http, cellHttpAddCookieWithClientId);
-	REG_FUNC(sys_http, cellHttpSessionCookieFlush);
-	REG_FUNC(sys_http, cellHttpCookieExportWithClientId);
-	REG_FUNC(sys_http, cellHttpCookieImportWithClientId);
-	REG_FUNC(sys_http, cellHttpClientSetCookieSendCallback);
-	REG_FUNC(sys_http, cellHttpClientSetCookieRecvCallback);
-
-	REG_FUNC(sys_http, cellHttpCreateClient);
-	REG_FUNC(sys_http, cellHttpDestroyClient);
-	REG_FUNC(sys_http, cellHttpClientSetAuthenticationCallback);
-	REG_FUNC(sys_http, cellHttpClientSetTransactionStateCallback);
-	REG_FUNC(sys_http, cellHttpClientSetRedirectCallback);
-
-	REG_FUNC(sys_http, cellHttpClientSetProxy);
-	REG_FUNC(sys_http, cellHttpClientGetProxy);
-	REG_FUNC(sys_http, cellHttpClientSetVersion);
-	REG_FUNC(sys_http, cellHttpClientGetVersion);
-	REG_FUNC(sys_http, cellHttpClientSetPipeline);
-	REG_FUNC(sys_http, cellHttpClientGetPipeline);
-	REG_FUNC(sys_http, cellHttpClientSetKeepAlive);
-	REG_FUNC(sys_http, cellHttpClientGetKeepAlive);
-	REG_FUNC(sys_http, cellHttpClientSetAutoRedirect);
-	REG_FUNC(sys_http, cellHttpClientGetAutoRedirect);
-	REG_FUNC(sys_http, cellHttpClientSetAutoAuthentication);
-	REG_FUNC(sys_http, cellHttpClientGetAutoAuthentication);
-	REG_FUNC(sys_http, cellHttpClientSetAuthenticationCacheStatus);
-	REG_FUNC(sys_http, cellHttpClientGetAuthenticationCacheStatus);
-	REG_FUNC(sys_http, cellHttpClientSetCookieStatus);
-	REG_FUNC(sys_http, cellHttpClientGetCookieStatus);
-	REG_FUNC(sys_http, cellHttpClientSetUserAgent);
-	REG_FUNC(sys_http, cellHttpClientGetUserAgent);
-	REG_FUNC(sys_http, cellHttpClientSetResponseBufferMax);
-	REG_FUNC(sys_http, cellHttpClientGetResponseBufferMax);
-
-	REG_FUNC(sys_http, cellHttpClientCloseAllConnections);
-	REG_FUNC(sys_http, cellHttpClientCloseConnections);
-	REG_FUNC(sys_http, cellHttpClientPollConnections);
-	REG_FUNC(sys_http, cellHttpClientSetRecvTimeout);
-	REG_FUNC(sys_http, cellHttpClientGetRecvTimeout);
-	REG_FUNC(sys_http, cellHttpClientSetSendTimeout);
-	REG_FUNC(sys_http, cellHttpClientGetSendTimeout);
-	REG_FUNC(sys_http, cellHttpClientSetConnTimeout);
-	REG_FUNC(sys_http, cellHttpClientGetConnTimeout);
-	REG_FUNC(sys_http, cellHttpClientSetTotalPoolSize);
-	REG_FUNC(sys_http, cellHttpClientGetTotalPoolSize);
-	REG_FUNC(sys_http, cellHttpClientSetPerHostPoolSize);
-	REG_FUNC(sys_http, cellHttpClientGetPerHostPoolSize);
-	REG_FUNC(sys_http, cellHttpClientSetPerHostKeepAliveMax);
-	REG_FUNC(sys_http, cellHttpClientGetPerHostKeepAliveMax);
-	REG_FUNC(sys_http, cellHttpClientSetPerPipelineMax);
-	REG_FUNC(sys_http, cellHttpClientGetPerPipelineMax);
-	REG_FUNC(sys_http, cellHttpClientSetRecvBufferSize);
-	REG_FUNC(sys_http, cellHttpClientGetRecvBufferSize);
-	//sys_http.AddFunc(, cellHttpClientSetSendBufferSize);
-	//sys_http.AddFunc(, cellHttpClientGetSendBufferSize);
-
-	REG_FUNC(sys_http, cellHttpClientGetAllHeaders);
-	REG_FUNC(sys_http, cellHttpClientSetHeader);
-	REG_FUNC(sys_http, cellHttpClientGetHeader);
-	REG_FUNC(sys_http, cellHttpClientAddHeader);
-	REG_FUNC(sys_http, cellHttpClientDeleteHeader);
-
-	REG_FUNC(sys_http, cellHttpClientSetSslCallback);
-	REG_FUNC(sys_http, cellHttpClientSetSslClientCertificate);
-
-	REG_FUNC(sys_http, cellHttpCreateTransaction);
-	REG_FUNC(sys_http, cellHttpDestroyTransaction);
-	REG_FUNC(sys_http, cellHttpTransactionGetUri);
-	REG_FUNC(sys_http, cellHttpTransactionCloseConnection);
-	REG_FUNC(sys_http, cellHttpTransactionReleaseConnection);
-	REG_FUNC(sys_http, cellHttpTransactionAbortConnection);
-
-	REG_FUNC(sys_http, cellHttpSendRequest);
-	REG_FUNC(sys_http, cellHttpRequestSetContentLength);
-	REG_FUNC(sys_http, cellHttpRequestGetContentLength);
-	REG_FUNC(sys_http, cellHttpRequestSetChunkedTransferStatus);
-	REG_FUNC(sys_http, cellHttpRequestGetChunkedTransferStatus);
-	REG_FUNC(sys_http, cellHttpRequestGetAllHeaders);
-	REG_FUNC(sys_http, cellHttpRequestSetHeader);
-	REG_FUNC(sys_http, cellHttpRequestGetHeader);
-	REG_FUNC(sys_http, cellHttpRequestAddHeader);
-	REG_FUNC(sys_http, cellHttpRequestDeleteHeader);
-
-	REG_FUNC(sys_http, cellHttpRecvResponse);
-	REG_FUNC(sys_http, cellHttpResponseGetAllHeaders);
-	REG_FUNC(sys_http, cellHttpResponseGetHeader);
-	REG_FUNC(sys_http, cellHttpResponseGetContentLength);
-	REG_FUNC(sys_http, cellHttpResponseGetStatusCode);
-	REG_FUNC(sys_http, cellHttpResponseGetStatusLine);
-
-	REG_FUNC(sys_http, cellHttpTransactionGetSslCipherName);
-	REG_FUNC(sys_http, cellHttpTransactionGetSslCipherId);
-	REG_FUNC(sys_http, cellHttpTransactionGetSslCipherVersion);
-	REG_FUNC(sys_http, cellHttpTransactionGetSslCipherBits);
-	REG_FUNC(sys_http, cellHttpTransactionGetSslCipherString);
-	REG_FUNC(sys_http, cellHttpTransactionGetSslVersion);
-	REG_FUNC(sys_http, cellHttpTransactionGetSslId);
-
-	REG_FUNC(sys_http, cellHttpClientSetSslVersion);
-	REG_FUNC(sys_http, cellHttpClientGetSslVersion);
-	REG_FUNC(sys_http, cellHttpClientSetSslIdDestroyCallback);
-}
-#endif

rpcs3/emucore.vcxproj

@@ -281,7 +281,7 @@
     <ClCompile Include="Emu\SysCalls\Modules\sceNpUtil.cpp" />
     <ClCompile Include="Emu\SysCalls\Modules\sysPrxForUser.cpp" />
     <ClCompile Include="Emu\SysCalls\Modules\sys_lv2dbg.cpp" />
-    <ClCompile Include="Emu\SysCalls\Modules\sys_http.cpp" />
+    <ClCompile Include="Emu\SysCalls\Modules\cellHttp.cpp" />
     <ClCompile Include="Emu\SysCalls\Modules\sys_io.cpp" />
     <ClCompile Include="Emu\SysCalls\Modules\sys_libc.cpp" />
     <ClCompile Include="Emu\SysCalls\Modules\sys_net.cpp" />

rpcs3/emucore.vcxproj.filters

@@ -413,12 +413,6 @@
     <ClCompile Include="Emu\SysCalls\ModuleManager.cpp">
       <Filter>Emu\SysCalls</Filter>
     </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Modules\cellBgdl.cpp">
-      <Filter>Emu\SysCalls\currently_unused</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Modules\cellHttpUtil.cpp">
-      <Filter>Emu\SysCalls\currently_unused</Filter>
-    </ClCompile>
     <ClCompile Include="Emu\SysCalls\Modules\cellImejp.cpp">
       <Filter>Emu\SysCalls\currently_unused</Filter>
     </ClCompile>
@@ -455,9 +449,6 @@
     <ClCompile Include="Emu\SysCalls\Modules\cellSheap.cpp">
       <Filter>Emu\SysCalls\currently_unused</Filter>
     </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Modules\cellSsl.cpp">
-      <Filter>Emu\SysCalls\currently_unused</Filter>
-    </ClCompile>
     <ClCompile Include="Emu\SysCalls\Modules\cellUsbpspcm.cpp">
       <Filter>Emu\SysCalls\currently_unused</Filter>
     </ClCompile>
@@ -467,9 +458,6 @@
     <ClCompile Include="Emu\SysCalls\Modules\libsynth2.cpp">
       <Filter>Emu\SysCalls\currently_unused</Filter>
     </ClCompile>
-    <ClCompile Include="Emu\SysCalls\Modules\sys_http.cpp">
-      <Filter>Emu\SysCalls\currently_unused</Filter>
-    </ClCompile>
     <ClCompile Include="Emu\SysCalls\lv2\sys_process.cpp">
       <Filter>Emu\SysCalls\lv2</Filter>
     </ClCompile>
@@ -887,6 +875,18 @@
     <ClCompile Include="Emu\SysCalls\Modules\cellCelpEnc.cpp">
       <Filter>Emu\SysCalls\Modules</Filter>
     </ClCompile>
+    <ClCompile Include="Emu\SysCalls\Modules\cellBgdl.cpp">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\Modules\cellHttp.cpp">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\Modules\cellHttpUtil.cpp">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\SysCalls\Modules\cellSsl.cpp">
+      <Filter>Emu\SysCalls\Modules</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Crypto\aes.h">