mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-01-25 06:35:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

CELL_OK cleanup

Browse Source
This commit is contained in:
Nekotekina 2017-05-15 14:58:32 +03:00
parent 45908b9dd8
commit 7ac64a6725
16 changed files with 66 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rpcs3/Emu/Cell/Modules/cellBgdl.cpp
View File

@ -4,6 +4,8 @@
#include "cellBgdl.h"
namespace vm { using namespace ps3; }
logs::channel cellBGDL("cellBGDL");
s32 cellBGDLGetInfo(vm::cptr<char> content_id, vm::ptr<CellBGDLInfo> info, s32 num)
@ -21,13 +23,13 @@ s32 cellBGDLGetInfo2(vm::cptr<char> service_id, vm::ptr<CellBGDLInfo> info, s32
s32 cellBGDLSetMode(CellBGDLMode mode)
{
cellBGDL.todo("cellBGDLSetMode(mode=%d)", (s32) mode);
return CELL_BGDL_UTIL_RET_OK;
return CELL_OK;
}
s32 cellBGDLGetMode(vm::ptr<CellBGDLMode> mode)
{
cellBGDL.todo("cellBGDLGetMode(mode=*0x%x)", mode);
return CELL_BGDL_UTIL_RET_OK;
return CELL_OK;
}
DECLARE(ppu_module_manager::cellBGDL)("cellBGDLUtility", []()

5
rpcs3/Emu/Cell/Modules/cellBgdl.h
View File

@ -1,11 +1,8 @@
#pragma once
namespace vm { using namespace ps3; }
// Return Codes
enum
{
CELL_BGDL_UTIL_RET_OK = 0x00000000,
CELL_BGDL_UTIL_ERROR_BUSY = 0x8002ce01,
CELL_BGDL_UTIL_ERROR_INTERNAL = 0x8002ce02,
CELL_BGDL_UTIL_ERROR_PARAM = 0x8002ce03,
@ -33,5 +30,5 @@ struct CellBGDLInfo
be_t<u64> received_size;
be_t<u64> content_size;
be_t<s32> state; // CellBGDLState
vm::bptr<void> reserved;
vm::ps3::bptr<void> reserved;
};

2
rpcs3/Emu/Cell/Modules/cellMusic.cpp
View File

@ -6,6 +6,8 @@
#include "cellMusic.h"
#include "cellSysutil.h"
namespace vm { using namespace ps3; }
logs::channel cellMusic("cellMusic");
struct music2_t

11
rpcs3/Emu/Cell/Modules/cellMusic.h
View File

@ -1,12 +1,8 @@
#pragma once
namespace vm { using namespace ps3; }
// Error Codes
enum
{
CELL_MUSIC_OK = 0,
CELL_MUSIC_CANCELED = 1,
CELL_MUSIC_PLAYBACK_FINISHED = 0x8002c101,
CELL_MUSIC_ERROR_PARAM = 0x8002c102,
CELL_MUSIC_ERROR_BUSY = 0x8002c103,
@ -18,8 +14,7 @@ enum
CELL_MUSIC_DIALOG_OPEN = 0x8002c109,
CELL_MUSIC_DIALOG_CLOSE = 0x8002c10A,
CELL_MUSIC_ERROR_GENERIC = 0x8002c1FF,
CELL_MUSIC2_OK = CELL_MUSIC_OK,
CELL_MUSIC2_CANCELED = CELL_MUSIC_CANCELED,
CELL_MUSIC2_PLAYBACK_FINISHED = CELL_MUSIC_PLAYBACK_FINISHED,
CELL_MUSIC2_ERROR_PARAM = CELL_MUSIC_ERROR_PARAM,
CELL_MUSIC2_ERROR_BUSY = CELL_MUSIC_ERROR_BUSY,
@ -125,8 +120,8 @@ enum
CELL_MUSIC_SELECTION_CONTEXT_SIZE = 2048,
};
using CellMusicCallback = void(u32 event, vm::ptr<void> param, vm::ptr<void> userData);
using CellMusic2Callback = void(u32 event, vm::ptr<void> param, vm::ptr<void> userData);
using CellMusicCallback = void(u32 event, vm::ps3::ptr<void> param, vm::ps3::ptr<void> userData);
using CellMusic2Callback = void(u32 event, vm::ps3::ptr<void> param, vm::ps3::ptr<void> userData);
struct CellMusicSelectionContext
{

4
rpcs3/Emu/Cell/Modules/cellMusicDecode.cpp
View File

@ -1,13 +1,13 @@
#include "stdafx.h"
#include "Emu/Cell/PPUModule.h"
namespace vm { using namespace ps3; }
logs::channel cellMusicDecode("cellMusicDecode");
// Return Codes
enum
{
CELL_MUSIC_DECODE_OK = 0,
CELL_MUSIC_DECODE_CANCELED = 1,
CELL_MUSIC_DECODE_DECODE_FINISHED = 0x8002C101,
CELL_MUSIC_DECODE_ERROR_PARAM = 0x8002C102,
CELL_MUSIC_DECODE_ERROR_BUSY = 0x8002C103,

4
rpcs3/Emu/Cell/Modules/cellMusicExport.cpp
View File

@ -1,13 +1,13 @@
#include "stdafx.h"
#include "Emu/Cell/PPUModule.h"
namespace vm { using namespace ps3; }
logs::channel cellMusicExport("cellMusicExport");
// Return Codes
enum
{
CELL_MUSIC_EXPORT_UTIL_RET_OK = 0,
CELL_MUSIC_EXPORT_UTIL_RET_CANCEL = 1,
CELL_MUSIC_EXPORT_UTIL_ERROR_BUSY = 0x8002c601,
CELL_MUSIC_EXPORT_UTIL_ERROR_INTERNAL = 0x8002c602,
CELL_MUSIC_EXPORT_UTIL_ERROR_PARAM = 0x8002c603,

72
rpcs3/Emu/Cell/Modules/cellOskDialog.cpp
View File

@ -1,10 +1,10 @@
#include "stdafx.h"
#include "Emu/Cell/PPUModule.h"
#include "Emu/System.h"
#include "cellSysutil.h"
#include "cellOskDialog.h"
#include "cellMsgDialog.h"
#include <thread>
#include "Emu/System.h"
logs::channel cellOskDialog("cellOskDialog");
@ -21,12 +21,7 @@ s32 cellOskDialogLoadAsync(u32 container, vm::ptr<CellOskDialogParam> dialogPara
osk->on_close = [&](s32 status)
{
if (status == CELL_MSGDIALOG_BUTTON_OK) {
sysutil_send_system_cmd(CELL_SYSUTIL_OSKDIALOG_FINISHED, 0);
}
else {
sysutil_send_system_cmd(CELL_SYSUTIL_OSKDIALOG_INPUT_CANCELED, 0);
}
sysutil_send_system_cmd(status == CELL_MSGDIALOG_BUTTON_OK ? CELL_SYSUTIL_OSKDIALOG_FINISHED : CELL_SYSUTIL_OSKDIALOG_INPUT_CANCELED, 0);
result = true;
};
@ -47,7 +42,7 @@ s32 cellOskDialogLoadAsync(u32 container, vm::ptr<CellOskDialogParam> dialogPara
thread_ctrl::wait_for(1000);
}
return CELL_OSKDIALOG_OK;
return CELL_OK;
}
s32 cellOskDialogUnloadAsync(vm::ptr<CellOskDialogCallbackReturnParam> OutputInfo)
@ -55,13 +50,14 @@ s32 cellOskDialogUnloadAsync(vm::ptr<CellOskDialogCallbackReturnParam> OutputInf
cellOskDialog.warning("cellOskDialogUnloadAsync(OutputInfo=*0x%x)", OutputInfo);
OutputInfo->result = CELL_OSKDIALOG_INPUT_FIELD_RESULT_OK;
for (int i = 0; i < OutputInfo->numCharsResultString; i++) {
*(OutputInfo->pResultString + i) = (be_t<u16>)*(s_osk_text + i);
for (int i = 0; i < OutputInfo->numCharsResultString; i++)
{
OutputInfo->pResultString[i] = s_osk_text[i];
}
sysutil_send_system_cmd(CELL_SYSUTIL_OSKDIALOG_UNLOADED, 0);
return CELL_OSKDIALOG_OK;
return CELL_OK;
}
s32 cellOskDialogGetSize(vm::ptr<u16> width, vm::ptr<u16> height, vm::ptr<CellOskDialogType> dialogType)
@ -69,62 +65,62 @@ s32 cellOskDialogGetSize(vm::ptr<u16> width, vm::ptr<u16> height, vm::ptr<CellOs
cellOskDialog.warning("cellOskDialogGetSize(width=*0x%x, height=*0x%x, dialogType=*0x%x)", width, height, dialogType);
*width = 1;
*height = 1;
return CELL_OSKDIALOG_OK;
return CELL_OK;
}
s32 cellOskDialogAbort()
{
cellOskDialog.warning("cellOskDialogAbort()");
sysutil_send_system_cmd(CELL_SYSUTIL_OSKDIALOG_FINISHED, 0);
return CELL_OSKDIALOG_OK;
return CELL_OK;
}
s32 cellOskDialogSetDeviceMask(u32 deviceMask)
{
cellOskDialog.todo("cellOskDialogSetDeviceMask(deviceMask=0x%x)", deviceMask);
return CELL_OSKDIALOG_OK;
return CELL_OK;
}
s32 cellOskDialogSetSeparateWindowOption(vm::ptr<CellOskDialogSeparateWindowOption> windowOption)
{
cellOskDialog.todo("cellOskDialogSetSeparateWindowOption(windowOption=*0x%x)", windowOption);
return CELL_OSKDIALOG_OK;
return CELL_OK;
}
s32 cellOskDialogSetInitialInputDevice(vm::ptr<CellOskDialogInputDevice> inputDevice)
{
cellOskDialog.todo("cellOskDialogSetInitialInputDevice(inputDevice=*0x%x)", inputDevice);
return CELL_OSKDIALOG_OK;
return CELL_OK;
}
s32 cellOskDialogSetInitialKeyLayout(vm::ptr<CellOskDialogInitialKeyLayout> initialKeyLayout)
{
cellOskDialog.todo("cellOskDialogSetInitialKeyLayout(initialKeyLayout=*0x%x)", initialKeyLayout);
return CELL_OSKDIALOG_OK;
return CELL_OK;
}
s32 cellOskDialogDisableDimmer()
{
cellOskDialog.todo("cellOskDialogDisableDimmer()");
return CELL_OSKDIALOG_OK;
return CELL_OK;
}
s32 cellOskDialogSetKeyLayoutOption(u32 option)
{
cellOskDialog.todo("cellOskDialogSetKeyLayoutOption(option=0x%x)", option);
return CELL_OSKDIALOG_OK;
return CELL_OK;
}
s32 cellOskDialogAddSupportLanguage(u32 supportLanguage)
{
cellOskDialog.todo("cellOskDialogAddSupportLanguage(supportLanguage=0x%x)", supportLanguage);
return CELL_OSKDIALOG_OK;
return CELL_OK;
}
s32 cellOskDialogSetLayoutMode(s32 layoutMode)
{
cellOskDialog.todo("cellOskDialogSetLayoutMode(layoutMode=%d)", layoutMode);
return CELL_OSKDIALOG_OK;
return CELL_OK;
}
s32 cellOskDialogGetInputText(vm::ptr<CellOskDialogCallbackReturnParam> OutputInfo)
@ -136,97 +132,97 @@ s32 cellOskDialogGetInputText(vm::ptr<CellOskDialogCallbackReturnParam> OutputIn
s32 cellOskDialogExtInputDeviceUnlock()
{
cellOskDialog.todo("cellOskDialogExtInputDeviceUnlock()");
return CELL_OSKDIALOG_OK;
return CELL_OK;
}
s32 cellOskDialogExtRegisterKeyboardEventHookCallback(u16 hookEventMode, vm::ptr<cellOskDialogHardwareKeyboardEventHookCallback> pCallback)
{
cellOskDialog.todo("cellOskDialogExtRegisterKeyboardEventHookCallback(hookEventMode=%u, pCallback=*0x%x)", hookEventMode, pCallback);
return CELL_OSKDIALOG_OK;
return CELL_OK;
}
s32 cellOskDialogExtAddJapaneseOptionDictionary(vm::cpptr<char> filePath)
{
cellOskDialog.todo("cellOskDialogExtAddJapaneseOptionDictionary(filePath=**0x%0x)", filePath);
return CELL_OSKDIALOG_OK;
return CELL_OK;
}
s32 cellOskDialogExtEnableClipboard()
{
cellOskDialog.todo("cellOskDialogExtEnableClipboard()");
return CELL_OSKDIALOG_OK;
return CELL_OK;
}
s32 cellOskDialogExtSendFinishMessage(s32 /*CellOskDialogFinishReason*/ finishReason)
{
cellOskDialog.todo("cellOskDialogExtSendFinishMessage(finishReason=%d)", finishReason);
return CELL_OSKDIALOG_OK;
return CELL_OK;
}
s32 cellOskDialogExtAddOptionDictionary(vm::cptr<CellOskDialogImeDictionaryInfo> dictionaryInfo)
{
cellOskDialog.todo("cellOskDialogExtAddOptionDictionary(dictionaryInfo=*0x%x)", dictionaryInfo);
return CELL_OSKDIALOG_OK;
return CELL_OK;
}
s32 cellOskDialogExtSetInitialScale(f32 initialScale)
{
cellOskDialog.todo("cellOskDialogExtSetInitialScale(initialScale=%f)", initialScale);
return CELL_OSKDIALOG_OK;
return CELL_OK;
}
s32 cellOskDialogExtInputDeviceLock()
{
cellOskDialog.todo("cellOskDialogExtInputDeviceLock()");
return CELL_OSKDIALOG_OK;
return CELL_OK;
}
s32 cellOskDialogExtSetBaseColor(f32 red, f32 blue, f32 green, f32 alpha)
{
cellOskDialog.warning("cellOskDialogExtSetBaseColor(red=%f, blue=%f, green=%f, alpha=%f)", red, blue, green, alpha);
return CELL_OSKDIALOG_OK;
return CELL_OK;
}
s32 cellOskDialogExtRegisterConfirmWordFilterCallback(vm::ptr<cellOskDialogConfirmWordFilterCallback> pCallback)
{
cellOskDialog.todo("cellOskDialogExtRegisterConfirmWordFilterCallback(pCallback=*0x%x)", pCallback);
return CELL_OSKDIALOG_OK;
return CELL_OK;
}
s32 cellOskDialogExtUpdateInputText()
{
cellOskDialog.todo("cellOskDialogExtUpdateInputText()");
return CELL_OSKDIALOG_OK;
return CELL_OK;
}
s32 cellOskDialogExtDisableHalfByteKana()
{
cellOskDialog.todo("cellOskDialogExtDisableHalfByteKana()");
return CELL_OSKDIALOG_OK;
return CELL_OK;
}
s32 cellOskDialogExtSetPointerEnable(b8 enable)
{
cellOskDialog.todo("cellOskDialogExtSetPointerEnable(enable=%d)", enable);
return CELL_OSKDIALOG_OK;
return CELL_OK;
}
s32 cellOskDialogExtUpdatePointerDisplayPos()
{
cellOskDialog.todo("cellOskDialogExtUpdatePointerDisplayPos"); // Missing arguments
return CELL_OSKDIALOG_OK;
return CELL_OK;
}
s32 cellOskDialogExtEnableHalfByteKana()
{
cellOskDialog.todo("cellOskDialogExtEnableHalfByteKana()");
return CELL_OSKDIALOG_OK;
return CELL_OK;
}
s32 cellOskDialogExtRegisterForceFinishCallback(vm::ptr<cellOskDialogForceFinishCallback> pCallback)
{
cellOskDialog.todo("cellOskDialogExtRegisterForceFinishCallback(pCallback=*0x%x)", pCallback);
return CELL_OSKDIALOG_OK;
return CELL_OK;
}

1
rpcs3/Emu/Cell/Modules/cellOskDialog.h
View File

@ -5,7 +5,6 @@ namespace vm { using namespace ps3; }
//error codes
enum
{
CELL_OSKDIALOG_OK = 0x0,
CELL_OSKDIALOG_ERROR_IME_ALREADY_IN_USE = 0x8002b501,
CELL_OSKDIALOG_ERROR_GET_SIZE_ERROR = 0x8002b502,
CELL_OSKDIALOG_ERROR_UNKNOWN = 0x8002b503,

4
rpcs3/Emu/Cell/Modules/cellPhotoDecode.cpp
View File

@ -1,13 +1,13 @@
#include "stdafx.h"
#include "Emu/Cell/PPUModule.h"
namespace vm { using namespace ps3; }
logs::channel cellPhotoDecode("cellPhotoDecode");
// Return Codes
enum
{
CELL_PHOTO_DECODE_RET_OK = 0,
CELL_PHOTO_DECODE_RET_CANCEL = 1,
CELL_PHOTO_DECODE_ERROR_BUSY = 0x8002c901,
CELL_PHOTO_DECODE_ERROR_INTERNAL = 0x8002c902,
CELL_PHOTO_DECODE_ERROR_PARAM = 0x8002c903,

4
rpcs3/Emu/Cell/Modules/cellPhotoExport.cpp
View File

@ -1,13 +1,13 @@
#include "stdafx.h"
#include "Emu/Cell/PPUModule.h"
namespace vm { using namespace ps3; }
logs::channel cellPhotoExport("cellPhotoExport");
// Return Codes
enum
{
CELL_PHOTO_EXPORT_UTIL_RET_OK = 0,
CELL_PHOTO_EXPORT_UTIL_RET_CANCEL = 1,
CELL_PHOTO_EXPORT_UTIL_ERROR_BUSY = 0x8002c201,
CELL_PHOTO_EXPORT_UTIL_ERROR_INTERNAL = 0x8002c202,
CELL_PHOTO_EXPORT_UTIL_ERROR_PARAM = 0x8002c203,

4
rpcs3/Emu/Cell/Modules/cellPhotoImport.cpp
View File

@ -1,13 +1,13 @@
#include "stdafx.h"
#include "Emu/Cell/PPUModule.h"
namespace vm { using namespace ps3; }
logs::channel cellPhotoImportUtil("cellPhotoImportUtil");
// Return Codes
enum
{
CELL_PHOTO_IMPORT_RET_OK = 0,
CELL_PHOTO_IMPORT_RET_CANCEL = 1,
CELL_PHOTO_IMPORT_ERROR_BUSY = 0x8002c701,
CELL_PHOTO_IMPORT_ERROR_INTERNAL = 0x8002c702,
CELL_PHOTO_IMPORT_ERROR_PARAM = 0x8002c703,

6
rpcs3/Emu/Cell/Modules/cellSaveData.cpp
View File

@ -791,14 +791,14 @@ s32 cellSaveDataDelete2(u32 container)
{
cellSaveData.todo("cellSaveDataDelete2(container=0x%x)", container);
return CELL_SAVEDATA_RET_CANCEL;
return CELL_CANCEL;
}
s32 cellSaveDataDelete(u32 container)
{
cellSaveData.todo("cellSaveDataDelete(container=0x%x)", container);
return CELL_SAVEDATA_RET_CANCEL;
return CELL_CANCEL;
}
s32 cellSaveDataFixedDelete(ppu_thread& ppu, PSetList setList, PSetBuf setBuf, PFuncFixed funcFixed, PFuncDone funcDone, u32 container, vm::ptr<void> userdata)
@ -948,7 +948,7 @@ s32 cellSaveDataGetListItem(vm::cptr<char> dirName, vm::ptr<CellSaveDataDirStat>
strcpy_trunc(sysFileParam->detail, psf.at("DETAIL").as_string());
}
return CELL_SAVEDATA_RET_OK;
return CELL_OK;
}
s32 cellSaveDataUserListDelete(ppu_thread& ppu, u32 userId, PSetList setList, PSetBuf setBuf, PFuncList funcList, PFuncDone funcDone, u32 container, vm::ptr<void> userdata)

2
rpcs3/Emu/Cell/Modules/cellSaveData.h
View File

@ -5,8 +5,6 @@ namespace vm { using namespace ps3; }
// Return codes
enum
{
CELL_SAVEDATA_RET_OK = 0,
CELL_SAVEDATA_RET_CANCEL = 1,
CELL_SAVEDATA_ERROR_CBRESULT = 0x8002b401,
CELL_SAVEDATA_ERROR_ACCESS_ERROR = 0x8002b402,
CELL_SAVEDATA_ERROR_INTERNAL = 0x8002b403,

10
rpcs3/Emu/Cell/Modules/cellScreenshot.cpp
View File

@ -4,30 +4,32 @@
#include "cellScreenshot.h"
namespace vm { using namespace ps3; }
logs::channel cellScreenshot("cellScreenshot");
s32 cellScreenShotSetParameter(vm::cptr<CellScreenShotSetParam> param)
{
cellScreenshot.todo("cellScreenShotSetParameter(param=*0x%x)", param);
return CELL_SCREENSHOT_OK;
return CELL_OK;
}
s32 cellScreenShotSetOverlayImage(vm::cptr<char> srcDir, vm::cptr<char> srcFile, s32 offset_x, s32 offset_y)
{
cellScreenshot.todo("cellScreenShotSetOverlayImage(srcDir=%s, srcFile=%s, offset_x=%d, offset_y=%d)", srcDir, srcFile, offset_x, offset_y);
return CELL_SCREENSHOT_OK;
return CELL_OK;
}
s32 cellScreenShotEnable()
{
cellScreenshot.todo("cellScreenShotEnable()");
return CELL_SCREENSHOT_OK;
return CELL_OK;
}
s32 cellScreenShotDisable()
{
cellScreenshot.todo("cellScreenShotDisable()");
return CELL_SCREENSHOT_OK;
return CELL_OK;
}
DECLARE(ppu_module_manager::cellScreenShot)("cellScreenShotUtility", []()

9
rpcs3/Emu/Cell/Modules/cellScreenshot.h
View File

@ -1,11 +1,8 @@
#pragma once
namespace vm { using namespace ps3; }
// Return Codes
enum
{
CELL_SCREENSHOT_OK = 0x0,
CELL_SCREENSHOT_ERROR_INTERNAL = 0x8002d101,
CELL_SCREENSHOT_ERROR_PARAM = 0x8002d102,
CELL_SCREENSHOT_ERROR_DECODE = 0x8002d103,
@ -15,7 +12,7 @@ enum
struct CellScreenShotSetParam
{
vm::bcptr<char> photo_title;
vm::bcptr<char> game_title;
vm::bcptr<char> game_comment;
vm::ps3::bcptr<char> photo_title;
vm::ps3::bcptr<char> game_title;
vm::ps3::bcptr<char> game_comment;
};

7
rpcs3/Emu/Cell/Modules/cellUserInfo.h
View File

@ -2,13 +2,6 @@
namespace vm { using namespace ps3; }
// Return Codes
enum
{
CELL_USERINFO_RET_OK = 0,
CELL_USERINFO_RET_CANCEL = 1,
};
// Error Codes
enum CellUserInfoError : u32
{