From 7470388e5a66c605e2dbd1658755e31c970ad94f Mon Sep 17 00:00:00 2001 From: eladash Date: Fri, 8 Mar 2019 10:08:30 +0200 Subject: [PATCH] Use error_code in sys_rsx --- rpcs3/Emu/Cell/lv2/sys_rsx.cpp | 24 ++++++++++++------------ rpcs3/Emu/Cell/lv2/sys_rsx.h | 24 ++++++++++++------------ 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/rpcs3/Emu/Cell/lv2/sys_rsx.cpp b/rpcs3/Emu/Cell/lv2/sys_rsx.cpp index bc0f669424..4d179b74e3 100644 --- a/rpcs3/Emu/Cell/lv2/sys_rsx.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_rsx.cpp @@ -18,14 +18,14 @@ u64 rsxTimeStamp() return get_timebased_time(); } -s32 sys_rsx_device_open() +error_code sys_rsx_device_open() { sys_rsx.todo("sys_rsx_device_open()"); return CELL_OK; } -s32 sys_rsx_device_close() +error_code sys_rsx_device_close() { sys_rsx.todo("sys_rsx_device_close()"); @@ -42,7 +42,7 @@ s32 sys_rsx_device_close() * @param a6 (IN): E.g. Immediate value passed in cellGcmSys is 16. * @param a7 (IN): E.g. Immediate value passed in cellGcmSys is 8. */ -s32 sys_rsx_memory_allocate(vm::ptr mem_handle, vm::ptr mem_addr, u32 size, u64 flags, u64 a5, u64 a6, u64 a7) +error_code sys_rsx_memory_allocate(vm::ptr mem_handle, vm::ptr mem_addr, u32 size, u64 flags, u64 a5, u64 a6, u64 a7) { sys_rsx.warning("sys_rsx_memory_allocate(mem_handle=*0x%x, mem_addr=*0x%x, size=0x%x, flags=0x%llx, a5=0x%llx, a6=0x%llx, a7=0x%llx)", mem_handle, mem_addr, size, flags, a5, a6, a7); @@ -56,7 +56,7 @@ s32 sys_rsx_memory_allocate(vm::ptr mem_handle, vm::ptr mem_addr, u32 * lv2 SysCall 669 (0x29D): sys_rsx_memory_free * @param mem_handle (OUT): Context / ID, for allocated local memory generated by sys_rsx_memory_allocate */ -s32 sys_rsx_memory_free(u32 mem_handle) +error_code sys_rsx_memory_free(u32 mem_handle) { sys_rsx.todo("sys_rsx_memory_free(mem_handle=0x%x)", mem_handle); @@ -72,7 +72,7 @@ s32 sys_rsx_memory_free(u32 mem_handle) * @param mem_ctx (IN): mem_ctx given by sys_rsx_memory_allocate * @param system_mode (IN): */ -s32 sys_rsx_context_allocate(vm::ptr context_id, vm::ptr lpar_dma_control, vm::ptr lpar_driver_info, vm::ptr lpar_reports, u64 mem_ctx, u64 system_mode) +error_code sys_rsx_context_allocate(vm::ptr context_id, vm::ptr lpar_dma_control, vm::ptr lpar_driver_info, vm::ptr lpar_reports, u64 mem_ctx, u64 system_mode) { sys_rsx.warning("sys_rsx_context_allocate(context_id=*0x%x, lpar_dma_control=*0x%x, lpar_driver_info=*0x%x, lpar_reports=*0x%x, mem_ctx=0x%llx, system_mode=0x%llx)", context_id, lpar_dma_control, lpar_driver_info, lpar_reports, mem_ctx, system_mode); @@ -157,7 +157,7 @@ s32 sys_rsx_context_allocate(vm::ptr context_id, vm::ptr lpar_dma_cont * lv2 SysCall 671 (0x29F): sys_rsx_context_free * @param context_id (IN): RSX context generated by sys_rsx_context_allocate to free the context. */ -s32 sys_rsx_context_free(u32 context_id) +error_code sys_rsx_context_free(u32 context_id) { sys_rsx.todo("sys_rsx_context_free(context_id=0x%x)", context_id); @@ -172,7 +172,7 @@ s32 sys_rsx_context_free(u32 context_id) * @param size (IN): Size of mapping area in bytes. E.g. 0x00200000 * @param flags (IN): */ -s32 sys_rsx_context_iomap(u32 context_id, u32 io, u32 ea, u32 size, u64 flags) +error_code sys_rsx_context_iomap(u32 context_id, u32 io, u32 ea, u32 size, u64 flags) { sys_rsx.warning("sys_rsx_context_iomap(context_id=0x%x, io=0x%x, ea=0x%x, size=0x%x, flags=0x%llx)", context_id, io, ea, size, flags); @@ -209,7 +209,7 @@ s32 sys_rsx_context_iomap(u32 context_id, u32 io, u32 ea, u32 size, u64 flags) * @param io (IN): IO address. E.g. 0x00600000 (Start page 6) * @param size (IN): Size to unmap in byte. E.g. 0x00200000 */ -s32 sys_rsx_context_iounmap(u32 context_id, u32 io, u32 size) +error_code sys_rsx_context_iounmap(u32 context_id, u32 io, u32 size) { sys_rsx.warning("sys_rsx_context_iounmap(context_id=0x%x, io=0x%x, size=0x%x)", context_id, io, size); @@ -237,7 +237,7 @@ s32 sys_rsx_context_iounmap(u32 context_id, u32 io, u32 size) * @param a5 (IN): * @param a6 (IN): */ -s32 sys_rsx_context_attribute(s32 context_id, u32 package_id, u64 a3, u64 a4, u64 a5, u64 a6) +error_code sys_rsx_context_attribute(s32 context_id, u32 package_id, u64 a3, u64 a4, u64 a5, u64 a6) { // Flip/queue/reset flip/flip event/user command/vblank as trace to help with log spam if (package_id == 0x102 || package_id == 0x103 || package_id == 0x10a || package_id == 0xFEC || package_id == 0xFED || package_id == 0xFEF) @@ -489,7 +489,7 @@ s32 sys_rsx_context_attribute(s32 context_id, u32 package_id, u64 a3, u64 a4, u6 * @param a2 (OUT): Unused? * @param dev_id (IN): An immediate value and always 8. (cellGcmInitPerfMon uses 11, 10, 9, 7, 12 successively). */ -s32 sys_rsx_device_map(vm::ptr dev_addr, vm::ptr a2, u32 dev_id) +error_code sys_rsx_device_map(vm::ptr dev_addr, vm::ptr a2, u32 dev_id) { sys_rsx.warning("sys_rsx_device_map(dev_addr=*0x%x, a2=*0x%x, dev_id=0x%x)", dev_addr, a2, dev_id); @@ -522,7 +522,7 @@ s32 sys_rsx_device_map(vm::ptr dev_addr, vm::ptr a2, u32 dev_id) * lv2 SysCall 676 (0x2A4): sys_rsx_device_unmap * @param dev_id (IN): An immediate value and always 8. */ -s32 sys_rsx_device_unmap(u32 dev_id) +error_code sys_rsx_device_unmap(u32 dev_id) { sys_rsx.todo("sys_rsx_device_unmap(dev_id=0x%x)", dev_id); @@ -532,7 +532,7 @@ s32 sys_rsx_device_unmap(u32 dev_id) /* * lv2 SysCall 677 (0x2A5): sys_rsx_attribute */ -s32 sys_rsx_attribute(u32 packageId, u32 a2, u32 a3, u32 a4, u32 a5) +error_code sys_rsx_attribute(u32 packageId, u32 a2, u32 a3, u32 a4, u32 a5) { sys_rsx.warning("sys_rsx_attribute(packageId=0x%x, a2=0x%x, a3=0x%x, a4=0x%x, a5=0x%x)", packageId, a2, a3, a4, a5); diff --git a/rpcs3/Emu/Cell/lv2/sys_rsx.h b/rpcs3/Emu/Cell/lv2/sys_rsx.h index f8eedd5d7c..c60a474280 100644 --- a/rpcs3/Emu/Cell/lv2/sys_rsx.h +++ b/rpcs3/Emu/Cell/lv2/sys_rsx.h @@ -107,15 +107,15 @@ struct SysRsxConfig }; // SysCalls -s32 sys_rsx_device_open(); -s32 sys_rsx_device_close(); -s32 sys_rsx_memory_allocate(vm::ptr mem_handle, vm::ptr mem_addr, u32 size, u64 flags, u64 a5, u64 a6, u64 a7); -s32 sys_rsx_memory_free(u32 mem_handle); -s32 sys_rsx_context_allocate(vm::ptr context_id, vm::ptr lpar_dma_control, vm::ptr lpar_driver_info, vm::ptr lpar_reports, u64 mem_ctx, u64 system_mode); -s32 sys_rsx_context_free(u32 context_id); -s32 sys_rsx_context_iomap(u32 context_id, u32 io, u32 ea, u32 size, u64 flags); -s32 sys_rsx_context_iounmap(u32 context_id, u32 io, u32 size); -s32 sys_rsx_context_attribute(s32 context_id, u32 package_id, u64 a3, u64 a4, u64 a5, u64 a6); -s32 sys_rsx_device_map(vm::ptr dev_addr, vm::ptr a2, u32 dev_id); -s32 sys_rsx_device_unmap(u32 dev_id); -s32 sys_rsx_attribute(u32 a1, u32 a2, u32 a3, u32 a4, u32 a5); +error_code sys_rsx_device_open(); +error_code sys_rsx_device_close(); +error_code sys_rsx_memory_allocate(vm::ptr mem_handle, vm::ptr mem_addr, u32 size, u64 flags, u64 a5, u64 a6, u64 a7); +error_code sys_rsx_memory_free(u32 mem_handle); +error_code sys_rsx_context_allocate(vm::ptr context_id, vm::ptr lpar_dma_control, vm::ptr lpar_driver_info, vm::ptr lpar_reports, u64 mem_ctx, u64 system_mode); +error_code sys_rsx_context_free(u32 context_id); +error_code sys_rsx_context_iomap(u32 context_id, u32 io, u32 ea, u32 size, u64 flags); +error_code sys_rsx_context_iounmap(u32 context_id, u32 io, u32 size); +error_code sys_rsx_context_attribute(s32 context_id, u32 package_id, u64 a3, u64 a4, u64 a5, u64 a6); +error_code sys_rsx_device_map(vm::ptr dev_addr, vm::ptr a2, u32 dev_id); +error_code sys_rsx_device_unmap(u32 dev_id); +error_code sys_rsx_attribute(u32 a1, u32 a2, u32 a3, u32 a4, u32 a5);