From 7ac64a6725e0f888bc327bcda954db5f1531a692 Mon Sep 17 00:00:00 2001 From: Nekotekina Date: Mon, 15 May 2017 14:58:32 +0300 Subject: [PATCH] CELL_OK cleanup --- rpcs3/Emu/Cell/Modules/cellBgdl.cpp | 6 +- rpcs3/Emu/Cell/Modules/cellBgdl.h | 5 +- rpcs3/Emu/Cell/Modules/cellMusic.cpp | 2 + rpcs3/Emu/Cell/Modules/cellMusic.h | 11 +--- rpcs3/Emu/Cell/Modules/cellMusicDecode.cpp | 4 +- rpcs3/Emu/Cell/Modules/cellMusicExport.cpp | 4 +- rpcs3/Emu/Cell/Modules/cellOskDialog.cpp | 72 ++++++++++------------ rpcs3/Emu/Cell/Modules/cellOskDialog.h | 1 - rpcs3/Emu/Cell/Modules/cellPhotoDecode.cpp | 4 +- rpcs3/Emu/Cell/Modules/cellPhotoExport.cpp | 4 +- rpcs3/Emu/Cell/Modules/cellPhotoImport.cpp | 4 +- rpcs3/Emu/Cell/Modules/cellSaveData.cpp | 6 +- rpcs3/Emu/Cell/Modules/cellSaveData.h | 2 - rpcs3/Emu/Cell/Modules/cellScreenshot.cpp | 10 +-- rpcs3/Emu/Cell/Modules/cellScreenshot.h | 9 +-- rpcs3/Emu/Cell/Modules/cellUserInfo.h | 7 --- 16 files changed, 66 insertions(+), 85 deletions(-) diff --git a/rpcs3/Emu/Cell/Modules/cellBgdl.cpp b/rpcs3/Emu/Cell/Modules/cellBgdl.cpp index 00c8aa83bd..932b94aa67 100644 --- a/rpcs3/Emu/Cell/Modules/cellBgdl.cpp +++ b/rpcs3/Emu/Cell/Modules/cellBgdl.cpp @@ -4,6 +4,8 @@ #include "cellBgdl.h" +namespace vm { using namespace ps3; } + logs::channel cellBGDL("cellBGDL"); s32 cellBGDLGetInfo(vm::cptr content_id, vm::ptr info, s32 num) @@ -21,13 +23,13 @@ s32 cellBGDLGetInfo2(vm::cptr service_id, vm::ptr 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 mode) { cellBGDL.todo("cellBGDLGetMode(mode=*0x%x)", mode); - return CELL_BGDL_UTIL_RET_OK; + return CELL_OK; } DECLARE(ppu_module_manager::cellBGDL)("cellBGDLUtility", []() diff --git a/rpcs3/Emu/Cell/Modules/cellBgdl.h b/rpcs3/Emu/Cell/Modules/cellBgdl.h index 0c2eca52a0..37a7319ad6 100644 --- a/rpcs3/Emu/Cell/Modules/cellBgdl.h +++ b/rpcs3/Emu/Cell/Modules/cellBgdl.h @@ -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 received_size; be_t content_size; be_t state; // CellBGDLState - vm::bptr reserved; + vm::ps3::bptr reserved; }; diff --git a/rpcs3/Emu/Cell/Modules/cellMusic.cpp b/rpcs3/Emu/Cell/Modules/cellMusic.cpp index 49e97d10fd..04ca0f964b 100644 --- a/rpcs3/Emu/Cell/Modules/cellMusic.cpp +++ b/rpcs3/Emu/Cell/Modules/cellMusic.cpp @@ -6,6 +6,8 @@ #include "cellMusic.h" #include "cellSysutil.h" +namespace vm { using namespace ps3; } + logs::channel cellMusic("cellMusic"); struct music2_t diff --git a/rpcs3/Emu/Cell/Modules/cellMusic.h b/rpcs3/Emu/Cell/Modules/cellMusic.h index 4be1261ecc..92d21a1260 100644 --- a/rpcs3/Emu/Cell/Modules/cellMusic.h +++ b/rpcs3/Emu/Cell/Modules/cellMusic.h @@ -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 param, vm::ptr userData); -using CellMusic2Callback = void(u32 event, vm::ptr param, vm::ptr userData); +using CellMusicCallback = void(u32 event, vm::ps3::ptr param, vm::ps3::ptr userData); +using CellMusic2Callback = void(u32 event, vm::ps3::ptr param, vm::ps3::ptr userData); struct CellMusicSelectionContext { diff --git a/rpcs3/Emu/Cell/Modules/cellMusicDecode.cpp b/rpcs3/Emu/Cell/Modules/cellMusicDecode.cpp index b11ff317bf..0127f06260 100644 --- a/rpcs3/Emu/Cell/Modules/cellMusicDecode.cpp +++ b/rpcs3/Emu/Cell/Modules/cellMusicDecode.cpp @@ -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, diff --git a/rpcs3/Emu/Cell/Modules/cellMusicExport.cpp b/rpcs3/Emu/Cell/Modules/cellMusicExport.cpp index fd43c9332c..c63b192e21 100644 --- a/rpcs3/Emu/Cell/Modules/cellMusicExport.cpp +++ b/rpcs3/Emu/Cell/Modules/cellMusicExport.cpp @@ -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, diff --git a/rpcs3/Emu/Cell/Modules/cellOskDialog.cpp b/rpcs3/Emu/Cell/Modules/cellOskDialog.cpp index 0d1fc6b69f..1454fb70e9 100644 --- a/rpcs3/Emu/Cell/Modules/cellOskDialog.cpp +++ b/rpcs3/Emu/Cell/Modules/cellOskDialog.cpp @@ -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 -#include "Emu/System.h" logs::channel cellOskDialog("cellOskDialog"); @@ -21,12 +21,7 @@ s32 cellOskDialogLoadAsync(u32 container, vm::ptr 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 dialogPara thread_ctrl::wait_for(1000); } - return CELL_OSKDIALOG_OK; + return CELL_OK; } s32 cellOskDialogUnloadAsync(vm::ptr OutputInfo) @@ -55,13 +50,14 @@ s32 cellOskDialogUnloadAsync(vm::ptr 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)*(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 width, vm::ptr height, vm::ptr dialogType) @@ -69,62 +65,62 @@ s32 cellOskDialogGetSize(vm::ptr width, vm::ptr height, vm::ptr windowOption) { cellOskDialog.todo("cellOskDialogSetSeparateWindowOption(windowOption=*0x%x)", windowOption); - return CELL_OSKDIALOG_OK; + return CELL_OK; } s32 cellOskDialogSetInitialInputDevice(vm::ptr inputDevice) { cellOskDialog.todo("cellOskDialogSetInitialInputDevice(inputDevice=*0x%x)", inputDevice); - return CELL_OSKDIALOG_OK; + return CELL_OK; } s32 cellOskDialogSetInitialKeyLayout(vm::ptr 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 OutputInfo) @@ -136,97 +132,97 @@ s32 cellOskDialogGetInputText(vm::ptr OutputIn s32 cellOskDialogExtInputDeviceUnlock() { cellOskDialog.todo("cellOskDialogExtInputDeviceUnlock()"); - return CELL_OSKDIALOG_OK; + return CELL_OK; } s32 cellOskDialogExtRegisterKeyboardEventHookCallback(u16 hookEventMode, vm::ptr pCallback) { cellOskDialog.todo("cellOskDialogExtRegisterKeyboardEventHookCallback(hookEventMode=%u, pCallback=*0x%x)", hookEventMode, pCallback); - return CELL_OSKDIALOG_OK; + return CELL_OK; } s32 cellOskDialogExtAddJapaneseOptionDictionary(vm::cpptr 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 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 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 pCallback) { cellOskDialog.todo("cellOskDialogExtRegisterForceFinishCallback(pCallback=*0x%x)", pCallback); - return CELL_OSKDIALOG_OK; + return CELL_OK; } diff --git a/rpcs3/Emu/Cell/Modules/cellOskDialog.h b/rpcs3/Emu/Cell/Modules/cellOskDialog.h index dc3a2b9cb8..3081675bcb 100644 --- a/rpcs3/Emu/Cell/Modules/cellOskDialog.h +++ b/rpcs3/Emu/Cell/Modules/cellOskDialog.h @@ -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, diff --git a/rpcs3/Emu/Cell/Modules/cellPhotoDecode.cpp b/rpcs3/Emu/Cell/Modules/cellPhotoDecode.cpp index d4b5741e39..92ec06bc22 100644 --- a/rpcs3/Emu/Cell/Modules/cellPhotoDecode.cpp +++ b/rpcs3/Emu/Cell/Modules/cellPhotoDecode.cpp @@ -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, diff --git a/rpcs3/Emu/Cell/Modules/cellPhotoExport.cpp b/rpcs3/Emu/Cell/Modules/cellPhotoExport.cpp index 091ec7bf8a..e8bd573c69 100644 --- a/rpcs3/Emu/Cell/Modules/cellPhotoExport.cpp +++ b/rpcs3/Emu/Cell/Modules/cellPhotoExport.cpp @@ -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, diff --git a/rpcs3/Emu/Cell/Modules/cellPhotoImport.cpp b/rpcs3/Emu/Cell/Modules/cellPhotoImport.cpp index 9586873aea..32b96cb506 100644 --- a/rpcs3/Emu/Cell/Modules/cellPhotoImport.cpp +++ b/rpcs3/Emu/Cell/Modules/cellPhotoImport.cpp @@ -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, diff --git a/rpcs3/Emu/Cell/Modules/cellSaveData.cpp b/rpcs3/Emu/Cell/Modules/cellSaveData.cpp index 7682aa76ab..5975e09198 100644 --- a/rpcs3/Emu/Cell/Modules/cellSaveData.cpp +++ b/rpcs3/Emu/Cell/Modules/cellSaveData.cpp @@ -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 userdata) @@ -948,7 +948,7 @@ s32 cellSaveDataGetListItem(vm::cptr dirName, vm::ptr 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 userdata) diff --git a/rpcs3/Emu/Cell/Modules/cellSaveData.h b/rpcs3/Emu/Cell/Modules/cellSaveData.h index 5c9abd330a..97162da674 100644 --- a/rpcs3/Emu/Cell/Modules/cellSaveData.h +++ b/rpcs3/Emu/Cell/Modules/cellSaveData.h @@ -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, diff --git a/rpcs3/Emu/Cell/Modules/cellScreenshot.cpp b/rpcs3/Emu/Cell/Modules/cellScreenshot.cpp index 9d60f82cc2..f6c5d14ae3 100644 --- a/rpcs3/Emu/Cell/Modules/cellScreenshot.cpp +++ b/rpcs3/Emu/Cell/Modules/cellScreenshot.cpp @@ -4,30 +4,32 @@ #include "cellScreenshot.h" +namespace vm { using namespace ps3; } + logs::channel cellScreenshot("cellScreenshot"); s32 cellScreenShotSetParameter(vm::cptr param) { cellScreenshot.todo("cellScreenShotSetParameter(param=*0x%x)", param); - return CELL_SCREENSHOT_OK; + return CELL_OK; } s32 cellScreenShotSetOverlayImage(vm::cptr srcDir, vm::cptr 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", []() diff --git a/rpcs3/Emu/Cell/Modules/cellScreenshot.h b/rpcs3/Emu/Cell/Modules/cellScreenshot.h index 766fd73783..a427b4d257 100644 --- a/rpcs3/Emu/Cell/Modules/cellScreenshot.h +++ b/rpcs3/Emu/Cell/Modules/cellScreenshot.h @@ -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 photo_title; - vm::bcptr game_title; - vm::bcptr game_comment; + vm::ps3::bcptr photo_title; + vm::ps3::bcptr game_title; + vm::ps3::bcptr game_comment; }; diff --git a/rpcs3/Emu/Cell/Modules/cellUserInfo.h b/rpcs3/Emu/Cell/Modules/cellUserInfo.h index 03beae5d29..f48771c8f1 100644 --- a/rpcs3/Emu/Cell/Modules/cellUserInfo.h +++ b/rpcs3/Emu/Cell/Modules/cellUserInfo.h @@ -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 {