diff --git a/rpcs3/Emu/ARMv7/Modules/sceDeflt.cpp b/rpcs3/Emu/ARMv7/Modules/sceDeflt.cpp index 8e31b95c72..f1ce171d65 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceDeflt.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceDeflt.cpp @@ -9,7 +9,7 @@ s32 sceGzipIsValid(vm::psv::ptr pSrcGzip) throw __FUNCTION__; } -s32 sceGzipGetInfo(vm::psv::ptr pSrcGzip, vm::psv::ptr> ppvExtra, vm::psv::ptr> ppszName, vm::psv::ptr> ppszComment, vm::psv::ptr pusCrc, vm::psv::ptr> ppvData) +s32 sceGzipGetInfo(vm::psv::ptr pSrcGzip, vm::psv::pptr ppvExtra, vm::psv::pptr ppszName, vm::psv::pptr ppszComment, vm::psv::ptr pusCrc, vm::psv::pptr ppvData) { throw __FUNCTION__; } @@ -39,7 +39,7 @@ s32 sceZlibIsValid(vm::psv::ptr pSrcZlib) throw __FUNCTION__; } -s32 sceZlibGetInfo(vm::psv::ptr pSrcZlib, vm::psv::ptr pbCmf, vm::psv::ptr pbFlg, vm::psv::ptr puiDictId, vm::psv::ptr> ppvData) +s32 sceZlibGetInfo(vm::psv::ptr pSrcZlib, vm::psv::ptr pbCmf, vm::psv::ptr pbFlg, vm::psv::ptr puiDictId, vm::psv::pptr ppvData) { throw __FUNCTION__; } @@ -59,12 +59,12 @@ u32 sceZlibAdler32(u32 uiAdler, vm::psv::ptr pSrc, u32 uiSize) throw __FUNCTION__; } -s32 sceDeflateDecompress(vm::psv::ptr pDst, u32 uiBufSize, vm::psv::ptr pSrcDeflate, vm::psv::ptr> ppNext) +s32 sceDeflateDecompress(vm::psv::ptr pDst, u32 uiBufSize, vm::psv::ptr pSrcDeflate, vm::psv::pptr ppNext) { throw __FUNCTION__; } -s32 sceZipGetInfo(vm::psv::ptr pSrc, vm::psv::ptr> ppvExtra, vm::psv::ptr puiCrc, vm::psv::ptr> ppvData) +s32 sceZipGetInfo(vm::psv::ptr pSrc, vm::psv::pptr ppvExtra, vm::psv::ptr puiCrc, vm::psv::pptr ppvData) { throw __FUNCTION__; } diff --git a/rpcs3/Emu/ARMv7/Modules/sceFiber.cpp b/rpcs3/Emu/ARMv7/Modules/sceFiber.cpp index ab35f7a9be..cd2155cd1d 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceFiber.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceFiber.cpp @@ -65,7 +65,7 @@ s32 sceFiberSwitch(vm::psv::ptr fiber, u32 argOnRunTo, vm::psv::ptr> fiber) +s32 sceFiberGetSelf(vm::psv::pptr fiber) { throw __FUNCTION__; } diff --git a/rpcs3/Emu/ARMv7/Modules/sceFios.cpp b/rpcs3/Emu/ARMv7/Modules/sceFios.cpp index 71dab26ea1..49831265e5 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceFios.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceFios.cpp @@ -787,7 +787,7 @@ s32 sceFiosIOFilterAdd(s32 index, SceFiosIOFilterCallback pFilterCallback, vm::p throw __FUNCTION__; } -s32 sceFiosIOFilterGetInfo(s32 index, vm::psv::ptr pOutFilterCallback, vm::psv::ptr> pOutFilterContext) +s32 sceFiosIOFilterGetInfo(s32 index, vm::psv::ptr pOutFilterCallback, vm::psv::pptr pOutFilterContext) { throw __FUNCTION__; } diff --git a/rpcs3/Emu/ARMv7/Modules/sceGxm.cpp b/rpcs3/Emu/ARMv7/Modules/sceGxm.cpp index f65f49b349..2ef54331e5 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceGxm.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceGxm.cpp @@ -64,7 +64,7 @@ s32 sceGxmDisplayQueueFinish() throw __FUNCTION__; } -s32 sceGxmSyncObjectCreate(vm::psv::ptr> syncObject) +s32 sceGxmSyncObjectCreate(vm::psv::pptr syncObject) { throw __FUNCTION__; } @@ -75,7 +75,7 @@ s32 sceGxmSyncObjectDestroy(vm::psv::ptr syncObject) } -s32 sceGxmCreateContext(vm::psv::ptr params, vm::psv::ptr> context) +s32 sceGxmCreateContext(vm::psv::ptr params, vm::psv::pptr context) { throw __FUNCTION__; } @@ -101,12 +101,12 @@ void sceGxmSetFragmentProgram(vm::psv::ptr context, vm::psv::ptr< throw __FUNCTION__; } -s32 sceGxmReserveVertexDefaultUniformBuffer(vm::psv::ptr context, vm::psv::ptr> uniformBuffer) +s32 sceGxmReserveVertexDefaultUniformBuffer(vm::psv::ptr context, vm::psv::pptr uniformBuffer) { throw __FUNCTION__; } -s32 sceGxmReserveFragmentDefaultUniformBuffer(vm::psv::ptr context, vm::psv::ptr> uniformBuffer) +s32 sceGxmReserveFragmentDefaultUniformBuffer(vm::psv::ptr context, vm::psv::pptr uniformBuffer) { throw __FUNCTION__; } @@ -650,7 +650,7 @@ vm::psv::ptr sceGxmVertexProgramGetProgram(vm::psv::ptr params, vm::psv::ptr> shaderPatcher) +s32 sceGxmShaderPatcherCreate(vm::psv::ptr params, vm::psv::pptr shaderPatcher) { throw __FUNCTION__; } @@ -690,12 +690,12 @@ s32 sceGxmShaderPatcherSetAuxiliarySurface(vm::psv::ptr sha throw __FUNCTION__; } -s32 sceGxmShaderPatcherCreateVertexProgram(vm::psv::ptr shaderPatcher, SceGxmShaderPatcherId programId, vm::psv::ptr attributes, u32 attributeCount, vm::psv::ptr streams, u32 streamCount, vm::psv::ptr> vertexProgram) +s32 sceGxmShaderPatcherCreateVertexProgram(vm::psv::ptr shaderPatcher, SceGxmShaderPatcherId programId, vm::psv::ptr attributes, u32 attributeCount, vm::psv::ptr streams, u32 streamCount, vm::psv::pptr vertexProgram) { throw __FUNCTION__; } -s32 sceGxmShaderPatcherCreateFragmentProgram(vm::psv::ptr shaderPatcher, SceGxmShaderPatcherId programId, SceGxmOutputRegisterFormat outputFormat, SceGxmMultisampleMode multisampleMode, vm::psv::ptr blendInfo, vm::psv::ptr vertexProgram, vm::psv::ptr> fragmentProgram) +s32 sceGxmShaderPatcherCreateFragmentProgram(vm::psv::ptr shaderPatcher, SceGxmShaderPatcherId programId, SceGxmOutputRegisterFormat outputFormat, SceGxmMultisampleMode multisampleMode, vm::psv::ptr blendInfo, vm::psv::ptr vertexProgram, vm::psv::pptr fragmentProgram) { throw __FUNCTION__; } @@ -1041,12 +1041,12 @@ s32 sceGxmGetRenderTargetMemSizes(vm::psv::ptr p throw __FUNCTION__; } -s32 sceGxmCreateRenderTarget(vm::psv::ptr params, vm::psv::ptr> renderTarget) +s32 sceGxmCreateRenderTarget(vm::psv::ptr params, vm::psv::pptr renderTarget) { throw __FUNCTION__; } -s32 sceGxmRenderTargetGetHostMem(vm::psv::ptr renderTarget, vm::psv::ptr> hostMem) +s32 sceGxmRenderTargetGetHostMem(vm::psv::ptr renderTarget, vm::psv::pptr hostMem) { throw __FUNCTION__; } diff --git a/rpcs3/Emu/ARMv7/Modules/sceHttp.cpp b/rpcs3/Emu/ARMv7/Modules/sceHttp.cpp index c98509fac4..c261e0335d 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceHttp.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceHttp.cpp @@ -33,7 +33,7 @@ enum SceHttpAuthType : s32 SCE_HTTP_AUTH_RESERVED2 }; -typedef vm::psv::ptr realm, vm::psv::ptr username, vm::psv::ptr password, s32 needEntity, vm::psv::ptr> entityBody, vm::psv::ptr entitySize, vm::psv::ptr save, vm::psv::ptr userArg)> SceHttpAuthInfoCallback; +typedef vm::psv::ptr realm, vm::psv::ptr username, vm::psv::ptr password, s32 needEntity, vm::psv::pptr entityBody, vm::psv::ptr entitySize, vm::psv::ptr save, vm::psv::ptr userArg)> SceHttpAuthInfoCallback; typedef vm::psv::ptr method, vm::psv::ptr location, vm::psv::ptr userArg)> SceHttpRedirectCallback; @@ -71,7 +71,7 @@ struct SceHttpsData struct SceHttpsCaList { - vm::psv::ptr> caCerts; + vm::psv::lpptr caCerts; s32 caNum; }; @@ -167,7 +167,7 @@ s32 sceHttpGetStatusCode(s32 reqId, vm::psv::ptr statusCode) throw __FUNCTION__; } -s32 sceHttpGetAllResponseHeaders(s32 reqId, vm::psv::ptr> header, vm::psv::ptr headerSize) +s32 sceHttpGetAllResponseHeaders(s32 reqId, vm::psv::pptr header, vm::psv::ptr headerSize) { throw __FUNCTION__; } @@ -187,12 +187,12 @@ s32 sceHttpRemoveRequestHeader(s32 id, vm::psv::ptr name) throw __FUNCTION__; } -s32 sceHttpParseResponseHeader(vm::psv::ptr header, u32 headerLen, vm::psv::ptr fieldStr, vm::psv::ptr> fieldValue, vm::psv::ptr valueLen) +s32 sceHttpParseResponseHeader(vm::psv::ptr header, u32 headerLen, vm::psv::ptr fieldStr, vm::psv::pptr fieldValue, vm::psv::ptr valueLen) { throw __FUNCTION__; } -s32 sceHttpParseStatusLine(vm::psv::ptr statusLine, u32 lineLen, vm::psv::ptr httpMajorVer, vm::psv::ptr httpMinorVer, vm::psv::ptr responseCode, vm::psv::ptr> reasonPhrase, vm::psv::ptr phraseLen) +s32 sceHttpParseStatusLine(vm::psv::ptr statusLine, u32 lineLen, vm::psv::ptr httpMajorVer, vm::psv::ptr httpMinorVer, vm::psv::ptr responseCode, vm::psv::pptr reasonPhrase, vm::psv::ptr phraseLen) { throw __FUNCTION__; } @@ -312,7 +312,7 @@ s32 sceHttpSetCookieSendCallback(s32 id, SceHttpCookieSendCallback cbfunc, vm::p throw __FUNCTION__; } -s32 sceHttpsLoadCert(s32 caCertNum, vm::psv::ptr> caList, vm::psv::ptr cert, vm::psv::ptr privKey) +s32 sceHttpsLoadCert(s32 caCertNum, vm::psv::pptr caList, vm::psv::ptr cert, vm::psv::ptr privKey) { throw __FUNCTION__; } diff --git a/rpcs3/Emu/ARMv7/Modules/sceLibKernel.cpp b/rpcs3/Emu/ARMv7/Modules/sceLibKernel.cpp index 89a8c073ca..0d1c9baf29 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceLibKernel.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceLibKernel.cpp @@ -25,7 +25,7 @@ s32 sceKernelFreeMemBlock(s32 uid) throw __FUNCTION__; } -s32 sceKernelGetMemBlockBase(s32 uid, vm::psv::ptr> ppBase) +s32 sceKernelGetMemBlockBase(s32 uid, vm::psv::pptr ppBase) { throw __FUNCTION__; } diff --git a/rpcs3/Emu/ARMv7/Modules/scePerf.cpp b/rpcs3/Emu/ARMv7/Modules/scePerf.cpp index a9ff8e8308..38516caafe 100644 --- a/rpcs3/Emu/ARMv7/Modules/scePerf.cpp +++ b/rpcs3/Emu/ARMv7/Modules/scePerf.cpp @@ -245,7 +245,7 @@ u32 scePerfGetTimebaseFrequency() return 1; } -s32 _sceRazorCpuInit(vm::psv::ptr pBufferBase, u32 bufferSize, u32 numPerfCounters, vm::psv::ptr> psceRazorVars) +s32 _sceRazorCpuInit(vm::psv::ptr pBufferBase, u32 bufferSize, u32 numPerfCounters, vm::psv::pptr psceRazorVars) { throw __FUNCTION__; } diff --git a/rpcs3/Emu/ARMv7/Modules/sceSas.cpp b/rpcs3/Emu/ARMv7/Modules/sceSas.cpp index 3d11ff98f1..b0961f2776 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceSas.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceSas.cpp @@ -19,7 +19,7 @@ s32 sceSasInitWithGrain(vm::psv::ptr config, u32 grain, vm::psv::ptr throw __FUNCTION__; } -s32 sceSasExit(vm::psv::ptr> outBuffer, vm::psv::ptr outBufferSize) +s32 sceSasExit(vm::psv::pptr outBuffer, vm::psv::ptr outBufferSize) { throw __FUNCTION__; } diff --git a/rpcs3/Emu/ARMv7/Modules/sceSsl.cpp b/rpcs3/Emu/ARMv7/Modules/sceSsl.cpp index 02a377996a..bd32cda9dd 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceSsl.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceSsl.cpp @@ -19,7 +19,7 @@ s32 sceSslGetMemoryPoolStats(vm::psv::ptr currentStat) throw __FUNCTION__; } -s32 sceSslGetSerialNumber(vm::psv::ptr sslCert, vm::psv::ptr> sboData, vm::psv::ptr sboLen) +s32 sceSslGetSerialNumber(vm::psv::ptr sslCert, vm::psv::pptr sboData, vm::psv::ptr sboLen) { throw __FUNCTION__; } diff --git a/rpcs3/Emu/ARMv7/Modules/sceUlt.cpp b/rpcs3/Emu/ARMv7/Modules/sceUlt.cpp index 68216d7ddc..5777638f92 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceUlt.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceUlt.cpp @@ -536,7 +536,7 @@ s32 sceUltUlthreadTryJoin(vm::psv::ptr ulthread, vm::psv::ptr> ulthread) +s32 sceUltUlthreadGetSelf(vm::psv::pptr ulthread) { throw __FUNCTION__; } diff --git a/rpcs3/Emu/ARMv7/Modules/sceVideodec.cpp b/rpcs3/Emu/ARMv7/Modules/sceVideodec.cpp index bec390ebe1..7899777f97 100644 --- a/rpcs3/Emu/ARMv7/Modules/sceVideodec.cpp +++ b/rpcs3/Emu/ARMv7/Modules/sceVideodec.cpp @@ -126,7 +126,7 @@ struct SceAvcdecArrayPicture { u32 numOfOutput; u32 numOfElm; - vm::psv::ptr> pPicture; + vm::psv::lpptr pPicture; };