hle: Fix cellSysutilAvcExt module

And add cellSysutilAvcExtSetChatMode and cellSysutilAvcExtSetChatGroup
functions
This commit is contained in:
scribam 2019-03-24 20:59:18 +01:00 committed by Ivan
parent 1916cc1691
commit f15eb88f59
9 changed files with 226 additions and 147 deletions

View File

@ -1,5 +1,4 @@
#include "stdafx.h"
#include "Emu/System.h"
#include "Emu/Cell/PPUModule.h"
LOG_CHANNEL(cellDtcpIpUtility);

View File

@ -1,5 +1,4 @@
#include "stdafx.h"
#include "Emu/System.h"
#include "Emu/Cell/PPUModule.h"
LOG_CHANNEL(cellNetAoi);

View File

@ -1,5 +1,4 @@
#include "stdafx.h"
#include "Emu/System.h"
#include "Emu/Cell/PPUModule.h"
LOG_CHANNEL(cellPesmUtility);

View File

@ -1,8 +1,6 @@
#include "stdafx.h"
#include "Emu/Cell/PPUModule.h"
LOG_CHANNEL(cellSysutilAvc);
s32 cellSysutilAvcByeRequest()
{
fmt::throw_exception("Unimplemented" HERE);
@ -103,118 +101,6 @@ s32 cellSysutilAvcUnloadAsync()
fmt::throw_exception("Unimplemented" HERE);
}
s32 cellSysutilAvcExtInitOptionParam()
{
fmt::throw_exception("Unimplemented" HERE);
}
s32 cellSysutilAvcExtSetHideNamePlate()
{
fmt::throw_exception("Unimplemented" HERE);
}
s32 cellSysutilAvcExtSetShowNamePlate()
{
fmt::throw_exception("Unimplemented" HERE);
}
s32 cellSysutilAvcExtHideWindow()
{
fmt::throw_exception("Unimplemented" HERE);
}
s32 cellSysutilAvcExtShowWindow()
{
fmt::throw_exception("Unimplemented" HERE);
}
s32 cellSysutilAvcExtGetWindowAlpha()
{
fmt::throw_exception("Unimplemented" HERE);
}
s32 cellSysutilAvcExtGetWindowSize()
{
fmt::throw_exception("Unimplemented" HERE);
}
s32 cellSysutilAvcExtGetWindowRotation()
{
fmt::throw_exception("Unimplemented" HERE);
}
s32 cellSysutilAvcExtGetWindowPosition()
{
fmt::throw_exception("Unimplemented" HERE);
}
s32 cellSysutilAvcExtSetWindowAlpha()
{
fmt::throw_exception("Unimplemented" HERE);
}
s32 cellSysutilAvcExtSetWindowSize()
{
fmt::throw_exception("Unimplemented" HERE);
}
s32 cellSysutilAvcExtSetWindowRotation()
{
fmt::throw_exception("Unimplemented" HERE);
}
s32 cellSysutilAvcExtSetWindowPosition()
{
fmt::throw_exception("Unimplemented" HERE);
}
s32 cellSysutilAvcExtLoadAsyncEx()
{
fmt::throw_exception("Unimplemented" HERE);
}
s32 cellSysutilAvcExtHidePanelEx()
{
fmt::throw_exception("Unimplemented" HERE);
}
s32 cellSysutilAvcExtShowPanelEx()
{
fmt::throw_exception("Unimplemented" HERE);
}
s32 cellSysutilAvcExtGetNamePlateShowStatus()
{
fmt::throw_exception("Unimplemented" HERE);
}
s32 cellSysutilAvcExtStopVoiceDetection()
{
fmt::throw_exception("Unimplemented" HERE);
}
s32 cellSysutilAvcExtStartVoiceDetection()
{
fmt::throw_exception("Unimplemented" HERE);
}
s32 cellSysutilAvcExtGetSurfacePointer()
{
fmt::throw_exception("Unimplemented" HERE);
}
s32 cellSysutilAvcExtSetWindowZorder()
{
fmt::throw_exception("Unimplemented" HERE);
}
s32 cellSysutilAvcExtGetWindowShowStatus()
{
fmt::throw_exception("Unimplemented" HERE);
}
void cellSysutil_SysutilAvc_init()
{
REG_FUNC(cellSysutil, cellSysutilAvcByeRequest);
@ -238,29 +124,3 @@ void cellSysutil_SysutilAvc_init()
REG_FUNC(cellSysutil, cellSysutilAvcShowPanel);
REG_FUNC(cellSysutil, cellSysutilAvcUnloadAsync);
}
DECLARE(ppu_module_manager::cellSysutilAvc)("cellSysutilAvc", []()
{
REG_FUNC(cellSysutilAvc, cellSysutilAvcExtInitOptionParam);
REG_FUNC(cellSysutilAvc, cellSysutilAvcExtSetHideNamePlate);
REG_FUNC(cellSysutilAvc, cellSysutilAvcExtSetShowNamePlate);
REG_FUNC(cellSysutilAvc, cellSysutilAvcExtHideWindow);
REG_FUNC(cellSysutilAvc, cellSysutilAvcExtShowWindow);
REG_FUNC(cellSysutilAvc, cellSysutilAvcExtGetWindowAlpha);
REG_FUNC(cellSysutilAvc, cellSysutilAvcExtGetWindowSize);
REG_FUNC(cellSysutilAvc, cellSysutilAvcExtGetWindowRotation);
REG_FUNC(cellSysutilAvc, cellSysutilAvcExtGetWindowPosition);
REG_FUNC(cellSysutilAvc, cellSysutilAvcExtSetWindowAlpha);
REG_FUNC(cellSysutilAvc, cellSysutilAvcExtSetWindowSize);
REG_FUNC(cellSysutilAvc, cellSysutilAvcExtSetWindowRotation);
REG_FUNC(cellSysutilAvc, cellSysutilAvcExtSetWindowPosition);
REG_FUNC(cellSysutilAvc, cellSysutilAvcExtLoadAsyncEx);
REG_FUNC(cellSysutilAvc, cellSysutilAvcExtHidePanelEx);
REG_FUNC(cellSysutilAvc, cellSysutilAvcExtShowPanelEx);
REG_FUNC(cellSysutilAvc, cellSysutilAvcExtGetNamePlateShowStatus);
REG_FUNC(cellSysutilAvc, cellSysutilAvcExtStopVoiceDetection);
REG_FUNC(cellSysutilAvc, cellSysutilAvcExtStartVoiceDetection);
REG_FUNC(cellSysutilAvc, cellSysutilAvcExtGetSurfacePointer);
REG_FUNC(cellSysutilAvc, cellSysutilAvcExtSetWindowZorder);
REG_FUNC(cellSysutilAvc, cellSysutilAvcExtGetWindowShowStatus);
});

