diff --git a/rpcs3/Emu/Cell/Modules/cellAudioOut.cpp b/rpcs3/Emu/Cell/Modules/cellAudioOut.cpp index fb80997fd7..f8176ad9e6 100644 --- a/rpcs3/Emu/Cell/Modules/cellAudioOut.cpp +++ b/rpcs3/Emu/Cell/Modules/cellAudioOut.cpp @@ -283,18 +283,6 @@ error_code cellAudioOutSetCopyControl(u32 audioOut, u32 control) return CELL_OK; } -error_code cellAudioOutConfigure2() -{ - cellSysutil.todo("cellAudioOutConfigure2()"); - return CELL_OK; -} - -error_code cellAudioOutGetConfiguration2() -{ - cellSysutil.todo("cellAudioOutGetConfiguration2()"); - return CELL_OK; -} - error_code cellAudioOutRegisterCallback() { cellSysutil.todo("cellAudioOutRegisterCallback()"); @@ -312,13 +300,11 @@ void cellSysutil_AudioOut_init() { REG_FUNC(cellSysutil, cellAudioOutGetState); REG_FUNC(cellSysutil, cellAudioOutConfigure); - REG_FUNC(cellSysutil, cellAudioOutConfigure2); REG_FUNC(cellSysutil, cellAudioOutGetSoundAvailability); REG_FUNC(cellSysutil, cellAudioOutGetSoundAvailability2); REG_FUNC(cellSysutil, cellAudioOutGetDeviceInfo); REG_FUNC(cellSysutil, cellAudioOutGetNumberOfDevice); REG_FUNC(cellSysutil, cellAudioOutGetConfiguration); - REG_FUNC(cellSysutil, cellAudioOutGetConfiguration2); REG_FUNC(cellSysutil, cellAudioOutSetCopyControl); REG_FUNC(cellSysutil, cellAudioOutRegisterCallback); REG_FUNC(cellSysutil, cellAudioOutUnregisterCallback); diff --git a/rpcs3/Emu/Cell/Modules/cellAvconfExt.cpp b/rpcs3/Emu/Cell/Modules/cellAvconfExt.cpp index 2ddb15d085..770ef55ab0 100644 --- a/rpcs3/Emu/Cell/Modules/cellAvconfExt.cpp +++ b/rpcs3/Emu/Cell/Modules/cellAvconfExt.cpp @@ -188,7 +188,7 @@ error_code cellAudioInGetDeviceInfo(u32 deviceNumber, u32 deviceIndex, vm::ptr src_addr, vm::ptr dest_addr, s32 num) { cellAvconfExt.todo("cellVideoOutConvertCursorColor(videoOut=%d, displaybuffer_format=0x%x, gamma=0x%x, source_buffer_format=0x%x, src_addr=*0x%x, dest_addr=*0x%x, num=0x%x)", videoOut, - displaybuffer_format, gamma, source_buffer_format, src_addr, dest_addr, num); + displaybuffer_format, gamma, source_buffer_format, src_addr, dest_addr, num); return CELL_OK; } @@ -318,6 +318,30 @@ error_code cellVideoOutSetCopyControl(u32 videoOut, u32 control) return CELL_OK; } +error_code cellVideoOutConfigure2() +{ + cellAvconfExt.todo("cellVideoOutConfigure2()"); + return CELL_OK; +} + +error_code cellAudioOutGetConfiguration2() +{ + cellAvconfExt.todo("cellAudioOutGetConfiguration2()"); + return CELL_OK; +} + +error_code cellAudioOutConfigure2() +{ + cellAvconfExt.todo("cellAudioOutConfigure2()"); + return CELL_OK; +} + +error_code cellVideoOutGetResolutionAvailability2() +{ + cellAvconfExt.todo("cellVideoOutGetResolutionAvailability2()"); + return CELL_OK; +} + DECLARE(ppu_module_manager::cellAvconfExt) ("cellSysutilAvconfExt", []() { REG_FUNC(cellSysutilAvconfExt, cellAudioOutUnregisterDevice); @@ -337,4 +361,8 @@ DECLARE(ppu_module_manager::cellAvconfExt) REG_FUNC(cellSysutilAvconfExt, cellAudioInUnregisterDevice); REG_FUNC(cellSysutilAvconfExt, cellVideoOutGetScreenSize); REG_FUNC(cellSysutilAvconfExt, cellVideoOutSetCopyControl); + REG_FUNC(cellSysutilAvconfExt, cellVideoOutConfigure2); + REG_FUNC(cellSysutilAvconfExt, cellAudioOutGetConfiguration2); + REG_FUNC(cellSysutilAvconfExt, cellAudioOutConfigure2); + REG_FUNC(cellSysutilAvconfExt, cellVideoOutGetResolutionAvailability2); }); diff --git a/rpcs3/Emu/Cell/Modules/cellVideoOut.cpp b/rpcs3/Emu/Cell/Modules/cellVideoOut.cpp index eb7b9fee89..6885f29ed7 100644 --- a/rpcs3/Emu/Cell/Modules/cellVideoOut.cpp +++ b/rpcs3/Emu/Cell/Modules/cellVideoOut.cpp @@ -289,18 +289,6 @@ error_code cellVideoOutGetResolutionAvailability(u32 videoOut, u32 resolutionId, return CELL_VIDEO_OUT_ERROR_UNSUPPORTED_VIDEO_OUT; } -error_code cellVideoOutConfigure2() -{ - cellSysutil.todo("cellVideoOutConfigure2()"); - return CELL_OK; -} - -error_code cellVideoOutGetResolutionAvailability2() -{ - cellSysutil.todo("cellVideoOutGetResolutionAvailability2()"); - return CELL_OK; -} - error_code cellVideoOutGetConvertCursorColorInfo(vm::ptr rgbOutputRange) { cellSysutil.todo("cellVideoOutGetConvertCursorColorInfo()"); @@ -331,12 +319,10 @@ void cellSysutil_VideoOut_init() REG_FUNC(cellSysutil, cellVideoOutGetState); REG_FUNC(cellSysutil, cellVideoOutGetResolution).flag(MFF_PERFECT); REG_FUNC(cellSysutil, cellVideoOutConfigure); - REG_FUNC(cellSysutil, cellVideoOutConfigure2); REG_FUNC(cellSysutil, cellVideoOutGetConfiguration); REG_FUNC(cellSysutil, cellVideoOutGetDeviceInfo); REG_FUNC(cellSysutil, cellVideoOutGetNumberOfDevice); REG_FUNC(cellSysutil, cellVideoOutGetResolutionAvailability); - REG_FUNC(cellSysutil, cellVideoOutGetResolutionAvailability2); REG_FUNC(cellSysutil, cellVideoOutGetConvertCursorColorInfo); REG_FUNC(cellSysutil, cellVideoOutDebugSetMonitorType); REG_FUNC(cellSysutil, cellVideoOutRegisterCallback);