Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

hle: Fix cellAvconfExt wrongly registered functions #7556

Merged
merged 1 commit into from
Feb 22, 2020
Merged

hle: Fix cellAvconfExt wrongly registered functions #7556

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 0 additions & 14 deletions rpcs3/Emu/Cell/Modules/cellAudioOut.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()");
Expand All @@ -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);
Expand Down
30 changes: 29 additions & 1 deletion rpcs3/Emu/Cell/Modules/cellAvconfExt.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ error_code cellAudioInGetDeviceInfo(u32 deviceNumber, u32 deviceIndex, vm::ptr<C
error_code cellVideoOutConvertCursorColor(u32 videoOut, s32 displaybuffer_format, f32 gamma, s32 source_buffer_format, vm::ptr<void> src_addr, vm::ptr<u32> 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;
}

Expand Down Expand Up @@ -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);
Expand All @@ -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);
});
14 changes: 0 additions & 14 deletions rpcs3/Emu/Cell/Modules/cellVideoOut.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<u8> rgbOutputRange)
{
cellSysutil.todo("cellVideoOutGetConvertCursorColorInfo()");
Expand Down Expand Up @@ -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);
Expand Down