View File

@ -0,0 +1,218 @@
#include "stdafx.h"
#include "Emu/Cell/PPUModule.h"
LOG_CHANNEL(cellSysutilAvcExt);
s32 cellSysutilAvcExtIsMicAttached()
{
UNIMPLEMENTED_FUNC(cellSysutilAvcExt);
return CELL_OK;
}
s32 cellSysutilAvcExtStopCameraDetection()
{
UNIMPLEMENTED_FUNC(cellSysutilAvcExt);
return CELL_OK;
}
s32 cellSysutilAvcExtSetWindowRotation()
{
UNIMPLEMENTED_FUNC(cellSysutilAvcExt);
return CELL_OK;
}
s32 cellSysutilAvcExtGetWindowPosition()
{
UNIMPLEMENTED_FUNC(cellSysutilAvcExt);
return CELL_OK;
}
s32 cellSysutilAvcExtSetHideNamePlate()
{
UNIMPLEMENTED_FUNC(cellSysutilAvcExt);
return CELL_OK;
}
s32 cellSysutilAvcExtSetWindowPosition()
{
UNIMPLEMENTED_FUNC(cellSysutilAvcExt);
return CELL_OK;
}
s32 cellSysutilAvcExtGetWindowSize()
{
UNIMPLEMENTED_FUNC(cellSysutilAvcExt);
return CELL_OK;
}
s32 cellSysutilAvcExtStartCameraDetection()
{
UNIMPLEMENTED_FUNC(cellSysutilAvcExt);
return CELL_OK;
}
s32 cellSysutilAvcExtGetWindowShowStatus()
{
UNIMPLEMENTED_FUNC(cellSysutilAvcExt);
return CELL_OK;
}
s32 cellSysutilAvcExtSetChatMode()
{
UNIMPLEMENTED_FUNC(cellSysutilAvcExt);
return CELL_OK;
}
s32 cellSysutilAvcExtGetNamePlateShowStatus()
{
UNIMPLEMENTED_FUNC(cellSysutilAvcExt);
return CELL_OK;
}
s32 cellSysutilAvcExtSetWindowAlpha()
{
UNIMPLEMENTED_FUNC(cellSysutilAvcExt);
return CELL_OK;
}
s32 cellSysutilAvcExtSetWindowSize()
{
UNIMPLEMENTED_FUNC(cellSysutilAvcExt);
return CELL_OK;
}
s32 cellSysutilAvcExtShowPanelEx()
{
UNIMPLEMENTED_FUNC(cellSysutilAvcExt);
return CELL_OK;
}
s32 cellSysutilAvcExtLoadAsyncEx()
{
UNIMPLEMENTED_FUNC(cellSysutilAvcExt);
return CELL_OK;
}
s32 cellSysutilAvcExtSetShowNamePlate()
{
UNIMPLEMENTED_FUNC(cellSysutilAvcExt);
return CELL_OK;
}
s32 cellSysutilAvcExtStopVoiceDetection()
{
UNIMPLEMENTED_FUNC(cellSysutilAvcExt);
return CELL_OK;
}
s32 cellSysutilAvcExtShowWindow()
{
UNIMPLEMENTED_FUNC(cellSysutilAvcExt);
return CELL_OK;
}
s32 cellSysutilAvcExtIsCameraAttached()
{
UNIMPLEMENTED_FUNC(cellSysutilAvcExt);
return CELL_OK;
}
s32 cellSysutilAvcExtHidePanelEx()
{
UNIMPLEMENTED_FUNC(cellSysutilAvcExt);
return CELL_OK;
}
s32 cellSysutilAvcExtHideWindow()
{
UNIMPLEMENTED_FUNC(cellSysutilAvcExt);
return CELL_OK;
}
s32 cellSysutilAvcExtSetChatGroup()
{
UNIMPLEMENTED_FUNC(cellSysutilAvcExt);
return CELL_OK;
}
s32 cellSysutilAvcExtGetWindowRotation()
{
UNIMPLEMENTED_FUNC(cellSysutilAvcExt);
return CELL_OK;
}
s32 cellSysutilAvcExtStartMicDetection()
{
UNIMPLEMENTED_FUNC(cellSysutilAvcExt);
return CELL_OK;
}
s32 cellSysutilAvcExtGetWindowAlpha()
{
UNIMPLEMENTED_FUNC(cellSysutilAvcExt);
return CELL_OK;
}
s32 cellSysutilAvcExtStartVoiceDetection()
{
UNIMPLEMENTED_FUNC(cellSysutilAvcExt);
return CELL_OK;
}
s32 cellSysutilAvcExtGetSurfacePointer()
{
UNIMPLEMENTED_FUNC(cellSysutilAvcExt);
return CELL_OK;
}
s32 cellSysutilAvcExtStopMicDetection()
{
UNIMPLEMENTED_FUNC(cellSysutilAvcExt);
return CELL_OK;
}
s32 cellSysutilAvcExtInitOptionParam()
{
UNIMPLEMENTED_FUNC(cellSysutilAvcExt);
return CELL_OK;
}
s32 cellSysutilAvcExtSetWindowZorder()
{
UNIMPLEMENTED_FUNC(cellSysutilAvcExt);
return CELL_OK;
}
DECLARE(ppu_module_manager::cellSysutilAvcExt)("cellSysutilAvcExt", []()
{
REG_FUNC(cellSysutilAvcExt, cellSysutilAvcExtIsMicAttached);
REG_FUNC(cellSysutilAvcExt, cellSysutilAvcExtStopCameraDetection);
REG_FUNC(cellSysutilAvcExt, cellSysutilAvcExtSetWindowRotation);
REG_FUNC(cellSysutilAvcExt, cellSysutilAvcExtGetWindowPosition);
REG_FUNC(cellSysutilAvcExt, cellSysutilAvcExtSetHideNamePlate);
REG_FUNC(cellSysutilAvcExt, cellSysutilAvcExtSetWindowPosition);
REG_FUNC(cellSysutilAvcExt, cellSysutilAvcExtGetWindowSize);
REG_FUNC(cellSysutilAvcExt, cellSysutilAvcExtStartCameraDetection);
REG_FUNC(cellSysutilAvcExt, cellSysutilAvcExtGetWindowShowStatus);
REG_FUNC(cellSysutilAvcExt, cellSysutilAvcExtSetChatMode);
REG_FUNC(cellSysutilAvcExt, cellSysutilAvcExtGetNamePlateShowStatus);
REG_FUNC(cellSysutilAvcExt, cellSysutilAvcExtSetWindowAlpha);
REG_FUNC(cellSysutilAvcExt, cellSysutilAvcExtSetWindowSize);
REG_FUNC(cellSysutilAvcExt, cellSysutilAvcExtShowPanelEx);
REG_FUNC(cellSysutilAvcExt, cellSysutilAvcExtLoadAsyncEx);
REG_FUNC(cellSysutilAvcExt, cellSysutilAvcExtSetShowNamePlate);
REG_FUNC(cellSysutilAvcExt, cellSysutilAvcExtStopVoiceDetection);
REG_FUNC(cellSysutilAvcExt, cellSysutilAvcExtShowWindow);
REG_FUNC(cellSysutilAvcExt, cellSysutilAvcExtIsCameraAttached);
REG_FUNC(cellSysutilAvcExt, cellSysutilAvcExtHidePanelEx);
REG_FUNC(cellSysutilAvcExt, cellSysutilAvcExtHideWindow);
REG_FUNC(cellSysutilAvcExt, cellSysutilAvcExtSetChatGroup);
REG_FUNC(cellSysutilAvcExt, cellSysutilAvcExtGetWindowRotation);
REG_FUNC(cellSysutilAvcExt, cellSysutilAvcExtStartMicDetection);
REG_FUNC(cellSysutilAvcExt, cellSysutilAvcExtGetWindowAlpha);
REG_FUNC(cellSysutilAvcExt, cellSysutilAvcExtStartVoiceDetection);
REG_FUNC(cellSysutilAvcExt, cellSysutilAvcExtGetSurfacePointer);
REG_FUNC(cellSysutilAvcExt, cellSysutilAvcExtStopMicDetection);
REG_FUNC(cellSysutilAvcExt, cellSysutilAvcExtInitOptionParam);
REG_FUNC(cellSysutilAvcExt, cellSysutilAvcExtSetWindowZorder);
});

View File

@ -170,7 +170,7 @@ static void ppu_initialize_modules(const std::shared_ptr<ppu_linkage_info>& link
&ppu_module_manager::cellCrossController,
&ppu_module_manager::cellDaisy,
&ppu_module_manager::cellDmux,
&ppu_module_manager::cellDtcpIpUtility,
&ppu_module_manager::cellDtcpIpUtility,
&ppu_module_manager::cellFiber,
&ppu_module_manager::cellFont,
&ppu_module_manager::cellFontFT,
@ -230,8 +230,8 @@ static void ppu_initialize_modules(const std::shared_ptr<ppu_linkage_info>& link
&ppu_module_manager::cellSysmodule,
&ppu_module_manager::cellSysutil,
&ppu_module_manager::cellSysutilAp,
&ppu_module_manager::cellSysutilAvc,
&ppu_module_manager::cellSysutilAvc2,
&ppu_module_manager::cellSysutilAvcExt,
&ppu_module_manager::cellSysutilNpEula,
&ppu_module_manager::cellSysutilMisc,
&ppu_module_manager::cellUsbd,
@ -239,7 +239,7 @@ static void ppu_initialize_modules(const std::shared_ptr<ppu_linkage_info>& link
&ppu_module_manager::cellUserInfo,
&ppu_module_manager::cellVdec,
&ppu_module_manager::cellVideoExport,
&ppu_module_manager::cellVideoPlayerUtility,
&ppu_module_manager::cellVideoPlayerUtility,
&ppu_module_manager::cellVideoUpload,
&ppu_module_manager::cellVoice,
&ppu_module_manager::cellVpost,

View File

@ -237,8 +237,8 @@ public:
static const ppu_static_module cellSysmodule;
static const ppu_static_module cellSysutil;
static const ppu_static_module cellSysutilAp;
static const ppu_static_module cellSysutilAvc;
static const ppu_static_module cellSysutilAvc2;
static const ppu_static_module cellSysutilAvcExt;
static const ppu_static_module cellSysutilNpEula;
static const ppu_static_module cellSysutilMisc;
static const ppu_static_module cellUsbd;

View File

@ -231,6 +231,7 @@
<ClCompile Include="Emu\Cell\Modules\cellSysutilAp.cpp" />
<ClCompile Include="Emu\Cell\Modules\cellSysutilAvc.cpp" />
<ClCompile Include="Emu\Cell\Modules\cellSysutilAvc2.cpp" />
<ClCompile Include="Emu\Cell\Modules\cellSysutilAvcExt.cpp" />
<ClCompile Include="Emu\Cell\Modules\cellSysutilMisc.cpp" />
<ClCompile Include="Emu\Cell\Modules\cellSysutilNpEula.cpp" />
<ClCompile Include="Emu\Cell\Modules\cellUsbd.cpp" />

View File

@ -533,6 +533,9 @@
<ClCompile Include="Emu\Cell\Modules\cellSysutilAvc2.cpp">
<Filter>Emu\Cell\Modules</Filter>
</ClCompile>
<ClCompile Include="Emu\Cell\Modules\cellSysutilAvcExt.cpp">
<Filter>Emu\Cell\Modules</Filter>
</ClCompile>
<ClCompile Include="Emu\Cell\Modules\cellSysutilMisc.cpp">
<Filter>Emu\Cell\Modules</Filter>
</ClCompile>