From d0c9d7c0ae04d55647a395e1555314ca7cdcbce1 Mon Sep 17 00:00:00 2001 From: lioncash Date: Fri, 4 Apr 2014 09:25:38 -0400 Subject: [PATCH] Use spaces for vertical alignment --- rpcs3/Emu/Audio/cellAudio.h | 124 +-- rpcs3/Emu/Audio/sysutil_audio.h | 96 +-- rpcs3/Emu/CPU/CPUThreadManager.cpp | 8 +- rpcs3/Emu/Cell/MFC.h | 38 +- rpcs3/Emu/Cell/PPUOpcodes.h | 768 +++++++++--------- rpcs3/Emu/Cell/PPUThread.cpp | 20 +- rpcs3/Emu/Cell/PPUThread.h | 244 +++--- rpcs3/Emu/Cell/RawSPUThread.cpp | 54 +- rpcs3/Emu/Cell/RawSPUThread.h | 42 +- rpcs3/Emu/Cell/SPUOpcodes.h | 372 ++++----- rpcs3/Emu/Cell/SPURSManager.h | 52 +- rpcs3/Emu/Cell/SPUThread.h | 80 +- rpcs3/Emu/FS/vfsLocalFile.cpp | 10 +- rpcs3/Emu/GS/GCM.h | 558 ++++++------- rpcs3/Emu/GS/GL/GLFragmentProgram.h | 116 +-- rpcs3/Emu/GS/GL/GLShaderParam.h | 8 +- rpcs3/Emu/GS/GSManager.h | 4 +- rpcs3/Emu/GS/RSXThread.h | 8 +- rpcs3/Emu/GS/sysutil_video.h | 150 ++-- rpcs3/Emu/HDD/HDD.h | 4 +- rpcs3/Emu/Io/MouseHandler.h | 4 +- rpcs3/Emu/Io/PadHandler.h | 96 +-- rpcs3/Emu/Io/Windows/WindowsKeyboardHandler.h | 4 +- rpcs3/Emu/Io/Windows/WindowsMouseHandler.h | 16 +- rpcs3/Emu/Io/Windows/WindowsPadHandler.h | 4 +- rpcs3/Emu/SysCalls/ErrorCodes.h | 120 +-- rpcs3/Emu/SysCalls/Modules/cellAdec.h | 218 +++-- rpcs3/Emu/SysCalls/Modules/cellAtrac.h | 44 +- rpcs3/Emu/SysCalls/Modules/cellBgdl.cpp | 12 +- rpcs3/Emu/SysCalls/Modules/cellCamera.cpp | 26 +- rpcs3/Emu/SysCalls/Modules/cellCelp8Enc.cpp | 12 +- rpcs3/Emu/SysCalls/Modules/cellCelpEnc.cpp | 12 +- rpcs3/Emu/SysCalls/Modules/cellFiber.cpp | 22 +- rpcs3/Emu/SysCalls/Modules/cellFont.h | 52 +- rpcs3/Emu/SysCalls/Modules/cellGame.cpp | 132 +-- rpcs3/Emu/SysCalls/Modules/cellGcmSys.cpp | 12 +- rpcs3/Emu/SysCalls/Modules/cellGem.cpp | 22 +- rpcs3/Emu/SysCalls/Modules/cellGifDec.cpp | 38 +- rpcs3/Emu/SysCalls/Modules/cellGifDec.h | 26 +- rpcs3/Emu/SysCalls/Modules/cellImejp.cpp | 14 +- rpcs3/Emu/SysCalls/Modules/cellJpgDec.cpp | 48 +- rpcs3/Emu/SysCalls/Modules/cellJpgDec.h | 62 +- rpcs3/Emu/SysCalls/Modules/cellJpgEnc.cpp | 12 +- rpcs3/Emu/SysCalls/Modules/cellKey2char.cpp | 14 +- rpcs3/Emu/SysCalls/Modules/cellLv2dbg.cpp | 4 +- rpcs3/Emu/SysCalls/Modules/cellMic.cpp | 34 +- .../Emu/SysCalls/Modules/cellMusicDecode.cpp | 30 +- .../Emu/SysCalls/Modules/cellMusicExport.cpp | 24 +- rpcs3/Emu/SysCalls/Modules/cellNetCtl.cpp | 68 +- rpcs3/Emu/SysCalls/Modules/cellPamf.h | 96 +-- .../Emu/SysCalls/Modules/cellPhotoDecode.cpp | 16 +- .../Emu/SysCalls/Modules/cellPhotoExport.cpp | 24 +- .../Emu/SysCalls/Modules/cellPhotoImport.cpp | 24 +- rpcs3/Emu/SysCalls/Modules/cellPngDec.cpp | 45 +- rpcs3/Emu/SysCalls/Modules/cellPngDec.h | 40 +- rpcs3/Emu/SysCalls/Modules/cellPngEnc.cpp | 12 +- rpcs3/Emu/SysCalls/Modules/cellPrint.cpp | 16 +- rpcs3/Emu/SysCalls/Modules/cellResc.cpp | 8 +- rpcs3/Emu/SysCalls/Modules/cellResc.h | 8 +- rpcs3/Emu/SysCalls/Modules/cellRudp.cpp | 78 +- rpcs3/Emu/SysCalls/Modules/cellSail.cpp | 24 +- rpcs3/Emu/SysCalls/Modules/cellSailRec.cpp | 24 +- rpcs3/Emu/SysCalls/Modules/cellScreenshot.cpp | 12 +- rpcs3/Emu/SysCalls/Modules/cellSearch.cpp | 42 +- rpcs3/Emu/SysCalls/Modules/cellSheap.cpp | 8 +- rpcs3/Emu/SysCalls/Modules/cellSpurs.h | 50 +- rpcs3/Emu/SysCalls/Modules/cellSubdisplay.cpp | 16 +- rpcs3/Emu/SysCalls/Modules/cellSync.cpp | 24 +- rpcs3/Emu/SysCalls/Modules/cellSync2.cpp | 24 +- rpcs3/Emu/SysCalls/Modules/cellSysmodule.cpp | 12 +- rpcs3/Emu/SysCalls/Modules/cellSysutilAp.cpp | 16 +- rpcs3/Emu/SysCalls/Modules/cellUsbd.cpp | 36 +- rpcs3/Emu/SysCalls/Modules/cellUsbpspcm.cpp | 24 +- rpcs3/Emu/SysCalls/Modules/cellVdec.h | 36 +- rpcs3/Emu/SysCalls/Modules/cellVoice.cpp | 36 +- rpcs3/Emu/SysCalls/Modules/cellVpost.h | 264 +++--- rpcs3/Emu/SysCalls/Modules/libmixer.h | 19 +- rpcs3/Emu/SysCalls/Modules/sceNpTrophy.h | 86 +- rpcs3/Emu/SysCalls/lv2/SC_FileSystem.h | 62 +- rpcs3/Emu/SysCalls/lv2/SC_Keyboard.cpp | 56 +- rpcs3/Emu/SysCalls/lv2/SC_Memory.h | 14 +- rpcs3/Emu/SysCalls/lv2/SC_Mouse.cpp | 16 +- rpcs3/Emu/SysCalls/lv2/SC_Pad.cpp | 20 +- rpcs3/Emu/SysCalls/lv2/SC_VM.cpp | 4 +- rpcs3/Emu/System.h | 36 +- rpcs3/Gui/CompilerELF.cpp | 26 +- rpcs3/Gui/ConLog.cpp | 6 +- rpcs3/Gui/Debugger.cpp | 18 +- rpcs3/Gui/DisAsmFrame.cpp | 12 +- rpcs3/Gui/InterpreterDisAsm.cpp | 44 +- rpcs3/Gui/MainFrame.cpp | 160 ++-- rpcs3/Gui/VHDDManager.cpp | 32 +- rpcs3/Loader/ELF32.h | 200 ++--- rpcs3/Loader/ELF64.h | 142 ++-- rpcs3/Loader/Loader.h | 8 +- rpcs3/Loader/SELF.h | 68 +- 96 files changed, 2990 insertions(+), 2992 deletions(-) diff --git a/rpcs3/Emu/Audio/cellAudio.h b/rpcs3/Emu/Audio/cellAudio.h index c0fe570980..07df509d7b 100644 --- a/rpcs3/Emu/Audio/cellAudio.h +++ b/rpcs3/Emu/Audio/cellAudio.h @@ -6,77 +6,77 @@ extern u64 get_system_time(); enum { //libaudio Error Codes - CELL_AUDIO_ERROR_ALREADY_INIT = 0x80310701, - CELL_AUDIO_ERROR_AUDIOSYSTEM = 0x80310702, - CELL_AUDIO_ERROR_NOT_INIT = 0x80310703, - CELL_AUDIO_ERROR_PARAM = 0x80310704, - CELL_AUDIO_ERROR_PORT_FULL = 0x80310705, - CELL_AUDIO_ERROR_PORT_ALREADY_RUN = 0x80310706, - CELL_AUDIO_ERROR_PORT_NOT_OPEN = 0x80310707, - CELL_AUDIO_ERROR_PORT_NOT_RUN = 0x80310708, - CELL_AUDIO_ERROR_TRANS_EVENT = 0x80310709, - CELL_AUDIO_ERROR_PORT_OPEN = 0x8031070a, - CELL_AUDIO_ERROR_SHAREDMEMORY = 0x8031070b, - CELL_AUDIO_ERROR_MUTEX = 0x8031070c, - CELL_AUDIO_ERROR_EVENT_QUEUE = 0x8031070d, - CELL_AUDIO_ERROR_AUDIOSYSTEM_NOT_FOUND = 0x8031070e, - CELL_AUDIO_ERROR_TAG_NOT_FOUND = 0x8031070f, + CELL_AUDIO_ERROR_ALREADY_INIT = 0x80310701, + CELL_AUDIO_ERROR_AUDIOSYSTEM = 0x80310702, + CELL_AUDIO_ERROR_NOT_INIT = 0x80310703, + CELL_AUDIO_ERROR_PARAM = 0x80310704, + CELL_AUDIO_ERROR_PORT_FULL = 0x80310705, + CELL_AUDIO_ERROR_PORT_ALREADY_RUN = 0x80310706, + CELL_AUDIO_ERROR_PORT_NOT_OPEN = 0x80310707, + CELL_AUDIO_ERROR_PORT_NOT_RUN = 0x80310708, + CELL_AUDIO_ERROR_TRANS_EVENT = 0x80310709, + CELL_AUDIO_ERROR_PORT_OPEN = 0x8031070a, + CELL_AUDIO_ERROR_SHAREDMEMORY = 0x8031070b, + CELL_AUDIO_ERROR_MUTEX = 0x8031070c, + CELL_AUDIO_ERROR_EVENT_QUEUE = 0x8031070d, + CELL_AUDIO_ERROR_AUDIOSYSTEM_NOT_FOUND = 0x8031070e, + CELL_AUDIO_ERROR_TAG_NOT_FOUND = 0x8031070f, //libsnd3 Error Codes - CELL_SND3_ERROR_PARAM = 0x80310301, - CELL_SND3_ERROR_CREATE_MUTEX = 0x80310302, - CELL_SND3_ERROR_SYNTH = 0x80310303, - CELL_SND3_ERROR_ALREADY = 0x80310304, - CELL_SND3_ERROR_NOTINIT = 0x80310305, - CELL_SND3_ERROR_SMFFULL = 0x80310306, - CELL_SND3_ERROR_HD3ID = 0x80310307, - CELL_SND3_ERROR_SMF = 0x80310308, - CELL_SND3_ERROR_SMFCTX = 0x80310309, - CELL_SND3_ERROR_FORMAT = 0x8031030a, - CELL_SND3_ERROR_SMFID = 0x8031030b, - CELL_SND3_ERROR_SOUNDDATAFULL = 0x8031030c, - CELL_SND3_ERROR_VOICENUM = 0x8031030d, - CELL_SND3_ERROR_RESERVEDVOICE = 0x8031030e, - CELL_SND3_ERROR_REQUESTQUEFULL = 0x8031030f, - CELL_SND3_ERROR_OUTPUTMODE = 0x80310310, + CELL_SND3_ERROR_PARAM = 0x80310301, + CELL_SND3_ERROR_CREATE_MUTEX = 0x80310302, + CELL_SND3_ERROR_SYNTH = 0x80310303, + CELL_SND3_ERROR_ALREADY = 0x80310304, + CELL_SND3_ERROR_NOTINIT = 0x80310305, + CELL_SND3_ERROR_SMFFULL = 0x80310306, + CELL_SND3_ERROR_HD3ID = 0x80310307, + CELL_SND3_ERROR_SMF = 0x80310308, + CELL_SND3_ERROR_SMFCTX = 0x80310309, + CELL_SND3_ERROR_FORMAT = 0x8031030a, + CELL_SND3_ERROR_SMFID = 0x8031030b, + CELL_SND3_ERROR_SOUNDDATAFULL = 0x8031030c, + CELL_SND3_ERROR_VOICENUM = 0x8031030d, + CELL_SND3_ERROR_RESERVEDVOICE = 0x8031030e, + CELL_SND3_ERROR_REQUESTQUEFULL = 0x8031030f, + CELL_SND3_ERROR_OUTPUTMODE = 0x80310310, //libsynt2 Error Codes - CELL_SOUND_SYNTH2_ERROR_FATAL = 0x80310201, - CELL_SOUND_SYNTH2_ERROR_INVALID_PARAMETER = 0x80310202, - CELL_SOUND_SYNTH2_ERROR_ALREADY_INITIALIZED = 0x80310203, + CELL_SOUND_SYNTH2_ERROR_FATAL = 0x80310201, + CELL_SOUND_SYNTH2_ERROR_INVALID_PARAMETER = 0x80310202, + CELL_SOUND_SYNTH2_ERROR_ALREADY_INITIALIZED = 0x80310203, }; // constants enum { - CELL_AUDIO_BLOCK_16 = 16, - CELL_AUDIO_BLOCK_8 = 8, - CELL_AUDIO_BLOCK_SAMPLES = 256, - CELL_AUDIO_CREATEEVENTFLAG_SPU = 0x00000001, - CELL_AUDIO_EVENT_HEADPHONE = 1, - CELL_AUDIO_EVENT_MIX = 0, - CELL_AUDIO_EVENTFLAG_BEFOREMIX = 0x80000000, - CELL_AUDIO_EVENTFLAG_DECIMATE_2 = 0x08000000, - CELL_AUDIO_EVENTFLAG_DECIMATE_4 = 0x10000000, - CELL_AUDIO_EVENTFLAG_HEADPHONE = 0x20000000, - CELL_AUDIO_EVENTFLAG_NOMIX = 0x40000000, - CELL_AUDIO_MAX_PORT = 4, - CELL_AUDIO_MAX_PORT_2 = 8, - CELL_AUDIO_MISC_ACCVOL_ALLDEVICE = 0x0000ffffUL, - CELL_AUDIO_PERSONAL_DEVICE_PRIMARY = 0x8000, - CELL_AUDIO_PORT_2CH = 2, - CELL_AUDIO_PORT_8CH = 8, - CELL_AUDIO_PORTATTR_BGM = 0x0000000000000010ULL, - CELL_AUDIO_PORTATTR_INITLEVEL = 0x0000000000001000ULL, - CELL_AUDIO_PORTATTR_OUT_NO_ROUTE = 0x0000000000100000ULL, - CELL_AUDIO_PORTATTR_OUT_PERSONAL_0 = 0x0000000001000000ULL, - CELL_AUDIO_PORTATTR_OUT_PERSONAL_1 = 0x0000000002000000ULL, - CELL_AUDIO_PORTATTR_OUT_PERSONAL_2 = 0x0000000004000000ULL, - CELL_AUDIO_PORTATTR_OUT_PERSONAL_3 = 0x0000000008000000ULL, - CELL_AUDIO_PORTATTR_OUT_SECONDARY = 0x0000000000000001ULL, - CELL_AUDIO_STATUS_CLOSE = 0x1010, - CELL_AUDIO_STATUS_READY = 1, - CELL_AUDIO_STATUS_RUN = 2, + CELL_AUDIO_BLOCK_16 = 16, + CELL_AUDIO_BLOCK_8 = 8, + CELL_AUDIO_BLOCK_SAMPLES = 256, + CELL_AUDIO_CREATEEVENTFLAG_SPU = 0x00000001, + CELL_AUDIO_EVENT_HEADPHONE = 1, + CELL_AUDIO_EVENT_MIX = 0, + CELL_AUDIO_EVENTFLAG_BEFOREMIX = 0x80000000, + CELL_AUDIO_EVENTFLAG_DECIMATE_2 = 0x08000000, + CELL_AUDIO_EVENTFLAG_DECIMATE_4 = 0x10000000, + CELL_AUDIO_EVENTFLAG_HEADPHONE = 0x20000000, + CELL_AUDIO_EVENTFLAG_NOMIX = 0x40000000, + CELL_AUDIO_MAX_PORT = 4, + CELL_AUDIO_MAX_PORT_2 = 8, + CELL_AUDIO_MISC_ACCVOL_ALLDEVICE = 0x0000ffffUL, + CELL_AUDIO_PERSONAL_DEVICE_PRIMARY = 0x8000, + CELL_AUDIO_PORT_2CH = 2, + CELL_AUDIO_PORT_8CH = 8, + CELL_AUDIO_PORTATTR_BGM = 0x0000000000000010ULL, + CELL_AUDIO_PORTATTR_INITLEVEL = 0x0000000000001000ULL, + CELL_AUDIO_PORTATTR_OUT_NO_ROUTE = 0x0000000000100000ULL, + CELL_AUDIO_PORTATTR_OUT_PERSONAL_0 = 0x0000000001000000ULL, + CELL_AUDIO_PORTATTR_OUT_PERSONAL_1 = 0x0000000002000000ULL, + CELL_AUDIO_PORTATTR_OUT_PERSONAL_2 = 0x0000000004000000ULL, + CELL_AUDIO_PORTATTR_OUT_PERSONAL_3 = 0x0000000008000000ULL, + CELL_AUDIO_PORTATTR_OUT_SECONDARY = 0x0000000000000001ULL, + CELL_AUDIO_STATUS_CLOSE = 0x1010, + CELL_AUDIO_STATUS_READY = 1, + CELL_AUDIO_STATUS_RUN = 2, }; //libaudio datatypes diff --git a/rpcs3/Emu/Audio/sysutil_audio.h b/rpcs3/Emu/Audio/sysutil_audio.h index aa60f4c1ee..94ea6dafd0 100644 --- a/rpcs3/Emu/Audio/sysutil_audio.h +++ b/rpcs3/Emu/Audio/sysutil_audio.h @@ -24,58 +24,58 @@ enum AudioErrorCode enum CellAudioOut { - CELL_AUDIO_OUT_PRIMARY = 0, - CELL_AUDIO_OUT_SECONDARY = 1, + CELL_AUDIO_OUT_PRIMARY = 0, + CELL_AUDIO_OUT_SECONDARY = 1, }; enum CellAudioOutDownMixer { - CELL_AUDIO_OUT_DOWNMIXER_NONE = 0, + CELL_AUDIO_OUT_DOWNMIXER_NONE = 0, CELL_AUDIO_OUT_DOWNMIXER_TYPE_A = 1, CELL_AUDIO_OUT_DOWNMIXER_TYPE_B = 2, }; enum { - CELL_AUDIO_OUT_SINGLE_DEVICE_MODE = 0, - CELL_AUDIO_OUT_MULTI_DEVICE_MODE = 1, - CELL_AUDIO_OUT_MULTI_DEVICE_MODE_2 = 2, + CELL_AUDIO_OUT_SINGLE_DEVICE_MODE = 0, + CELL_AUDIO_OUT_MULTI_DEVICE_MODE = 1, + CELL_AUDIO_OUT_MULTI_DEVICE_MODE_2 = 2, }; enum CellAudioOutPortType { - CELL_AUDIO_OUT_PORT_HDMI = 0, - CELL_AUDIO_OUT_PORT_SPDIF = 1, - CELL_AUDIO_OUT_PORT_ANALOG = 2, - CELL_AUDIO_OUT_PORT_USB = 3, - CELL_AUDIO_OUT_PORT_BLUETOOTH = 4, - CELL_AUDIO_OUT_PORT_NETWORK = 5, + CELL_AUDIO_OUT_PORT_HDMI = 0, + CELL_AUDIO_OUT_PORT_SPDIF = 1, + CELL_AUDIO_OUT_PORT_ANALOG = 2, + CELL_AUDIO_OUT_PORT_USB = 3, + CELL_AUDIO_OUT_PORT_BLUETOOTH = 4, + CELL_AUDIO_OUT_PORT_NETWORK = 5, }; enum CellAudioOutDeviceState { CELL_AUDIO_OUT_DEVICE_STATE_UNAVAILABLE = 0, - CELL_AUDIO_OUT_DEVICE_STATE_AVAILABLE = 1, + CELL_AUDIO_OUT_DEVICE_STATE_AVAILABLE = 1, }; enum CellAudioOutOutputState { - CELL_AUDIO_OUT_OUTPUT_STATE_ENABLED = 0, - CELL_AUDIO_OUT_OUTPUT_STATE_DISABLED = 1, - CELL_AUDIO_OUT_OUTPUT_STATE_PREPARING = 2, + CELL_AUDIO_OUT_OUTPUT_STATE_ENABLED = 0, + CELL_AUDIO_OUT_OUTPUT_STATE_DISABLED = 1, + CELL_AUDIO_OUT_OUTPUT_STATE_PREPARING = 2, }; enum CellAudioOutCodingType { - CELL_AUDIO_OUT_CODING_TYPE_LPCM = 0, - CELL_AUDIO_OUT_CODING_TYPE_AC3 = 1, - CELL_AUDIO_OUT_CODING_TYPE_MPEG1 = 2, - CELL_AUDIO_OUT_CODING_TYPE_MP3 = 3, - CELL_AUDIO_OUT_CODING_TYPE_MPEG2 = 4, - CELL_AUDIO_OUT_CODING_TYPE_AAC = 5, - CELL_AUDIO_OUT_CODING_TYPE_DTS = 6, - CELL_AUDIO_OUT_CODING_TYPE_ATRAC = 7, - CELL_AUDIO_OUT_CODING_TYPE_BITSTREAM = 0xff, + CELL_AUDIO_OUT_CODING_TYPE_LPCM = 0, + CELL_AUDIO_OUT_CODING_TYPE_AC3 = 1, + CELL_AUDIO_OUT_CODING_TYPE_MPEG1 = 2, + CELL_AUDIO_OUT_CODING_TYPE_MP3 = 3, + CELL_AUDIO_OUT_CODING_TYPE_MPEG2 = 4, + CELL_AUDIO_OUT_CODING_TYPE_AAC = 5, + CELL_AUDIO_OUT_CODING_TYPE_DTS = 6, + CELL_AUDIO_OUT_CODING_TYPE_ATRAC = 7, + CELL_AUDIO_OUT_CODING_TYPE_BITSTREAM = 0xff, }; enum CellAudioOutChnum @@ -99,35 +99,35 @@ enum CellAudioOutFs enum { - CELL_AUDIO_OUT_SPEAKER_LAYOUT_2CH = 0x00000001, - CELL_AUDIO_OUT_SPEAKER_LAYOUT_6CH_LREClr = 0x00010000, - CELL_AUDIO_OUT_SPEAKER_LAYOUT_8CH_LREClrxy = 0x40000000, + CELL_AUDIO_OUT_SPEAKER_LAYOUT_2CH = 0x00000001, + CELL_AUDIO_OUT_SPEAKER_LAYOUT_6CH_LREClr = 0x00010000, + CELL_AUDIO_OUT_SPEAKER_LAYOUT_8CH_LREClrxy = 0x40000000, }; enum { - CELL_AUDIO_OUT_COPY_CONTROL_COPY_FREE = 0, - CELL_AUDIO_OUT_COPY_CONTROL_COPY_ONCE = 1, - CELL_AUDIO_OUT_COPY_CONTROL_COPY_NEVER = 2, + CELL_AUDIO_OUT_COPY_CONTROL_COPY_FREE = 0, + CELL_AUDIO_OUT_COPY_CONTROL_COPY_ONCE = 1, + CELL_AUDIO_OUT_COPY_CONTROL_COPY_NEVER = 2, }; enum { - CELL_AUDIO_IN_SINGLE_DEVICE_MODE = 0, - CELL_AUDIO_IN_MULTI_DEVICE_MODE = 1, - CELL_AUDIO_IN_MULTI_DEVICE_MODE_2 = 2, + CELL_AUDIO_IN_SINGLE_DEVICE_MODE = 0, + CELL_AUDIO_IN_MULTI_DEVICE_MODE = 1, + CELL_AUDIO_IN_MULTI_DEVICE_MODE_2 = 2, }; enum CellAudioInPortType { - CELL_AUDIO_IN_PORT_USB = 3, - CELL_AUDIO_IN_PORT_BLUETOOTH = 4, + CELL_AUDIO_IN_PORT_USB = 3, + CELL_AUDIO_IN_PORT_BLUETOOTH = 4, }; enum CellAudioInDeviceState { - CELL_AUDIO_IN_DEVICE_STATE_UNAVAILABLE = 0, - CELL_AUDIO_IN_DEVICE_STATE_AVAILABLE = 1, + CELL_AUDIO_IN_DEVICE_STATE_UNAVAILABLE = 0, + CELL_AUDIO_IN_DEVICE_STATE_AVAILABLE = 1, }; enum CellAudioInCodingType @@ -137,20 +137,20 @@ enum CellAudioInCodingType enum CellAudioInChnum { - CELL_AUDIO_IN_CHNUM_NONE = 0, - CELL_AUDIO_IN_CHNUM_1 = 1, - CELL_AUDIO_IN_CHNUM_2 = 2, + CELL_AUDIO_IN_CHNUM_NONE = 0, + CELL_AUDIO_IN_CHNUM_1 = 1, + CELL_AUDIO_IN_CHNUM_2 = 2, }; enum CellAudioInFs { - CELL_AUDIO_IN_FS_UNDEFINED = 0x00, - CELL_AUDIO_IN_FS_8KHZ = 0x01, - CELL_AUDIO_IN_FS_12KHZ = 0x02, - CELL_AUDIO_IN_FS_16KHZ = 0x04, - CELL_AUDIO_IN_FS_24KHZ = 0x08, - CELL_AUDIO_IN_FS_32KHZ = 0x10, - CELL_AUDIO_IN_FS_48KHZ = 0x20, + CELL_AUDIO_IN_FS_UNDEFINED = 0x00, + CELL_AUDIO_IN_FS_8KHZ = 0x01, + CELL_AUDIO_IN_FS_12KHZ = 0x02, + CELL_AUDIO_IN_FS_16KHZ = 0x04, + CELL_AUDIO_IN_FS_24KHZ = 0x08, + CELL_AUDIO_IN_FS_32KHZ = 0x10, + CELL_AUDIO_IN_FS_48KHZ = 0x20, }; struct CellAudioOutConfiguration diff --git a/rpcs3/Emu/CPU/CPUThreadManager.cpp b/rpcs3/Emu/CPU/CPUThreadManager.cpp index a77b2802d9..48ced91638 100644 --- a/rpcs3/Emu/CPU/CPUThreadManager.cpp +++ b/rpcs3/Emu/CPU/CPUThreadManager.cpp @@ -29,10 +29,10 @@ CPUThread& CPUThreadManager::AddThread(CPUThreadType type) switch(type) { - case CPU_THREAD_PPU: new_thread = new PPUThread(); break; - case CPU_THREAD_SPU: new_thread = new SPUThread(); break; - case CPU_THREAD_RAW_SPU: new_thread = new RawSPUThread(m_raw_spu_num++); break; - case CPU_THREAD_ARMv7: new_thread = new ARMv7Thread(); break; + case CPU_THREAD_PPU: new_thread = new PPUThread(); break; + case CPU_THREAD_SPU: new_thread = new SPUThread(); break; + case CPU_THREAD_RAW_SPU: new_thread = new RawSPUThread(m_raw_spu_num++); break; + case CPU_THREAD_ARMv7: new_thread = new ARMv7Thread(); break; default: assert(0); } diff --git a/rpcs3/Emu/Cell/MFC.h b/rpcs3/Emu/Cell/MFC.h index 0cd0a5f43a..a4cb348559 100644 --- a/rpcs3/Emu/Cell/MFC.h +++ b/rpcs3/Emu/Cell/MFC.h @@ -3,18 +3,18 @@ enum { - MFC_PUT_CMD = 0x20, MFC_PUTB_CMD = 0x21, MFC_PUTF_CMD = 0x22, - MFC_PUTR_CMD = 0x30, MFC_PUTRB_CMD = 0x31, MFC_PUTRF_CMD = 0x32, - MFC_GET_CMD = 0x40, MFC_GETB_CMD = 0x41, MFC_GETF_CMD = 0x42, - MFC_PUTL_CMD = 0x24, MFC_PUTLB_CMD = 0x25, MFC_PUTLF_CMD = 0x26, - MFC_PUTRL_CMD = 0x34, MFC_PUTRLB_CMD = 0x35, MFC_PUTRLF_CMD = 0x36, - MFC_GETL_CMD = 0x44, MFC_GETLB_CMD = 0x45, MFC_GETLF_CMD = 0x46, + MFC_PUT_CMD = 0x20, MFC_PUTB_CMD = 0x21, MFC_PUTF_CMD = 0x22, + MFC_PUTR_CMD = 0x30, MFC_PUTRB_CMD = 0x31, MFC_PUTRF_CMD = 0x32, + MFC_GET_CMD = 0x40, MFC_GETB_CMD = 0x41, MFC_GETF_CMD = 0x42, + MFC_PUTL_CMD = 0x24, MFC_PUTLB_CMD = 0x25, MFC_PUTLF_CMD = 0x26, + MFC_PUTRL_CMD = 0x34, MFC_PUTRLB_CMD = 0x35, MFC_PUTRLF_CMD = 0x36, + MFC_GETL_CMD = 0x44, MFC_GETLB_CMD = 0x45, MFC_GETLF_CMD = 0x46, MFC_GETLLAR_CMD = 0xD0, MFC_PUTLLC_CMD = 0xB4, MFC_PUTLLUC_CMD = 0xB0, MFC_PUTQLLUC_CMD = 0xB8, - MFC_SNDSIG_CMD = 0xA0, MFC_SNDSIGB_CMD = 0xA1, MFC_SNDSIGF_CMD = 0xA2, + MFC_SNDSIG_CMD = 0xA0, MFC_SNDSIGB_CMD = 0xA1, MFC_SNDSIGF_CMD = 0xA2, MFC_BARRIER_CMD = 0xC0, MFC_EIEIO_CMD = 0xC8, MFC_SYNC_CMD = 0xCC, @@ -38,26 +38,26 @@ enum enum { - MFC_SPU_TO_PPU_MAILBOX_STATUS_MASK = 0x000000FF, - MFC_SPU_TO_PPU_MAILBOX_STATUS_SHIFT = 0x0, - MFC_PPU_TO_SPU_MAILBOX_STATUS_MASK = 0x0000FF00, - MFC_PPU_TO_SPU_MAILBOX_STATUS_SHIFT = 0x8, - MFC_PPU_TO_SPU_MAILBOX_MAX = 0x4, - MFC_SPU_TO_PPU_INT_MAILBOX_STATUS_MASK = 0x00FF0000, - MFC_SPU_TO_PPU_INT_MAILBOX_STATUS_SHIFT = 0x10, + MFC_SPU_TO_PPU_MAILBOX_STATUS_MASK = 0x000000FF, + MFC_SPU_TO_PPU_MAILBOX_STATUS_SHIFT = 0x0, + MFC_PPU_TO_SPU_MAILBOX_STATUS_MASK = 0x0000FF00, + MFC_PPU_TO_SPU_MAILBOX_STATUS_SHIFT = 0x8, + MFC_PPU_TO_SPU_MAILBOX_MAX = 0x4, + MFC_SPU_TO_PPU_INT_MAILBOX_STATUS_MASK = 0x00FF0000, + MFC_SPU_TO_PPU_INT_MAILBOX_STATUS_SHIFT = 0x10, }; enum { - MFC_PPU_DMA_CMD_ENQUEUE_SUCCESSFUL = 0x00, - MFC_PPU_DMA_CMD_SEQUENCE_ERROR = 0x01, - MFC_PPU_DMA_QUEUE_FULL = 0x02, + MFC_PPU_DMA_CMD_ENQUEUE_SUCCESSFUL = 0x00, + MFC_PPU_DMA_CMD_SEQUENCE_ERROR = 0x01, + MFC_PPU_DMA_QUEUE_FULL = 0x02, }; enum { - MFC_PPU_MAX_QUEUE_SPACE = 0x08, - MFC_SPU_MAX_QUEUE_SPACE = 0x10, + MFC_PPU_MAX_QUEUE_SPACE = 0x08, + MFC_SPU_MAX_QUEUE_SPACE = 0x10, }; /*struct DMAC_Queue diff --git a/rpcs3/Emu/Cell/PPUOpcodes.h b/rpcs3/Emu/Cell/PPUOpcodes.h index b0ef854bfa..3fce7ffaa6 100644 --- a/rpcs3/Emu/Cell/PPUOpcodes.h +++ b/rpcs3/Emu/Cell/PPUOpcodes.h @@ -4,442 +4,442 @@ namespace PPU_opcodes { enum PPU_MainOpcodes { - TDI = 0x02, //Trap Doubleword Immediate - TWI = 0x03, //Trap Word Immediate - G_04 = 0x04, - MULLI = 0x07, //Multiply Low Immediate - SUBFIC = 0x08, //Subtract from Immediate Carrying - //DOZI = 0x09, - CMPLI = 0x0a, //Compare Logical Immediate - CMPI = 0x0b, //Compare Immediate - ADDIC = 0x0c, //Add Immediate Carrying - ADDIC_ = 0x0d, //Add Immediate Carrying and Record - ADDI = 0x0e, //Add Immediate - ADDIS = 0x0f, //Add Immediate Shifted - BC = 0x10, //Branch Conditional - SC = 0x11, //System Call - B = 0x12, //Branch - G_13 = 0x13, - RLWIMI = 0x14, //Rotate Left Word Immediate then Mask Insert - RLWINM = 0x15, //Rotate Left Word Immediate then AND with Mask - RLWNM = 0x17, //Rotate Left Word then AND with Mask - ORI = 0x18, //OR Immediate - ORIS = 0x19, //OR Immediate Shifted - XORI = 0x1a, //XOR Immediate - XORIS = 0x1b, //XOR Immediate Shifted - ANDI_ = 0x1c, //AND Immediate - ANDIS_ = 0x1d, //AND Immediate Shifted - G_1e = 0x1e, - G_1f = 0x1f, - LWZ = 0x20, //Load Word and Zero Indexed - LWZU = 0x21, //Load Word and Zero with Update Indexed - LBZ = 0x22, //Load Byte and Zero - LBZU = 0x23, //Load Byte and Zero with Update - STW = 0x24, //Store Word - STWU = 0x25, //Store Word with Update - STB = 0x26, //Store Byte - STBU = 0x27, //Store Byte with Update - LHZ = 0x28, //Load Halfword and Zero - LHZU = 0x29, //Load Halfword and Zero with Update - LHA = 0x2a, //Load Halfword Algebraic with Update - LHAU = 0x2b, //Load Halfword Algebraic - STH = 0x2c, //Store Halfword - STHU = 0x2d, //Store Halfword with Update - LMW = 0x2e, //Load Multiple Word - STMW = 0x2f, //Store Multiple Word - LFS = 0x30, //Load Floating-Point Single - LFSU = 0x31, //Load Floating-Point Single with Update - LFD = 0x32, //Load Floating-Point Double - LFDU = 0x33, //Load Floating-Point Double with Update - STFS = 0x34, //Store Floating-Point Single - STFSU = 0x35, //Store Floating-Point Single with Update - STFD = 0x36, //Store Floating-Point Double - STFDU = 0x37, //Store Floating-Point Double with Update - LFQ = 0x38, // - LFQU = 0x39, // - G_3a = 0x3a, - G_3b = 0x3b, - G_3e = 0x3e, - G_3f = 0x3f, + TDI = 0x02, //Trap Doubleword Immediate + TWI = 0x03, //Trap Word Immediate + G_04 = 0x04, + MULLI = 0x07, //Multiply Low Immediate + SUBFIC = 0x08, //Subtract from Immediate Carrying + //DOZI = 0x09, + CMPLI = 0x0a, //Compare Logical Immediate + CMPI = 0x0b, //Compare Immediate + ADDIC = 0x0c, //Add Immediate Carrying + ADDIC_ = 0x0d, //Add Immediate Carrying and Record + ADDI = 0x0e, //Add Immediate + ADDIS = 0x0f, //Add Immediate Shifted + BC = 0x10, //Branch Conditional + SC = 0x11, //System Call + B = 0x12, //Branch + G_13 = 0x13, + RLWIMI = 0x14, //Rotate Left Word Immediate then Mask Insert + RLWINM = 0x15, //Rotate Left Word Immediate then AND with Mask + RLWNM = 0x17, //Rotate Left Word then AND with Mask + ORI = 0x18, //OR Immediate + ORIS = 0x19, //OR Immediate Shifted + XORI = 0x1a, //XOR Immediate + XORIS = 0x1b, //XOR Immediate Shifted + ANDI_ = 0x1c, //AND Immediate + ANDIS_ = 0x1d, //AND Immediate Shifted + G_1e = 0x1e, + G_1f = 0x1f, + LWZ = 0x20, //Load Word and Zero Indexed + LWZU = 0x21, //Load Word and Zero with Update Indexed + LBZ = 0x22, //Load Byte and Zero + LBZU = 0x23, //Load Byte and Zero with Update + STW = 0x24, //Store Word + STWU = 0x25, //Store Word with Update + STB = 0x26, //Store Byte + STBU = 0x27, //Store Byte with Update + LHZ = 0x28, //Load Halfword and Zero + LHZU = 0x29, //Load Halfword and Zero with Update + LHA = 0x2a, //Load Halfword Algebraic with Update + LHAU = 0x2b, //Load Halfword Algebraic + STH = 0x2c, //Store Halfword + STHU = 0x2d, //Store Halfword with Update + LMW = 0x2e, //Load Multiple Word + STMW = 0x2f, //Store Multiple Word + LFS = 0x30, //Load Floating-Point Single + LFSU = 0x31, //Load Floating-Point Single with Update + LFD = 0x32, //Load Floating-Point Double + LFDU = 0x33, //Load Floating-Point Double with Update + STFS = 0x34, //Store Floating-Point Single + STFSU = 0x35, //Store Floating-Point Single with Update + STFD = 0x36, //Store Floating-Point Double + STFDU = 0x37, //Store Floating-Point Double with Update + LFQ = 0x38, // + LFQU = 0x39, // + G_3a = 0x3a, + G_3b = 0x3b, + G_3e = 0x3e, + G_3f = 0x3f, }; enum G_04Opcodes { - VADDUBM = 0x0, - VMAXUB = 0x2, - VRLB = 0x4, - VCMPEQUB = 0x6, - VMULOUB = 0x8, - VADDFP = 0xa, - VMRGHB = 0xc, - VPKUHUM = 0xe, - VADDUHM = 0x40, - VMAXUH = 0x42, - VRLH = 0x44, - VCMPEQUH = 0x46, - VMULOUH = 0x48, - VSUBFP = 0x4a, - VMRGHH = 0x4c, - VPKUWUM = 0x4e, - VADDUWM = 0x80, - VMAXUW = 0x82, - VRLW = 0x84, - VCMPEQUW = 0x86, - VMRGHW = 0x8c, - VPKUHUS = 0x8e, - VCMPEQFP = 0xc6, - VPKUWUS = 0xce, - VMAXSB = 0x102, - VSLB = 0x104, - VMULOSB = 0x108, - VREFP = 0x10a, - VMRGLB = 0x10c, - VPKSHUS = 0x10e, - VMAXSH = 0x142, - VSLH = 0x144, - VMULOSH = 0x148, + VADDUBM = 0x0, + VMAXUB = 0x2, + VRLB = 0x4, + VCMPEQUB = 0x6, + VMULOUB = 0x8, + VADDFP = 0xa, + VMRGHB = 0xc, + VPKUHUM = 0xe, + VADDUHM = 0x40, + VMAXUH = 0x42, + VRLH = 0x44, + VCMPEQUH = 0x46, + VMULOUH = 0x48, + VSUBFP = 0x4a, + VMRGHH = 0x4c, + VPKUWUM = 0x4e, + VADDUWM = 0x80, + VMAXUW = 0x82, + VRLW = 0x84, + VCMPEQUW = 0x86, + VMRGHW = 0x8c, + VPKUHUS = 0x8e, + VCMPEQFP = 0xc6, + VPKUWUS = 0xce, + VMAXSB = 0x102, + VSLB = 0x104, + VMULOSB = 0x108, + VREFP = 0x10a, + VMRGLB = 0x10c, + VPKSHUS = 0x10e, + VMAXSH = 0x142, + VSLH = 0x144, + VMULOSH = 0x148, VRSQRTEFP = 0x14a, - VMRGLH = 0x14c, - VPKSWUS = 0x14e, - VADDCUW = 0x180, - VMAXSW = 0x182, - VSLW = 0x184, - VEXPTEFP = 0x18a, - VMRGLW = 0x18c, - VPKSHSS = 0x18e, - VSL = 0x1c4, - VCMPGEFP = 0x1c6, - VLOGEFP = 0x1ca, - VPKSWSS = 0x1ce, - VADDUBS = 0x200, - VMINUB = 0x202, - VSRB = 0x204, - VCMPGTUB = 0x206, - VMULEUB = 0x208, - VRFIN = 0x20a, - VSPLTB = 0x20c, - VUPKHSB = 0x20e, - VADDUHS = 0x240, - VMINUH = 0x242, - VSRH = 0x244, - VCMPGTUH = 0x246, - VMULEUH = 0x248, - VRFIZ = 0x24a, - VSPLTH = 0x24c, - VUPKHSH = 0x24e, - VADDUWS = 0x280, - VMINUW = 0x282, - VSRW = 0x284, - VCMPGTUW = 0x286, - VRFIP = 0x28a, - VSPLTW = 0x28c, - VUPKLSB = 0x28e, - VSR = 0x2c4, - VCMPGTFP = 0x2c6, - VRFIM = 0x2ca, - VUPKLSH = 0x2ce, - VADDSBS = 0x300, - VMINSB = 0x302, - VSRAB = 0x304, - VCMPGTSB = 0x306, - VMULESB = 0x308, - VCFUX = 0x30a, - VSPLTISB = 0x30c, - VPKPX = 0x30e, - VADDSHS = 0x340, - VMINSH = 0x342, - VSRAH = 0x344, - VCMPGTSH = 0x346, - VMULESH = 0x348, - VCFSX = 0x34a, - VSPLTISH = 0x34c, - VUPKHPX = 0x34e, - VADDSWS = 0x380, - VMINSW = 0x382, - VSRAW = 0x384, - VCMPGTSW = 0x386, - VCTUXS = 0x38a, - VSPLTISW = 0x38c, - VCMPBFP = 0x3c6, - VCTSXS = 0x3ca, - VUPKLPX = 0x3ce, - VSUBUBM = 0x400, - VAVGUB = 0x402, - VAND = 0x404, + VMRGLH = 0x14c, + VPKSWUS = 0x14e, + VADDCUW = 0x180, + VMAXSW = 0x182, + VSLW = 0x184, + VEXPTEFP = 0x18a, + VMRGLW = 0x18c, + VPKSHSS = 0x18e, + VSL = 0x1c4, + VCMPGEFP = 0x1c6, + VLOGEFP = 0x1ca, + VPKSWSS = 0x1ce, + VADDUBS = 0x200, + VMINUB = 0x202, + VSRB = 0x204, + VCMPGTUB = 0x206, + VMULEUB = 0x208, + VRFIN = 0x20a, + VSPLTB = 0x20c, + VUPKHSB = 0x20e, + VADDUHS = 0x240, + VMINUH = 0x242, + VSRH = 0x244, + VCMPGTUH = 0x246, + VMULEUH = 0x248, + VRFIZ = 0x24a, + VSPLTH = 0x24c, + VUPKHSH = 0x24e, + VADDUWS = 0x280, + VMINUW = 0x282, + VSRW = 0x284, + VCMPGTUW = 0x286, + VRFIP = 0x28a, + VSPLTW = 0x28c, + VUPKLSB = 0x28e, + VSR = 0x2c4, + VCMPGTFP = 0x2c6, + VRFIM = 0x2ca, + VUPKLSH = 0x2ce, + VADDSBS = 0x300, + VMINSB = 0x302, + VSRAB = 0x304, + VCMPGTSB = 0x306, + VMULESB = 0x308, + VCFUX = 0x30a, + VSPLTISB = 0x30c, + VPKPX = 0x30e, + VADDSHS = 0x340, + VMINSH = 0x342, + VSRAH = 0x344, + VCMPGTSH = 0x346, + VMULESH = 0x348, + VCFSX = 0x34a, + VSPLTISH = 0x34c, + VUPKHPX = 0x34e, + VADDSWS = 0x380, + VMINSW = 0x382, + VSRAW = 0x384, + VCMPGTSW = 0x386, + VCTUXS = 0x38a, + VSPLTISW = 0x38c, + VCMPBFP = 0x3c6, + VCTSXS = 0x3ca, + VUPKLPX = 0x3ce, + VSUBUBM = 0x400, + VAVGUB = 0x402, + VAND = 0x404, VCMPEQUB_ = 0x406, - VMAXFP = 0x40a, - VSLO = 0x40c, - VSUBUHM = 0x440, - VAVGUH = 0x442, - VANDC = 0x444, + VMAXFP = 0x40a, + VSLO = 0x40c, + VSUBUHM = 0x440, + VAVGUH = 0x442, + VANDC = 0x444, VCMPEQUH_ = 0x446, - VMINFP = 0x44a, - VSRO = 0x44c, - VSUBUWM = 0x480, - VAVGUW = 0x482, - VOR = 0x484, + VMINFP = 0x44a, + VSRO = 0x44c, + VSUBUWM = 0x480, + VAVGUW = 0x482, + VOR = 0x484, VCMPEQUW_ = 0x486, - VXOR = 0x4c4, + VXOR = 0x4c4, VCMPEQFP_ = 0x4c6, - VAVGSB = 0x502, - VNOR = 0x504, - VAVGSH = 0x542, - VSUBCUW = 0x580, - VAVGSW = 0x582, + VAVGSB = 0x502, + VNOR = 0x504, + VAVGSH = 0x542, + VSUBCUW = 0x580, + VAVGSW = 0x582, VCMPGEFP_ = 0x5c6, - VSUBUBS = 0x600, - MFVSCR = 0x604, + VSUBUBS = 0x600, + MFVSCR = 0x604, VCMPGTUB_ = 0x606, - VSUM4UBS = 0x608, - VSUBUHS = 0x640, - MTVSCR = 0x644, + VSUM4UBS = 0x608, + VSUBUHS = 0x640, + MTVSCR = 0x644, VCMPGTUH_ = 0x646, - VSUM4SHS = 0x648, - VSUBUWS = 0x680, + VSUM4SHS = 0x648, + VSUBUWS = 0x680, VCMPGTUW_ = 0x686, - VSUM2SWS = 0x688, + VSUM2SWS = 0x688, VCMPGTFP_ = 0x6c6, - VSUBSBS = 0x700, + VSUBSBS = 0x700, VCMPGTSB_ = 0x706, - VSUM4SBS = 0x708, - VSUBSHS = 0x740, + VSUM4SBS = 0x708, + VSUBSHS = 0x740, VCMPGTSH_ = 0x746, - VSUBSWS = 0x780, + VSUBSWS = 0x780, VCMPGTSW_ = 0x786, - VSUMSWS = 0x788, - VCMPBFP_ = 0x7c6, + VSUMSWS = 0x788, + VCMPBFP_ = 0x7c6, }; enum G_04_VA_Opcodes { - VMHADDSHS = 0x20, + VMHADDSHS = 0x20, VMHRADDSHS = 0x21, - VMLADDUHM = 0x22, - VMSUMUBM = 0x24, - VMSUMMBM = 0x25, - VMSUMUHM = 0x26, - VMSUMUHS = 0x27, - VMSUMSHM = 0x28, - VMSUMSHS = 0x29, - VSEL = 0x2a, - VPERM = 0x2b, - VSLDOI = 0x2c, - VMADDFP = 0x2e, - VNMSUBFP = 0x2f, + VMLADDUHM = 0x22, + VMSUMUBM = 0x24, + VMSUMMBM = 0x25, + VMSUMUHM = 0x26, + VMSUMUHS = 0x27, + VMSUMSHM = 0x28, + VMSUMSHS = 0x29, + VSEL = 0x2a, + VPERM = 0x2b, + VSLDOI = 0x2c, + VMADDFP = 0x2e, + VNMSUBFP = 0x2f, }; enum G_13Opcodes //Field 21 - 30 { - MCRF = 0x000, - BCLR = 0x010, - CRNOR = 0x021, - CRANDC = 0x081, - ISYNC = 0x096, - CRXOR = 0x0c1, - CRNAND = 0x0e1, - CRAND = 0x101, - CREQV = 0x121, - CRORC = 0x1a1, - CROR = 0x1c1, - BCCTR = 0x210, + MCRF = 0x000, + BCLR = 0x010, + CRNOR = 0x021, + CRANDC = 0x081, + ISYNC = 0x096, + CRXOR = 0x0c1, + CRNAND = 0x0e1, + CRAND = 0x101, + CREQV = 0x121, + CRORC = 0x1a1, + CROR = 0x1c1, + BCCTR = 0x210, }; enum G_1eOpcodes //Field 27 - 29 { - RLDICL = 0x0, - RLDICR = 0x1, - RLDIC = 0x2, - RLDIMI = 0x3, - RLDC_LR = 0x4, + RLDICL = 0x0, + RLDICR = 0x1, + RLDIC = 0x2, + RLDIMI = 0x3, + RLDC_LR = 0x4, }; enum G_1fOpcodes //Field 21 - 30 { - CMP = 0x000, - TW = 0x004, - LVSL = 0x006, //Load Vector for Shift Left - LVEBX = 0x007, //Load Vector Element Byte Indexed - SUBFC = 0x008, //Subtract from Carrying - MULHDU = 0x009, - ADDC = 0x00a, - MULHWU = 0x00b, - MFOCRF = 0x013, - LWARX = 0x014, - LDX = 0x015, - LWZX = 0x017, - SLW = 0x018, - CNTLZW = 0x01a, - SLD = 0x01b, - AND = 0x01c, - CMPL = 0x020, - LVSR = 0x026, //Load Vector for Shift Right - LVEHX = 0x027, //Load Vector Element Halfword Indexed - SUBF = 0x028, - LDUX = 0x035, //Load Doubleword with Update Indexed - DCBST = 0x036, - LWZUX = 0x037, - CNTLZD = 0x03a, - ANDC = 0x03c, - LVEWX = 0x047, //Load Vector Element Word Indexed - MULHD = 0x049, - MULHW = 0x04b, - LDARX = 0x054, - DCBF = 0x056, - LBZX = 0x057, - LVX = 0x067, //Load Vector Indexed - NEG = 0x068, - LBZUX = 0x077, - NOR = 0x07c, - STVEBX = 0x087, //Store Vector Element Byte Indexed - SUBFE = 0x088, //Subtract from Extended - ADDE = 0x08a, - MTOCRF = 0x090, - STDX = 0x095, - STWCX_ = 0x096, - STWX = 0x097, - STVEHX = 0x0a7, //Store Vector Element Halfword Indexed - STDUX = 0x0b5, - STWUX = 0x0b7, - STVEWX = 0x0c7, //Store Vector Element Word Indexed - SUBFZE = 0x0c8, - ADDZE = 0x0ca, - STDCX_ = 0x0d6, - STBX = 0x0d7, - STVX = 0x0e7, - SUBFME = 0x0e8, - MULLD = 0x0e9, - ADDME = 0x0ea, - MULLW = 0x0eb, - DCBTST = 0x0f6, - STBUX = 0x0f7, - DOZ = 0x108, - ADD = 0x10a, - DCBT = 0x116, - LHZX = 0x117, - EQV = 0x11c, - ECIWX = 0x136, - LHZUX = 0x137, - XOR = 0x13c, - MFSPR = 0x153, - LWAX = 0x155, - DST = 0x156, //Data Stream Touch - LHAX = 0x157, - LVXL = 0x167, //Load Vector Indexed Last - MFTB = 0x173, - LWAUX = 0x175, - DSTST = 0x176, //Data Stream Touch for Store - LHAUX = 0x177, - STHX = 0x197, //Store Halfword Indexed - ORC = 0x19c, //OR with Complement - ECOWX = 0x1b6, - STHUX = 0x1b7, - OR = 0x1bc, - DIVDU = 0x1c9, - DIVWU = 0x1cb, - MTSPR = 0x1d3, - DCBI = 0x1d6, - NAND = 0x1dc, - STVXL = 0x1e7, //Store Vector Indexed Last - DIVD = 0x1e9, - DIVW = 0x1eb, - LVLX = 0x207, //Load Vector Left Indexed - LDBRX = 0x214, - LWBRX = 0x216, - LFSX = 0x217, - SRW = 0x218, - SRD = 0x21b, - LVRX = 0x227, //Load Vector Right Indexed - LFSUX = 0x237, - LSWI = 0x255, - SYNC = 0x256, - LFDX = 0x257, - LFDUX = 0x277, - STVLX = 0x287, //Store Vector Left Indexed - STWBRX = 0x296, - STFSX = 0x297, - STVRX = 0x2a7, //Store Vector Right Indexed - STSWI = 0x2d5, - STFDX = 0x2d7, //Store Floating-Point Double Indexed - LVLXL = 0x307, //Load Vector Left Indexed Last - LHBRX = 0x316, - SRAW = 0x318, - SRAD = 0x31a, - LVRXL = 0x327, //Load Vector Right Indexed Last - DSS = 0x336, //Data Stream Stop - SRAWI = 0x338, - SRADI1 = 0x33a, //sh_5 == 0 - SRADI2 = 0x33b, //sh_5 != 0 - EIEIO = 0x356, - STVLXL = 0x387, //Store Vector Left Indexed Last - STHBRX = 0x396, - EXTSH = 0x39a, - STVRXL = 0x3a7, //Store Vector Right Indexed Last - EXTSB = 0x3ba, - STFIWX = 0x3d7, - EXTSW = 0x3da, - ICBI = 0x3d6, - DCBZ = 0x3f6, + CMP = 0x000, + TW = 0x004, + LVSL = 0x006, //Load Vector for Shift Left + LVEBX = 0x007, //Load Vector Element Byte Indexed + SUBFC = 0x008, //Subtract from Carrying + MULHDU = 0x009, + ADDC = 0x00a, + MULHWU = 0x00b, + MFOCRF = 0x013, + LWARX = 0x014, + LDX = 0x015, + LWZX = 0x017, + SLW = 0x018, + CNTLZW = 0x01a, + SLD = 0x01b, + AND = 0x01c, + CMPL = 0x020, + LVSR = 0x026, //Load Vector for Shift Right + LVEHX = 0x027, //Load Vector Element Halfword Indexed + SUBF = 0x028, + LDUX = 0x035, //Load Doubleword with Update Indexed + DCBST = 0x036, + LWZUX = 0x037, + CNTLZD = 0x03a, + ANDC = 0x03c, + LVEWX = 0x047, //Load Vector Element Word Indexed + MULHD = 0x049, + MULHW = 0x04b, + LDARX = 0x054, + DCBF = 0x056, + LBZX = 0x057, + LVX = 0x067, //Load Vector Indexed + NEG = 0x068, + LBZUX = 0x077, + NOR = 0x07c, + STVEBX = 0x087, //Store Vector Element Byte Indexed + SUBFE = 0x088, //Subtract from Extended + ADDE = 0x08a, + MTOCRF = 0x090, + STDX = 0x095, + STWCX_ = 0x096, + STWX = 0x097, + STVEHX = 0x0a7, //Store Vector Element Halfword Indexed + STDUX = 0x0b5, + STWUX = 0x0b7, + STVEWX = 0x0c7, //Store Vector Element Word Indexed + SUBFZE = 0x0c8, + ADDZE = 0x0ca, + STDCX_ = 0x0d6, + STBX = 0x0d7, + STVX = 0x0e7, + SUBFME = 0x0e8, + MULLD = 0x0e9, + ADDME = 0x0ea, + MULLW = 0x0eb, + DCBTST = 0x0f6, + STBUX = 0x0f7, + DOZ = 0x108, + ADD = 0x10a, + DCBT = 0x116, + LHZX = 0x117, + EQV = 0x11c, + ECIWX = 0x136, + LHZUX = 0x137, + XOR = 0x13c, + MFSPR = 0x153, + LWAX = 0x155, + DST = 0x156, //Data Stream Touch + LHAX = 0x157, + LVXL = 0x167, //Load Vector Indexed Last + MFTB = 0x173, + LWAUX = 0x175, + DSTST = 0x176, //Data Stream Touch for Store + LHAUX = 0x177, + STHX = 0x197, //Store Halfword Indexed + ORC = 0x19c, //OR with Complement + ECOWX = 0x1b6, + STHUX = 0x1b7, + OR = 0x1bc, + DIVDU = 0x1c9, + DIVWU = 0x1cb, + MTSPR = 0x1d3, + DCBI = 0x1d6, + NAND = 0x1dc, + STVXL = 0x1e7, //Store Vector Indexed Last + DIVD = 0x1e9, + DIVW = 0x1eb, + LVLX = 0x207, //Load Vector Left Indexed + LDBRX = 0x214, + LWBRX = 0x216, + LFSX = 0x217, + SRW = 0x218, + SRD = 0x21b, + LVRX = 0x227, //Load Vector Right Indexed + LFSUX = 0x237, + LSWI = 0x255, + SYNC = 0x256, + LFDX = 0x257, + LFDUX = 0x277, + STVLX = 0x287, //Store Vector Left Indexed + STWBRX = 0x296, + STFSX = 0x297, + STVRX = 0x2a7, //Store Vector Right Indexed + STSWI = 0x2d5, + STFDX = 0x2d7, //Store Floating-Point Double Indexed + LVLXL = 0x307, //Load Vector Left Indexed Last + LHBRX = 0x316, + SRAW = 0x318, + SRAD = 0x31a, + LVRXL = 0x327, //Load Vector Right Indexed Last + DSS = 0x336, //Data Stream Stop + SRAWI = 0x338, + SRADI1 = 0x33a, //sh_5 == 0 + SRADI2 = 0x33b, //sh_5 != 0 + EIEIO = 0x356, + STVLXL = 0x387, //Store Vector Left Indexed Last + STHBRX = 0x396, + EXTSH = 0x39a, + STVRXL = 0x3a7, //Store Vector Right Indexed Last + EXTSB = 0x3ba, + STFIWX = 0x3d7, + EXTSW = 0x3da, + ICBI = 0x3d6, + DCBZ = 0x3f6, }; enum G_3aOpcodes //Field 30 - 31 { - LD = 0x0, - LDU = 0x1, + LD = 0x0, + LDU = 0x1, LWA = 0x2, }; enum G_3bOpcodes //Field 26 - 30 { - FDIVS = 0x12, - FSUBS = 0x14, - FADDS = 0x15, - FSQRTS = 0x16, - FRES = 0x18, - FMULS = 0x19, - FMSUBS = 0x1c, - FMADDS = 0x1d, - FNMSUBS = 0x1e, - FNMADDS = 0x1f, + FDIVS = 0x12, + FSUBS = 0x14, + FADDS = 0x15, + FSQRTS = 0x16, + FRES = 0x18, + FMULS = 0x19, + FMSUBS = 0x1c, + FMADDS = 0x1d, + FNMSUBS = 0x1e, + FNMADDS = 0x1f, }; enum G_3eOpcodes //Field 30 - 31 { - STD = 0x0, - STDU = 0x1, + STD = 0x0, + STDU = 0x1, }; enum G_3fOpcodes //Field 21 - 30 { - MTFSB1 = 0x026, - MCRFS = 0x040, - MTFSB0 = 0x046, - MTFSFI = 0x086, - MFFS = 0x247, - MTFSF = 0x2c7, + MTFSB1 = 0x026, + MCRFS = 0x040, + MTFSB0 = 0x046, + MTFSFI = 0x086, + MFFS = 0x247, + MTFSF = 0x2c7, - FCMPU = 0x000, - FRSP = 0x00c, - FCTIW = 0x00e, - FCTIWZ = 0x00f, - FDIV = 0x012, - FSUB = 0x014, - FADD = 0x015, - FSQRT = 0x016, - FSEL = 0x017, - FMUL = 0x019, - FRSQRTE = 0x01a, - FMSUB = 0x01c, - FMADD = 0x01d, - FNMSUB = 0x01e, - FNMADD = 0x01f, - FCMPO = 0x020, - FNEG = 0x028, - FMR = 0x048, - FNABS = 0x088, - FABS = 0x108, - FCTID = 0x32e, - FCTIDZ = 0x32f, - FCFID = 0x34e, + FCMPU = 0x000, + FRSP = 0x00c, + FCTIW = 0x00e, + FCTIWZ = 0x00f, + FDIV = 0x012, + FSUB = 0x014, + FADD = 0x015, + FSQRT = 0x016, + FSEL = 0x017, + FMUL = 0x019, + FRSQRTE = 0x01a, + FMSUB = 0x01c, + FMADD = 0x01d, + FNMSUB = 0x01e, + FNMADD = 0x01f, + FCMPO = 0x020, + FNEG = 0x028, + FMR = 0x048, + FNABS = 0x088, + FABS = 0x108, + FCTID = 0x32e, + FCTIDZ = 0x32f, + FCFID = 0x34e, }; } diff --git a/rpcs3/Emu/Cell/PPUThread.cpp b/rpcs3/Emu/Cell/PPUThread.cpp index 2e2de76536..2057b07c2a 100644 --- a/rpcs3/Emu/Cell/PPUThread.cpp +++ b/rpcs3/Emu/Cell/PPUThread.cpp @@ -30,19 +30,19 @@ void PPUThread::DoReset() PPCThread::DoReset(); //reset regs - memset(VPR, 0, sizeof(VPR)); + memset(VPR, 0, sizeof(VPR)); memset(FPR, 0, sizeof(FPR)); memset(GPR, 0, sizeof(GPR)); memset(SPRG, 0, sizeof(SPRG)); - - CR.CR = 0; - LR = 0; - CTR = 0; - USPRG0 = 0; - TB = 0; - XER.XER = 0; - FPSCR.FPSCR = 0; - VSCR.VSCR = 0; + + CR.CR = 0; + LR = 0; + CTR = 0; + USPRG0 = 0; + TB = 0; + XER.XER = 0; + FPSCR.FPSCR = 0; + VSCR.VSCR = 0; cycle = 0; } diff --git a/rpcs3/Emu/Cell/PPUThread.h b/rpcs3/Emu/Cell/PPUThread.h index 9da6680abd..6a7cc29273 100644 --- a/rpcs3/Emu/Cell/PPUThread.h +++ b/rpcs3/Emu/Cell/PPUThread.h @@ -21,40 +21,40 @@ enum enum { - PPU_THREAD_STATUS_IDLE = (1 << 0), - PPU_THREAD_STATUS_RUNNABLE = (1 << 1), - PPU_THREAD_STATUS_ONPROC = (1 << 2), - PPU_THREAD_STATUS_SLEEP = (1 << 3), - PPU_THREAD_STATUS_STOP = (1 << 4), - PPU_THREAD_STATUS_ZOMBIE = (1 << 5), - PPU_THREAD_STATUS_DELETED = (1 << 6), - PPU_THREAD_STATUS_UNKNOWN = (1 << 7), + PPU_THREAD_STATUS_IDLE = (1 << 0), + PPU_THREAD_STATUS_RUNNABLE = (1 << 1), + PPU_THREAD_STATUS_ONPROC = (1 << 2), + PPU_THREAD_STATUS_SLEEP = (1 << 3), + PPU_THREAD_STATUS_STOP = (1 << 4), + PPU_THREAD_STATUS_ZOMBIE = (1 << 5), + PPU_THREAD_STATUS_DELETED = (1 << 6), + PPU_THREAD_STATUS_UNKNOWN = (1 << 7), }; enum FPSCR_EXP { - FPSCR_FX = 0x80000000, - FPSCR_FEX = 0x40000000, - FPSCR_VX = 0x20000000, - FPSCR_OX = 0x10000000, + FPSCR_FX = 0x80000000, + FPSCR_FEX = 0x40000000, + FPSCR_VX = 0x20000000, + FPSCR_OX = 0x10000000, - FPSCR_UX = 0x08000000, - FPSCR_ZX = 0x04000000, - FPSCR_XX = 0x02000000, - FPSCR_VXSNAN = 0x01000000, + FPSCR_UX = 0x08000000, + FPSCR_ZX = 0x04000000, + FPSCR_XX = 0x02000000, + FPSCR_VXSNAN = 0x01000000, - FPSCR_VXISI = 0x00800000, - FPSCR_VXIDI = 0x00400000, - FPSCR_VXZDZ = 0x00200000, - FPSCR_VXIMZ = 0x00100000, + FPSCR_VXISI = 0x00800000, + FPSCR_VXIDI = 0x00400000, + FPSCR_VXZDZ = 0x00200000, + FPSCR_VXIMZ = 0x00100000, - FPSCR_VXVC = 0x00080000, - FPSCR_FR = 0x00040000, - FPSCR_FI = 0x00020000, + FPSCR_VXVC = 0x00080000, + FPSCR_FR = 0x00040000, + FPSCR_FI = 0x00020000, - FPSCR_VXSOFT = 0x00000400, - FPSCR_VXSQRT = 0x00000200, - FPSCR_VXCVI = 0x00000100, + FPSCR_VXSOFT = 0x00000400, + FPSCR_VXSQRT = 0x00000200, + FPSCR_VXCVI = 0x00000100, }; enum FPSCR_RN @@ -74,33 +74,33 @@ union FPSCRhdr { struct { - u32 RN :2; //Floating-point rounding control - u32 NI :1; //Floating-point non-IEEE mode - u32 XE :1; //Floating-point inexact exception enable - u32 ZE :1; //IEEE floating-point zero divide exception enable - u32 UE :1; //IEEE floating-point underflow exception enable - u32 OE :1; //IEEE floating-point overflow exception enable - u32 VE :1; //Floating-point invalid operation exception enable - u32 VXCVI :1; //Floating-point invalid operation exception for invalid integer convert - u32 VXSQRT :1; //Floating-point invalid operation exception for invalid square root - u32 VXSOFT :1; //Floating-point invalid operation exception for software request - u32 :1; //Reserved - u32 FPRF :5; //Floating-point result flags - u32 FI :1; //Floating-point fraction inexact - u32 FR :1; //Floating-point fraction rounded - u32 VXVC :1; //Floating-point invalid operation exception for invalid compare - u32 VXIMZ :1; //Floating-point invalid operation exception for * * 0 - u32 VXZDZ :1; //Floating-point invalid operation exception for 0 / 0 - u32 VXIDI :1; //Floating-point invalid operation exception for * + * - u32 VXISI :1; //Floating-point invalid operation exception for * - * - u32 VXSNAN :1; //Floating-point invalid operation exception for SNaN - u32 XX :1; //Floating-point inexact exception - u32 ZX :1; //Floating-point zero divide exception - u32 UX :1; //Floating-point underflow exception - u32 OX :1; //Floating-point overflow exception - u32 VX :1; //Floating-point invalid operation exception summary - u32 FEX :1; //Floating-point enabled exception summary - u32 FX :1; //Floating-point exception summary + u32 RN :2; //Floating-point rounding control + u32 NI :1; //Floating-point non-IEEE mode + u32 XE :1; //Floating-point inexact exception enable + u32 ZE :1; //IEEE floating-point zero divide exception enable + u32 UE :1; //IEEE floating-point underflow exception enable + u32 OE :1; //IEEE floating-point overflow exception enable + u32 VE :1; //Floating-point invalid operation exception enable + u32 VXCVI :1; //Floating-point invalid operation exception for invalid integer convert + u32 VXSQRT :1; //Floating-point invalid operation exception for invalid square root + u32 VXSOFT :1; //Floating-point invalid operation exception for software request + u32 :1; //Reserved + u32 FPRF :5; //Floating-point result flags + u32 FI :1; //Floating-point fraction inexact + u32 FR :1; //Floating-point fraction rounded + u32 VXVC :1; //Floating-point invalid operation exception for invalid compare + u32 VXIMZ :1; //Floating-point invalid operation exception for * * 0 + u32 VXZDZ :1; //Floating-point invalid operation exception for 0 / 0 + u32 VXIDI :1; //Floating-point invalid operation exception for * + * + u32 VXISI :1; //Floating-point invalid operation exception for * - * + u32 VXSNAN :1; //Floating-point invalid operation exception for SNaN + u32 XX :1; //Floating-point inexact exception + u32 ZX :1; //Floating-point zero divide exception + u32 UX :1; //Floating-point underflow exception + u32 OX :1; //Floating-point overflow exception + u32 VX :1; //Floating-point invalid operation exception summary + u32 FEX :1; //Floating-point enabled exception summary + u32 FX :1; //Floating-point exception summary }; u32 FPSCR; @@ -113,38 +113,38 @@ union MSRhdr //Little-endian mode enable //0 The processor runs in big-endian mode. //1 The processor runs in little-endian mode. - u64 LE : 1; - + u64 LE : 1; + //Recoverable exception (for system reset and machine check exceptions). //0 Exception is not recoverable. //1 Exception is recoverable. - u64 RI : 1; - + u64 RI : 1; + //Reserved - u64 : 2; - + u64 : 2; + //Data address translation //0 Data address translation is disabled. //1 Data address translation is enabled. - u64 DR : 1; - + u64 DR : 1; + //Instruction address translation //0 Instruction address translation is disabled. //1 Instruction address translation is enabled. - u64 IR : 1; + u64 IR : 1; //Exception prefix. The setting of this bit specifies whether an exception vector offset //is prepended with Fs or 0s. In the following description, nnnnn is the offset of the //exception. //0 Exceptions are vectored to the physical address 0x0000_0000_000n_nnnn in 64-bit implementations. //1 Exceptions are vectored to the physical address 0xFFFF_FFFF_FFFn_nnnn in 64-bit implementations. - u64 IP : 1; + u64 IP : 1; //Reserved - u64 : 1; + u64 : 1; //Floating-point exception mode 1 - u64 FE1 : 1; + u64 FE1 : 1; //Branch trace enable (Optional) //0 The processor executes branch instructions normally. @@ -152,62 +152,62 @@ union MSRhdr //execution of a branch instruction, regardless of whether or not the branch was //taken. //Note: If the function is not implemented, this bit is treated as reserved. - u64 BE : 1; + u64 BE : 1; //Single-step trace enable (Optional) //0 The processor executes instructions normally. //1 The processor generates a single-step trace exception upon the successful //execution of the next instruction. //Note: If the function is not implemented, this bit is treated as reserved. - u64 SE : 1; + u64 SE : 1; //Floating-point exception mode 0 - u64 FE0 : 1; + u64 FE0 : 1; //Machine check enable //0 Machine check exceptions are disabled. //1 Machine check exceptions are enabled. - u64 ME : 1; + u64 ME : 1; //Floating-point available //0 The processor prevents dispatch of floating-point instructions, including //floating-point loads, stores, and moves. //1 The processor can execute floating-point instructions. - u64 FP : 1; + u64 FP : 1; //Privilege level //0 The processor can execute both user- and supervisor-level instructions. //1 The processor can only execute user-level instructions. - u64 PR : 1; + u64 PR : 1; //External interrupt enable //0 While the bit is cleared the processor delays recognition of external interrupts //and decrementer exception conditions. //1 The processor is enabled to take an external interrupt or the decrementer //exception. - u64 EE : 1; + u64 EE : 1; //Exception little-endian mode. When an exception occurs, this bit is copied into //MSR[LE] to select the endian mode for the context established by the exception - u64 ILE : 1; + u64 ILE : 1; //Reserved - u64 : 1; + u64 : 1; //Power management enable //0 Power management disabled (normal operation mode). //1 Power management enabled (reduced power mode). //Note: Power management functions are implementation-dependent. If the function //is not implemented, this bit is treated as reserved. - u64 POW : 1; + u64 POW : 1; //Reserved - u64 : 44; + u64 : 44; //Sixty-four bit mode //0 The 64-bit processor runs in 32-bit mode. //1 The 64-bit processor runs in 64-bit mode. Note that this is the default setting. - u64 SF : 1; + u64 SF : 1; }; u64 MSR; @@ -230,14 +230,14 @@ union CRhdr struct { - u8 cr7 : 4; - u8 cr6 : 4; - u8 cr5 : 4; - u8 cr4 : 4; - u8 cr3 : 4; - u8 cr2 : 4; - u8 cr1 : 4; - u8 cr0 : 4; + u8 cr7 : 4; + u8 cr6 : 4; + u8 cr5 : 4; + u8 cr4 : 4; + u8 cr3 : 4; + u8 cr2 : 4; + u8 cr1 : 4; + u8 cr0 : 4; }; }; @@ -247,10 +247,10 @@ union XERhdr struct { - u64 L : 61; - u64 CA : 1; - u64 OV : 1; - u64 SO : 1; + u64 L : 61; + u64 CA : 1; + u64 OV : 1; + u64 SO : 1; }; }; @@ -279,8 +279,8 @@ union VSCRhdr Vector Convert to Fixed-Point with Saturation (vctuxs, vctsxs) 0 Indicates no saturation occurred; mtvscr can explicitly clear this bit. */ - u32 SAT : 1; - u32 X : 15; + u32 SAT : 1; + u32 X : 15; /* Non-Java. A mode control bit that determines whether vector floating-point operations will be performed @@ -292,8 +292,8 @@ union VSCRhdr exception, the corresponding element in the target VR is cleared to ‘0’. In both cases, the ‘0’ has the same sign as the denormalized or underflowing value. */ - u32 NJ : 1; - u32 Y : 15; + u32 NJ : 1; + u32 Y : 15; }; }; @@ -327,16 +327,16 @@ struct PPCdouble struct { - u64 frac : 52; - u64 exp : 11; - u64 sign : 1; + u64 frac : 52; + u64 exp : 11; + u64 sign : 1; }; struct { - u64 : 51; + u64 : 51; u64 nan : 1; - u64 : 12; + u64 : 12; }; }; @@ -360,24 +360,24 @@ struct PPCdouble switch(fpc) { case _FPCLASS_SNAN:// return FPR_SNAN; - case _FPCLASS_QNAN: return FPR_QNAN; - case _FPCLASS_NINF: return FPR_NINF; - case _FPCLASS_NN: return FPR_NN; - case _FPCLASS_ND: return FPR_ND; - case _FPCLASS_NZ: return FPR_NZ; - case _FPCLASS_PZ: return FPR_PZ; - case _FPCLASS_PD: return FPR_PD; - case _FPCLASS_PN: return FPR_PN; - case _FPCLASS_PINF: return FPR_PINF; + case _FPCLASS_QNAN: return FPR_QNAN; + case _FPCLASS_NINF: return FPR_NINF; + case _FPCLASS_NN: return FPR_NN; + case _FPCLASS_ND: return FPR_ND; + case _FPCLASS_NZ: return FPR_NZ; + case _FPCLASS_PZ: return FPR_PZ; + case _FPCLASS_PD: return FPR_PD; + case _FPCLASS_PN: return FPR_PN; + case _FPCLASS_PINF: return FPR_PINF; } #else switch (fpc) { - case FP_NAN: return FPR_QNAN; - case FP_INFINITE: return std::signbit(_double) ? FPR_NINF : FPR_PINF; - case FP_SUBNORMAL: return std::signbit(_double) ? FPR_ND : FPR_PD; - case FP_ZERO: return std::signbit(_double) ? FPR_NZ : FPR_PZ; - default: return std::signbit(_double) ? FPR_NN : FPR_PN; + case FP_NAN: return FPR_QNAN; + case FP_INFINITE: return std::signbit(_double) ? FPR_NINF : FPR_PINF; + case FP_SUBNORMAL: return std::signbit(_double) ? FPR_ND : FPR_PD; + case FP_ZERO: return std::signbit(_double) ? FPR_NZ : FPR_PZ; + default: return std::signbit(_double) ? FPR_NN : FPR_PN; } #endif @@ -585,8 +585,8 @@ public: VSCRhdr VSCR; // Vector Status and Control Register - u64 LR; //SPR 0x008 : Link Register - u64 CTR; //SPR 0x009 : Count Register + u64 LR; //SPR 0x008 : Link Register + u64 CTR; //SPR 0x009 : Count Register union { @@ -670,9 +670,9 @@ public: template void UpdateCRn(const u8 n, const T a, const T b) { - if (a < b) SetCR(n, CR_LT); - else if (a > b) SetCR(n, CR_GT); - else if (a == b) SetCR(n, CR_EQ); + if (a < b) SetCR(n, CR_LT); + else if (a > b) SetCR(n, CR_GT); + else if (a == b) SetCR(n, CR_EQ); SetCR_SO(n, XER.SO); } @@ -773,11 +773,11 @@ public: if (reg.find("FPR")==0) return fmt::Format("%016llx", (double)FPR[reg_index]); if (reg.find("VPR")==0) return fmt::Format("%016llx%016llx", VPR[reg_index]._u64[1], VPR[reg_index]._u64[0]); } - if (reg == "CR") return fmt::Format("%08x", CR.CR); - if (reg == "LR") return fmt::Format("%016llx", LR); - if (reg == "CTR") return fmt::Format("%016llx", CTR); - if (reg == "XER") return fmt::Format("%016llx", XER.XER); - if (reg == "FPSCR") return fmt::Format("%08x", FPSCR.FPSCR); + if (reg == "CR") return fmt::Format("%08x", CR.CR); + if (reg == "LR") return fmt::Format("%016llx", LR); + if (reg == "CTR") return fmt::Format("%016llx", CTR); + if (reg == "XER") return fmt::Format("%016llx", XER.XER); + if (reg == "FPSCR") return fmt::Format("%08x", FPSCR.FPSCR); return ""; } diff --git a/rpcs3/Emu/Cell/RawSPUThread.cpp b/rpcs3/Emu/Cell/RawSPUThread.cpp index 0c2dac87cb..e3dd598ff0 100644 --- a/rpcs3/Emu/Cell/RawSPUThread.cpp +++ b/rpcs3/Emu/Cell/RawSPUThread.cpp @@ -60,33 +60,33 @@ bool RawSPUThread::Read32(const u64 addr, u32* value) u32 offset = addr - GetStartAddr() - RAW_SPU_PROB_OFFSET; switch(offset) { - case MFC_LSA_offs: ConLog.Warning("RawSPUThread[%d]: Read32(MFC_LSA)", m_index); *value = MFC2.LSA.GetValue(); break; - case MFC_EAH_offs: ConLog.Warning("RawSPUThread[%d]: Read32(MFC_EAH)", m_index); *value = MFC2.EAH.GetValue(); break; - case MFC_EAL_offs: ConLog.Warning("RawSPUThread[%d]: Read32(MFC_EAL)", m_index); *value = MFC2.EAL.GetValue(); break; - case MFC_Size_Tag_offs: ConLog.Warning("RawSPUThread[%d]: Read32(MFC_Size_Tag)", m_index); *value = MFC2.Size_Tag.GetValue(); break; - case MFC_CMDStatus_offs: ConLog.Warning("RawSPUThread[%d]: Read32(MFC_CMDStatus)", m_index); *value = MFC2.CMDStatus.GetValue(); break; - case MFC_QStatus_offs: + case MFC_LSA_offs: ConLog.Warning("RawSPUThread[%d]: Read32(MFC_LSA)", m_index); *value = MFC2.LSA.GetValue(); break; + case MFC_EAH_offs: ConLog.Warning("RawSPUThread[%d]: Read32(MFC_EAH)", m_index); *value = MFC2.EAH.GetValue(); break; + case MFC_EAL_offs: ConLog.Warning("RawSPUThread[%d]: Read32(MFC_EAL)", m_index); *value = MFC2.EAL.GetValue(); break; + case MFC_Size_Tag_offs: ConLog.Warning("RawSPUThread[%d]: Read32(MFC_Size_Tag)", m_index); *value = MFC2.Size_Tag.GetValue(); break; + case MFC_CMDStatus_offs: ConLog.Warning("RawSPUThread[%d]: Read32(MFC_CMDStatus)", m_index); *value = MFC2.CMDStatus.GetValue(); break; + case MFC_QStatus_offs: ConLog.Warning("RawSPUThread[%d]: Read32(MFC_QStatus)", m_index); *value = MFC2.QStatus.GetValue(); break; - case Prxy_QueryType_offs: ConLog.Warning("RawSPUThread[%d]: Read32(Prxy_QueryType)", m_index); *value = Prxy.QueryType.GetValue(); break; - case Prxy_QueryMask_offs: ConLog.Warning("RawSPUThread[%d]: Read32(Prxy_QueryMask)", m_index); *value = Prxy.QueryMask.GetValue(); break; - case Prxy_TagStatus_offs: ConLog.Warning("RawSPUThread[%d]: Read32(Prxy_TagStatus)", m_index); *value = Prxy.TagStatus.GetValue(); break; - case SPU_Out_MBox_offs: + case Prxy_QueryType_offs: ConLog.Warning("RawSPUThread[%d]: Read32(Prxy_QueryType)", m_index); *value = Prxy.QueryType.GetValue(); break; + case Prxy_QueryMask_offs: ConLog.Warning("RawSPUThread[%d]: Read32(Prxy_QueryMask)", m_index); *value = Prxy.QueryMask.GetValue(); break; + case Prxy_TagStatus_offs: ConLog.Warning("RawSPUThread[%d]: Read32(Prxy_TagStatus)", m_index); *value = Prxy.TagStatus.GetValue(); break; + case SPU_Out_MBox_offs: ConLog.Warning("RawSPUThread[%d]: Read32(SPU_Out_MBox)", m_index); SPU.Out_MBox.PopUncond(*value); //if Out_MBox is empty yet, the result will be undefined break; - case SPU_In_MBox_offs: ConLog.Warning("RawSPUThread[%d]: Read32(SPU_In_MBox)", m_index); while(!SPU.In_MBox.Pop(*value) && !Emu.IsStopped()) Sleep(1); break; - case SPU_MBox_Status_offs: //ConLog.Warning("RawSPUThread[%d]: Read32(SPU_MBox_Status)", m_index); + case SPU_In_MBox_offs: ConLog.Warning("RawSPUThread[%d]: Read32(SPU_In_MBox)", m_index); while(!SPU.In_MBox.Pop(*value) && !Emu.IsStopped()) Sleep(1); break; + case SPU_MBox_Status_offs: //ConLog.Warning("RawSPUThread[%d]: Read32(SPU_MBox_Status)", m_index); //SPU.MBox_Status.SetValue(SPU.Out_MBox.GetCount() ? SPU.MBox_Status.GetValue() | 1 : SPU.MBox_Status.GetValue() & ~1); SPU.MBox_Status.SetValue((SPU.Out_MBox.GetCount() & 0xff) | (SPU.In_MBox.GetFreeCount() << 8)); *value = SPU.MBox_Status.GetValue(); break; - case SPU_RunCntl_offs: ConLog.Warning("RawSPUThread[%d]: Read32(SPU_RunCntl)", m_index); *value = SPU.RunCntl.GetValue(); break; - case SPU_Status_offs: ConLog.Warning("RawSPUThread[%d]: Read32(SPU_Status)", m_index); *value = SPU.Status.GetValue(); break; - case SPU_NPC_offs: ConLog.Warning("RawSPUThread[%d]: Read32(SPU_NPC)", m_index); *value = SPU.NPC.GetValue(); break; - case SPU_RdSigNotify1_offs: ConLog.Warning("RawSPUThread[%d]: Read32(SPU_RdSigNotify1)", m_index); *value = SPU.SNR[0].GetValue(); break; - case SPU_RdSigNotify2_offs: ConLog.Warning("RawSPUThread[%d]: Read32(SPU_RdSigNotify2)", m_index); *value = SPU.SNR[1].GetValue(); break; + case SPU_RunCntl_offs: ConLog.Warning("RawSPUThread[%d]: Read32(SPU_RunCntl)", m_index); *value = SPU.RunCntl.GetValue(); break; + case SPU_Status_offs: ConLog.Warning("RawSPUThread[%d]: Read32(SPU_Status)", m_index); *value = SPU.Status.GetValue(); break; + case SPU_NPC_offs: ConLog.Warning("RawSPUThread[%d]: Read32(SPU_NPC)", m_index); *value = SPU.NPC.GetValue(); break; + case SPU_RdSigNotify1_offs: ConLog.Warning("RawSPUThread[%d]: Read32(SPU_RdSigNotify1)", m_index); *value = SPU.SNR[0].GetValue(); break; + case SPU_RdSigNotify2_offs: ConLog.Warning("RawSPUThread[%d]: Read32(SPU_RdSigNotify2)", m_index); *value = SPU.SNR[1].GetValue(); break; default: ConLog.Error("RawSPUThread[%d]: Read32(0x%x)", m_index, offset); @@ -189,19 +189,19 @@ bool RawSPUThread::Write32(const u64 addr, const u32 value) MFC2.QStatus.SetValue(Prxy.QueryMask.GetValue()); } break; - case Prxy_QueryMask_offs: ConLog.Warning("RawSPUThread[%d]: Write32(Prxy_QueryMask, 0x%x)", m_index, value); Prxy.QueryMask.SetValue(value); break; - case Prxy_TagStatus_offs: ConLog.Warning("RawSPUThread[%d]: Write32(Prxy_TagStatus, 0x%x)", m_index, value); Prxy.TagStatus.SetValue(value); break; - case SPU_Out_MBox_offs: ConLog.Warning("RawSPUThread[%d]: Write32(SPU_Out_MBox, 0x%x)", m_index, value); while(!SPU.Out_MBox.Push(value) && !Emu.IsStopped()) Sleep(1); break; - case SPU_In_MBox_offs: + case Prxy_QueryMask_offs: ConLog.Warning("RawSPUThread[%d]: Write32(Prxy_QueryMask, 0x%x)", m_index, value); Prxy.QueryMask.SetValue(value); break; + case Prxy_TagStatus_offs: ConLog.Warning("RawSPUThread[%d]: Write32(Prxy_TagStatus, 0x%x)", m_index, value); Prxy.TagStatus.SetValue(value); break; + case SPU_Out_MBox_offs: ConLog.Warning("RawSPUThread[%d]: Write32(SPU_Out_MBox, 0x%x)", m_index, value); while(!SPU.Out_MBox.Push(value) && !Emu.IsStopped()) Sleep(1); break; + case SPU_In_MBox_offs: ConLog.Warning("RawSPUThread[%d]: Write32(SPU_In_MBox, 0x%x)", m_index, value); SPU.In_MBox.PushUncond(value); //if In_MBox is already full, the last message will be overwritten break; - case SPU_MBox_Status_offs: ConLog.Warning("RawSPUThread[%d]: Write32(SPU_MBox_Status, 0x%x)", m_index, value); SPU.MBox_Status.SetValue(value); break; - case SPU_RunCntl_offs: ConLog.Warning("RawSPUThread[%d]: Write32(SPU_RunCntl, 0x%x)", m_index, value); SPU.RunCntl.SetValue(value); break; - case SPU_Status_offs: ConLog.Warning("RawSPUThread[%d]: Write32(SPU_Status, 0x%x)", m_index, value); SPU.Status.SetValue(value); break; - case SPU_NPC_offs: ConLog.Warning("RawSPUThread[%d]: Write32(SPU_NPC, 0x%x)", m_index, value); SPU.NPC.SetValue(value); break; - case SPU_RdSigNotify1_offs: ConLog.Warning("RawSPUThread[%d]: Write32(SPU_RdSigNotify1, 0x%x)", m_index, value); SPU.SNR[0].SetValue(value); break; - case SPU_RdSigNotify2_offs: ConLog.Warning("RawSPUThread[%d]: Write32(SPU_RdSigNotify2, 0x%x)", m_index, value); SPU.SNR[1].SetValue(value); break; + case SPU_MBox_Status_offs: ConLog.Warning("RawSPUThread[%d]: Write32(SPU_MBox_Status, 0x%x)", m_index, value); SPU.MBox_Status.SetValue(value); break; + case SPU_RunCntl_offs: ConLog.Warning("RawSPUThread[%d]: Write32(SPU_RunCntl, 0x%x)", m_index, value); SPU.RunCntl.SetValue(value); break; + case SPU_Status_offs: ConLog.Warning("RawSPUThread[%d]: Write32(SPU_Status, 0x%x)", m_index, value); SPU.Status.SetValue(value); break; + case SPU_NPC_offs: ConLog.Warning("RawSPUThread[%d]: Write32(SPU_NPC, 0x%x)", m_index, value); SPU.NPC.SetValue(value); break; + case SPU_RdSigNotify1_offs: ConLog.Warning("RawSPUThread[%d]: Write32(SPU_RdSigNotify1, 0x%x)", m_index, value); SPU.SNR[0].SetValue(value); break; + case SPU_RdSigNotify2_offs: ConLog.Warning("RawSPUThread[%d]: Write32(SPU_RdSigNotify2, 0x%x)", m_index, value); SPU.SNR[1].SetValue(value); break; default: ConLog.Error("RawSPUThread[%d]: Write32(0x%x, 0x%x)", m_index, offset, value); diff --git a/rpcs3/Emu/Cell/RawSPUThread.h b/rpcs3/Emu/Cell/RawSPUThread.h index 5a19973afc..51164dfad6 100644 --- a/rpcs3/Emu/Cell/RawSPUThread.h +++ b/rpcs3/Emu/Cell/RawSPUThread.h @@ -4,32 +4,32 @@ enum { - MFC_LSA_offs = 0x3004, - MFC_EAH_offs = 0x3008, - MFC_EAL_offs = 0x300C, - MFC_Size_Tag_offs = 0x3010, - MFC_Class_CMD_offs = 0x3014, - MFC_CMDStatus_offs = 0x3014, - MFC_QStatus_offs = 0x3104, - Prxy_QueryType_offs = 0x3204, - Prxy_QueryMask_offs = 0x321C, - Prxy_TagStatus_offs = 0x322C, - SPU_Out_MBox_offs = 0x4004, - SPU_In_MBox_offs = 0x400C, - SPU_MBox_Status_offs = 0x4014, - SPU_RunCntl_offs = 0x401C, - SPU_Status_offs = 0x4024, - SPU_NPC_offs = 0x4034, - SPU_RdSigNotify1_offs = 0x1400C, - SPU_RdSigNotify2_offs = 0x1C00C, + MFC_LSA_offs = 0x3004, + MFC_EAH_offs = 0x3008, + MFC_EAL_offs = 0x300C, + MFC_Size_Tag_offs = 0x3010, + MFC_Class_CMD_offs = 0x3014, + MFC_CMDStatus_offs = 0x3014, + MFC_QStatus_offs = 0x3104, + Prxy_QueryType_offs = 0x3204, + Prxy_QueryMask_offs = 0x321C, + Prxy_TagStatus_offs = 0x322C, + SPU_Out_MBox_offs = 0x4004, + SPU_In_MBox_offs = 0x400C, + SPU_MBox_Status_offs = 0x4014, + SPU_RunCntl_offs = 0x401C, + SPU_Status_offs = 0x4024, + SPU_NPC_offs = 0x4034, + SPU_RdSigNotify1_offs = 0x1400C, + SPU_RdSigNotify2_offs = 0x1C00C, }; enum : u64 { - RAW_SPU_OFFSET = 0x0000000000100000, + RAW_SPU_OFFSET = 0x0000000000100000, RAW_SPU_BASE_ADDR = 0x00000000E0000000, - RAW_SPU_LS_OFFSET = 0x0000000000000000, - RAW_SPU_PROB_OFFSET = 0x0000000000040000, + RAW_SPU_LS_OFFSET = 0x0000000000000000, + RAW_SPU_PROB_OFFSET = 0x0000000000040000, }; __forceinline static u32 GetRawSPURegAddrByNum(int num, int offset) diff --git a/rpcs3/Emu/Cell/SPUOpcodes.h b/rpcs3/Emu/Cell/SPUOpcodes.h index 6b85300298..d486ba7495 100644 --- a/rpcs3/Emu/Cell/SPUOpcodes.h +++ b/rpcs3/Emu/Cell/SPUOpcodes.h @@ -4,146 +4,146 @@ namespace SPU_opcodes { enum SPU_0_10_Opcodes { - STOP = 0x0, - LNOP = 0x1, - SYNC = 0x2, - DSYNC = 0x3, - MFSPR = 0xc, - RDCH = 0xd, - RCHCNT = 0xf, - SF = 0x40, - OR = 0x41, - BG = 0x42, - SFH = 0x48, - NOR = 0x49, - ABSDB = 0x53, - ROT = 0x58, - ROTM = 0x59, - ROTMA = 0x5a, - SHL = 0x5b, - ROTH = 0x5c, - ROTHM = 0x5d, - ROTMAH = 0x5e, - SHLH = 0x5f, - ROTI = 0x78, - ROTMI = 0x79, - ROTMAI = 0x7a, - SHLI = 0x7b, - ROTHI = 0x7c, - ROTHMI = 0x7d, - ROTMAHI = 0x7e, - SHLHI = 0x7f, - A = 0xc0, - AND = 0xc1, - CG = 0xc2, - AH = 0xc8, - NAND = 0xc9, - AVGB = 0xd3, - MTSPR = 0x10c, - WRCH = 0x10d, - BIZ = 0x128, - BINZ = 0x129, - BIHZ = 0x12a, - BIHNZ = 0x12b, - STOPD = 0x140, - STQX = 0x144, - BI = 0x1a8, - BISL = 0x1a9, - IRET = 0x1aa, - BISLED = 0x1ab, - HBR = 0x1ac, - GB = 0x1b0, - GBH = 0x1b1, - GBB = 0x1b2, - FSM = 0x1b4, - FSMH = 0x1b5, - FSMB = 0x1b6, - FREST = 0x1b8, - FRSQEST = 0x1b9, - LQX = 0x1c4, - ROTQBYBI = 0x1cc, + STOP = 0x0, + LNOP = 0x1, + SYNC = 0x2, + DSYNC = 0x3, + MFSPR = 0xc, + RDCH = 0xd, + RCHCNT = 0xf, + SF = 0x40, + OR = 0x41, + BG = 0x42, + SFH = 0x48, + NOR = 0x49, + ABSDB = 0x53, + ROT = 0x58, + ROTM = 0x59, + ROTMA = 0x5a, + SHL = 0x5b, + ROTH = 0x5c, + ROTHM = 0x5d, + ROTMAH = 0x5e, + SHLH = 0x5f, + ROTI = 0x78, + ROTMI = 0x79, + ROTMAI = 0x7a, + SHLI = 0x7b, + ROTHI = 0x7c, + ROTHMI = 0x7d, + ROTMAHI = 0x7e, + SHLHI = 0x7f, + A = 0xc0, + AND = 0xc1, + CG = 0xc2, + AH = 0xc8, + NAND = 0xc9, + AVGB = 0xd3, + MTSPR = 0x10c, + WRCH = 0x10d, + BIZ = 0x128, + BINZ = 0x129, + BIHZ = 0x12a, + BIHNZ = 0x12b, + STOPD = 0x140, + STQX = 0x144, + BI = 0x1a8, + BISL = 0x1a9, + IRET = 0x1aa, + BISLED = 0x1ab, + HBR = 0x1ac, + GB = 0x1b0, + GBH = 0x1b1, + GBB = 0x1b2, + FSM = 0x1b4, + FSMH = 0x1b5, + FSMB = 0x1b6, + FREST = 0x1b8, + FRSQEST = 0x1b9, + LQX = 0x1c4, + ROTQBYBI = 0x1cc, ROTQMBYBI = 0x1cd, - SHLQBYBI = 0x1cf, - CBX = 0x1d4, - CHX = 0x1d5, - CWX = 0x1d6, - CDX = 0x1d7, - ROTQBI = 0x1d8, - ROTQMBI = 0x1d9, - SHLQBI = 0x1db, - ROTQBY = 0x1dc, - ROTQMBY = 0x1dd, - SHLQBY = 0x1df, - ORX = 0x1f0, - CBD = 0x1f4, - CHD = 0x1f5, - CWD = 0x1f6, - CDD = 0x1f7, - ROTQBII = 0x1f8, - ROTQMBII = 0x1f9, - SHLQBII = 0x1fb, - ROTQBYI = 0x1fc, - ROTQMBYI = 0x1fd, - SHLQBYI = 0x1ff, - NOP = 0x201, - CGT = 0x240, - XOR = 0x241, - CGTH = 0x248, - EQV = 0x249, - CGTB = 0x250, - SUMB = 0x253, - HGT = 0x258, - CLZ = 0x2a5, - XSWD = 0x2a6, - XSHW = 0x2ae, - CNTB = 0x2b4, - XSBH = 0x2b6, - CLGT = 0x2c0, - ANDC = 0x2c1, - FCGT = 0x2c2, - DFCGT = 0x2c3, - FA = 0x2c4, - FS = 0x2c5, - FM = 0x2c6, - CLGTH = 0x2c8, - ORC = 0x2c9, - FCMGT = 0x2ca, - DFCMGT = 0x2cb, - DFA = 0x2cc, - DFS = 0x2cd, - DFM = 0x2ce, - CLGTB = 0x2d0, - HLGT = 0x2d8, - DFMA = 0x35c, - DFMS = 0x35d, - DFNMS = 0x35e, - DFNMA = 0x35f, - CEQ = 0x3c0, - MPYHHU = 0x3ce, - ADDX = 0x340, - SFX = 0x341, - CGX = 0x342, - BGX = 0x343, - MPYHHA = 0x346, - MPYHHAU = 0x34e, - FSCRRD = 0x398, - FESD = 0x3b8, - FRDS = 0x3b9, - FSCRWR = 0x3ba, - DFTSV = 0x3bf, - FCEQ = 0x3c2, - DFCEQ = 0x3c3, - MPY = 0x3c4, - MPYH = 0x3c5, - MPYHH = 0x3c6, - MPYS = 0x3c7, - CEQH = 0x3c8, - FCMEQ = 0x3ca, - DFCMEQ = 0x3cb, - MPYU = 0x3cc, - CEQB = 0x3d0, - FI = 0x3d4, - HEQ = 0x3d8, + SHLQBYBI = 0x1cf, + CBX = 0x1d4, + CHX = 0x1d5, + CWX = 0x1d6, + CDX = 0x1d7, + ROTQBI = 0x1d8, + ROTQMBI = 0x1d9, + SHLQBI = 0x1db, + ROTQBY = 0x1dc, + ROTQMBY = 0x1dd, + SHLQBY = 0x1df, + ORX = 0x1f0, + CBD = 0x1f4, + CHD = 0x1f5, + CWD = 0x1f6, + CDD = 0x1f7, + ROTQBII = 0x1f8, + ROTQMBII = 0x1f9, + SHLQBII = 0x1fb, + ROTQBYI = 0x1fc, + ROTQMBYI = 0x1fd, + SHLQBYI = 0x1ff, + NOP = 0x201, + CGT = 0x240, + XOR = 0x241, + CGTH = 0x248, + EQV = 0x249, + CGTB = 0x250, + SUMB = 0x253, + HGT = 0x258, + CLZ = 0x2a5, + XSWD = 0x2a6, + XSHW = 0x2ae, + CNTB = 0x2b4, + XSBH = 0x2b6, + CLGT = 0x2c0, + ANDC = 0x2c1, + FCGT = 0x2c2, + DFCGT = 0x2c3, + FA = 0x2c4, + FS = 0x2c5, + FM = 0x2c6, + CLGTH = 0x2c8, + ORC = 0x2c9, + FCMGT = 0x2ca, + DFCMGT = 0x2cb, + DFA = 0x2cc, + DFS = 0x2cd, + DFM = 0x2ce, + CLGTB = 0x2d0, + HLGT = 0x2d8, + DFMA = 0x35c, + DFMS = 0x35d, + DFNMS = 0x35e, + DFNMA = 0x35f, + CEQ = 0x3c0, + MPYHHU = 0x3ce, + ADDX = 0x340, + SFX = 0x341, + CGX = 0x342, + BGX = 0x343, + MPYHHA = 0x346, + MPYHHAU = 0x34e, + FSCRRD = 0x398, + FESD = 0x3b8, + FRDS = 0x3b9, + FSCRWR = 0x3ba, + DFTSV = 0x3bf, + FCEQ = 0x3c2, + DFCEQ = 0x3c3, + MPY = 0x3c4, + MPYH = 0x3c5, + MPYHH = 0x3c6, + MPYS = 0x3c7, + CEQH = 0x3c8, + FCMEQ = 0x3ca, + DFCMEQ = 0x3cb, + MPYU = 0x3cc, + CEQB = 0x3d0, + FI = 0x3d4, + HEQ = 0x3d8, }; enum SPU_0_9_Opcodes @@ -156,73 +156,73 @@ namespace SPU_opcodes enum SPU_0_8_Opcodes { - BRZ = 0x40, - STQA = 0x41, - BRNZ = 0x42, - BRHZ = 0x44, + BRZ = 0x40, + STQA = 0x41, + BRNZ = 0x42, + BRHZ = 0x44, BRHNZ = 0x46, - STQR = 0x47, - BRA = 0x60, - LQA = 0x61, + STQR = 0x47, + BRA = 0x60, + LQA = 0x61, BRASL = 0x62, - BR = 0x64, + BR = 0x64, FSMBI = 0x65, - BRSL = 0x66, - LQR = 0x67, - IL = 0x81, - ILHU = 0x82, - ILH = 0x83, - IOHL = 0xc1, + BRSL = 0x66, + LQR = 0x67, + IL = 0x81, + ILHU = 0x82, + ILH = 0x83, + IOHL = 0xc1, }; enum SPU_0_7_Opcodes { - ORI = 0x4, - ORHI = 0x5, - ORBI = 0x6, - SFI = 0xc, - SFHI = 0xd, - ANDI = 0x14, - ANDHI = 0x15, - ANDBI = 0x16, - AI = 0x1c, - AHI = 0x1d, - STQD = 0x24, - LQD = 0x34, - XORI = 0x44, - XORHI = 0x45, - XORBI = 0x46, - CGTI = 0x4c, - CGTHI = 0x4d, - CGTBI = 0x4e, - HGTI = 0x4f, - CLGTI = 0x5c, + ORI = 0x4, + ORHI = 0x5, + ORBI = 0x6, + SFI = 0xc, + SFHI = 0xd, + ANDI = 0x14, + ANDHI = 0x15, + ANDBI = 0x16, + AI = 0x1c, + AHI = 0x1d, + STQD = 0x24, + LQD = 0x34, + XORI = 0x44, + XORHI = 0x45, + XORBI = 0x46, + CGTI = 0x4c, + CGTHI = 0x4d, + CGTBI = 0x4e, + HGTI = 0x4f, + CLGTI = 0x5c, CLGTHI = 0x5d, CLGTBI = 0x5e, - HLGTI = 0x5f, - MPYI = 0x74, - MPYUI = 0x75, - CEQI = 0x7c, - CEQHI = 0x7d, - CEQBI = 0x7e, - HEQI = 0x7f, + HLGTI = 0x5f, + MPYI = 0x74, + MPYUI = 0x75, + CEQI = 0x7c, + CEQHI = 0x7d, + CEQBI = 0x7e, + HEQI = 0x7f, }; enum SPU_0_6_Opcodes { HBRA = 0x8, HBRR = 0x9, - ILA = 0x21, + ILA = 0x21, }; enum SPU_0_3_Opcodes { - SELB = 0x8, + SELB = 0x8, SHUFB = 0xb, - MPYA = 0xc, - FNMS = 0xd, - FMA = 0xe, - FMS = 0xf, + MPYA = 0xc, + FNMS = 0xd, + FMA = 0xe, + FMS = 0xf, }; }; diff --git a/rpcs3/Emu/Cell/SPURSManager.h b/rpcs3/Emu/Cell/SPURSManager.h index 4f22f5b8f2..96585674b4 100644 --- a/rpcs3/Emu/Cell/SPURSManager.h +++ b/rpcs3/Emu/Cell/SPURSManager.h @@ -3,45 +3,45 @@ // SPURS defines. enum SPURSKernelInterfaces { - CELL_SPURS_MAX_SPU = 8, - CELL_SPURS_MAX_WORKLOAD = 16, - CELL_SPURS_MAX_WORKLOAD2 = 32, - CELL_SPURS_MAX_PRIORITY = 16, - CELL_SPURS_NAME_MAX_LENGTH = 15, - CELL_SPURS_SIZE = 4096, - CELL_SPURS_SIZE2 = 8192, - CELL_SPURS_ALIGN = 128, - CELL_SPURS_ATTRIBUTE_SIZE = 512, - CELL_SPURS_ATTRIBUTE_ALIGN = 8, - CELL_SPURS_INTERRUPT_VECTOR = 0x0, - CELL_SPURS_LOCK_LINE = 0x80, - CELL_SPURS_KERNEL_DMA_TAG_ID = 31, + CELL_SPURS_MAX_SPU = 8, + CELL_SPURS_MAX_WORKLOAD = 16, + CELL_SPURS_MAX_WORKLOAD2 = 32, + CELL_SPURS_MAX_PRIORITY = 16, + CELL_SPURS_NAME_MAX_LENGTH = 15, + CELL_SPURS_SIZE = 4096, + CELL_SPURS_SIZE2 = 8192, + CELL_SPURS_ALIGN = 128, + CELL_SPURS_ATTRIBUTE_SIZE = 512, + CELL_SPURS_ATTRIBUTE_ALIGN = 8, + CELL_SPURS_INTERRUPT_VECTOR = 0x0, + CELL_SPURS_LOCK_LINE = 0x80, + CELL_SPURS_KERNEL_DMA_TAG_ID = 31, }; enum RangeofEventQueuePortNumbers { - CELL_SPURS_STATIC_PORT_RANGE_BOTTOM = 15, - CELL_SPURS_DYNAMIC_PORT_RANGE_TOP = 16, - CELL_SPURS_DYNAMIC_PORT_RANGE_BOTTOM = 63, + CELL_SPURS_STATIC_PORT_RANGE_BOTTOM = 15, + CELL_SPURS_DYNAMIC_PORT_RANGE_TOP = 16, + CELL_SPURS_DYNAMIC_PORT_RANGE_BOTTOM = 63, }; enum SPURSTraceTypes { - CELL_SPURS_TRACE_TAG_LOAD = 0x2a, - CELL_SPURS_TRACE_TAG_MAP = 0x2b, - CELL_SPURS_TRACE_TAG_START = 0x2c, - CELL_SPURS_TRACE_TAG_STOP = 0x2d, - CELL_SPURS_TRACE_TAG_USER = 0x2e, - CELL_SPURS_TRACE_TAG_GUID = 0x2f, + CELL_SPURS_TRACE_TAG_LOAD = 0x2a, + CELL_SPURS_TRACE_TAG_MAP = 0x2b, + CELL_SPURS_TRACE_TAG_START = 0x2c, + CELL_SPURS_TRACE_TAG_STOP = 0x2d, + CELL_SPURS_TRACE_TAG_USER = 0x2e, + CELL_SPURS_TRACE_TAG_GUID = 0x2f, }; // SPURS task defines. enum TaskConstants { - CELL_SPURS_MAX_TASK = 128, - CELL_SPURS_TASK_TOP = 0x3000, - CELL_SPURS_TASK_BOTTOM = 0x40000, - CELL_SPURS_MAX_TASK_NAME_LENGTH = 32, + CELL_SPURS_MAX_TASK = 128, + CELL_SPURS_TASK_TOP = 0x3000, + CELL_SPURS_TASK_BOTTOM = 0x40000, + CELL_SPURS_MAX_TASK_NAME_LENGTH = 32, }; // Internal class to shape a SPURS attribute. diff --git a/rpcs3/Emu/Cell/SPUThread.h b/rpcs3/Emu/Cell/SPUThread.h index f8d99b5c9a..5c947664c6 100644 --- a/rpcs3/Emu/Cell/SPUThread.h +++ b/rpcs3/Emu/Cell/SPUThread.h @@ -69,63 +69,63 @@ static const char* spu_ch_name[128] = enum SPUchannels { - SPU_RdEventStat = 0, //Read event status with mask applied - SPU_WrEventMask = 1, //Write event mask - SPU_WrEventAck = 2, //Write end of event processing - SPU_RdSigNotify1 = 3, //Signal notification 1 - SPU_RdSigNotify2 = 4, //Signal notification 2 - SPU_WrDec = 7, //Write decrementer count - SPU_RdDec = 8, //Read decrementer count - SPU_RdEventMask = 11, //Read event mask - SPU_RdMachStat = 13, //Read SPU run status - SPU_WrSRR0 = 14, //Write SPU machine state save/restore register 0 (SRR0) - SPU_RdSRR0 = 15, //Read SPU machine state save/restore register 0 (SRR0) - SPU_WrOutMbox = 28, //Write outbound mailbox contents - SPU_RdInMbox = 29, //Read inbound mailbox contents - SPU_WrOutIntrMbox = 30, //Write outbound interrupt mailbox contents (interrupting PPU) + SPU_RdEventStat = 0, //Read event status with mask applied + SPU_WrEventMask = 1, //Write event mask + SPU_WrEventAck = 2, //Write end of event processing + SPU_RdSigNotify1 = 3, //Signal notification 1 + SPU_RdSigNotify2 = 4, //Signal notification 2 + SPU_WrDec = 7, //Write decrementer count + SPU_RdDec = 8, //Read decrementer count + SPU_RdEventMask = 11, //Read event mask + SPU_RdMachStat = 13, //Read SPU run status + SPU_WrSRR0 = 14, //Write SPU machine state save/restore register 0 (SRR0) + SPU_RdSRR0 = 15, //Read SPU machine state save/restore register 0 (SRR0) + SPU_WrOutMbox = 28, //Write outbound mailbox contents + SPU_RdInMbox = 29, //Read inbound mailbox contents + SPU_WrOutIntrMbox = 30, //Write outbound interrupt mailbox contents (interrupting PPU) }; enum MFCchannels { - MFC_WrMSSyncReq = 9, //Write multisource synchronization request - MFC_RdTagMask = 12, //Read tag mask - MFC_LSA = 16, //Write local memory address command parameter - MFC_EAH = 17, //Write high order DMA effective address command parameter - MFC_EAL = 18, //Write low order DMA effective address command parameter - MFC_Size = 19, //Write DMA transfer size command parameter - MFC_TagID = 20, //Write tag identifier command parameter - MFC_Cmd = 21, //Write and enqueue DMA command with associated class ID - MFC_WrTagMask = 22, //Write tag mask - MFC_WrTagUpdate = 23, //Write request for conditional or unconditional tag status update - MFC_RdTagStat = 24, //Read tag status with mask applied - MFC_RdListStallStat = 25, //Read DMA list stall-and-notify status - MFC_WrListStallAck = 26, //Write DMA list stall-and-notify acknowledge - MFC_RdAtomicStat = 27, //Read completion status of last completed immediate MFC atomic update command + MFC_WrMSSyncReq = 9, //Write multisource synchronization request + MFC_RdTagMask = 12, //Read tag mask + MFC_LSA = 16, //Write local memory address command parameter + MFC_EAH = 17, //Write high order DMA effective address command parameter + MFC_EAL = 18, //Write low order DMA effective address command parameter + MFC_Size = 19, //Write DMA transfer size command parameter + MFC_TagID = 20, //Write tag identifier command parameter + MFC_Cmd = 21, //Write and enqueue DMA command with associated class ID + MFC_WrTagMask = 22, //Write tag mask + MFC_WrTagUpdate = 23, //Write request for conditional or unconditional tag status update + MFC_RdTagStat = 24, //Read tag status with mask applied + MFC_RdListStallStat = 25, //Read DMA list stall-and-notify status + MFC_WrListStallAck = 26, //Write DMA list stall-and-notify acknowledge + MFC_RdAtomicStat = 27, //Read completion status of last completed immediate MFC atomic update command }; enum { - SPU_RUNCNTL_STOP = 0, - SPU_RUNCNTL_RUNNABLE = 1, + SPU_RUNCNTL_STOP = 0, + SPU_RUNCNTL_RUNNABLE = 1, }; enum { - SPU_STATUS_STOPPED = 0x0, - SPU_STATUS_RUNNING = 0x1, - SPU_STATUS_STOPPED_BY_STOP = 0x2, - SPU_STATUS_STOPPED_BY_HALT = 0x4, - SPU_STATUS_WAITING_FOR_CHANNEL = 0x8, - SPU_STATUS_SINGLE_STEP = 0x10, + SPU_STATUS_STOPPED = 0x0, + SPU_STATUS_RUNNING = 0x1, + SPU_STATUS_STOPPED_BY_STOP = 0x2, + SPU_STATUS_STOPPED_BY_HALT = 0x4, + SPU_STATUS_WAITING_FOR_CHANNEL = 0x8, + SPU_STATUS_SINGLE_STEP = 0x10, }; enum : u32 { - SYS_SPU_THREAD_BASE_LOW = 0xf0000000, + SYS_SPU_THREAD_BASE_LOW = 0xf0000000, SYS_SPU_THREAD_BASE_MASK = 0xfffffff, - SYS_SPU_THREAD_OFFSET = 0x00100000, - SYS_SPU_THREAD_SNR1 = 0x05400c, - SYS_SPU_THREAD_SNR2 = 0x05C00c, + SYS_SPU_THREAD_OFFSET = 0x00100000, + SYS_SPU_THREAD_SNR1 = 0x05400c, + SYS_SPU_THREAD_SNR2 = 0x05C00c, }; //Floating point status and control register. Unsure if this is one of the GPRs or SPRs diff --git a/rpcs3/Emu/FS/vfsLocalFile.cpp b/rpcs3/Emu/FS/vfsLocalFile.cpp index 3fbb78a8eb..0dbf878987 100644 --- a/rpcs3/Emu/FS/vfsLocalFile.cpp +++ b/rpcs3/Emu/FS/vfsLocalFile.cpp @@ -5,11 +5,11 @@ static const wxFile::OpenMode vfs2wx_mode(vfsOpenMode mode) { switch(mode) { - case vfsRead: return wxFile::read; - case vfsWrite: return wxFile::write; - case vfsReadWrite: return wxFile::read_write; - case vfsWriteExcl: return wxFile::write_excl; - case vfsWriteAppend: return wxFile::write_append; + case vfsRead: return wxFile::read; + case vfsWrite: return wxFile::write; + case vfsReadWrite: return wxFile::read_write; + case vfsWriteExcl: return wxFile::write_excl; + case vfsWriteAppend: return wxFile::write_append; } return wxFile::read; diff --git a/rpcs3/Emu/GS/GCM.h b/rpcs3/Emu/GS/GCM.h index c96dfbb9cc..e556eadc56 100644 --- a/rpcs3/Emu/GS/GCM.h +++ b/rpcs3/Emu/GS/GCM.h @@ -3,9 +3,9 @@ enum { - CELL_GCM_DISPLAY_HSYNC = 1, - CELL_GCM_DISPLAY_VSYNC = 2, - CELL_GCM_DISPLAY_HSYNC_WITH_NOISE = 3, + CELL_GCM_DISPLAY_HSYNC = 1, + CELL_GCM_DISPLAY_VSYNC = 2, + CELL_GCM_DISPLAY_HSYNC_WITH_NOISE = 3, }; enum @@ -212,295 +212,295 @@ enum enum { // NV406E - NV406E_SET_REFERENCE = 0x00000050, - NV406E_SET_CONTEXT_DMA_SEMAPHORE = 0x00000060, - NV406E_SEMAPHORE_OFFSET = 0x00000064, - NV406E_SEMAPHORE_ACQUIRE = 0x00000068, - NV406E_SEMAPHORE_RELEASE = 0x0000006c, + NV406E_SET_REFERENCE = 0x00000050, + NV406E_SET_CONTEXT_DMA_SEMAPHORE = 0x00000060, + NV406E_SEMAPHORE_OFFSET = 0x00000064, + NV406E_SEMAPHORE_ACQUIRE = 0x00000068, + NV406E_SEMAPHORE_RELEASE = 0x0000006c, // NV4097 - NV4097_SET_OBJECT = 0x00000000, - NV4097_NO_OPERATION = 0x00000100, - NV4097_NOTIFY = 0x00000104, - NV4097_WAIT_FOR_IDLE = 0x00000110, - NV4097_PM_TRIGGER = 0x00000140, - NV4097_SET_CONTEXT_DMA_NOTIFIES = 0x00000180, - NV4097_SET_CONTEXT_DMA_A = 0x00000184, - NV4097_SET_CONTEXT_DMA_B = 0x00000188, - NV4097_SET_CONTEXT_DMA_COLOR_B = 0x0000018c, - NV4097_SET_CONTEXT_DMA_STATE = 0x00000190, - NV4097_SET_CONTEXT_DMA_COLOR_A = 0x00000194, - NV4097_SET_CONTEXT_DMA_ZETA = 0x00000198, - NV4097_SET_CONTEXT_DMA_VERTEX_A = 0x0000019c, - NV4097_SET_CONTEXT_DMA_VERTEX_B = 0x000001a0, - NV4097_SET_CONTEXT_DMA_SEMAPHORE = 0x000001a4, - NV4097_SET_CONTEXT_DMA_REPORT = 0x000001a8, - NV4097_SET_CONTEXT_DMA_CLIP_ID = 0x000001ac, - NV4097_SET_CONTEXT_DMA_CULL_DATA = 0x000001b0, - NV4097_SET_CONTEXT_DMA_COLOR_C = 0x000001b4, - NV4097_SET_CONTEXT_DMA_COLOR_D = 0x000001b8, - NV4097_SET_SURFACE_CLIP_HORIZONTAL = 0x00000200, - NV4097_SET_SURFACE_CLIP_VERTICAL = 0x00000204, - NV4097_SET_SURFACE_FORMAT = 0x00000208, - NV4097_SET_SURFACE_PITCH_A = 0x0000020c, - NV4097_SET_SURFACE_COLOR_AOFFSET = 0x00000210, - NV4097_SET_SURFACE_ZETA_OFFSET = 0x00000214, - NV4097_SET_SURFACE_COLOR_BOFFSET = 0x00000218, - NV4097_SET_SURFACE_PITCH_B = 0x0000021c, - NV4097_SET_SURFACE_COLOR_TARGET = 0x00000220, - NV4097_SET_SURFACE_PITCH_Z = 0x0000022c, - NV4097_INVALIDATE_ZCULL = 0x00000234, - NV4097_SET_CYLINDRICAL_WRAP = 0x00000238, - NV4097_SET_CYLINDRICAL_WRAP1 = 0x0000023c, - NV4097_SET_SURFACE_PITCH_C = 0x00000280, - NV4097_SET_SURFACE_PITCH_D = 0x00000284, - NV4097_SET_SURFACE_COLOR_COFFSET = 0x00000288, - NV4097_SET_SURFACE_COLOR_DOFFSET = 0x0000028c, - NV4097_SET_WINDOW_OFFSET = 0x000002b8, - NV4097_SET_WINDOW_CLIP_TYPE = 0x000002bc, - NV4097_SET_WINDOW_CLIP_HORIZONTAL = 0x000002c0, - NV4097_SET_WINDOW_CLIP_VERTICAL = 0x000002c4, - NV4097_SET_DITHER_ENABLE = 0x00000300, - NV4097_SET_ALPHA_TEST_ENABLE = 0x00000304, - NV4097_SET_ALPHA_FUNC = 0x00000308, - NV4097_SET_ALPHA_REF = 0x0000030c, - NV4097_SET_BLEND_ENABLE = 0x00000310, - NV4097_SET_BLEND_FUNC_SFACTOR = 0x00000314, - NV4097_SET_BLEND_FUNC_DFACTOR = 0x00000318, - NV4097_SET_BLEND_COLOR = 0x0000031c, - NV4097_SET_BLEND_EQUATION = 0x00000320, - NV4097_SET_COLOR_MASK = 0x00000324, - NV4097_SET_STENCIL_TEST_ENABLE = 0x00000328, - NV4097_SET_STENCIL_MASK = 0x0000032c, - NV4097_SET_STENCIL_FUNC = 0x00000330, - NV4097_SET_STENCIL_FUNC_REF = 0x00000334, - NV4097_SET_STENCIL_FUNC_MASK = 0x00000338, - NV4097_SET_STENCIL_OP_FAIL = 0x0000033c, - NV4097_SET_STENCIL_OP_ZFAIL = 0x00000340, - NV4097_SET_STENCIL_OP_ZPASS = 0x00000344, + NV4097_SET_OBJECT = 0x00000000, + NV4097_NO_OPERATION = 0x00000100, + NV4097_NOTIFY = 0x00000104, + NV4097_WAIT_FOR_IDLE = 0x00000110, + NV4097_PM_TRIGGER = 0x00000140, + NV4097_SET_CONTEXT_DMA_NOTIFIES = 0x00000180, + NV4097_SET_CONTEXT_DMA_A = 0x00000184, + NV4097_SET_CONTEXT_DMA_B = 0x00000188, + NV4097_SET_CONTEXT_DMA_COLOR_B = 0x0000018c, + NV4097_SET_CONTEXT_DMA_STATE = 0x00000190, + NV4097_SET_CONTEXT_DMA_COLOR_A = 0x00000194, + NV4097_SET_CONTEXT_DMA_ZETA = 0x00000198, + NV4097_SET_CONTEXT_DMA_VERTEX_A = 0x0000019c, + NV4097_SET_CONTEXT_DMA_VERTEX_B = 0x000001a0, + NV4097_SET_CONTEXT_DMA_SEMAPHORE = 0x000001a4, + NV4097_SET_CONTEXT_DMA_REPORT = 0x000001a8, + NV4097_SET_CONTEXT_DMA_CLIP_ID = 0x000001ac, + NV4097_SET_CONTEXT_DMA_CULL_DATA = 0x000001b0, + NV4097_SET_CONTEXT_DMA_COLOR_C = 0x000001b4, + NV4097_SET_CONTEXT_DMA_COLOR_D = 0x000001b8, + NV4097_SET_SURFACE_CLIP_HORIZONTAL = 0x00000200, + NV4097_SET_SURFACE_CLIP_VERTICAL = 0x00000204, + NV4097_SET_SURFACE_FORMAT = 0x00000208, + NV4097_SET_SURFACE_PITCH_A = 0x0000020c, + NV4097_SET_SURFACE_COLOR_AOFFSET = 0x00000210, + NV4097_SET_SURFACE_ZETA_OFFSET = 0x00000214, + NV4097_SET_SURFACE_COLOR_BOFFSET = 0x00000218, + NV4097_SET_SURFACE_PITCH_B = 0x0000021c, + NV4097_SET_SURFACE_COLOR_TARGET = 0x00000220, + NV4097_SET_SURFACE_PITCH_Z = 0x0000022c, + NV4097_INVALIDATE_ZCULL = 0x00000234, + NV4097_SET_CYLINDRICAL_WRAP = 0x00000238, + NV4097_SET_CYLINDRICAL_WRAP1 = 0x0000023c, + NV4097_SET_SURFACE_PITCH_C = 0x00000280, + NV4097_SET_SURFACE_PITCH_D = 0x00000284, + NV4097_SET_SURFACE_COLOR_COFFSET = 0x00000288, + NV4097_SET_SURFACE_COLOR_DOFFSET = 0x0000028c, + NV4097_SET_WINDOW_OFFSET = 0x000002b8, + NV4097_SET_WINDOW_CLIP_TYPE = 0x000002bc, + NV4097_SET_WINDOW_CLIP_HORIZONTAL = 0x000002c0, + NV4097_SET_WINDOW_CLIP_VERTICAL = 0x000002c4, + NV4097_SET_DITHER_ENABLE = 0x00000300, + NV4097_SET_ALPHA_TEST_ENABLE = 0x00000304, + NV4097_SET_ALPHA_FUNC = 0x00000308, + NV4097_SET_ALPHA_REF = 0x0000030c, + NV4097_SET_BLEND_ENABLE = 0x00000310, + NV4097_SET_BLEND_FUNC_SFACTOR = 0x00000314, + NV4097_SET_BLEND_FUNC_DFACTOR = 0x00000318, + NV4097_SET_BLEND_COLOR = 0x0000031c, + NV4097_SET_BLEND_EQUATION = 0x00000320, + NV4097_SET_COLOR_MASK = 0x00000324, + NV4097_SET_STENCIL_TEST_ENABLE = 0x00000328, + NV4097_SET_STENCIL_MASK = 0x0000032c, + NV4097_SET_STENCIL_FUNC = 0x00000330, + NV4097_SET_STENCIL_FUNC_REF = 0x00000334, + NV4097_SET_STENCIL_FUNC_MASK = 0x00000338, + NV4097_SET_STENCIL_OP_FAIL = 0x0000033c, + NV4097_SET_STENCIL_OP_ZFAIL = 0x00000340, + NV4097_SET_STENCIL_OP_ZPASS = 0x00000344, NV4097_SET_TWO_SIDED_STENCIL_TEST_ENABLE = 0x00000348, - NV4097_SET_BACK_STENCIL_MASK = 0x0000034c, - NV4097_SET_BACK_STENCIL_FUNC = 0x00000350, - NV4097_SET_BACK_STENCIL_FUNC_REF = 0x00000354, - NV4097_SET_BACK_STENCIL_FUNC_MASK = 0x00000358, - NV4097_SET_BACK_STENCIL_OP_FAIL = 0x0000035c, - NV4097_SET_BACK_STENCIL_OP_ZFAIL = 0x00000360, - NV4097_SET_BACK_STENCIL_OP_ZPASS = 0x00000364, - NV4097_SET_SHADE_MODE = 0x00000368, - NV4097_SET_BLEND_ENABLE_MRT = 0x0000036c, - NV4097_SET_COLOR_MASK_MRT = 0x00000370, - NV4097_SET_LOGIC_OP_ENABLE = 0x00000374, - NV4097_SET_LOGIC_OP = 0x00000378, - NV4097_SET_BLEND_COLOR2 = 0x0000037c, - NV4097_SET_DEPTH_BOUNDS_TEST_ENABLE = 0x00000380, - NV4097_SET_DEPTH_BOUNDS_MIN = 0x00000384, - NV4097_SET_DEPTH_BOUNDS_MAX = 0x00000388, - NV4097_SET_CLIP_MIN = 0x00000394, - NV4097_SET_CLIP_MAX = 0x00000398, - NV4097_SET_CONTROL0 = 0x000003b0, - NV4097_SET_LINE_WIDTH = 0x000003b8, - NV4097_SET_LINE_SMOOTH_ENABLE = 0x000003bc, - NV4097_SET_ANISO_SPREAD = 0x000003c0, - NV4097_SET_SCISSOR_HORIZONTAL = 0x000008c0, - NV4097_SET_SCISSOR_VERTICAL = 0x000008c4, - NV4097_SET_FOG_MODE = 0x000008cc, - NV4097_SET_FOG_PARAMS = 0x000008d0, - NV4097_SET_SHADER_PROGRAM = 0x000008e4, - NV4097_SET_VERTEX_TEXTURE_OFFSET = 0x00000900, - NV4097_SET_VERTEX_TEXTURE_FORMAT = 0x00000904, - NV4097_SET_VERTEX_TEXTURE_ADDRESS = 0x00000908, - NV4097_SET_VERTEX_TEXTURE_CONTROL0 = 0x0000090c, - NV4097_SET_VERTEX_TEXTURE_CONTROL3 = 0x00000910, - NV4097_SET_VERTEX_TEXTURE_FILTER = 0x00000914, - NV4097_SET_VERTEX_TEXTURE_IMAGE_RECT = 0x00000918, - NV4097_SET_VERTEX_TEXTURE_BORDER_COLOR = 0x0000091c, - NV4097_SET_VIEWPORT_HORIZONTAL = 0x00000a00, - NV4097_SET_VIEWPORT_VERTICAL = 0x00000a04, - NV4097_SET_POINT_CENTER_MODE = 0x00000a0c, - NV4097_ZCULL_SYNC = 0x00000a1c, - NV4097_SET_VIEWPORT_OFFSET = 0x00000a20, - NV4097_SET_VIEWPORT_SCALE = 0x00000a30, - NV4097_SET_POLY_OFFSET_POINT_ENABLE = 0x00000a60, - NV4097_SET_POLY_OFFSET_LINE_ENABLE = 0x00000a64, - NV4097_SET_POLY_OFFSET_FILL_ENABLE = 0x00000a68, - NV4097_SET_DEPTH_FUNC = 0x00000a6c, - NV4097_SET_DEPTH_MASK = 0x00000a70, - NV4097_SET_DEPTH_TEST_ENABLE = 0x00000a74, - NV4097_SET_POLYGON_OFFSET_SCALE_FACTOR = 0x00000a78, - NV4097_SET_POLYGON_OFFSET_BIAS = 0x00000a7c, - NV4097_SET_VERTEX_DATA_SCALED4S_M = 0x00000a80, - NV4097_SET_TEXTURE_CONTROL2 = 0x00000b00, - NV4097_SET_TEX_COORD_CONTROL = 0x00000b40, - NV4097_SET_TRANSFORM_PROGRAM = 0x00000b80, - NV4097_SET_SPECULAR_ENABLE = 0x00001428, - NV4097_SET_TWO_SIDE_LIGHT_EN = 0x0000142c, - NV4097_CLEAR_ZCULL_SURFACE = 0x00001438, - NV4097_SET_PERFORMANCE_PARAMS = 0x00001450, - NV4097_SET_FLAT_SHADE_OP = 0x00001454, - NV4097_SET_EDGE_FLAG = 0x0000145c, - NV4097_SET_USER_CLIP_PLANE_CONTROL = 0x00001478, - NV4097_SET_POLYGON_STIPPLE = 0x0000147c, - NV4097_SET_POLYGON_STIPPLE_PATTERN = 0x00001480, - NV4097_SET_VERTEX_DATA3F_M = 0x00001500, - NV4097_SET_VERTEX_DATA_ARRAY_OFFSET = 0x00001680, - NV4097_INVALIDATE_VERTEX_CACHE_FILE = 0x00001710, - NV4097_INVALIDATE_VERTEX_FILE = 0x00001714, - NV4097_PIPE_NOP = 0x00001718, - NV4097_SET_VERTEX_DATA_BASE_OFFSET = 0x00001738, - NV4097_SET_VERTEX_DATA_BASE_INDEX = 0x0000173c, - NV4097_SET_VERTEX_DATA_ARRAY_FORMAT = 0x00001740, - NV4097_CLEAR_REPORT_VALUE = 0x000017c8, - NV4097_SET_ZPASS_PIXEL_COUNT_ENABLE = 0x000017cc, - NV4097_GET_REPORT = 0x00001800, - NV4097_SET_ZCULL_STATS_ENABLE = 0x00001804, - NV4097_SET_BEGIN_END = 0x00001808, - NV4097_ARRAY_ELEMENT16 = 0x0000180c, - NV4097_ARRAY_ELEMENT32 = 0x00001810, - NV4097_DRAW_ARRAYS = 0x00001814, - NV4097_INLINE_ARRAY = 0x00001818, - NV4097_SET_INDEX_ARRAY_ADDRESS = 0x0000181c, - NV4097_SET_INDEX_ARRAY_DMA = 0x00001820, - NV4097_DRAW_INDEX_ARRAY = 0x00001824, - NV4097_SET_FRONT_POLYGON_MODE = 0x00001828, - NV4097_SET_BACK_POLYGON_MODE = 0x0000182c, - NV4097_SET_CULL_FACE = 0x00001830, - NV4097_SET_FRONT_FACE = 0x00001834, - NV4097_SET_POLY_SMOOTH_ENABLE = 0x00001838, - NV4097_SET_CULL_FACE_ENABLE = 0x0000183c, - NV4097_SET_TEXTURE_CONTROL3 = 0x00001840, - NV4097_SET_VERTEX_DATA2F_M = 0x00001880, - NV4097_SET_VERTEX_DATA2S_M = 0x00001900, - NV4097_SET_VERTEX_DATA4UB_M = 0x00001940, - NV4097_SET_VERTEX_DATA4S_M = 0x00001980, - NV4097_SET_TEXTURE_OFFSET = 0x00001a00, - NV4097_SET_TEXTURE_FORMAT = 0x00001a04, - NV4097_SET_TEXTURE_ADDRESS = 0x00001a08, - NV4097_SET_TEXTURE_CONTROL0 = 0x00001a0c, - NV4097_SET_TEXTURE_CONTROL1 = 0x00001a10, - NV4097_SET_TEXTURE_FILTER = 0x00001a14, - NV4097_SET_TEXTURE_IMAGE_RECT = 0x00001a18, - NV4097_SET_TEXTURE_BORDER_COLOR = 0x00001a1c, - NV4097_SET_VERTEX_DATA4F_M = 0x00001c00, - NV4097_SET_COLOR_KEY_COLOR = 0x00001d00, - NV4097_SET_SHADER_CONTROL = 0x00001d60, - NV4097_SET_INDEXED_CONSTANT_READ_LIMITS = 0x00001d64, - NV4097_SET_SEMAPHORE_OFFSET = 0x00001d6c, - NV4097_BACK_END_WRITE_SEMAPHORE_RELEASE = 0x00001d70, - NV4097_TEXTURE_READ_SEMAPHORE_RELEASE = 0x00001d74, - NV4097_SET_ZMIN_MAX_CONTROL = 0x00001d78, - NV4097_SET_ANTI_ALIASING_CONTROL = 0x00001d7c, - NV4097_SET_SURFACE_COMPRESSION = 0x00001d80, - NV4097_SET_ZCULL_EN = 0x00001d84, - NV4097_SET_SHADER_WINDOW = 0x00001d88, - NV4097_SET_ZSTENCIL_CLEAR_VALUE = 0x00001d8c, - NV4097_SET_COLOR_CLEAR_VALUE = 0x00001d90, - NV4097_CLEAR_SURFACE = 0x00001d94, - NV4097_SET_CLEAR_RECT_HORIZONTAL = 0x00001d98, - NV4097_SET_CLEAR_RECT_VERTICAL = 0x00001d9c, - NV4097_SET_CLIP_ID_TEST_ENABLE = 0x00001da4, - NV4097_SET_RESTART_INDEX_ENABLE = 0x00001dac, - NV4097_SET_RESTART_INDEX = 0x00001db0, - NV4097_SET_LINE_STIPPLE = 0x00001db4, - NV4097_SET_LINE_STIPPLE_PATTERN = 0x00001db8, - NV4097_SET_VERTEX_DATA1F_M = 0x00001e40, - NV4097_SET_TRANSFORM_EXECUTION_MODE = 0x00001e94, - NV4097_SET_RENDER_ENABLE = 0x00001e98, - NV4097_SET_TRANSFORM_PROGRAM_LOAD = 0x00001e9c, - NV4097_SET_TRANSFORM_PROGRAM_START = 0x00001ea0, - NV4097_SET_ZCULL_CONTROL0 = 0x00001ea4, - NV4097_SET_ZCULL_CONTROL1 = 0x00001ea8, - NV4097_SET_SCULL_CONTROL = 0x00001eac, - NV4097_SET_POINT_SIZE = 0x00001ee0, - NV4097_SET_POINT_PARAMS_ENABLE = 0x00001ee4, - NV4097_SET_POINT_SPRITE_CONTROL = 0x00001ee8, - NV4097_SET_TRANSFORM_TIMEOUT = 0x00001ef8, - NV4097_SET_TRANSFORM_CONSTANT_LOAD = 0x00001efc, - NV4097_SET_TRANSFORM_CONSTANT = 0x00001f00, - NV4097_SET_FREQUENCY_DIVIDER_OPERATION = 0x00001fc0, - NV4097_SET_ATTRIB_COLOR = 0x00001fc4, - NV4097_SET_ATTRIB_TEX_COORD = 0x00001fc8, - NV4097_SET_ATTRIB_TEX_COORD_EX = 0x00001fcc, - NV4097_SET_ATTRIB_UCLIP0 = 0x00001fd0, - NV4097_SET_ATTRIB_UCLIP1 = 0x00001fd4, - NV4097_INVALIDATE_L2 = 0x00001fd8, - NV4097_SET_REDUCE_DST_COLOR = 0x00001fe0, - NV4097_SET_NO_PARANOID_TEXTURE_FETCHES = 0x00001fe8, - NV4097_SET_SHADER_PACKER = 0x00001fec, - NV4097_SET_VERTEX_ATTRIB_INPUT_MASK = 0x00001ff0, - NV4097_SET_VERTEX_ATTRIB_OUTPUT_MASK = 0x00001ff4, - NV4097_SET_TRANSFORM_BRANCH_BITS = 0x00001ff8, + NV4097_SET_BACK_STENCIL_MASK = 0x0000034c, + NV4097_SET_BACK_STENCIL_FUNC = 0x00000350, + NV4097_SET_BACK_STENCIL_FUNC_REF = 0x00000354, + NV4097_SET_BACK_STENCIL_FUNC_MASK = 0x00000358, + NV4097_SET_BACK_STENCIL_OP_FAIL = 0x0000035c, + NV4097_SET_BACK_STENCIL_OP_ZFAIL = 0x00000360, + NV4097_SET_BACK_STENCIL_OP_ZPASS = 0x00000364, + NV4097_SET_SHADE_MODE = 0x00000368, + NV4097_SET_BLEND_ENABLE_MRT = 0x0000036c, + NV4097_SET_COLOR_MASK_MRT = 0x00000370, + NV4097_SET_LOGIC_OP_ENABLE = 0x00000374, + NV4097_SET_LOGIC_OP = 0x00000378, + NV4097_SET_BLEND_COLOR2 = 0x0000037c, + NV4097_SET_DEPTH_BOUNDS_TEST_ENABLE = 0x00000380, + NV4097_SET_DEPTH_BOUNDS_MIN = 0x00000384, + NV4097_SET_DEPTH_BOUNDS_MAX = 0x00000388, + NV4097_SET_CLIP_MIN = 0x00000394, + NV4097_SET_CLIP_MAX = 0x00000398, + NV4097_SET_CONTROL0 = 0x000003b0, + NV4097_SET_LINE_WIDTH = 0x000003b8, + NV4097_SET_LINE_SMOOTH_ENABLE = 0x000003bc, + NV4097_SET_ANISO_SPREAD = 0x000003c0, + NV4097_SET_SCISSOR_HORIZONTAL = 0x000008c0, + NV4097_SET_SCISSOR_VERTICAL = 0x000008c4, + NV4097_SET_FOG_MODE = 0x000008cc, + NV4097_SET_FOG_PARAMS = 0x000008d0, + NV4097_SET_SHADER_PROGRAM = 0x000008e4, + NV4097_SET_VERTEX_TEXTURE_OFFSET = 0x00000900, + NV4097_SET_VERTEX_TEXTURE_FORMAT = 0x00000904, + NV4097_SET_VERTEX_TEXTURE_ADDRESS = 0x00000908, + NV4097_SET_VERTEX_TEXTURE_CONTROL0 = 0x0000090c, + NV4097_SET_VERTEX_TEXTURE_CONTROL3 = 0x00000910, + NV4097_SET_VERTEX_TEXTURE_FILTER = 0x00000914, + NV4097_SET_VERTEX_TEXTURE_IMAGE_RECT = 0x00000918, + NV4097_SET_VERTEX_TEXTURE_BORDER_COLOR = 0x0000091c, + NV4097_SET_VIEWPORT_HORIZONTAL = 0x00000a00, + NV4097_SET_VIEWPORT_VERTICAL = 0x00000a04, + NV4097_SET_POINT_CENTER_MODE = 0x00000a0c, + NV4097_ZCULL_SYNC = 0x00000a1c, + NV4097_SET_VIEWPORT_OFFSET = 0x00000a20, + NV4097_SET_VIEWPORT_SCALE = 0x00000a30, + NV4097_SET_POLY_OFFSET_POINT_ENABLE = 0x00000a60, + NV4097_SET_POLY_OFFSET_LINE_ENABLE = 0x00000a64, + NV4097_SET_POLY_OFFSET_FILL_ENABLE = 0x00000a68, + NV4097_SET_DEPTH_FUNC = 0x00000a6c, + NV4097_SET_DEPTH_MASK = 0x00000a70, + NV4097_SET_DEPTH_TEST_ENABLE = 0x00000a74, + NV4097_SET_POLYGON_OFFSET_SCALE_FACTOR = 0x00000a78, + NV4097_SET_POLYGON_OFFSET_BIAS = 0x00000a7c, + NV4097_SET_VERTEX_DATA_SCALED4S_M = 0x00000a80, + NV4097_SET_TEXTURE_CONTROL2 = 0x00000b00, + NV4097_SET_TEX_COORD_CONTROL = 0x00000b40, + NV4097_SET_TRANSFORM_PROGRAM = 0x00000b80, + NV4097_SET_SPECULAR_ENABLE = 0x00001428, + NV4097_SET_TWO_SIDE_LIGHT_EN = 0x0000142c, + NV4097_CLEAR_ZCULL_SURFACE = 0x00001438, + NV4097_SET_PERFORMANCE_PARAMS = 0x00001450, + NV4097_SET_FLAT_SHADE_OP = 0x00001454, + NV4097_SET_EDGE_FLAG = 0x0000145c, + NV4097_SET_USER_CLIP_PLANE_CONTROL = 0x00001478, + NV4097_SET_POLYGON_STIPPLE = 0x0000147c, + NV4097_SET_POLYGON_STIPPLE_PATTERN = 0x00001480, + NV4097_SET_VERTEX_DATA3F_M = 0x00001500, + NV4097_SET_VERTEX_DATA_ARRAY_OFFSET = 0x00001680, + NV4097_INVALIDATE_VERTEX_CACHE_FILE = 0x00001710, + NV4097_INVALIDATE_VERTEX_FILE = 0x00001714, + NV4097_PIPE_NOP = 0x00001718, + NV4097_SET_VERTEX_DATA_BASE_OFFSET = 0x00001738, + NV4097_SET_VERTEX_DATA_BASE_INDEX = 0x0000173c, + NV4097_SET_VERTEX_DATA_ARRAY_FORMAT = 0x00001740, + NV4097_CLEAR_REPORT_VALUE = 0x000017c8, + NV4097_SET_ZPASS_PIXEL_COUNT_ENABLE = 0x000017cc, + NV4097_GET_REPORT = 0x00001800, + NV4097_SET_ZCULL_STATS_ENABLE = 0x00001804, + NV4097_SET_BEGIN_END = 0x00001808, + NV4097_ARRAY_ELEMENT16 = 0x0000180c, + NV4097_ARRAY_ELEMENT32 = 0x00001810, + NV4097_DRAW_ARRAYS = 0x00001814, + NV4097_INLINE_ARRAY = 0x00001818, + NV4097_SET_INDEX_ARRAY_ADDRESS = 0x0000181c, + NV4097_SET_INDEX_ARRAY_DMA = 0x00001820, + NV4097_DRAW_INDEX_ARRAY = 0x00001824, + NV4097_SET_FRONT_POLYGON_MODE = 0x00001828, + NV4097_SET_BACK_POLYGON_MODE = 0x0000182c, + NV4097_SET_CULL_FACE = 0x00001830, + NV4097_SET_FRONT_FACE = 0x00001834, + NV4097_SET_POLY_SMOOTH_ENABLE = 0x00001838, + NV4097_SET_CULL_FACE_ENABLE = 0x0000183c, + NV4097_SET_TEXTURE_CONTROL3 = 0x00001840, + NV4097_SET_VERTEX_DATA2F_M = 0x00001880, + NV4097_SET_VERTEX_DATA2S_M = 0x00001900, + NV4097_SET_VERTEX_DATA4UB_M = 0x00001940, + NV4097_SET_VERTEX_DATA4S_M = 0x00001980, + NV4097_SET_TEXTURE_OFFSET = 0x00001a00, + NV4097_SET_TEXTURE_FORMAT = 0x00001a04, + NV4097_SET_TEXTURE_ADDRESS = 0x00001a08, + NV4097_SET_TEXTURE_CONTROL0 = 0x00001a0c, + NV4097_SET_TEXTURE_CONTROL1 = 0x00001a10, + NV4097_SET_TEXTURE_FILTER = 0x00001a14, + NV4097_SET_TEXTURE_IMAGE_RECT = 0x00001a18, + NV4097_SET_TEXTURE_BORDER_COLOR = 0x00001a1c, + NV4097_SET_VERTEX_DATA4F_M = 0x00001c00, + NV4097_SET_COLOR_KEY_COLOR = 0x00001d00, + NV4097_SET_SHADER_CONTROL = 0x00001d60, + NV4097_SET_INDEXED_CONSTANT_READ_LIMITS = 0x00001d64, + NV4097_SET_SEMAPHORE_OFFSET = 0x00001d6c, + NV4097_BACK_END_WRITE_SEMAPHORE_RELEASE = 0x00001d70, + NV4097_TEXTURE_READ_SEMAPHORE_RELEASE = 0x00001d74, + NV4097_SET_ZMIN_MAX_CONTROL = 0x00001d78, + NV4097_SET_ANTI_ALIASING_CONTROL = 0x00001d7c, + NV4097_SET_SURFACE_COMPRESSION = 0x00001d80, + NV4097_SET_ZCULL_EN = 0x00001d84, + NV4097_SET_SHADER_WINDOW = 0x00001d88, + NV4097_SET_ZSTENCIL_CLEAR_VALUE = 0x00001d8c, + NV4097_SET_COLOR_CLEAR_VALUE = 0x00001d90, + NV4097_CLEAR_SURFACE = 0x00001d94, + NV4097_SET_CLEAR_RECT_HORIZONTAL = 0x00001d98, + NV4097_SET_CLEAR_RECT_VERTICAL = 0x00001d9c, + NV4097_SET_CLIP_ID_TEST_ENABLE = 0x00001da4, + NV4097_SET_RESTART_INDEX_ENABLE = 0x00001dac, + NV4097_SET_RESTART_INDEX = 0x00001db0, + NV4097_SET_LINE_STIPPLE = 0x00001db4, + NV4097_SET_LINE_STIPPLE_PATTERN = 0x00001db8, + NV4097_SET_VERTEX_DATA1F_M = 0x00001e40, + NV4097_SET_TRANSFORM_EXECUTION_MODE = 0x00001e94, + NV4097_SET_RENDER_ENABLE = 0x00001e98, + NV4097_SET_TRANSFORM_PROGRAM_LOAD = 0x00001e9c, + NV4097_SET_TRANSFORM_PROGRAM_START = 0x00001ea0, + NV4097_SET_ZCULL_CONTROL0 = 0x00001ea4, + NV4097_SET_ZCULL_CONTROL1 = 0x00001ea8, + NV4097_SET_SCULL_CONTROL = 0x00001eac, + NV4097_SET_POINT_SIZE = 0x00001ee0, + NV4097_SET_POINT_PARAMS_ENABLE = 0x00001ee4, + NV4097_SET_POINT_SPRITE_CONTROL = 0x00001ee8, + NV4097_SET_TRANSFORM_TIMEOUT = 0x00001ef8, + NV4097_SET_TRANSFORM_CONSTANT_LOAD = 0x00001efc, + NV4097_SET_TRANSFORM_CONSTANT = 0x00001f00, + NV4097_SET_FREQUENCY_DIVIDER_OPERATION = 0x00001fc0, + NV4097_SET_ATTRIB_COLOR = 0x00001fc4, + NV4097_SET_ATTRIB_TEX_COORD = 0x00001fc8, + NV4097_SET_ATTRIB_TEX_COORD_EX = 0x00001fcc, + NV4097_SET_ATTRIB_UCLIP0 = 0x00001fd0, + NV4097_SET_ATTRIB_UCLIP1 = 0x00001fd4, + NV4097_INVALIDATE_L2 = 0x00001fd8, + NV4097_SET_REDUCE_DST_COLOR = 0x00001fe0, + NV4097_SET_NO_PARANOID_TEXTURE_FETCHES = 0x00001fe8, + NV4097_SET_SHADER_PACKER = 0x00001fec, + NV4097_SET_VERTEX_ATTRIB_INPUT_MASK = 0x00001ff0, + NV4097_SET_VERTEX_ATTRIB_OUTPUT_MASK = 0x00001ff4, + NV4097_SET_TRANSFORM_BRANCH_BITS = 0x00001ff8, // NV0039 - NV0039_SET_OBJECT = 0x00002000, - NV0039_SET_CONTEXT_DMA_NOTIFIES = 0x00002180, - NV0039_SET_CONTEXT_DMA_BUFFER_IN = 0x00002184, - NV0039_SET_CONTEXT_DMA_BUFFER_OUT = 0x00002188, - NV0039_OFFSET_IN = 0x0000230C, - NV0039_OFFSET_OUT = 0x00002310, - NV0039_PITCH_IN = 0x00002314, - NV0039_PITCH_OUT = 0x00002318, - NV0039_LINE_LENGTH_IN = 0x0000231C, - NV0039_LINE_COUNT = 0x00002320, - NV0039_FORMAT = 0x00002324, - NV0039_BUFFER_NOTIFY = 0x00002328, + NV0039_SET_OBJECT = 0x00002000, + NV0039_SET_CONTEXT_DMA_NOTIFIES = 0x00002180, + NV0039_SET_CONTEXT_DMA_BUFFER_IN = 0x00002184, + NV0039_SET_CONTEXT_DMA_BUFFER_OUT = 0x00002188, + NV0039_OFFSET_IN = 0x0000230C, + NV0039_OFFSET_OUT = 0x00002310, + NV0039_PITCH_IN = 0x00002314, + NV0039_PITCH_OUT = 0x00002318, + NV0039_LINE_LENGTH_IN = 0x0000231C, + NV0039_LINE_COUNT = 0x00002320, + NV0039_FORMAT = 0x00002324, + NV0039_BUFFER_NOTIFY = 0x00002328, // NV3062 - NV3062_SET_OBJECT = 0x00006000, - NV3062_SET_CONTEXT_DMA_NOTIFIES = 0x00006180, - NV3062_SET_CONTEXT_DMA_IMAGE_SOURCE = 0x00006184, - NV3062_SET_CONTEXT_DMA_IMAGE_DESTIN = 0x00006188, - NV3062_SET_COLOR_FORMAT = 0x00006300, - NV3062_SET_PITCH = 0x00006304, - NV3062_SET_OFFSET_SOURCE = 0x00006308, - NV3062_SET_OFFSET_DESTIN = 0x0000630C, + NV3062_SET_OBJECT = 0x00006000, + NV3062_SET_CONTEXT_DMA_NOTIFIES = 0x00006180, + NV3062_SET_CONTEXT_DMA_IMAGE_SOURCE = 0x00006184, + NV3062_SET_CONTEXT_DMA_IMAGE_DESTIN = 0x00006188, + NV3062_SET_COLOR_FORMAT = 0x00006300, + NV3062_SET_PITCH = 0x00006304, + NV3062_SET_OFFSET_SOURCE = 0x00006308, + NV3062_SET_OFFSET_DESTIN = 0x0000630C, // NV309E - NV309E_SET_OBJECT = 0x00008000, - NV309E_SET_CONTEXT_DMA_NOTIFIES = 0x00008180, - NV309E_SET_CONTEXT_DMA_IMAGE = 0x00008184, - NV309E_SET_FORMAT = 0x00008300, - NV309E_SET_OFFSET = 0x00008304, + NV309E_SET_OBJECT = 0x00008000, + NV309E_SET_CONTEXT_DMA_NOTIFIES = 0x00008180, + NV309E_SET_CONTEXT_DMA_IMAGE = 0x00008184, + NV309E_SET_FORMAT = 0x00008300, + NV309E_SET_OFFSET = 0x00008304, // NV308A - NV308A_SET_OBJECT = 0x0000A000, - NV308A_SET_CONTEXT_DMA_NOTIFIES = 0x0000A180, - NV308A_SET_CONTEXT_COLOR_KEY = 0x0000A184, - NV308A_SET_CONTEXT_CLIP_RECTANGLE = 0x0000A188, - NV308A_SET_CONTEXT_PATTERN = 0x0000A18C, - NV308A_SET_CONTEXT_ROP = 0x0000A190, - NV308A_SET_CONTEXT_BETA1 = 0x0000A194, - NV308A_SET_CONTEXT_BETA4 = 0x0000A198, - NV308A_SET_CONTEXT_SURFACE = 0x0000A19C, - NV308A_SET_COLOR_CONVERSION = 0x0000A2F8, - NV308A_SET_OPERATION = 0x0000A2FC, - NV308A_SET_COLOR_FORMAT = 0x0000A300, - NV308A_POINT = 0x0000A304, - NV308A_SIZE_OUT = 0x0000A308, - NV308A_SIZE_IN = 0x0000A30C, - NV308A_COLOR = 0x0000A400, + NV308A_SET_OBJECT = 0x0000A000, + NV308A_SET_CONTEXT_DMA_NOTIFIES = 0x0000A180, + NV308A_SET_CONTEXT_COLOR_KEY = 0x0000A184, + NV308A_SET_CONTEXT_CLIP_RECTANGLE = 0x0000A188, + NV308A_SET_CONTEXT_PATTERN = 0x0000A18C, + NV308A_SET_CONTEXT_ROP = 0x0000A190, + NV308A_SET_CONTEXT_BETA1 = 0x0000A194, + NV308A_SET_CONTEXT_BETA4 = 0x0000A198, + NV308A_SET_CONTEXT_SURFACE = 0x0000A19C, + NV308A_SET_COLOR_CONVERSION = 0x0000A2F8, + NV308A_SET_OPERATION = 0x0000A2FC, + NV308A_SET_COLOR_FORMAT = 0x0000A300, + NV308A_POINT = 0x0000A304, + NV308A_SIZE_OUT = 0x0000A308, + NV308A_SIZE_IN = 0x0000A30C, + NV308A_COLOR = 0x0000A400, // NV3089 - NV3089_SET_OBJECT = 0x0000C000, - NV3089_SET_CONTEXT_DMA_NOTIFIES = 0x0000C180, - NV3089_SET_CONTEXT_DMA_IMAGE = 0x0000C184, - NV3089_SET_CONTEXT_PATTERN = 0x0000C188, - NV3089_SET_CONTEXT_ROP = 0x0000C18C, - NV3089_SET_CONTEXT_BETA1 = 0x0000C190, - NV3089_SET_CONTEXT_BETA4 = 0x0000C194, - NV3089_SET_CONTEXT_SURFACE = 0x0000C198, - NV3089_SET_COLOR_CONVERSION = 0x0000C2FC, - NV3089_SET_COLOR_FORMAT = 0x0000C300, - NV3089_SET_OPERATION = 0x0000C304, - NV3089_CLIP_POINT = 0x0000C308, - NV3089_CLIP_SIZE = 0x0000C30C, - NV3089_IMAGE_OUT_POINT = 0x0000C310, - NV3089_IMAGE_OUT_SIZE = 0x0000C314, - NV3089_DS_DX = 0x0000C318, - NV3089_DT_DY = 0x0000C31C, - NV3089_IMAGE_IN_SIZE = 0x0000C400, - NV3089_IMAGE_IN_FORMAT = 0x0000C404, - NV3089_IMAGE_IN_OFFSET = 0x0000C408, - NV3089_IMAGE_IN = 0x0000C40C, + NV3089_SET_OBJECT = 0x0000C000, + NV3089_SET_CONTEXT_DMA_NOTIFIES = 0x0000C180, + NV3089_SET_CONTEXT_DMA_IMAGE = 0x0000C184, + NV3089_SET_CONTEXT_PATTERN = 0x0000C188, + NV3089_SET_CONTEXT_ROP = 0x0000C18C, + NV3089_SET_CONTEXT_BETA1 = 0x0000C190, + NV3089_SET_CONTEXT_BETA4 = 0x0000C194, + NV3089_SET_CONTEXT_SURFACE = 0x0000C198, + NV3089_SET_COLOR_CONVERSION = 0x0000C2FC, + NV3089_SET_COLOR_FORMAT = 0x0000C300, + NV3089_SET_OPERATION = 0x0000C304, + NV3089_CLIP_POINT = 0x0000C308, + NV3089_CLIP_SIZE = 0x0000C30C, + NV3089_IMAGE_OUT_POINT = 0x0000C310, + NV3089_IMAGE_OUT_SIZE = 0x0000C314, + NV3089_DS_DX = 0x0000C318, + NV3089_DT_DY = 0x0000C31C, + NV3089_IMAGE_IN_SIZE = 0x0000C400, + NV3089_IMAGE_IN_FORMAT = 0x0000C404, + NV3089_IMAGE_IN_OFFSET = 0x0000C408, + NV3089_IMAGE_IN = 0x0000C40C, }; static const std::string GetMethodName(const u32 id) diff --git a/rpcs3/Emu/GS/GL/GLFragmentProgram.h b/rpcs3/Emu/GS/GL/GLFragmentProgram.h index 3748652509..b6b2a75ccf 100644 --- a/rpcs3/Emu/GS/GL/GLFragmentProgram.h +++ b/rpcs3/Emu/GS/GL/GLFragmentProgram.h @@ -10,21 +10,21 @@ struct GLFragmentDecompilerThread : public ThreadBase struct { - u32 end : 1; - u32 dest_reg : 6; - u32 fp16 : 1; - u32 set_cond : 1; - u32 mask_x : 1; - u32 mask_y : 1; - u32 mask_z : 1; - u32 mask_w : 1; - u32 src_attr_reg_num : 4; - u32 tex_num : 4; - u32 exp_tex : 1; - u32 prec : 2; - u32 opcode : 6; - u32 no_dest : 1; - u32 saturate : 1; + u32 end : 1; + u32 dest_reg : 6; + u32 fp16 : 1; + u32 set_cond : 1; + u32 mask_x : 1; + u32 mask_y : 1; + u32 mask_z : 1; + u32 mask_w : 1; + u32 src_attr_reg_num : 4; + u32 tex_num : 4; + u32 exp_tex : 1; + u32 prec : 2; + u32 opcode : 6; + u32 no_dest : 1; + u32 saturate : 1; }; } dst; @@ -34,24 +34,24 @@ struct GLFragmentDecompilerThread : public ThreadBase struct { - u32 reg_type : 2; - u32 tmp_reg_index : 6; - u32 fp16 : 1; - u32 swizzle_x : 2; - u32 swizzle_y : 2; - u32 swizzle_z : 2; - u32 swizzle_w : 2; - u32 neg : 1; - u32 exec_if_lt : 1; - u32 exec_if_eq : 1; - u32 exec_if_gr : 1; - u32 cond_swizzle_x : 2; - u32 cond_swizzle_y : 2; - u32 cond_swizzle_z : 2; - u32 cond_swizzle_w : 2; - u32 abs : 1; - u32 cond_mod_reg_index : 1; - u32 cond_reg_index : 1; + u32 reg_type : 2; + u32 tmp_reg_index : 6; + u32 fp16 : 1; + u32 swizzle_x : 2; + u32 swizzle_y : 2; + u32 swizzle_z : 2; + u32 swizzle_w : 2; + u32 neg : 1; + u32 exec_if_lt : 1; + u32 exec_if_eq : 1; + u32 exec_if_gr : 1; + u32 cond_swizzle_x : 2; + u32 cond_swizzle_y : 2; + u32 cond_swizzle_z : 2; + u32 cond_swizzle_w : 2; + u32 abs : 1; + u32 cond_mod_reg_index : 1; + u32 cond_reg_index : 1; }; } src0; @@ -61,19 +61,19 @@ struct GLFragmentDecompilerThread : public ThreadBase struct { - u32 reg_type : 2; - u32 tmp_reg_index : 6; - u32 fp16 : 1; - u32 swizzle_x : 2; - u32 swizzle_y : 2; - u32 swizzle_z : 2; - u32 swizzle_w : 2; - u32 neg : 1; - u32 abs : 1; - u32 input_mod_src0 : 3; - u32 : 6; - u32 scale : 3; - u32 opcode_is_branch : 1; + u32 reg_type : 2; + u32 tmp_reg_index : 6; + u32 fp16 : 1; + u32 swizzle_x : 2; + u32 swizzle_y : 2; + u32 swizzle_z : 2; + u32 swizzle_w : 2; + u32 neg : 1; + u32 abs : 1; + u32 input_mod_src0 : 3; + u32 : 6; + u32 scale : 3; + u32 opcode_is_branch : 1; }; } src1; @@ -83,18 +83,18 @@ struct GLFragmentDecompilerThread : public ThreadBase struct { - u32 reg_type : 2; - u32 tmp_reg_index : 6; - u32 fp16 : 1; - u32 swizzle_x : 2; - u32 swizzle_y : 2; - u32 swizzle_z : 2; - u32 swizzle_w : 2; - u32 neg : 1; - u32 abs : 1; - u32 addr_reg : 11; - u32 use_index_reg : 1; - u32 perspective_corr: 1; + u32 reg_type : 2; + u32 tmp_reg_index : 6; + u32 fp16 : 1; + u32 swizzle_x : 2; + u32 swizzle_y : 2; + u32 swizzle_z : 2; + u32 swizzle_w : 2; + u32 neg : 1; + u32 abs : 1; + u32 addr_reg : 11; + u32 use_index_reg : 1; + u32 perspective_corr : 1; }; } src2; diff --git a/rpcs3/Emu/GS/GL/GLShaderParam.h b/rpcs3/Emu/GS/GL/GLShaderParam.h index 26e0e34705..d1b4ad7f4b 100644 --- a/rpcs3/Emu/GS/GL/GLShaderParam.h +++ b/rpcs3/Emu/GS/GL/GLShaderParam.h @@ -86,10 +86,10 @@ struct GLParamArray { switch(flag) { - case PARAM_OUT: return "out "; - case PARAM_IN: return "in "; - case PARAM_UNIFORM: return "uniform "; - case PARAM_CONST: return "const "; + case PARAM_OUT: return "out "; + case PARAM_IN: return "in "; + case PARAM_UNIFORM: return "uniform "; + case PARAM_CONST: return "const "; } return ""; diff --git a/rpcs3/Emu/GS/GSManager.h b/rpcs3/Emu/GS/GSManager.h index bafa6961c3..bb00909f73 100644 --- a/rpcs3/Emu/GS/GSManager.h +++ b/rpcs3/Emu/GS/GSManager.h @@ -10,9 +10,9 @@ struct GSInfo u8 scanMode; u8 conversion; u8 aspect; - u8 format; + u8 format; u16 refreshRates; - u32 pitch; + u32 pitch; } mode; //CellVideoOutDisplayMode mode; diff --git a/rpcs3/Emu/GS/RSXThread.h b/rpcs3/Emu/GS/RSXThread.h index f3aee00b18..318621b7b9 100644 --- a/rpcs3/Emu/GS/RSXThread.h +++ b/rpcs3/Emu/GS/RSXThread.h @@ -7,10 +7,10 @@ enum Method { - CELL_GCM_METHOD_FLAG_NON_INCREMENT = 0x40000000, - CELL_GCM_METHOD_FLAG_JUMP = 0x20000000, - CELL_GCM_METHOD_FLAG_CALL = 0x00000002, - CELL_GCM_METHOD_FLAG_RETURN = 0x00020000, + CELL_GCM_METHOD_FLAG_NON_INCREMENT = 0x40000000, + CELL_GCM_METHOD_FLAG_JUMP = 0x20000000, + CELL_GCM_METHOD_FLAG_CALL = 0x00000002, + CELL_GCM_METHOD_FLAG_RETURN = 0x00020000, }; extern u32 methodRegisters[0xffff]; diff --git a/rpcs3/Emu/GS/sysutil_video.h b/rpcs3/Emu/GS/sysutil_video.h index fe70b1a0ef..ce92847a29 100644 --- a/rpcs3/Emu/GS/sysutil_video.h +++ b/rpcs3/Emu/GS/sysutil_video.h @@ -2,16 +2,16 @@ enum VideoErrorCode { - CELL_VIDEO_OUT_SUCCEEDED = 0, - CELL_VIDEO_OUT_ERROR_NOT_IMPLEMENTED = 0x8002b220, - CELL_VIDEO_OUT_ERROR_ILLEGAL_CONFIGURATION = 0x8002b221, - CELL_VIDEO_OUT_ERROR_ILLEGAL_PARAMETER = 0x8002b222, - CELL_VIDEO_OUT_ERROR_PARAMETER_OUT_OF_RANGE = 0x8002b223, - CELL_VIDEO_OUT_ERROR_DEVICE_NOT_FOUND = 0x8002b224, - CELL_VIDEO_OUT_ERROR_UNSUPPORTED_VIDEO_OUT = 0x8002b225, - CELL_VIDEO_OUT_ERROR_UNSUPPORTED_DISPLAY_MODE = 0x8002b226, - CELL_VIDEO_OUT_ERROR_CONDITION_BUSY = 0x8002b227, - CELL_VIDEO_OUT_ERROR_VALUE_IS_NOT_SET = 0x8002b228, + CELL_VIDEO_OUT_SUCCEEDED = 0, + CELL_VIDEO_OUT_ERROR_NOT_IMPLEMENTED = 0x8002b220, + CELL_VIDEO_OUT_ERROR_ILLEGAL_CONFIGURATION = 0x8002b221, + CELL_VIDEO_OUT_ERROR_ILLEGAL_PARAMETER = 0x8002b222, + CELL_VIDEO_OUT_ERROR_PARAMETER_OUT_OF_RANGE = 0x8002b223, + CELL_VIDEO_OUT_ERROR_DEVICE_NOT_FOUND = 0x8002b224, + CELL_VIDEO_OUT_ERROR_UNSUPPORTED_VIDEO_OUT = 0x8002b225, + CELL_VIDEO_OUT_ERROR_UNSUPPORTED_DISPLAY_MODE = 0x8002b226, + CELL_VIDEO_OUT_ERROR_CONDITION_BUSY = 0x8002b227, + CELL_VIDEO_OUT_ERROR_VALUE_IS_NOT_SET = 0x8002b228, }; enum CellVideoOut @@ -22,20 +22,20 @@ enum CellVideoOut enum CellVideoOutResolutionId { - CELL_VIDEO_OUT_RESOLUTION_UNDEFINED = 0, - CELL_VIDEO_OUT_RESOLUTION_1080 = 1, - CELL_VIDEO_OUT_RESOLUTION_720 = 2, - CELL_VIDEO_OUT_RESOLUTION_480 = 4, - CELL_VIDEO_OUT_RESOLUTION_576 = 5, - CELL_VIDEO_OUT_RESOLUTION_1600x1080 = 10, - CELL_VIDEO_OUT_RESOLUTION_1440x1080 = 11, - CELL_VIDEO_OUT_RESOLUTION_1280x1080 = 12, - CELL_VIDEO_OUT_RESOLUTION_960x1080 = 13, - CELL_VIDEO_OUT_RESOLUTION_720_3D_FRAME_PACKING = 0x81, + CELL_VIDEO_OUT_RESOLUTION_UNDEFINED = 0, + CELL_VIDEO_OUT_RESOLUTION_1080 = 1, + CELL_VIDEO_OUT_RESOLUTION_720 = 2, + CELL_VIDEO_OUT_RESOLUTION_480 = 4, + CELL_VIDEO_OUT_RESOLUTION_576 = 5, + CELL_VIDEO_OUT_RESOLUTION_1600x1080 = 10, + CELL_VIDEO_OUT_RESOLUTION_1440x1080 = 11, + CELL_VIDEO_OUT_RESOLUTION_1280x1080 = 12, + CELL_VIDEO_OUT_RESOLUTION_960x1080 = 13, + CELL_VIDEO_OUT_RESOLUTION_720_3D_FRAME_PACKING = 0x81, CELL_VIDEO_OUT_RESOLUTION_1024x720_3D_FRAME_PACKING = 0x88, - CELL_VIDEO_OUT_RESOLUTION_960x720_3D_FRAME_PACKING = 0x89, - CELL_VIDEO_OUT_RESOLUTION_800x720_3D_FRAME_PACKING = 0x8a, - CELL_VIDEO_OUT_RESOLUTION_640x720_3D_FRAME_PACKING = 0x8b, + CELL_VIDEO_OUT_RESOLUTION_960x720_3D_FRAME_PACKING = 0x89, + CELL_VIDEO_OUT_RESOLUTION_800x720_3D_FRAME_PACKING = 0x8a, + CELL_VIDEO_OUT_RESOLUTION_640x720_3D_FRAME_PACKING = 0x8b, }; enum CellVideoOutScanMode @@ -53,24 +53,24 @@ enum CellVideoOutScanMode2 enum CellVideoOutRefreshRate { - CELL_VIDEO_OUT_REFRESH_RATE_AUTO = 0x0000, - CELL_VIDEO_OUT_REFRESH_RATE_59_94HZ = 0x0001, - CELL_VIDEO_OUT_REFRESH_RATE_50HZ = 0x0002, - CELL_VIDEO_OUT_REFRESH_RATE_60HZ = 0x0004, - CELL_VIDEO_OUT_REFRESH_RATE_30HZ = 0x0008 + CELL_VIDEO_OUT_REFRESH_RATE_AUTO = 0x0000, + CELL_VIDEO_OUT_REFRESH_RATE_59_94HZ = 0x0001, + CELL_VIDEO_OUT_REFRESH_RATE_50HZ = 0x0002, + CELL_VIDEO_OUT_REFRESH_RATE_60HZ = 0x0004, + CELL_VIDEO_OUT_REFRESH_RATE_30HZ = 0x0008 }; enum CellVideoOutPortType { - CELL_VIDEO_OUT_PORT_NONE = 0x00, - CELL_VIDEO_OUT_PORT_HDMI = 0x01, - CELL_VIDEO_OUT_PORT_NETWORK = 0x41, - CELL_VIDEO_OUT_PORT_COMPOSITE_S = 0x81, - CELL_VIDEO_OUT_PORT_D = 0x82, - CELL_VIDEO_OUT_PORT_COMPONENT = 0x83, - CELL_VIDEO_OUT_PORT_RGB = 0x84, - CELL_VIDEO_OUT_PORT_AVMULTI_SCART = 0x85, - CELL_VIDEO_OUT_PORT_DSUB = 0x86 + CELL_VIDEO_OUT_PORT_NONE = 0x00, + CELL_VIDEO_OUT_PORT_HDMI = 0x01, + CELL_VIDEO_OUT_PORT_NETWORK = 0x41, + CELL_VIDEO_OUT_PORT_COMPOSITE_S = 0x81, + CELL_VIDEO_OUT_PORT_D = 0x82, + CELL_VIDEO_OUT_PORT_COMPONENT = 0x83, + CELL_VIDEO_OUT_PORT_RGB = 0x84, + CELL_VIDEO_OUT_PORT_AVMULTI_SCART = 0x85, + CELL_VIDEO_OUT_PORT_DSUB = 0x86 }; enum CellVideoOutDisplayAspect @@ -109,17 +109,17 @@ enum CellVideoOutColorSpace enum CellVideoOutDebugMonitorType { - CELL_VIDEO_OUT_DEBUG_MONITOR_TYPE_UNDEFINED = 0, - CELL_VIDEO_OUT_DEBUG_MONITOR_TYPE_480I_59_94HZ = 1, - CELL_VIDEO_OUT_DEBUG_MONITOR_TYPE_576I_50HZ = 2, - CELL_VIDEO_OUT_DEBUG_MONITOR_TYPE_480P_59_94HZ = 3, - CELL_VIDEO_OUT_DEBUG_MONITOR_TYPE_576P_50HZ = 4, - CELL_VIDEO_OUT_DEBUG_MONITOR_TYPE_1080I_59_94HZ = 5, - CELL_VIDEO_OUT_DEBUG_MONITOR_TYPE_720P_59_94HZ = 7, - CELL_VIDEO_OUT_DEBUG_MONITOR_TYPE_1080P_59_94HZ = 9, - CELL_VIDEO_OUT_DEBUG_MONITOR_TYPE_WXGA_60HZ = 11, - CELL_VIDEO_OUT_DEBUG_MONITOR_TYPE_SXGA_60HZ = 12, - CELL_VIDEO_OUT_DEBUG_MONITOR_TYPE_WUXGA_60HZ = 13 + CELL_VIDEO_OUT_DEBUG_MONITOR_TYPE_UNDEFINED = 0, + CELL_VIDEO_OUT_DEBUG_MONITOR_TYPE_480I_59_94HZ = 1, + CELL_VIDEO_OUT_DEBUG_MONITOR_TYPE_576I_50HZ = 2, + CELL_VIDEO_OUT_DEBUG_MONITOR_TYPE_480P_59_94HZ = 3, + CELL_VIDEO_OUT_DEBUG_MONITOR_TYPE_576P_50HZ = 4, + CELL_VIDEO_OUT_DEBUG_MONITOR_TYPE_1080I_59_94HZ = 5, + CELL_VIDEO_OUT_DEBUG_MONITOR_TYPE_720P_59_94HZ = 7, + CELL_VIDEO_OUT_DEBUG_MONITOR_TYPE_1080P_59_94HZ = 9, + CELL_VIDEO_OUT_DEBUG_MONITOR_TYPE_WXGA_60HZ = 11, + CELL_VIDEO_OUT_DEBUG_MONITOR_TYPE_SXGA_60HZ = 12, + CELL_VIDEO_OUT_DEBUG_MONITOR_TYPE_WUXGA_60HZ = 13 }; struct CellVideoOutColorInfo @@ -144,11 +144,11 @@ struct CellVideoOutKSVList enum CellVideoOutDisplayConversion { - CELL_VIDEO_OUT_DISPLAY_CONVERSION_NONE = 0x00, - CELL_VIDEO_OUT_DISPLAY_CONVERSION_TO_WXGA = 0x01, + CELL_VIDEO_OUT_DISPLAY_CONVERSION_NONE = 0x00, + CELL_VIDEO_OUT_DISPLAY_CONVERSION_TO_WXGA = 0x01, CELL_VIDEO_OUT_DISPLAY_CONVERSION_TO_SXGA = 0x02, - CELL_VIDEO_OUT_DISPLAY_CONVERSION_TO_WUXGA = 0x03, - CELL_VIDEO_OUT_DISPLAY_CONVERSION_TO_1080 = 0x05, + CELL_VIDEO_OUT_DISPLAY_CONVERSION_TO_WUXGA = 0x03, + CELL_VIDEO_OUT_DISPLAY_CONVERSION_TO_1080 = 0x05, CELL_VIDEO_OUT_DISPLAY_CONVERSION_TO_REMOTEPLAY = 0x10, CELL_VIDEO_OUT_DISPLAY_CONVERSION_TO_720_3D_FRAME_PACKING = 0x80, }; @@ -223,35 +223,35 @@ enum CellVideoOutRGBOutputRange static const CellVideoOutResolution ResolutionTable[] = { - {(u16)-1, (u16)-1}, //0 - 0 - {1920, 1080}, //1 - 1 - {1280, 720}, //2 - 2 - {720, 480}, //4 - 3 - {720, 576}, //5 - 4 - {1600, 1080}, //10 - 5 - {1440, 1080}, //11 - 6 - {1280, 1080}, //12 - 7 - {960, 1080}, //13 - 8 + {(u16)-1, (u16)-1}, //0 - 0 + {1920, 1080}, //1 - 1 + {1280, 720}, //2 - 2 + {720, 480}, //4 - 3 + {720, 576}, //5 - 4 + {1600, 1080}, //10 - 5 + {1440, 1080}, //11 - 6 + {1280, 1080}, //12 - 7 + {960, 1080}, //13 - 8 }; inline static u32 ResolutionIdToNum(u32 id) { static const u32 res[] = { - 0, //0 - 1, //1 - 2, //2 - 0, //3 - 3, //4 - 4, //5 - 0, //6 - 0, //7 - 0, //8 - 0, //9 - 5, //10 - 6, //11 - 7, //12 - 8, //13 + 0, //0 + 1, //1 + 2, //2 + 0, //3 + 3, //4 + 4, //5 + 0, //6 + 0, //7 + 0, //8 + 0, //9 + 5, //10 + 6, //11 + 7, //12 + 8, //13 }; return id <= 13 ? res[id] : 0; diff --git a/rpcs3/Emu/HDD/HDD.h b/rpcs3/Emu/HDD/HDD.h index 3aee9c63b1..8dc3767f68 100644 --- a/rpcs3/Emu/HDD/HDD.h +++ b/rpcs3/Emu/HDD/HDD.h @@ -8,8 +8,8 @@ struct vfsHDD_Block { struct { - u64 is_used : 1; - u64 next_block : 63; + u64 is_used : 1; + u64 next_block : 63; }; } static const g_null_block = {0}, g_used_block = {1}; diff --git a/rpcs3/Emu/Io/MouseHandler.h b/rpcs3/Emu/Io/MouseHandler.h index d937bf25c9..00cbab73e4 100644 --- a/rpcs3/Emu/Io/MouseHandler.h +++ b/rpcs3/Emu/Io/MouseHandler.h @@ -2,8 +2,8 @@ enum MousePortStatus { - CELL_MOUSE_STATUS_DISCONNECTED = 0x00000000, - CELL_MOUSE_STATUS_CONNECTED = 0x00000001, + CELL_MOUSE_STATUS_DISCONNECTED = 0x00000000, + CELL_MOUSE_STATUS_CONNECTED = 0x00000001, }; enum MouseDataUpdate diff --git a/rpcs3/Emu/Io/PadHandler.h b/rpcs3/Emu/Io/PadHandler.h index d56be02df3..bade37bef8 100644 --- a/rpcs3/Emu/Io/PadHandler.h +++ b/rpcs3/Emu/Io/PadHandler.h @@ -2,41 +2,41 @@ enum PortStatus { - CELL_PAD_STATUS_DISCONNECTED = 0x00000000, - CELL_PAD_STATUS_CONNECTED = 0x00000001, - CELL_PAD_STATUS_ASSIGN_CHANGES = 0x00000002, + CELL_PAD_STATUS_DISCONNECTED = 0x00000000, + CELL_PAD_STATUS_CONNECTED = 0x00000001, + CELL_PAD_STATUS_ASSIGN_CHANGES = 0x00000002, }; enum PortSettings { - CELL_PAD_SETTING_PRESS_ON = 0x00000002, - CELL_PAD_SETTING_SENSOR_ON = 0x00000004, - CELL_PAD_SETTING_PRESS_OFF = 0x00000000, - CELL_PAD_SETTING_SENSOR_OFF = 0x00000000, + CELL_PAD_SETTING_PRESS_ON = 0x00000002, + CELL_PAD_SETTING_SENSOR_ON = 0x00000004, + CELL_PAD_SETTING_PRESS_OFF = 0x00000000, + CELL_PAD_SETTING_SENSOR_OFF = 0x00000000, }; enum Digital1Flags { - CELL_PAD_CTRL_LEFT = 0x00000080, - CELL_PAD_CTRL_DOWN = 0x00000040, - CELL_PAD_CTRL_RIGHT = 0x00000020, - CELL_PAD_CTRL_UP = 0x00000010, - CELL_PAD_CTRL_START = 0x00000008, - CELL_PAD_CTRL_R3 = 0x00000004, - CELL_PAD_CTRL_L3 = 0x00000002, - CELL_PAD_CTRL_SELECT = 0x00000001, + CELL_PAD_CTRL_LEFT = 0x00000080, + CELL_PAD_CTRL_DOWN = 0x00000040, + CELL_PAD_CTRL_RIGHT = 0x00000020, + CELL_PAD_CTRL_UP = 0x00000010, + CELL_PAD_CTRL_START = 0x00000008, + CELL_PAD_CTRL_R3 = 0x00000004, + CELL_PAD_CTRL_L3 = 0x00000002, + CELL_PAD_CTRL_SELECT = 0x00000001, }; enum Digital2Flags { - CELL_PAD_CTRL_SQUARE = 0x00000080, - CELL_PAD_CTRL_CROSS = 0x00000040, - CELL_PAD_CTRL_CIRCLE = 0x00000020, - CELL_PAD_CTRL_TRIANGLE = 0x00000010, - CELL_PAD_CTRL_R1 = 0x00000008, - CELL_PAD_CTRL_L1 = 0x00000004, - CELL_PAD_CTRL_R2 = 0x00000002, - CELL_PAD_CTRL_L2 = 0x00000001, + CELL_PAD_CTRL_SQUARE = 0x00000080, + CELL_PAD_CTRL_CROSS = 0x00000040, + CELL_PAD_CTRL_CIRCLE = 0x00000020, + CELL_PAD_CTRL_TRIANGLE = 0x00000010, + CELL_PAD_CTRL_R1 = 0x00000008, + CELL_PAD_CTRL_L1 = 0x00000004, + CELL_PAD_CTRL_R2 = 0x00000002, + CELL_PAD_CTRL_L2 = 0x00000001, }; enum DeviceCapability @@ -50,35 +50,35 @@ enum DeviceCapability enum DeviceType { - CELL_PAD_DEV_TYPE_STANDARD = 0, - CELL_PAD_DEV_TYPE_BD_REMOCON = 4, - CELL_PAD_DEV_TYPE_LDD = 5, + CELL_PAD_DEV_TYPE_STANDARD = 0, + CELL_PAD_DEV_TYPE_BD_REMOCON = 4, + CELL_PAD_DEV_TYPE_LDD = 5, }; enum ButtonDataOffset { - CELL_PAD_BTN_OFFSET_DIGITAL1 = 2, - CELL_PAD_BTN_OFFSET_DIGITAL2 = 3, - CELL_PAD_BTN_OFFSET_ANALOG_RIGHT_X = 4, - CELL_PAD_BTN_OFFSET_ANALOG_RIGHT_Y = 5, - CELL_PAD_BTN_OFFSET_ANALOG_LEFT_X = 6, - CELL_PAD_BTN_OFFSET_ANALOG_LEFT_Y = 7, - CELL_PAD_BTN_OFFSET_PRESS_RIGHT = 8, - CELL_PAD_BTN_OFFSET_PRESS_LEFT = 9, - CELL_PAD_BTN_OFFSET_PRESS_UP = 10, - CELL_PAD_BTN_OFFSET_PRESS_DOWN = 11, - CELL_PAD_BTN_OFFSET_PRESS_TRIANGLE = 12, - CELL_PAD_BTN_OFFSET_PRESS_CIRCLE = 13, - CELL_PAD_BTN_OFFSET_PRESS_CROSS = 14, - CELL_PAD_BTN_OFFSET_PRESS_SQUARE = 15, - CELL_PAD_BTN_OFFSET_PRESS_L1 = 16, - CELL_PAD_BTN_OFFSET_PRESS_R1 = 17, - CELL_PAD_BTN_OFFSET_PRESS_L2 = 18, - CELL_PAD_BTN_OFFSET_PRESS_R2 = 19, - CELL_PAD_BTN_OFFSET_SENSOR_X = 20, - CELL_PAD_BTN_OFFSET_SENSOR_Y = 21, - CELL_PAD_BTN_OFFSET_SENSOR_Z = 22, - CELL_PAD_BTN_OFFSET_SENSOR_G = 23, + CELL_PAD_BTN_OFFSET_DIGITAL1 = 2, + CELL_PAD_BTN_OFFSET_DIGITAL2 = 3, + CELL_PAD_BTN_OFFSET_ANALOG_RIGHT_X = 4, + CELL_PAD_BTN_OFFSET_ANALOG_RIGHT_Y = 5, + CELL_PAD_BTN_OFFSET_ANALOG_LEFT_X = 6, + CELL_PAD_BTN_OFFSET_ANALOG_LEFT_Y = 7, + CELL_PAD_BTN_OFFSET_PRESS_RIGHT = 8, + CELL_PAD_BTN_OFFSET_PRESS_LEFT = 9, + CELL_PAD_BTN_OFFSET_PRESS_UP = 10, + CELL_PAD_BTN_OFFSET_PRESS_DOWN = 11, + CELL_PAD_BTN_OFFSET_PRESS_TRIANGLE = 12, + CELL_PAD_BTN_OFFSET_PRESS_CIRCLE = 13, + CELL_PAD_BTN_OFFSET_PRESS_CROSS = 14, + CELL_PAD_BTN_OFFSET_PRESS_SQUARE = 15, + CELL_PAD_BTN_OFFSET_PRESS_L1 = 16, + CELL_PAD_BTN_OFFSET_PRESS_R1 = 17, + CELL_PAD_BTN_OFFSET_PRESS_L2 = 18, + CELL_PAD_BTN_OFFSET_PRESS_R2 = 19, + CELL_PAD_BTN_OFFSET_SENSOR_X = 20, + CELL_PAD_BTN_OFFSET_SENSOR_Y = 21, + CELL_PAD_BTN_OFFSET_SENSOR_Z = 22, + CELL_PAD_BTN_OFFSET_SENSOR_G = 23, }; static const u32 CELL_MAX_PADS = 127; diff --git a/rpcs3/Emu/Io/Windows/WindowsKeyboardHandler.h b/rpcs3/Emu/Io/Windows/WindowsKeyboardHandler.h index c68d64725a..29128e166f 100644 --- a/rpcs3/Emu/Io/Windows/WindowsKeyboardHandler.h +++ b/rpcs3/Emu/Io/Windows/WindowsKeyboardHandler.h @@ -15,8 +15,8 @@ public: m_app_connector.Connect(wxEVT_KEY_UP, wxKeyEventHandler(WindowsKeyboardHandler::KeyUp), (wxObject*)0, this); } - virtual void KeyDown(wxKeyEvent& event) { Key(event.GetKeyCode(), 1); event.Skip(); } - virtual void KeyUp(wxKeyEvent& event) { Key(event.GetKeyCode(), 0); event.Skip(); } + virtual void KeyDown(wxKeyEvent& event) { Key(event.GetKeyCode(), 1); event.Skip(); } + virtual void KeyUp(wxKeyEvent& event) { Key(event.GetKeyCode(), 0); event.Skip(); } virtual void Init(const u32 max_connect) { diff --git a/rpcs3/Emu/Io/Windows/WindowsMouseHandler.h b/rpcs3/Emu/Io/Windows/WindowsMouseHandler.h index dce6832dec..194f9dae5a 100644 --- a/rpcs3/Emu/Io/Windows/WindowsMouseHandler.h +++ b/rpcs3/Emu/Io/Windows/WindowsMouseHandler.h @@ -23,20 +23,20 @@ public: virtual void MouseButtonDown(wxMouseEvent& event) { - if (event.LeftDown()) MouseHandlerBase::Button(CELL_MOUSE_BUTTON_1, 1); - else if (event.RightDown()) MouseHandlerBase::Button(CELL_MOUSE_BUTTON_2, 1); - else if (event.MiddleDown())MouseHandlerBase::Button(CELL_MOUSE_BUTTON_3, 1); + if (event.LeftDown()) MouseHandlerBase::Button(CELL_MOUSE_BUTTON_1, 1); + else if (event.RightDown()) MouseHandlerBase::Button(CELL_MOUSE_BUTTON_2, 1); + else if (event.MiddleDown()) MouseHandlerBase::Button(CELL_MOUSE_BUTTON_3, 1); event.Skip(); } virtual void MouseButtonUp(wxMouseEvent& event) { - if (event.LeftUp()) MouseHandlerBase::Button(CELL_MOUSE_BUTTON_1, 0); - else if (event.RightUp()) MouseHandlerBase::Button(CELL_MOUSE_BUTTON_2, 0); - else if (event.MiddleUp()) MouseHandlerBase::Button(CELL_MOUSE_BUTTON_3, 0); + if (event.LeftUp()) MouseHandlerBase::Button(CELL_MOUSE_BUTTON_1, 0); + else if (event.RightUp()) MouseHandlerBase::Button(CELL_MOUSE_BUTTON_2, 0); + else if (event.MiddleUp()) MouseHandlerBase::Button(CELL_MOUSE_BUTTON_3, 0); event.Skip(); } - virtual void MouseScroll(wxMouseEvent& event) { MouseHandlerBase::Scroll(event.GetWheelRotation()); event.Skip(); } - virtual void MouseMove(wxMouseEvent& event) { MouseHandlerBase::Move(event.m_x, event.m_y); event.Skip(); } + virtual void MouseScroll(wxMouseEvent& event) { MouseHandlerBase::Scroll(event.GetWheelRotation()); event.Skip(); } + virtual void MouseMove(wxMouseEvent& event) { MouseHandlerBase::Move(event.m_x, event.m_y); event.Skip(); } virtual void Init(const u32 max_connect) { diff --git a/rpcs3/Emu/Io/Windows/WindowsPadHandler.h b/rpcs3/Emu/Io/Windows/WindowsPadHandler.h index 43156e779a..a3464aecc5 100644 --- a/rpcs3/Emu/Io/Windows/WindowsPadHandler.h +++ b/rpcs3/Emu/Io/Windows/WindowsPadHandler.h @@ -15,8 +15,8 @@ public: m_app_connector.Connect(wxEVT_KEY_UP, wxKeyEventHandler(WindowsPadHandler::KeyUp), (wxObject*)0, this); } - virtual void KeyDown(wxKeyEvent& event) { Key(event.GetKeyCode(), 1); event.Skip(); } - virtual void KeyUp(wxKeyEvent& event) { Key(event.GetKeyCode(), 0); event.Skip(); } + virtual void KeyDown(wxKeyEvent& event) { Key(event.GetKeyCode(), 1); event.Skip(); } + virtual void KeyUp(wxKeyEvent& event) { Key(event.GetKeyCode(), 0); event.Skip(); } virtual void Init(const u32 max_connect) { diff --git a/rpcs3/Emu/SysCalls/ErrorCodes.h b/rpcs3/Emu/SysCalls/ErrorCodes.h index bc8871475c..5f5a512685 100644 --- a/rpcs3/Emu/SysCalls/ErrorCodes.h +++ b/rpcs3/Emu/SysCalls/ErrorCodes.h @@ -2,65 +2,65 @@ enum ErrorCode { - CELL_OK = 0x00000000, - CELL_EAGAIN = 0x80010001, //The resource is temporarily unavailable - CELL_EINVAL = 0x80010002, //An invalid argument value is specified - CELL_ENOSYS = 0x80010003, //The feature is not yet implemented - CELL_ENOMEM = 0x80010004, //Memory allocation failure - CELL_ESRCH = 0x80010005, //The resource with the specified identifier does not exist - CELL_ENOENT = 0x80010006, //The file does not exist - CELL_ENOEXEC = 0x80010007, //The file is in unrecognized format - CELL_EDEADLK = 0x80010008, //Resource deadlock is avoided - CELL_EPERM = 0x80010009, //The operation is not permitted - CELL_EBUSY = 0x8001000A, //The device or resource is busy - CELL_ETIMEDOUT = 0x8001000B, //The operation is timed out - CELL_EABORT = 0x8001000C, //The operation is aborted - CELL_EFAULT = 0x8001000D, //Invalid memory access - CELL_ESTAT = 0x8001000F, //State of the target thread is invalid - CELL_EALIGN = 0x80010010, //Alignment is invalid. - CELL_EKRESOURCE = 0x80010011, //Shortage of the kernel resources - CELL_EISDIR = 0x80010012, //The file is a directory - CELL_ECANCELED = 0x80010013, //Operation canceled - CELL_EEXIST = 0x80010014, //Entry already exists - CELL_EISCONN = 0x80010015, //Port is already connected - CELL_ENOTCONN = 0x80010016, //Port is not connected - CELL_EAUTHFAIL = 0x80010017, //Program authentication fail - CELL_ENOTMSELF = 0x80010018, //The file is not a MSELF - CELL_ESYSVER = 0x80010019, //System version error - CELL_EAUTHFATAL = 0x8001001A, //Fatal system error - CELL_EDOM = 0x8001001B, - CELL_ERANGE = 0x8001001C, - CELL_EILSEQ = 0x8001001D, - CELL_EFPOS = 0x8001001E, - CELL_EINTR = 0x8001001F, - CELL_EFBIG = 0x80010020, - CELL_EMLIN = 0x80010021, - CELL_ENFILE = 0x80010022, - CELL_ENOSPC = 0x80010023, - CELL_ENOTTY = 0x80010024, - CELL_EPIPE = 0x80010025, - CELL_EROFS = 0x80010026, - CELL_ESPIPE = 0x80010027, - CELL_E2BIG = 0x80010028, - CELL_EACCES = 0x80010029, - CELL_EBADF = 0x8001002A, - CELL_EIO = 0x8001002B, - CELL_EMFILE = 0x8001002C, - CELL_ENODEV = 0x8001002D, - CELL_ENOTDIR = 0x8001002E, - CELL_ENXIO = 0x8001002F, - CELL_EXDEV = 0x80010030, - CELL_EBADMSG = 0x80010031, - CELL_EINPROGRESS = 0x80010032, - CELL_EMSGSIZE = 0x80010033, - CELL_ENAMETOOLONG = 0x80010034, - CELL_ENOLCK = 0x80010035, - CELL_ENOTEMPTY = 0x80010036, - CELL_ENOTSUP = 0x80010037, - CELL_EFSSPECIFIC = 0x80010038, - CELL_EOVERFLOW = 0x80010039, - CELL_ENOTMOUNTED = 0x8001003A, - CELL_ENOTSDATA = 0x8001003B, + CELL_OK = 0x00000000, + CELL_EAGAIN = 0x80010001, //The resource is temporarily unavailable + CELL_EINVAL = 0x80010002, //An invalid argument value is specified + CELL_ENOSYS = 0x80010003, //The feature is not yet implemented + CELL_ENOMEM = 0x80010004, //Memory allocation failure + CELL_ESRCH = 0x80010005, //The resource with the specified identifier does not exist + CELL_ENOENT = 0x80010006, //The file does not exist + CELL_ENOEXEC = 0x80010007, //The file is in unrecognized format + CELL_EDEADLK = 0x80010008, //Resource deadlock is avoided + CELL_EPERM = 0x80010009, //The operation is not permitted + CELL_EBUSY = 0x8001000A, //The device or resource is busy + CELL_ETIMEDOUT = 0x8001000B, //The operation is timed out + CELL_EABORT = 0x8001000C, //The operation is aborted + CELL_EFAULT = 0x8001000D, //Invalid memory access + CELL_ESTAT = 0x8001000F, //State of the target thread is invalid + CELL_EALIGN = 0x80010010, //Alignment is invalid. + CELL_EKRESOURCE = 0x80010011, //Shortage of the kernel resources + CELL_EISDIR = 0x80010012, //The file is a directory + CELL_ECANCELED = 0x80010013, //Operation canceled + CELL_EEXIST = 0x80010014, //Entry already exists + CELL_EISCONN = 0x80010015, //Port is already connected + CELL_ENOTCONN = 0x80010016, //Port is not connected + CELL_EAUTHFAIL = 0x80010017, //Program authentication fail + CELL_ENOTMSELF = 0x80010018, //The file is not a MSELF + CELL_ESYSVER = 0x80010019, //System version error + CELL_EAUTHFATAL = 0x8001001A, //Fatal system error + CELL_EDOM = 0x8001001B, + CELL_ERANGE = 0x8001001C, + CELL_EILSEQ = 0x8001001D, + CELL_EFPOS = 0x8001001E, + CELL_EINTR = 0x8001001F, + CELL_EFBIG = 0x80010020, + CELL_EMLIN = 0x80010021, + CELL_ENFILE = 0x80010022, + CELL_ENOSPC = 0x80010023, + CELL_ENOTTY = 0x80010024, + CELL_EPIPE = 0x80010025, + CELL_EROFS = 0x80010026, + CELL_ESPIPE = 0x80010027, + CELL_E2BIG = 0x80010028, + CELL_EACCES = 0x80010029, + CELL_EBADF = 0x8001002A, + CELL_EIO = 0x8001002B, + CELL_EMFILE = 0x8001002C, + CELL_ENODEV = 0x8001002D, + CELL_ENOTDIR = 0x8001002E, + CELL_ENXIO = 0x8001002F, + CELL_EXDEV = 0x80010030, + CELL_EBADMSG = 0x80010031, + CELL_EINPROGRESS = 0x80010032, + CELL_EMSGSIZE = 0x80010033, + CELL_ENAMETOOLONG = 0x80010034, + CELL_ENOLCK = 0x80010035, + CELL_ENOTEMPTY = 0x80010036, + CELL_ENOTSUP = 0x80010037, + CELL_EFSSPECIFIC = 0x80010038, + CELL_EOVERFLOW = 0x80010039, + CELL_ENOTMOUNTED = 0x8001003A, + CELL_ENOTSDATA = 0x8001003B, - CELL_UNKNOWN_ERROR = 0xFFFFFFFF, + CELL_UNKNOWN_ERROR = 0xFFFFFFFF, }; \ No newline at end of file diff --git a/rpcs3/Emu/SysCalls/Modules/cellAdec.h b/rpcs3/Emu/SysCalls/Modules/cellAdec.h index 3e29c92b1a..385d2486c4 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellAdec.h +++ b/rpcs3/Emu/SysCalls/Modules/cellAdec.h @@ -5,11 +5,11 @@ // Error Codes enum { - CELL_ADEC_ERROR_FATAL = 0x80610001, - CELL_ADEC_ERROR_SEQ = 0x80610002, - CELL_ADEC_ERROR_ARG = 0x80610003, - CELL_ADEC_ERROR_BUSY = 0x80610004, - CELL_ADEC_ERROR_EMPTY = 0x80610005, + CELL_ADEC_ERROR_FATAL = 0x80610001, + CELL_ADEC_ERROR_SEQ = 0x80610002, + CELL_ADEC_ERROR_ARG = 0x80610003, + CELL_ADEC_ERROR_BUSY = 0x80610004, + CELL_ADEC_ERROR_EMPTY = 0x80610005, CELL_ADEC_ERROR_CELP_BUSY = 0x80612e01, CELL_ADEC_ERROR_CELP_EMPTY = 0x80612e02, @@ -27,77 +27,75 @@ enum CELL_ADEC_ERROR_CELP8_CORE_ARG = 0x80612eb2, CELL_ADEC_ERROR_CELP8_CORE_SEQ = 0x80612eb3, - CELL_ADEC_ERROR_M4AAC_FATAL = 0x80612401, - CELL_ADEC_ERROR_M4AAC_SEQ = 0x80612402, - CELL_ADEC_ERROR_M4AAC_ARG = 0x80612403, - CELL_ADEC_ERROR_M4AAC_BUSY = 0x80612404, - CELL_ADEC_ERROR_M4AAC_EMPTY = 0x80612405, - CELL_ADEC_ERROR_M4AAC_BUFFER_OVERFLOW = 0x80612406, - CELL_ADEC_ERROR_M4AAC_END_OF_BITSTREAM = 0x80612407, + CELL_ADEC_ERROR_M4AAC_FATAL = 0x80612401, + CELL_ADEC_ERROR_M4AAC_SEQ = 0x80612402, + CELL_ADEC_ERROR_M4AAC_ARG = 0x80612403, + CELL_ADEC_ERROR_M4AAC_BUSY = 0x80612404, + CELL_ADEC_ERROR_M4AAC_EMPTY = 0x80612405, + CELL_ADEC_ERROR_M4AAC_BUFFER_OVERFLOW = 0x80612406, + CELL_ADEC_ERROR_M4AAC_END_OF_BITSTREAM = 0x80612407, /* Core */ - CELL_ADEC_ERROR_M4AAC_CH_CONFIG_INCONSISTENCY = 0x80612410, - CELL_ADEC_ERROR_M4AAC_NO_CH_DEFAULT_POS = 0x80612411, - CELL_ADEC_ERROR_M4AAC_INVALID_CH_POS = 0x80612412, - CELL_ADEC_ERROR_M4AAC_UNANTICIPATED_COUPLING_CH = 0x80612413, - CELL_ADEC_ERROR_M4AAC_INVALID_LAYER_ID = 0x80612414, - CELL_ADEC_ERROR_M4AAC_ADTS_SYNCWORD_ERROR = 0x80612415, - CELL_ADEC_ERROR_M4AAC_INVALID_ADTS_ID = 0x80612416, - CELL_ADEC_ERROR_M4AAC_CH_CHANGED = 0x80612417, - CELL_ADEC_ERROR_M4AAC_SAMPLING_FREQ_CHANGED = 0x80612418, - CELL_ADEC_ERROR_M4AAC_WRONG_SBR_CH = 0x80612419, - CELL_ADEC_ERROR_M4AAC_WRONG_SCALE_FACTOR = 0x8061241a, - CELL_ADEC_ERROR_M4AAC_INVALID_BOOKS = 0x8061241b, - CELL_ADEC_ERROR_M4AAC_INVALID_SECTION_DATA = 0x8061241c, - CELL_ADEC_ERROR_M4AAC_PULSE_IS_NOT_LONG = 0x8061241d, - CELL_ADEC_ERROR_M4AAC_GC_IS_NOT_SUPPORTED = 0x8061241e, - CELL_ADEC_ERROR_M4AAC_INVALID_ELEMENT_ID = 0x8061241f, - CELL_ADEC_ERROR_M4AAC_NO_CH_CONFIG = 0x80612420, - CELL_ADEC_ERROR_M4AAC_UNEXPECTED_OVERLAP_CRC = 0x80612421, - CELL_ADEC_ERROR_M4AAC_CRC_BUFFER_EXCEEDED = 0x80612422, - CELL_ADEC_ERROR_M4AAC_INVALID_CRC = 0x80612423, - CELL_ADEC_ERROR_M4AAC_BAD_WINDOW_CODE = 0x80612424, - CELL_ADEC_ERROR_M4AAC_INVALID_ADIF_HEADER_ID = 0x80612425, - CELL_ADEC_ERROR_M4AAC_NOT_SUPPORTED_PROFILE = 0x80612426, - CELL_ADEC_ERROR_M4AAC_PROG_NUMBER_NOT_FOUND = 0x80612427, - CELL_ADEC_ERROR_M4AAC_INVALID_SAMP_RATE_INDEX = 0x80612428, - CELL_ADEC_ERROR_M4AAC_UNANTICIPATED_CH_CONFIG = 0x80612429, - CELL_ADEC_ERROR_M4AAC_PULSE_OVERFLOWED = 0x8061242a, - CELL_ADEC_ERROR_M4AAC_CAN_NOT_UNPACK_INDEX = 0x8061242b, - CELL_ADEC_ERROR_M4AAC_DEINTERLEAVE_FAILED = 0x8061242c, - CELL_ADEC_ERROR_M4AAC_CALC_BAND_OFFSET_FAILED = 0x8061242d, - CELL_ADEC_ERROR_M4AAC_GET_SCALE_FACTOR_FAILED = 0x8061242e, - CELL_ADEC_ERROR_M4AAC_GET_CC_GAIN_FAILED = 0x8061242f, - CELL_ADEC_ERROR_M4AAC_MIX_COUPLING_CH_FAILED = 0x80612430, - CELL_ADEC_ERROR_M4AAC_GROUP_IS_INVALID = 0x80612431, - CELL_ADEC_ERROR_M4AAC_PREDICT_FAILED = 0x80612432, - CELL_ADEC_ERROR_M4AAC_INVALID_PREDICT_RESET_PATTERN = 0x80612433, - CELL_ADEC_ERROR_M4AAC_INVALID_TNS_FRAME_INFO = 0x80612434, - CELL_ADEC_ERROR_M4AAC_GET_MASK_FAILED = 0x80612435, - CELL_ADEC_ERROR_M4AAC_GET_GROUP_FAILED = 0x80612436, - CELL_ADEC_ERROR_M4AAC_GET_LPFLAG_FAILED = 0x80612437, - CELL_ADEC_ERROR_M4AAC_INVERSE_QUANTIZATION_FAILED = 0x80612438, - CELL_ADEC_ERROR_M4AAC_GET_CB_MAP_FAILED = 0x80612439, - CELL_ADEC_ERROR_M4AAC_GET_PULSE_FAILED = 0x8061243a, - CELL_ADEC_ERROR_M4AAC_MONO_MIXDOWN_ELEMENT_IS_NOT_SUPPORTED - = 0x8061243b, - CELL_ADEC_ERROR_M4AAC_STEREO_MIXDOWN_ELEMENT_IS_NOT_SUPPORTED - = 0x8061243c, + CELL_ADEC_ERROR_M4AAC_CH_CONFIG_INCONSISTENCY = 0x80612410, + CELL_ADEC_ERROR_M4AAC_NO_CH_DEFAULT_POS = 0x80612411, + CELL_ADEC_ERROR_M4AAC_INVALID_CH_POS = 0x80612412, + CELL_ADEC_ERROR_M4AAC_UNANTICIPATED_COUPLING_CH = 0x80612413, + CELL_ADEC_ERROR_M4AAC_INVALID_LAYER_ID = 0x80612414, + CELL_ADEC_ERROR_M4AAC_ADTS_SYNCWORD_ERROR = 0x80612415, + CELL_ADEC_ERROR_M4AAC_INVALID_ADTS_ID = 0x80612416, + CELL_ADEC_ERROR_M4AAC_CH_CHANGED = 0x80612417, + CELL_ADEC_ERROR_M4AAC_SAMPLING_FREQ_CHANGED = 0x80612418, + CELL_ADEC_ERROR_M4AAC_WRONG_SBR_CH = 0x80612419, + CELL_ADEC_ERROR_M4AAC_WRONG_SCALE_FACTOR = 0x8061241a, + CELL_ADEC_ERROR_M4AAC_INVALID_BOOKS = 0x8061241b, + CELL_ADEC_ERROR_M4AAC_INVALID_SECTION_DATA = 0x8061241c, + CELL_ADEC_ERROR_M4AAC_PULSE_IS_NOT_LONG = 0x8061241d, + CELL_ADEC_ERROR_M4AAC_GC_IS_NOT_SUPPORTED = 0x8061241e, + CELL_ADEC_ERROR_M4AAC_INVALID_ELEMENT_ID = 0x8061241f, + CELL_ADEC_ERROR_M4AAC_NO_CH_CONFIG = 0x80612420, + CELL_ADEC_ERROR_M4AAC_UNEXPECTED_OVERLAP_CRC = 0x80612421, + CELL_ADEC_ERROR_M4AAC_CRC_BUFFER_EXCEEDED = 0x80612422, + CELL_ADEC_ERROR_M4AAC_INVALID_CRC = 0x80612423, + CELL_ADEC_ERROR_M4AAC_BAD_WINDOW_CODE = 0x80612424, + CELL_ADEC_ERROR_M4AAC_INVALID_ADIF_HEADER_ID = 0x80612425, + CELL_ADEC_ERROR_M4AAC_NOT_SUPPORTED_PROFILE = 0x80612426, + CELL_ADEC_ERROR_M4AAC_PROG_NUMBER_NOT_FOUND = 0x80612427, + CELL_ADEC_ERROR_M4AAC_INVALID_SAMP_RATE_INDEX = 0x80612428, + CELL_ADEC_ERROR_M4AAC_UNANTICIPATED_CH_CONFIG = 0x80612429, + CELL_ADEC_ERROR_M4AAC_PULSE_OVERFLOWED = 0x8061242a, + CELL_ADEC_ERROR_M4AAC_CAN_NOT_UNPACK_INDEX = 0x8061242b, + CELL_ADEC_ERROR_M4AAC_DEINTERLEAVE_FAILED = 0x8061242c, + CELL_ADEC_ERROR_M4AAC_CALC_BAND_OFFSET_FAILED = 0x8061242d, + CELL_ADEC_ERROR_M4AAC_GET_SCALE_FACTOR_FAILED = 0x8061242e, + CELL_ADEC_ERROR_M4AAC_GET_CC_GAIN_FAILED = 0x8061242f, + CELL_ADEC_ERROR_M4AAC_MIX_COUPLING_CH_FAILED = 0x80612430, + CELL_ADEC_ERROR_M4AAC_GROUP_IS_INVALID = 0x80612431, + CELL_ADEC_ERROR_M4AAC_PREDICT_FAILED = 0x80612432, + CELL_ADEC_ERROR_M4AAC_INVALID_PREDICT_RESET_PATTERN = 0x80612433, + CELL_ADEC_ERROR_M4AAC_INVALID_TNS_FRAME_INFO = 0x80612434, + CELL_ADEC_ERROR_M4AAC_GET_MASK_FAILED = 0x80612435, + CELL_ADEC_ERROR_M4AAC_GET_GROUP_FAILED = 0x80612436, + CELL_ADEC_ERROR_M4AAC_GET_LPFLAG_FAILED = 0x80612437, + CELL_ADEC_ERROR_M4AAC_INVERSE_QUANTIZATION_FAILED = 0x80612438, + CELL_ADEC_ERROR_M4AAC_GET_CB_MAP_FAILED = 0x80612439, + CELL_ADEC_ERROR_M4AAC_GET_PULSE_FAILED = 0x8061243a, + CELL_ADEC_ERROR_M4AAC_MONO_MIXDOWN_ELEMENT_IS_NOT_SUPPORTED = 0x8061243b, + CELL_ADEC_ERROR_M4AAC_STEREO_MIXDOWN_ELEMENT_IS_NOT_SUPPORTED = 0x8061243c, - CELL_ADEC_ERROR_M4AAC_SBR_CH_OVERFLOW = 0x80612480, - CELL_ADEC_ERROR_M4AAC_SBR_NOSYNCH = 0x80612481, - CELL_ADEC_ERROR_M4AAC_SBR_ILLEGAL_PROGRAM = 0x80612482, - CELL_ADEC_ERROR_M4AAC_SBR_ILLEGAL_TAG = 0x80612483, - CELL_ADEC_ERROR_M4AAC_SBR_ILLEGAL_CHN_CONFIG = 0x80612484, - CELL_ADEC_ERROR_M4AAC_SBR_ILLEGAL_SECTION = 0x80612485, - CELL_ADEC_ERROR_M4AAC_SBR_ILLEGAL_SCFACTORS = 0x80612486, - CELL_ADEC_ERROR_M4AAC_SBR_ILLEGAL_PULSE_DATA = 0x80612487, - CELL_ADEC_ERROR_M4AAC_SBR_MAIN_PROFILE_NOT_IMPLEMENTED = 0x80612488, - CELL_ADEC_ERROR_M4AAC_SBR_GC_NOT_IMPLEMENTED = 0x80612489, - CELL_ADEC_ERROR_M4AAC_SBR_ILLEGAL_PLUS_ELE_ID = 0x8061248a, - CELL_ADEC_ERROR_M4AAC_SBR_CREATE_ERROR = 0x8061248b, - CELL_ADEC_ERROR_M4AAC_SBR_NOT_INITIALIZED = 0x8061248c, - CELL_ADEC_ERROR_M4AAC_SBR_INVALID_ENVELOPE = 0x8061248d, + CELL_ADEC_ERROR_M4AAC_SBR_CH_OVERFLOW = 0x80612480, + CELL_ADEC_ERROR_M4AAC_SBR_NOSYNCH = 0x80612481, + CELL_ADEC_ERROR_M4AAC_SBR_ILLEGAL_PROGRAM = 0x80612482, + CELL_ADEC_ERROR_M4AAC_SBR_ILLEGAL_TAG = 0x80612483, + CELL_ADEC_ERROR_M4AAC_SBR_ILLEGAL_CHN_CONFIG = 0x80612484, + CELL_ADEC_ERROR_M4AAC_SBR_ILLEGAL_SECTION = 0x80612485, + CELL_ADEC_ERROR_M4AAC_SBR_ILLEGAL_SCFACTORS = 0x80612486, + CELL_ADEC_ERROR_M4AAC_SBR_ILLEGAL_PULSE_DATA = 0x80612487, + CELL_ADEC_ERROR_M4AAC_SBR_MAIN_PROFILE_NOT_IMPLEMENTED = 0x80612488, + CELL_ADEC_ERROR_M4AAC_SBR_GC_NOT_IMPLEMENTED = 0x80612489, + CELL_ADEC_ERROR_M4AAC_SBR_ILLEGAL_PLUS_ELE_ID = 0x8061248a, + CELL_ADEC_ERROR_M4AAC_SBR_CREATE_ERROR = 0x8061248b, + CELL_ADEC_ERROR_M4AAC_SBR_NOT_INITIALIZED = 0x8061248c, + CELL_ADEC_ERROR_M4AAC_SBR_INVALID_ENVELOPE = 0x8061248d, CELL_ADEC_ERROR_AC3_BUSY = 0x80612500, @@ -114,8 +112,8 @@ enum CELL_ADEC_ERROR_ATX_OFFSET = 0x80612200, - CELL_ADEC_ERROR_ATX_NONE = 0x80612200, - CELL_ADEC_ERROR_ATX_OK = 0x80612200, + CELL_ADEC_ERROR_ATX_NONE = 0x80612200, + CELL_ADEC_ERROR_ATX_OK = 0x80612200, CELL_ADEC_ERROR_ATX_BUSY = 0x80612264, CELL_ADEC_ERROR_ATX_EMPTY = 0x80612265, CELL_ADEC_ERROR_ATX_ATSHDR = 0x80612266, @@ -207,46 +205,46 @@ enum CELL_ADEC_ERROR_MP3_PCMOUT = 0x8061279e, - CELL_ADEC_ERROR_M2BC_FATAL = 0x80612b01, - CELL_ADEC_ERROR_M2BC_SEQ = 0x80612b02, - CELL_ADEC_ERROR_M2BC_ARG = 0x80612b03, - CELL_ADEC_ERROR_M2BC_BUSY = 0x80612b04, - CELL_ADEC_ERROR_M2BC_EMPTY = 0x80612b05, + CELL_ADEC_ERROR_M2BC_FATAL = 0x80612b01, + CELL_ADEC_ERROR_M2BC_SEQ = 0x80612b02, + CELL_ADEC_ERROR_M2BC_ARG = 0x80612b03, + CELL_ADEC_ERROR_M2BC_BUSY = 0x80612b04, + CELL_ADEC_ERROR_M2BC_EMPTY = 0x80612b05, - CELL_ADEC_ERROR_M2BC_SYNCF = 0x80612b11, - CELL_ADEC_ERROR_M2BC_LAYER = 0x80612b12, - CELL_ADEC_ERROR_M2BC_BITRATE = 0x80612b13, - CELL_ADEC_ERROR_M2BC_SAMPLEFREQ = 0x80612b14, - CELL_ADEC_ERROR_M2BC_VERSION = 0x80612b15, - CELL_ADEC_ERROR_M2BC_MODE_EXT = 0x80612b16, - CELL_ADEC_ERROR_M2BC_UNSUPPORT = 0x80612b17, + CELL_ADEC_ERROR_M2BC_SYNCF = 0x80612b11, + CELL_ADEC_ERROR_M2BC_LAYER = 0x80612b12, + CELL_ADEC_ERROR_M2BC_BITRATE = 0x80612b13, + CELL_ADEC_ERROR_M2BC_SAMPLEFREQ = 0x80612b14, + CELL_ADEC_ERROR_M2BC_VERSION = 0x80612b15, + CELL_ADEC_ERROR_M2BC_MODE_EXT = 0x80612b16, + CELL_ADEC_ERROR_M2BC_UNSUPPORT = 0x80612b17, - CELL_ADEC_ERROR_M2BC_OPENBS_EX = 0x80612b21, - CELL_ADEC_ERROR_M2BC_SYNCF_EX = 0x80612b22, - CELL_ADEC_ERROR_M2BC_CRCGET_EX = 0x80612b23, - CELL_ADEC_ERROR_M2BC_CRC_EX = 0x80612b24, + CELL_ADEC_ERROR_M2BC_OPENBS_EX = 0x80612b21, + CELL_ADEC_ERROR_M2BC_SYNCF_EX = 0x80612b22, + CELL_ADEC_ERROR_M2BC_CRCGET_EX = 0x80612b23, + CELL_ADEC_ERROR_M2BC_CRC_EX = 0x80612b24, - CELL_ADEC_ERROR_M2BC_CRCGET = 0x80612b31, - CELL_ADEC_ERROR_M2BC_CRC = 0x80612b32, - CELL_ADEC_ERROR_M2BC_BITALLOC = 0x80612b33, - CELL_ADEC_ERROR_M2BC_SCALE = 0x80612b34, - CELL_ADEC_ERROR_M2BC_SAMPLE = 0x80612b35, - CELL_ADEC_ERROR_M2BC_OPENBS = 0x80612b36, + CELL_ADEC_ERROR_M2BC_CRCGET = 0x80612b31, + CELL_ADEC_ERROR_M2BC_CRC = 0x80612b32, + CELL_ADEC_ERROR_M2BC_BITALLOC = 0x80612b33, + CELL_ADEC_ERROR_M2BC_SCALE = 0x80612b34, + CELL_ADEC_ERROR_M2BC_SAMPLE = 0x80612b35, + CELL_ADEC_ERROR_M2BC_OPENBS = 0x80612b36, - CELL_ADEC_ERROR_M2BC_MC_CRCGET = 0x80612b41, - CELL_ADEC_ERROR_M2BC_MC_CRC = 0x80612b42, - CELL_ADEC_ERROR_M2BC_MC_BITALLOC = 0x80612b43, - CELL_ADEC_ERROR_M2BC_MC_SCALE = 0x80612b44, - CELL_ADEC_ERROR_M2BC_MC_SAMPLE = 0x80612b45, - CELL_ADEC_ERROR_M2BC_MC_HEADER = 0x80612b46, - CELL_ADEC_ERROR_M2BC_MC_STATUS = 0x80612b47, + CELL_ADEC_ERROR_M2BC_MC_CRCGET = 0x80612b41, + CELL_ADEC_ERROR_M2BC_MC_CRC = 0x80612b42, + CELL_ADEC_ERROR_M2BC_MC_BITALLOC = 0x80612b43, + CELL_ADEC_ERROR_M2BC_MC_SCALE = 0x80612b44, + CELL_ADEC_ERROR_M2BC_MC_SAMPLE = 0x80612b45, + CELL_ADEC_ERROR_M2BC_MC_HEADER = 0x80612b46, + CELL_ADEC_ERROR_M2BC_MC_STATUS = 0x80612b47, - CELL_ADEC_ERROR_M2BC_AG_CCRCGET = 0x80612b51, - CELL_ADEC_ERROR_M2BC_AG_CRC = 0x80612b52, - CELL_ADEC_ERROR_M2BC_AG_BITALLOC = 0x80612b53, - CELL_ADEC_ERROR_M2BC_AG_SCALE = 0x80612b54, - CELL_ADEC_ERROR_M2BC_AG_SAMPLE = 0x80612b55, - CELL_ADEC_ERROR_M2BC_AG_STATUS = 0x80612b57, + CELL_ADEC_ERROR_M2BC_AG_CCRCGET = 0x80612b51, + CELL_ADEC_ERROR_M2BC_AG_CRC = 0x80612b52, + CELL_ADEC_ERROR_M2BC_AG_BITALLOC = 0x80612b53, + CELL_ADEC_ERROR_M2BC_AG_SCALE = 0x80612b54, + CELL_ADEC_ERROR_M2BC_AG_SAMPLE = 0x80612b55, + CELL_ADEC_ERROR_M2BC_AG_STATUS = 0x80612b57, }; // Audio Codec Type diff --git a/rpcs3/Emu/SysCalls/Modules/cellAtrac.h b/rpcs3/Emu/SysCalls/Modules/cellAtrac.h index 5a95c32b97..809bcc6d10 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellAtrac.h +++ b/rpcs3/Emu/SysCalls/Modules/cellAtrac.h @@ -3,28 +3,28 @@ // Return Codes enum { - CELL_ATRAC_OK = 0x00000000, - CELL_ATRAC_ERROR_API_FAIL = 0x80610301, - CELL_ATRAC_ERROR_READSIZE_OVER_BUFFER = 0x80610311, - CELL_ATRAC_ERROR_UNKNOWN_FORMAT = 0x80610312, - CELL_ATRAC_ERROR_READSIZE_IS_TOO_SMALL = 0x80610313, - CELL_ATRAC_ERROR_ILLEGAL_SAMPLING_RATE = 0x80610314, - CELL_ATRAC_ERROR_ILLEGAL_DATA = 0x80610315, - CELL_ATRAC_ERROR_NO_DECODER = 0x80610321, - CELL_ATRAC_ERROR_UNSET_DATA = 0x80610322, - CELL_ATRAC_ERROR_DECODER_WAS_CREATED = 0x80610323, - CELL_ATRAC_ERROR_ALLDATA_WAS_DECODED = 0x80610331, - CELL_ATRAC_ERROR_NODATA_IN_BUFFER = 0x80610332, - CELL_ATRAC_ERROR_NOT_ALIGNED_OUT_BUFFER = 0x80610333, - CELL_ATRAC_ERROR_NEED_SECOND_BUFFER = 0x80610334, - CELL_ATRAC_ERROR_ALLDATA_IS_ONMEMORY = 0x80610341, - CELL_ATRAC_ERROR_ADD_DATA_IS_TOO_BIG = 0x80610342, - CELL_ATRAC_ERROR_NONEED_SECOND_BUFFER = 0x80610351, - CELL_ATRAC_ERROR_UNSET_LOOP_NUM = 0x80610361, - CELL_ATRAC_ERROR_ILLEGAL_SAMPLE = 0x80610371, - CELL_ATRAC_ERROR_ILLEGAL_RESET_BYTE = 0x80610372, - CELL_ATRAC_ERROR_ILLEGAL_PPU_THREAD_PRIORITY = 0x80610381, - CELL_ATRAC_ERROR_ILLEGAL_SPU_THREAD_PRIORITY = 0x80610382, + CELL_ATRAC_OK = 0x00000000, + CELL_ATRAC_ERROR_API_FAIL = 0x80610301, + CELL_ATRAC_ERROR_READSIZE_OVER_BUFFER = 0x80610311, + CELL_ATRAC_ERROR_UNKNOWN_FORMAT = 0x80610312, + CELL_ATRAC_ERROR_READSIZE_IS_TOO_SMALL = 0x80610313, + CELL_ATRAC_ERROR_ILLEGAL_SAMPLING_RATE = 0x80610314, + CELL_ATRAC_ERROR_ILLEGAL_DATA = 0x80610315, + CELL_ATRAC_ERROR_NO_DECODER = 0x80610321, + CELL_ATRAC_ERROR_UNSET_DATA = 0x80610322, + CELL_ATRAC_ERROR_DECODER_WAS_CREATED = 0x80610323, + CELL_ATRAC_ERROR_ALLDATA_WAS_DECODED = 0x80610331, + CELL_ATRAC_ERROR_NODATA_IN_BUFFER = 0x80610332, + CELL_ATRAC_ERROR_NOT_ALIGNED_OUT_BUFFER = 0x80610333, + CELL_ATRAC_ERROR_NEED_SECOND_BUFFER = 0x80610334, + CELL_ATRAC_ERROR_ALLDATA_IS_ONMEMORY = 0x80610341, + CELL_ATRAC_ERROR_ADD_DATA_IS_TOO_BIG = 0x80610342, + CELL_ATRAC_ERROR_NONEED_SECOND_BUFFER = 0x80610351, + CELL_ATRAC_ERROR_UNSET_LOOP_NUM = 0x80610361, + CELL_ATRAC_ERROR_ILLEGAL_SAMPLE = 0x80610371, + CELL_ATRAC_ERROR_ILLEGAL_RESET_BYTE = 0x80610372, + CELL_ATRAC_ERROR_ILLEGAL_PPU_THREAD_PRIORITY = 0x80610381, + CELL_ATRAC_ERROR_ILLEGAL_SPU_THREAD_PRIORITY = 0x80610382, }; // Remain Frame diff --git a/rpcs3/Emu/SysCalls/Modules/cellBgdl.cpp b/rpcs3/Emu/SysCalls/Modules/cellBgdl.cpp index 4738bc2e25..ac1803e101 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellBgdl.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellBgdl.cpp @@ -8,12 +8,12 @@ Module cellBgdl(0x003f, cellBgdl_init); // 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, - CELL_BGDL_UTIL_ERROR_ACCESS_ERROR = 0x8002ce04, - CELL_BGDL_UTIL_ERROR_INITIALIZE = 0x8002ce05, + CELL_BGDL_UTIL_RET_OK = 0x00000000, + CELL_BGDL_UTIL_ERROR_BUSY = 0x8002ce01, + CELL_BGDL_UTIL_ERROR_INTERNAL = 0x8002ce02, + CELL_BGDL_UTIL_ERROR_PARAM = 0x8002ce03, + CELL_BGDL_UTIL_ERROR_ACCESS_ERROR = 0x8002ce04, + CELL_BGDL_UTIL_ERROR_INITIALIZE = 0x8002ce05, }; int cellBGDLGetInfo() diff --git a/rpcs3/Emu/SysCalls/Modules/cellCamera.cpp b/rpcs3/Emu/SysCalls/Modules/cellCamera.cpp index 691f74e691..19e91bb08e 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellCamera.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellCamera.cpp @@ -8,19 +8,19 @@ Module cellCamera(0x0023, cellCamera_init); // Error Codes enum { - CELL_CAMERA_ERROR_ALREADY_INIT = 0x80140801, - CELL_CAMERA_ERROR_NOT_INIT = 0x80140803, - CELL_CAMERA_ERROR_PARAM = 0x80140804, - CELL_CAMERA_ERROR_ALREADY_OPEN = 0x80140805, - CELL_CAMERA_ERROR_NOT_OPEN = 0x80140806, - CELL_CAMERA_ERROR_DEVICE_NOT_FOUND = 0x80140807, - CELL_CAMERA_ERROR_DEVICE_DEACTIVATED = 0x80140808, - CELL_CAMERA_ERROR_NOT_STARTED = 0x80140809, - CELL_CAMERA_ERROR_FORMAT_UNKNOWN = 0x8014080a, - CELL_CAMERA_ERROR_RESOLUTION_UNKNOWN = 0x8014080b, - CELL_CAMERA_ERROR_BAD_FRAMERATE = 0x8014080c, - CELL_CAMERA_ERROR_TIMEOUT = 0x8014080d, - CELL_CAMERA_ERROR_FATAL = 0x8014080f, + CELL_CAMERA_ERROR_ALREADY_INIT = 0x80140801, + CELL_CAMERA_ERROR_NOT_INIT = 0x80140803, + CELL_CAMERA_ERROR_PARAM = 0x80140804, + CELL_CAMERA_ERROR_ALREADY_OPEN = 0x80140805, + CELL_CAMERA_ERROR_NOT_OPEN = 0x80140806, + CELL_CAMERA_ERROR_DEVICE_NOT_FOUND = 0x80140807, + CELL_CAMERA_ERROR_DEVICE_DEACTIVATED = 0x80140808, + CELL_CAMERA_ERROR_NOT_STARTED = 0x80140809, + CELL_CAMERA_ERROR_FORMAT_UNKNOWN = 0x8014080a, + CELL_CAMERA_ERROR_RESOLUTION_UNKNOWN = 0x8014080b, + CELL_CAMERA_ERROR_BAD_FRAMERATE = 0x8014080c, + CELL_CAMERA_ERROR_TIMEOUT = 0x8014080d, + CELL_CAMERA_ERROR_FATAL = 0x8014080f, }; int cellCameraInit() diff --git a/rpcs3/Emu/SysCalls/Modules/cellCelp8Enc.cpp b/rpcs3/Emu/SysCalls/Modules/cellCelp8Enc.cpp index c6cf243dc2..e061f648d3 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellCelp8Enc.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellCelp8Enc.cpp @@ -8,12 +8,12 @@ Module cellCelp8Enc(0x0048, cellCelp8Enc_init); // Return Codes enum { - CELL_CELP8ENC_ERROR_FAILED = 0x806140a1, - CELL_CELP8ENC_ERROR_SEQ = 0x806140a2, - CELL_CELP8ENC_ERROR_ARG = 0x806140a3, - CELL_CELP8ENC_ERROR_CORE_FAILED = 0x806140b1, - CELL_CELP8ENC_ERROR_CORE_SEQ = 0x806140b2, - CELL_CELP8ENC_ERROR_CORE_ARG = 0x806140b3, + CELL_CELP8ENC_ERROR_FAILED = 0x806140a1, + CELL_CELP8ENC_ERROR_SEQ = 0x806140a2, + CELL_CELP8ENC_ERROR_ARG = 0x806140a3, + CELL_CELP8ENC_ERROR_CORE_FAILED = 0x806140b1, + CELL_CELP8ENC_ERROR_CORE_SEQ = 0x806140b2, + CELL_CELP8ENC_ERROR_CORE_ARG = 0x806140b3, }; int cellCelp8EncQueryAttr() diff --git a/rpcs3/Emu/SysCalls/Modules/cellCelpEnc.cpp b/rpcs3/Emu/SysCalls/Modules/cellCelpEnc.cpp index ed476c84ba..0e4dfec54a 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellCelpEnc.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellCelpEnc.cpp @@ -8,12 +8,12 @@ Module cellCelpEnc(0xf00a, cellCelpEnc_init); // Return Codes enum { - CELL_CELPENC_ERROR_FAILED = 0x80614001, - CELL_CELPENC_ERROR_SEQ = 0x80614002, - CELL_CELPENC_ERROR_ARG = 0x80614003, - CELL_CELPENC_ERROR_CORE_FAILED = 0x80614081, - CELL_CELPENC_ERROR_CORE_SEQ = 0x80614082, - CELL_CELPENC_ERROR_CORE_ARG = 0x80614083, + CELL_CELPENC_ERROR_FAILED = 0x80614001, + CELL_CELPENC_ERROR_SEQ = 0x80614002, + CELL_CELPENC_ERROR_ARG = 0x80614003, + CELL_CELPENC_ERROR_CORE_FAILED = 0x80614081, + CELL_CELPENC_ERROR_CORE_SEQ = 0x80614082, + CELL_CELPENC_ERROR_CORE_ARG = 0x80614083, }; int cellCelpEncQueryAttr() diff --git a/rpcs3/Emu/SysCalls/Modules/cellFiber.cpp b/rpcs3/Emu/SysCalls/Modules/cellFiber.cpp index efe6327166..f24bd211c9 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellFiber.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellFiber.cpp @@ -8,17 +8,17 @@ Module cellFiber(0x0043, cellFiber_init); // Return Codes enum { - CELL_FIBER_ERROR_AGAIN = 0x80760001, - CELL_FIBER_ERROR_INVAL = 0x80760002, - CELL_FIBER_ERROR_NOMEM = 0x80760004, - CELL_FIBER_ERROR_DEADLK = 0x80760008, - CELL_FIBER_ERROR_PERM = 0x80760009, - CELL_FIBER_ERROR_BUSY = 0x8076000A, - CELL_FIBER_ERROR_ABORT = 0x8076000C, - CELL_FIBER_ERROR_STAT = 0x8076000F, - CELL_FIBER_ERROR_ALIGN = 0x80760010, - CELL_FIBER_ERROR_NULL_POINTER = 0x80760011, - CELL_FIBER_ERROR_NOSYSINIT = 0x80760020, + CELL_FIBER_ERROR_AGAIN = 0x80760001, + CELL_FIBER_ERROR_INVAL = 0x80760002, + CELL_FIBER_ERROR_NOMEM = 0x80760004, + CELL_FIBER_ERROR_DEADLK = 0x80760008, + CELL_FIBER_ERROR_PERM = 0x80760009, + CELL_FIBER_ERROR_BUSY = 0x8076000A, + CELL_FIBER_ERROR_ABORT = 0x8076000C, + CELL_FIBER_ERROR_STAT = 0x8076000F, + CELL_FIBER_ERROR_ALIGN = 0x80760010, + CELL_FIBER_ERROR_NULL_POINTER = 0x80760011, + CELL_FIBER_ERROR_NOSYSINIT = 0x80760020, }; int _cellFiberPpuInitialize() diff --git a/rpcs3/Emu/SysCalls/Modules/cellFont.h b/rpcs3/Emu/SysCalls/Modules/cellFont.h index 2fdb6f0784..f2cf9f1321 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellFont.h +++ b/rpcs3/Emu/SysCalls/Modules/cellFont.h @@ -3,32 +3,32 @@ // Error codes enum { - CELL_FONT_OK = 0, - CELL_FONT_ERROR_FATAL = 0x80540001, - CELL_FONT_ERROR_INVALID_PARAMETER = 0x80540002, - CELL_FONT_ERROR_UNINITIALIZED = 0x80540003, - CELL_FONT_ERROR_INITIALIZE_FAILED = 0x80540004, - CELL_FONT_ERROR_INVALID_CACHE_BUFFER = 0x80540005, - CELL_FONT_ERROR_ALREADY_INITIALIZED = 0x80540006, - CELL_FONT_ERROR_ALLOCATION_FAILED = 0x80540007, - CELL_FONT_ERROR_NO_SUPPORT_FONTSET = 0x80540008, - CELL_FONT_ERROR_OPEN_FAILED = 0x80540009, - CELL_FONT_ERROR_READ_FAILED = 0x8054000a, - CELL_FONT_ERROR_FONT_OPEN_FAILED = 0x8054000b, - CELL_FONT_ERROR_FONT_NOT_FOUND = 0x8054000c, - CELL_FONT_ERROR_FONT_OPEN_MAX = 0x8054000d, - CELL_FONT_ERROR_FONT_CLOSE_FAILED = 0x8054000e, - CELL_FONT_ERROR_ALREADY_OPENED = 0x8054000f, - CELL_FONT_ERROR_NO_SUPPORT_FUNCTION = 0x80540010, - CELL_FONT_ERROR_NO_SUPPORT_CODE = 0x80540011, - CELL_FONT_ERROR_NO_SUPPORT_GLYPH = 0x80540012, - CELL_FONT_ERROR_BUFFER_SIZE_NOT_ENOUGH = 0x80540016, - CELL_FONT_ERROR_RENDERER_ALREADY_BIND = 0x80540020, - CELL_FONT_ERROR_RENDERER_UNBIND = 0x80540021, - CELL_FONT_ERROR_RENDERER_INVALID = 0x80540022, - CELL_FONT_ERROR_RENDERER_ALLOCATION_FAILED = 0x80540023, - CELL_FONT_ERROR_ENOUGH_RENDERING_BUFFER = 0x80540024, - CELL_FONT_ERROR_NO_SUPPORT_SURFACE = 0x80540040, + CELL_FONT_OK = 0, + CELL_FONT_ERROR_FATAL = 0x80540001, + CELL_FONT_ERROR_INVALID_PARAMETER = 0x80540002, + CELL_FONT_ERROR_UNINITIALIZED = 0x80540003, + CELL_FONT_ERROR_INITIALIZE_FAILED = 0x80540004, + CELL_FONT_ERROR_INVALID_CACHE_BUFFER = 0x80540005, + CELL_FONT_ERROR_ALREADY_INITIALIZED = 0x80540006, + CELL_FONT_ERROR_ALLOCATION_FAILED = 0x80540007, + CELL_FONT_ERROR_NO_SUPPORT_FONTSET = 0x80540008, + CELL_FONT_ERROR_OPEN_FAILED = 0x80540009, + CELL_FONT_ERROR_READ_FAILED = 0x8054000a, + CELL_FONT_ERROR_FONT_OPEN_FAILED = 0x8054000b, + CELL_FONT_ERROR_FONT_NOT_FOUND = 0x8054000c, + CELL_FONT_ERROR_FONT_OPEN_MAX = 0x8054000d, + CELL_FONT_ERROR_FONT_CLOSE_FAILED = 0x8054000e, + CELL_FONT_ERROR_ALREADY_OPENED = 0x8054000f, + CELL_FONT_ERROR_NO_SUPPORT_FUNCTION = 0x80540010, + CELL_FONT_ERROR_NO_SUPPORT_CODE = 0x80540011, + CELL_FONT_ERROR_NO_SUPPORT_GLYPH = 0x80540012, + CELL_FONT_ERROR_BUFFER_SIZE_NOT_ENOUGH = 0x80540016, + CELL_FONT_ERROR_RENDERER_ALREADY_BIND = 0x80540020, + CELL_FONT_ERROR_RENDERER_UNBIND = 0x80540021, + CELL_FONT_ERROR_RENDERER_INVALID = 0x80540022, + CELL_FONT_ERROR_RENDERER_ALLOCATION_FAILED = 0x80540023, + CELL_FONT_ERROR_ENOUGH_RENDERING_BUFFER = 0x80540024, + CELL_FONT_ERROR_NO_SUPPORT_SURFACE = 0x80540040, }; struct CellFontLibrary diff --git a/rpcs3/Emu/SysCalls/Modules/cellGame.cpp b/rpcs3/Emu/SysCalls/Modules/cellGame.cpp index 632fab7c91..8afca34644 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellGame.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellGame.cpp @@ -10,86 +10,86 @@ Module cellGame(0x003e, cellGame_init); // Return Codes enum { - CELL_GAME_RET_OK = 0, - CELL_GAME_RET_CANCEL = 1, - CELL_GAME_RET_NONE = 2, - CELL_GAME_ERROR_NOTFOUND = 0x8002cb04, - CELL_GAME_ERROR_BROKEN = 0x8002cb05, - CELL_GAME_ERROR_INTERNAL = 0x8002cb06, - CELL_GAME_ERROR_PARAM = 0x8002cb07, - CELL_GAME_ERROR_NOAPP = 0x8002cb08, - CELL_GAME_ERROR_ACCESS_ERROR = 0x8002cb09, - CELL_GAME_ERROR_NOSPACE = 0x8002cb20, - CELL_GAME_ERROR_NOTSUPPORTED = 0x8002cb21, - CELL_GAME_ERROR_FAILURE = 0x8002cb22, - CELL_GAME_ERROR_BUSY = 0x8002cb23, - CELL_GAME_ERROR_IN_SHUTDOWN = 0x8002cb24, - CELL_GAME_ERROR_INVALID_ID = 0x8002cb25, - CELL_GAME_ERROR_EXIST = 0x8002cb26, - CELL_GAME_ERROR_NOTPATCH = 0x8002cb27, - CELL_GAME_ERROR_INVALID_THEME_FILE = 0x8002cb28, - CELL_GAME_ERROR_BOOTPATH = 0x8002cb50, + CELL_GAME_RET_OK = 0, + CELL_GAME_RET_CANCEL = 1, + CELL_GAME_RET_NONE = 2, + CELL_GAME_ERROR_NOTFOUND = 0x8002cb04, + CELL_GAME_ERROR_BROKEN = 0x8002cb05, + CELL_GAME_ERROR_INTERNAL = 0x8002cb06, + CELL_GAME_ERROR_PARAM = 0x8002cb07, + CELL_GAME_ERROR_NOAPP = 0x8002cb08, + CELL_GAME_ERROR_ACCESS_ERROR = 0x8002cb09, + CELL_GAME_ERROR_NOSPACE = 0x8002cb20, + CELL_GAME_ERROR_NOTSUPPORTED = 0x8002cb21, + CELL_GAME_ERROR_FAILURE = 0x8002cb22, + CELL_GAME_ERROR_BUSY = 0x8002cb23, + CELL_GAME_ERROR_IN_SHUTDOWN = 0x8002cb24, + CELL_GAME_ERROR_INVALID_ID = 0x8002cb25, + CELL_GAME_ERROR_EXIST = 0x8002cb26, + CELL_GAME_ERROR_NOTPATCH = 0x8002cb27, + CELL_GAME_ERROR_INVALID_THEME_FILE = 0x8002cb28, + CELL_GAME_ERROR_BOOTPATH = 0x8002cb50, }; // Definitions enum { - CELL_GAME_PATH_MAX = 128, - CELL_GAME_DIRNAME_SIZE = 32, - CELL_GAME_THEMEFILENAME_SIZE = 48, - CELL_GAME_SYSP_TITLE_SIZE = 128, - CELL_GAME_SYSP_TITLEID_SIZE = 10, - CELL_GAME_SYSP_VERSION_SIZE = 6, - CELL_GAME_SYSP_APP_VER_SIZE = 6, + CELL_GAME_PATH_MAX = 128, + CELL_GAME_DIRNAME_SIZE = 32, + CELL_GAME_THEMEFILENAME_SIZE = 48, + CELL_GAME_SYSP_TITLE_SIZE = 128, + CELL_GAME_SYSP_TITLEID_SIZE = 10, + CELL_GAME_SYSP_VERSION_SIZE = 6, + CELL_GAME_SYSP_APP_VER_SIZE = 6, - CELL_GAME_GAMETYPE_DISC = 1, - CELL_GAME_GAMETYPE_HDD = 2, + CELL_GAME_GAMETYPE_DISC = 1, + CELL_GAME_GAMETYPE_HDD = 2, CELL_GAME_SIZEKB_NOTCALC = -1, - CELL_GAME_ATTRIBUTE_PATCH = 0x1, - CELL_GAME_ATTRIBUTE_APP_HOME = 0x2, - CELL_GAME_ATTRIBUTE_DEBUG = 0x4, - CELL_GAME_ATTRIBUTE_XMBBUY = 0x8, - CELL_GAME_ATTRIBUTE_COMMERCE2_BROWSER = 0x10, - CELL_GAME_ATTRIBUTE_INVITE_MESSAGE = 0x20, - CELL_GAME_ATTRIBUTE_CUSTOM_DATA_MESSAGE = 0x40, - CELL_GAME_ATTRIBUTE_WEB_BROWSER = 0x100, + CELL_GAME_ATTRIBUTE_PATCH = 0x1, + CELL_GAME_ATTRIBUTE_APP_HOME = 0x2, + CELL_GAME_ATTRIBUTE_DEBUG = 0x4, + CELL_GAME_ATTRIBUTE_XMBBUY = 0x8, + CELL_GAME_ATTRIBUTE_COMMERCE2_BROWSER = 0x10, + CELL_GAME_ATTRIBUTE_INVITE_MESSAGE = 0x20, + CELL_GAME_ATTRIBUTE_CUSTOM_DATA_MESSAGE = 0x40, + CELL_GAME_ATTRIBUTE_WEB_BROWSER = 0x100, }; //Parameter IDs of PARAM.SFO enum { //Integers - CELL_GAME_PARAMID_PARENTAL_LEVEL = 102, - CELL_GAME_PARAMID_RESOLUTION = 103, - CELL_GAME_PARAMID_SOUND_FORMAT = 104, + CELL_GAME_PARAMID_PARENTAL_LEVEL = 102, + CELL_GAME_PARAMID_RESOLUTION = 103, + CELL_GAME_PARAMID_SOUND_FORMAT = 104, //Strings - CELL_GAME_PARAMID_TITLE = 0, - CELL_GAME_PARAMID_TITLE_DEFAULT = 1, - CELL_GAME_PARAMID_TITLE_JAPANESE = 2, - CELL_GAME_PARAMID_TITLE_ENGLISH = 3, - CELL_GAME_PARAMID_TITLE_FRENCH = 4, - CELL_GAME_PARAMID_TITLE_SPANISH = 5, - CELL_GAME_PARAMID_TITLE_GERMAN = 6, - CELL_GAME_PARAMID_TITLE_ITALIAN = 7, - CELL_GAME_PARAMID_TITLE_DUTCH = 8, - CELL_GAME_PARAMID_TITLE_PORTUGUESE = 9, - CELL_GAME_PARAMID_TITLE_RUSSIAN = 10, - CELL_GAME_PARAMID_TITLE_KOREAN = 11, - CELL_GAME_PARAMID_TITLE_CHINESE_T = 12, - CELL_GAME_PARAMID_TITLE_CHINESE_S = 13, - CELL_GAME_PARAMID_TITLE_FINNISH = 14, - CELL_GAME_PARAMID_TITLE_SWEDISH = 15, - CELL_GAME_PARAMID_TITLE_DANISH = 16, - CELL_GAME_PARAMID_TITLE_NORWEGIAN = 17, - CELL_GAME_PARAMID_TITLE_POLISH = 18, + CELL_GAME_PARAMID_TITLE = 0, + CELL_GAME_PARAMID_TITLE_DEFAULT = 1, + CELL_GAME_PARAMID_TITLE_JAPANESE = 2, + CELL_GAME_PARAMID_TITLE_ENGLISH = 3, + CELL_GAME_PARAMID_TITLE_FRENCH = 4, + CELL_GAME_PARAMID_TITLE_SPANISH = 5, + CELL_GAME_PARAMID_TITLE_GERMAN = 6, + CELL_GAME_PARAMID_TITLE_ITALIAN = 7, + CELL_GAME_PARAMID_TITLE_DUTCH = 8, + CELL_GAME_PARAMID_TITLE_PORTUGUESE = 9, + CELL_GAME_PARAMID_TITLE_RUSSIAN = 10, + CELL_GAME_PARAMID_TITLE_KOREAN = 11, + CELL_GAME_PARAMID_TITLE_CHINESE_T = 12, + CELL_GAME_PARAMID_TITLE_CHINESE_S = 13, + CELL_GAME_PARAMID_TITLE_FINNISH = 14, + CELL_GAME_PARAMID_TITLE_SWEDISH = 15, + CELL_GAME_PARAMID_TITLE_DANISH = 16, + CELL_GAME_PARAMID_TITLE_NORWEGIAN = 17, + CELL_GAME_PARAMID_TITLE_POLISH = 18, CELL_GAME_PARAMID_TITLE_PORTUGUESE_BRAZIL = 19, - CELL_GAME_PARAMID_TITLE_ENGLISH_UK = 20, - CELL_GAME_PARAMID_TITLE_ID = 100, - CELL_GAME_PARAMID_VERSION = 101, - CELL_GAME_PARAMID_APP_VER = 106, + CELL_GAME_PARAMID_TITLE_ENGLISH_UK = 20, + CELL_GAME_PARAMID_TITLE_ID = 100, + CELL_GAME_PARAMID_VERSION = 101, + CELL_GAME_PARAMID_APP_VER = 106, }; //Error dialog types @@ -122,11 +122,11 @@ int cellGameBootCheck(mem32_t type, mem32_t attributes, mem_ptr_thddFreeSizeKB = 40000000; //40 GB, TODO: Use the free space of the computer's HDD where RPCS3 is being run. - size->sizeKB = CELL_GAME_SIZEKB_NOTCALC; - size->sysSizeKB = 0; + size->sizeKB = CELL_GAME_SIZEKB_NOTCALC; + size->sysSizeKB = 0; // TODO: Locate the PARAM.SFO. The following path may be wrong. vfsFile f("/app_home/PARAM.SFO"); diff --git a/rpcs3/Emu/SysCalls/Modules/cellGcmSys.cpp b/rpcs3/Emu/SysCalls/Modules/cellGcmSys.cpp index 08af230f60..7872146ed9 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellGcmSys.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellGcmSys.cpp @@ -13,12 +13,12 @@ u32 local_addr = NULL; enum { - CELL_GCM_ERROR_FAILURE = 0x802100ff, - CELL_GCM_ERROR_NO_IO_PAGE_TABLE = 0x80210001, - CELL_GCM_ERROR_INVALID_ENUM = 0x80210002, - CELL_GCM_ERROR_INVALID_VALUE = 0x80210003, - CELL_GCM_ERROR_INVALID_ALIGNMENT = 0x80210004, - CELL_GCM_ERROR_ADDRESS_OVERWRAP = 0x80210005 + CELL_GCM_ERROR_FAILURE = 0x802100ff, + CELL_GCM_ERROR_NO_IO_PAGE_TABLE = 0x80210001, + CELL_GCM_ERROR_INVALID_ENUM = 0x80210002, + CELL_GCM_ERROR_INVALID_VALUE = 0x80210003, + CELL_GCM_ERROR_INVALID_ALIGNMENT = 0x80210004, + CELL_GCM_ERROR_ADDRESS_OVERWRAP = 0x80210005 }; // Function declaration diff --git a/rpcs3/Emu/SysCalls/Modules/cellGem.cpp b/rpcs3/Emu/SysCalls/Modules/cellGem.cpp index af3bf7c259..256927a8bd 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellGem.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellGem.cpp @@ -8,17 +8,17 @@ Module cellGem(0x005a, cellGem_init); // Error Codes enum { - CELL_GEM_ERROR_RESOURCE_ALLOCATION_FAILED = 0x80121801, - CELL_GEM_ERROR_ALREADY_INITIALIZED = 0x80121802, - CELL_GEM_ERROR_UNINITIALIZED = 0x80121803, - CELL_GEM_ERROR_INVALID_PARAMETER = 0x80121804, - CELL_GEM_ERROR_INVALID_ALIGNMENT = 0x80121805, - CELL_GEM_ERROR_UPDATE_NOT_FINISHED = 0x80121806, - CELL_GEM_ERROR_UPDATE_NOT_STARTED = 0x80121807, - CELL_GEM_ERROR_CONVERT_NOT_FINISHED = 0x80121808, - CELL_GEM_ERROR_CONVERT_NOT_STARTED = 0x80121809, - CELL_GEM_ERROR_WRITE_NOT_FINISHED = 0x8012180A, - CELL_GEM_ERROR_NOT_A_HUE = 0x8012180B, + CELL_GEM_ERROR_RESOURCE_ALLOCATION_FAILED = 0x80121801, + CELL_GEM_ERROR_ALREADY_INITIALIZED = 0x80121802, + CELL_GEM_ERROR_UNINITIALIZED = 0x80121803, + CELL_GEM_ERROR_INVALID_PARAMETER = 0x80121804, + CELL_GEM_ERROR_INVALID_ALIGNMENT = 0x80121805, + CELL_GEM_ERROR_UPDATE_NOT_FINISHED = 0x80121806, + CELL_GEM_ERROR_UPDATE_NOT_STARTED = 0x80121807, + CELL_GEM_ERROR_CONVERT_NOT_FINISHED = 0x80121808, + CELL_GEM_ERROR_CONVERT_NOT_STARTED = 0x80121809, + CELL_GEM_ERROR_WRITE_NOT_FINISHED = 0x8012180A, + CELL_GEM_ERROR_NOT_A_HUE = 0x8012180B, }; int cellGemCalibrate() diff --git a/rpcs3/Emu/SysCalls/Modules/cellGifDec.cpp b/rpcs3/Emu/SysCalls/Modules/cellGifDec.cpp index ec8d9c6d41..41cde3ef46 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellGifDec.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellGifDec.cpp @@ -65,7 +65,7 @@ int cellGifDecOpen(u32 mainHandle, mem32_t subHandle, const mem_ptr_t sb; // Alloc a CellFsStat struct ret = cellFsFstat(current_subHandle->fd, sb.GetAddr()); if(ret != CELL_OK) return ret; - current_subHandle->fileSize = sb->st_size; // Get CellFsStat.st_size + current_subHandle->fileSize = sb->st_size; // Get CellFsStat.st_size // From now, every u32 subHandle argument is a pointer to a CellPngDecSubHandle struct. subHandle = cellGifDec.GetNewId(current_subHandle); @@ -87,27 +87,27 @@ int cellGifDecReadHeader(u32 mainHandle, u32 subHandle, mem_ptr_tinfo; //Write the header to buffer - MemoryAllocator buffer(13); // Alloc buffer for GIF header + MemoryAllocator buffer(13); // Alloc buffer for GIF header MemoryAllocator> pos, nread; cellFsLseek(fd, 0, CELL_SEEK_SET, pos); cellFsRead(fd, buffer.GetAddr(), buffer.GetSize(), nread); if (*buffer.To>(0) != 0x47494638 || - (*buffer.To(4) != 0x6139 && *buffer.To(4) != 0x6137)) // Error: The first 6 bytes are not a valid GIF signature + (*buffer.To(4) != 0x6139 && *buffer.To(4) != 0x6137)) // Error: The first 6 bytes are not a valid GIF signature { - return CELL_GIFDEC_ERROR_STREAM_FORMAT; // Surprisingly there is no error code related with headerss + return CELL_GIFDEC_ERROR_STREAM_FORMAT; // Surprisingly there is no error code related with headerss } u8 packedField = buffer[10]; - current_info.SWidth = buffer[6] + buffer[7] * 0x100; - current_info.SHeight = buffer[8] + buffer[9] * 0x100; - current_info.SGlobalColorTableFlag = packedField >> 7; - current_info.SColorResolution = ((packedField >> 4) & 7)+1; - current_info.SSortFlag = (packedField >> 3) & 1; - current_info.SSizeOfGlobalColorTable = (packedField & 7)+1; - current_info.SBackGroundColor = buffer[11]; - current_info.SPixelAspectRatio = buffer[12]; + current_info.SWidth = buffer[6] + buffer[7] * 0x100; + current_info.SHeight = buffer[8] + buffer[9] * 0x100; + current_info.SGlobalColorTableFlag = packedField >> 7; + current_info.SColorResolution = ((packedField >> 4) & 7)+1; + current_info.SSortFlag = (packedField >> 3) & 1; + current_info.SSizeOfGlobalColorTable = (packedField & 7)+1; + current_info.SBackGroundColor = buffer[11]; + current_info.SPixelAspectRatio = buffer[12]; *info = current_info; @@ -126,18 +126,18 @@ int cellGifDecSetParameter(u32 mainHandle, u32 subHandle, const mem_ptr_tinfo; CellGifDecOutParam& current_outParam = subHandle_data->outParam; - current_outParam.outputWidthByte = (current_info.SWidth * current_info.SColorResolution * 3)/8; - current_outParam.outputWidth = current_info.SWidth; - current_outParam.outputHeight = current_info.SHeight; - current_outParam.outputColorSpace = inParam->colorSpace; + current_outParam.outputWidthByte = (current_info.SWidth * current_info.SColorResolution * 3)/8; + current_outParam.outputWidth = current_info.SWidth; + current_outParam.outputHeight = current_info.SHeight; + current_outParam.outputColorSpace = inParam->colorSpace; switch (current_outParam.outputColorSpace) { case CELL_GIFDEC_RGBA: case CELL_GIFDEC_ARGB: current_outParam.outputComponents = 4; break; - default: return CELL_GIFDEC_ERROR_ARG; // Not supported color space + default: return CELL_GIFDEC_ERROR_ARG; // Not supported color space } - current_outParam.outputBitDepth = 0; // Unimplemented - current_outParam.useMemorySpace = 0; // Unimplemented + current_outParam.outputBitDepth = 0; // Unimplemented + current_outParam.useMemorySpace = 0; // Unimplemented *outParam = current_outParam; diff --git a/rpcs3/Emu/SysCalls/Modules/cellGifDec.h b/rpcs3/Emu/SysCalls/Modules/cellGifDec.h index 48e36656ff..e6b13ac7c2 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellGifDec.h +++ b/rpcs3/Emu/SysCalls/Modules/cellGifDec.h @@ -4,20 +4,20 @@ //Return Codes enum { - CELL_GIFDEC_ERROR_OPEN_FILE = 0x80611300, + CELL_GIFDEC_ERROR_OPEN_FILE = 0x80611300, CELL_GIFDEC_ERROR_STREAM_FORMAT = 0x80611301, - CELL_GIFDEC_ERROR_SEQ = 0x80611302, - CELL_GIFDEC_ERROR_ARG = 0x80611303, - CELL_GIFDEC_ERROR_FATAL = 0x80611304, + CELL_GIFDEC_ERROR_SEQ = 0x80611302, + CELL_GIFDEC_ERROR_ARG = 0x80611303, + CELL_GIFDEC_ERROR_FATAL = 0x80611304, CELL_GIFDEC_ERROR_SPU_UNSUPPORT = 0x80611305, - CELL_GIFDEC_ERROR_SPU_ERROR = 0x80611306, - CELL_GIFDEC_ERROR_CB_PARAM = 0x80611307, + CELL_GIFDEC_ERROR_SPU_ERROR = 0x80611306, + CELL_GIFDEC_ERROR_CB_PARAM = 0x80611307, }; enum CellGifDecStreamSrcSel { - CELL_GIFDEC_FILE = 0, //Input from a file - CELL_GIFDEC_BUFFER = 1, //Input from a buffer + CELL_GIFDEC_FILE = 0, //Input from a file + CELL_GIFDEC_BUFFER = 1, //Input from a buffer }; enum CellGifDecColorSpace @@ -28,15 +28,15 @@ enum CellGifDecColorSpace enum CellGifDecRecordType { - CELL_GIFDEC_RECORD_TYPE_IMAGE_DESC = 1, // Image data block - CELL_GIFDEC_RECORD_TYPE_EXTENSION = 2, // Extension block - CELL_GIFDEC_RECORD_TYPE_TERMINATE = 3, // Trailer block + CELL_GIFDEC_RECORD_TYPE_IMAGE_DESC = 1, // Image data block + CELL_GIFDEC_RECORD_TYPE_EXTENSION = 2, // Extension block + CELL_GIFDEC_RECORD_TYPE_TERMINATE = 3, // Trailer block }; enum CellGifDecDecodeStatus { - CELL_GIFDEC_DEC_STATUS_FINISH = 0, //Decoding finished - CELL_GIFDEC_DEC_STATUS_STOP = 1, //Decoding halted + CELL_GIFDEC_DEC_STATUS_FINISH = 0, //Decoding finished + CELL_GIFDEC_DEC_STATUS_STOP = 1, //Decoding halted }; struct CellGifDecInfo diff --git a/rpcs3/Emu/SysCalls/Modules/cellImejp.cpp b/rpcs3/Emu/SysCalls/Modules/cellImejp.cpp index 150c97db13..d78d2293e9 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellImejp.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellImejp.cpp @@ -8,13 +8,13 @@ Module cellImejp(0xf023, cellImejp_init); // Return Codes enum { - CELL_IMEJP_ERROR_ERR = 0x8002bf01, - CELL_IMEJP_ERROR_CONTEXT = 0x8002bf11, - CELL_IMEJP_ERROR_ALREADY_OPEN = 0x8002bf21, - CELL_IMEJP_ERROR_DIC_OPEN = 0x8002bf31, - CELL_IMEJP_ERROR_PARAM = 0x8002bf41, - CELL_IMEJP_ERROR_IME_ALREADY_IN_USE = 0x8002bf51, - CELL_IMEJP_ERROR_OTHER = 0x8002bfff, + CELL_IMEJP_ERROR_ERR = 0x8002bf01, + CELL_IMEJP_ERROR_CONTEXT = 0x8002bf11, + CELL_IMEJP_ERROR_ALREADY_OPEN = 0x8002bf21, + CELL_IMEJP_ERROR_DIC_OPEN = 0x8002bf31, + CELL_IMEJP_ERROR_PARAM = 0x8002bf41, + CELL_IMEJP_ERROR_IME_ALREADY_IN_USE = 0x8002bf51, + CELL_IMEJP_ERROR_OTHER = 0x8002bfff, }; int cellImeJpOpen() diff --git a/rpcs3/Emu/SysCalls/Modules/cellJpgDec.cpp b/rpcs3/Emu/SysCalls/Modules/cellJpgDec.cpp index 7bd25271c9..f3f2b959ae 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellJpgDec.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellJpgDec.cpp @@ -87,8 +87,8 @@ int cellJpgDecReadHeader(u32 mainHandle, u32 subHandle, mem_ptr_t(0) != 0xE0FFD8FF || // Error: Not a valid SOI header - *buffer.To(6) != 0x4649464A) // Error: Not a valid JFIF string + if (*buffer.To(0) != 0xE0FFD8FF || // Error: Not a valid SOI header + *buffer.To(6) != 0x4649464A) // Error: Not a valid JFIF string { return CELL_JPGDEC_ERROR_HEADER; } @@ -102,24 +102,24 @@ int cellJpgDecReadHeader(u32 mainHandle, u32 subHandle, mem_ptr_t= fileSize || // Check to protect against segmentation faults - buffer[i] != 0xFF) // Check that we are truly at the start of another block + i += block_length; // Increase the file index to get to the next block + if (i >= fileSize || // Check to protect against segmentation faults + buffer[i] != 0xFF) // Check that we are truly at the start of another block { return CELL_JPGDEC_ERROR_HEADER; } if(buffer[i+1] == 0xC0) - break; // 0xFFC0 is the "Start of frame" marker which contains the file size + break; // 0xFFC0 is the "Start of frame" marker which contains the file size - i += 2; // Skip the block marker - block_length = buffer[i] * 0xFF + buffer[i+1]; // Go to the next block + i += 2; // Skip the block marker + block_length = buffer[i] * 0xFF + buffer[i+1]; // Go to the next block } - current_info.imageWidth = buffer[i+7]*0x100 + buffer[i+8]; - current_info.imageHeight = buffer[i+5]*0x100 + buffer[i+6]; - current_info.numComponents = 3; // Unimplemented - current_info.colorSpace = CELL_JPG_RGB; + current_info.imageWidth = buffer[i+7]*0x100 + buffer[i+8]; + current_info.imageHeight = buffer[i+5]*0x100 + buffer[i+6]; + current_info.numComponents = 3; // Unimplemented + current_info.colorSpace = CELL_JPG_RGB; *info = current_info; @@ -205,31 +205,31 @@ int cellJpgDecSetParameter(u32 mainHandle, u32 subHandle, const mem_ptr_tinfo; CellJpgDecOutParam& current_outParam = subHandle_data->outParam; - current_outParam.outputWidthByte = (current_info.imageWidth * current_info.numComponents); - current_outParam.outputWidth = current_info.imageWidth; - current_outParam.outputHeight = current_info.imageHeight; - current_outParam.outputColorSpace = inParam->outputColorSpace; + current_outParam.outputWidthByte = (current_info.imageWidth * current_info.numComponents); + current_outParam.outputWidth = current_info.imageWidth; + current_outParam.outputHeight = current_info.imageHeight; + current_outParam.outputColorSpace = inParam->outputColorSpace; switch (current_outParam.outputColorSpace) { - case CELL_JPG_GRAYSCALE: current_outParam.outputComponents = 1; break; + case CELL_JPG_GRAYSCALE: current_outParam.outputComponents = 1; break; case CELL_JPG_RGB: - case CELL_JPG_YCbCr: current_outParam.outputComponents = 3; break; + case CELL_JPG_YCbCr: current_outParam.outputComponents = 3; break; - case CELL_JPG_UPSAMPLE_ONLY: current_outParam.outputComponents = current_info.numComponents; break; + case CELL_JPG_UPSAMPLE_ONLY: current_outParam.outputComponents = current_info.numComponents; break; case CELL_JPG_RGBA: case CELL_JPG_ARGB: case CELL_JPG_GRAYSCALE_TO_ALPHA_RGBA: - case CELL_JPG_GRAYSCALE_TO_ALPHA_ARGB: current_outParam.outputComponents = 4; break; + case CELL_JPG_GRAYSCALE_TO_ALPHA_ARGB: current_outParam.outputComponents = 4; break; - default: return CELL_JPGDEC_ERROR_ARG; // Not supported color space + default: return CELL_JPGDEC_ERROR_ARG; // Not supported color space } - current_outParam.outputMode = inParam->outputMode; - current_outParam.downScale = inParam->downScale; - current_outParam.useMemorySpace = 0; // Unimplemented + current_outParam.outputMode = inParam->outputMode; + current_outParam.downScale = inParam->downScale; + current_outParam.useMemorySpace = 0; // Unimplemented *outParam = current_outParam; diff --git a/rpcs3/Emu/SysCalls/Modules/cellJpgDec.h b/rpcs3/Emu/SysCalls/Modules/cellJpgDec.h index 6a6c5a8c13..207dc0a7c2 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellJpgDec.h +++ b/rpcs3/Emu/SysCalls/Modules/cellJpgDec.h @@ -3,34 +3,34 @@ //Return Codes enum { - CELL_JPGDEC_ERROR_HEADER = 0x80611101, - CELL_JPGDEC_ERROR_STREAM_FORMAT = 0x80611102, - CELL_JPGDEC_ERROR_ARG = 0x80611103, - CELL_JPGDEC_ERROR_SEQ = 0x80611104, - CELL_JPGDEC_ERROR_BUSY = 0x80611105, - CELL_JPGDEC_ERROR_FATAL = 0x80611106, - CELL_JPGDEC_ERROR_OPEN_FILE = 0x80611107, - CELL_JPGDEC_ERROR_SPU_UNSUPPORT = 0x80611108, - CELL_JPGDEC_ERROR_CB_PARAM = 0x80611109, + CELL_JPGDEC_ERROR_HEADER = 0x80611101, + CELL_JPGDEC_ERROR_STREAM_FORMAT = 0x80611102, + CELL_JPGDEC_ERROR_ARG = 0x80611103, + CELL_JPGDEC_ERROR_SEQ = 0x80611104, + CELL_JPGDEC_ERROR_BUSY = 0x80611105, + CELL_JPGDEC_ERROR_FATAL = 0x80611106, + CELL_JPGDEC_ERROR_OPEN_FILE = 0x80611107, + CELL_JPGDEC_ERROR_SPU_UNSUPPORT = 0x80611108, + CELL_JPGDEC_ERROR_CB_PARAM = 0x80611109, }; enum CellJpgDecColorSpace { - CELL_JPG_UNKNOWN = 0, - CELL_JPG_GRAYSCALE = 1, - CELL_JPG_RGB = 2, - CELL_JPG_YCbCr = 3, - CELL_JPG_RGBA = 10, - CELL_JPG_UPSAMPLE_ONLY = 11, - CELL_JPG_ARGB = 20, - CELL_JPG_GRAYSCALE_TO_ALPHA_RGBA = 40, - CELL_JPG_GRAYSCALE_TO_ALPHA_ARGB = 41, + CELL_JPG_UNKNOWN = 0, + CELL_JPG_GRAYSCALE = 1, + CELL_JPG_RGB = 2, + CELL_JPG_YCbCr = 3, + CELL_JPG_RGBA = 10, + CELL_JPG_UPSAMPLE_ONLY = 11, + CELL_JPG_ARGB = 20, + CELL_JPG_GRAYSCALE_TO_ALPHA_RGBA = 40, + CELL_JPG_GRAYSCALE_TO_ALPHA_ARGB = 41, }; enum CellJpgDecDecodeStatus { - CELL_JPGDEC_DEC_STATUS_FINISH = 0, //Decoding finished - CELL_JPGDEC_DEC_STATUS_STOP = 1, //Decoding halted + CELL_JPGDEC_DEC_STATUS_FINISH = 0, //Decoding finished + CELL_JPGDEC_DEC_STATUS_STOP = 1, //Decoding halted }; struct CellJpgDecInfo @@ -38,27 +38,27 @@ struct CellJpgDecInfo be_t imageWidth; be_t imageHeight; be_t numComponents; - be_t colorSpace; // CellJpgDecColorSpace + be_t colorSpace; // CellJpgDecColorSpace }; struct CellJpgDecSrc { - be_t srcSelect; // CellJpgDecStreamSrcSel - be_t fileName; // const char* - be_t fileOffset; // int64_t + be_t srcSelect; // CellJpgDecStreamSrcSel + be_t fileName; // const char* + be_t fileOffset; // int64_t be_t fileSize; be_t streamPtr; be_t streamSize; - be_t spuThreadEnable; // CellJpgDecSpuThreadEna + be_t spuThreadEnable; // CellJpgDecSpuThreadEna }; struct CellJpgDecInParam { be_t commandPtr; be_t downScale; - be_t method; // CellJpgDecMethod - be_t outputMode; // CellJpgDecOutputMode - be_t outputColorSpace; // CellJpgDecColorSpace + be_t method; // CellJpgDecMethod + be_t outputMode; // CellJpgDecOutputMode + be_t outputColorSpace; // CellJpgDecColorSpace be_t outputColorAlpha; be_t reserved[3]; }; @@ -69,8 +69,8 @@ struct CellJpgDecOutParam be_t outputWidth; be_t outputHeight; be_t outputComponents; - be_t outputMode; // CellJpgDecOutputMode - be_t outputColorSpace; // CellJpgDecColorSpace + be_t outputMode; // CellJpgDecOutputMode + be_t outputColorSpace; // CellJpgDecColorSpace be_t downScale; be_t useMemorySpace; }; @@ -92,7 +92,7 @@ struct CellJpgDecDataOutInfo be_t status; }; -struct CellJpgDecSubHandle //Custom struct +struct CellJpgDecSubHandle //Custom struct { u32 fd; u64 fileSize; diff --git a/rpcs3/Emu/SysCalls/Modules/cellJpgEnc.cpp b/rpcs3/Emu/SysCalls/Modules/cellJpgEnc.cpp index f6d9fd980f..585aec3659 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellJpgEnc.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellJpgEnc.cpp @@ -8,12 +8,12 @@ Module cellJpgEnc(0x003d, cellJpgEnc_init); // Error Codes enum { - CELL_JPGENC_ERROR_ARG = 0x80611191, - CELL_JPGENC_ERROR_SEQ = 0x80611192, - CELL_JPGENC_ERROR_BUSY = 0x80611193, - CELL_JPGENC_ERROR_EMPTY = 0x80611194, - CELL_JPGENC_ERROR_RESET = 0x80611195, - CELL_JPGENC_ERROR_FATAL = 0x80611196, + CELL_JPGENC_ERROR_ARG = 0x80611191, + CELL_JPGENC_ERROR_SEQ = 0x80611192, + CELL_JPGENC_ERROR_BUSY = 0x80611193, + CELL_JPGENC_ERROR_EMPTY = 0x80611194, + CELL_JPGENC_ERROR_RESET = 0x80611195, + CELL_JPGENC_ERROR_FATAL = 0x80611196, }; int cellJpgEncQueryAttr() diff --git a/rpcs3/Emu/SysCalls/Modules/cellKey2char.cpp b/rpcs3/Emu/SysCalls/Modules/cellKey2char.cpp index bb85fcdb7a..125e718301 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellKey2char.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellKey2char.cpp @@ -8,13 +8,13 @@ Module cellKey2char(0x0021, cellKey2char_init); // Return Codes enum { - CELL_K2C_OK = 0x00000000, - CELL_K2C_ERROR_FATAL = 0x80121301, - CELL_K2C_ERROR_INVALID_HANDLE = 0x80121302, - CELL_K2C_ERROR_INVALID_PARAMETER = 0x80121303, - CELL_K2C_ERROR_ALREADY_INITIALIZED = 0x80121304, - CELL_K2C_ERROR_UNINITIALIZED = 0x80121305, - CELL_K2C_ERROR_OTHER = 0x80121306, + CELL_K2C_OK = 0x00000000, + CELL_K2C_ERROR_FATAL = 0x80121301, + CELL_K2C_ERROR_INVALID_HANDLE = 0x80121302, + CELL_K2C_ERROR_INVALID_PARAMETER = 0x80121303, + CELL_K2C_ERROR_ALREADY_INITIALIZED = 0x80121304, + CELL_K2C_ERROR_UNINITIALIZED = 0x80121305, + CELL_K2C_ERROR_OTHER = 0x80121306, }; int cellKey2CharOpen() diff --git a/rpcs3/Emu/SysCalls/Modules/cellLv2dbg.cpp b/rpcs3/Emu/SysCalls/Modules/cellLv2dbg.cpp index e644dc1e5f..58f959efd2 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellLv2dbg.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellLv2dbg.cpp @@ -8,8 +8,8 @@ Module cellLv2dbg(0x002e, cellLv2dbg_init); // Return Codes enum { - CELL_LV2DBG_ERROR_DEINVALIDARGUMENTS = 0x80010409, - CELL_LV2DBG_ERROR_DEOPERATIONDENIED = 0x8001042c, + CELL_LV2DBG_ERROR_DEINVALIDARGUMENTS = 0x80010409, + CELL_LV2DBG_ERROR_DEOPERATIONDENIED = 0x8001042c, }; int sys_dbg_read_spu_thread_context() diff --git a/rpcs3/Emu/SysCalls/Modules/cellMic.cpp b/rpcs3/Emu/SysCalls/Modules/cellMic.cpp index 195371e493..9fd5f7aef6 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellMic.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellMic.cpp @@ -8,23 +8,23 @@ Module cellMic(0x0022, cellMic_init); // Error Codes enum { - CELL_MICIN_ERROR_ALREADY_INIT = 0x80140101, - CELL_MICIN_ERROR_SYSTEM = 0x80140102, - CELL_MICIN_ERROR_NOT_INIT = 0x80140103, - CELL_MICIN_ERROR_PARAM = 0x80140104, - CELL_MICIN_ERROR_PORT_FULL = 0x80140105, - CELL_MICIN_ERROR_ALREADY_OPEN = 0x80140106, - CELL_MICIN_ERROR_NOT_OPEN = 0x80140107, - CELL_MICIN_ERROR_NOT_RUN = 0x80140108, - CELL_MICIN_ERROR_TRANS_EVENT = 0x80140109, - CELL_MICIN_ERROR_OPEN = 0x8014010a, - CELL_MICIN_ERROR_SHAREDMEMORY = 0x8014010b, - CELL_MICIN_ERROR_MUTEX = 0x8014010c, - CELL_MICIN_ERROR_EVENT_QUEUE = 0x8014010d, - CELL_MICIN_ERROR_DEVICE_NOT_FOUND = 0x8014010e, - CELL_MICIN_ERROR_SYSTEM_NOT_FOUND = 0x8014010e, - CELL_MICIN_ERROR_FATAL = 0x8014010f, - CELL_MICIN_ERROR_DEVICE_NOT_SUPPORT = 0x80140110, + CELL_MICIN_ERROR_ALREADY_INIT = 0x80140101, + CELL_MICIN_ERROR_SYSTEM = 0x80140102, + CELL_MICIN_ERROR_NOT_INIT = 0x80140103, + CELL_MICIN_ERROR_PARAM = 0x80140104, + CELL_MICIN_ERROR_PORT_FULL = 0x80140105, + CELL_MICIN_ERROR_ALREADY_OPEN = 0x80140106, + CELL_MICIN_ERROR_NOT_OPEN = 0x80140107, + CELL_MICIN_ERROR_NOT_RUN = 0x80140108, + CELL_MICIN_ERROR_TRANS_EVENT = 0x80140109, + CELL_MICIN_ERROR_OPEN = 0x8014010a, + CELL_MICIN_ERROR_SHAREDMEMORY = 0x8014010b, + CELL_MICIN_ERROR_MUTEX = 0x8014010c, + CELL_MICIN_ERROR_EVENT_QUEUE = 0x8014010d, + CELL_MICIN_ERROR_DEVICE_NOT_FOUND = 0x8014010e, + CELL_MICIN_ERROR_SYSTEM_NOT_FOUND = 0x8014010e, + CELL_MICIN_ERROR_FATAL = 0x8014010f, + CELL_MICIN_ERROR_DEVICE_NOT_SUPPORT = 0x80140110, }; int cellMicInit() diff --git a/rpcs3/Emu/SysCalls/Modules/cellMusicDecode.cpp b/rpcs3/Emu/SysCalls/Modules/cellMusicDecode.cpp index 82b97f07ce..5d7741121f 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellMusicDecode.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellMusicDecode.cpp @@ -8,21 +8,21 @@ Module cellMusicDecode(0x004f, cellMusicDecode_init); // 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, - CELL_MUSIC_DECODE_ERROR_NO_ACTIVE_CONTENT = 0x8002C104, - CELL_MUSIC_DECODE_ERROR_NO_MATCH_FOUND = 0x8002C105, - CELL_MUSIC_DECODE_ERROR_INVALID_CONTEXT = 0x8002C106, - CELL_MUSIC_DECODE_ERROR_DECODE_FAILURE = 0x8002C107, - CELL_MUSIC_DECODE_ERROR_NO_MORE_CONTENT = 0x8002C108, - CELL_MUSIC_DECODE_DIALOG_OPEN = 0x8002C109, - CELL_MUSIC_DECODE_DIALOG_CLOSE = 0x8002C10A, - CELL_MUSIC_DECODE_ERROR_NO_LPCM_DATA = 0x8002C10B, - CELL_MUSIC_DECODE_NEXT_CONTENTS_READY = 0x8002C10C, - CELL_MUSIC_DECODE_ERROR_GENERIC = 0x8002C1FF, + 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, + CELL_MUSIC_DECODE_ERROR_NO_ACTIVE_CONTENT = 0x8002C104, + CELL_MUSIC_DECODE_ERROR_NO_MATCH_FOUND = 0x8002C105, + CELL_MUSIC_DECODE_ERROR_INVALID_CONTEXT = 0x8002C106, + CELL_MUSIC_DECODE_ERROR_DECODE_FAILURE = 0x8002C107, + CELL_MUSIC_DECODE_ERROR_NO_MORE_CONTENT = 0x8002C108, + CELL_MUSIC_DECODE_DIALOG_OPEN = 0x8002C109, + CELL_MUSIC_DECODE_DIALOG_CLOSE = 0x8002C10A, + CELL_MUSIC_DECODE_ERROR_NO_LPCM_DATA = 0x8002C10B, + CELL_MUSIC_DECODE_NEXT_CONTENTS_READY = 0x8002C10C, + CELL_MUSIC_DECODE_ERROR_GENERIC = 0x8002C1FF, }; int cellMusicDecodeInitialize() diff --git a/rpcs3/Emu/SysCalls/Modules/cellMusicExport.cpp b/rpcs3/Emu/SysCalls/Modules/cellMusicExport.cpp index d047287b3a..abce6c329d 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellMusicExport.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellMusicExport.cpp @@ -8,18 +8,18 @@ Module cellMusicExport(0xf02c, cellMusicExport_init); // 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, - CELL_MUSIC_EXPORT_UTIL_ERROR_ACCESS_ERROR = 0x8002c604, - CELL_MUSIC_EXPORT_UTIL_ERROR_DB_INTERNAL = 0x8002c605, - CELL_MUSIC_EXPORT_UTIL_ERROR_DB_REGIST = 0x8002c606, - CELL_MUSIC_EXPORT_UTIL_ERROR_SET_META = 0x8002c607, - CELL_MUSIC_EXPORT_UTIL_ERROR_FLUSH_META = 0x8002c608, - CELL_MUSIC_EXPORT_UTIL_ERROR_MOVE = 0x8002c609, - CELL_MUSIC_EXPORT_UTIL_ERROR_INITIALIZE = 0x8002c60a, + 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, + CELL_MUSIC_EXPORT_UTIL_ERROR_ACCESS_ERROR = 0x8002c604, + CELL_MUSIC_EXPORT_UTIL_ERROR_DB_INTERNAL = 0x8002c605, + CELL_MUSIC_EXPORT_UTIL_ERROR_DB_REGIST = 0x8002c606, + CELL_MUSIC_EXPORT_UTIL_ERROR_SET_META = 0x8002c607, + CELL_MUSIC_EXPORT_UTIL_ERROR_FLUSH_META = 0x8002c608, + CELL_MUSIC_EXPORT_UTIL_ERROR_MOVE = 0x8002c609, + CELL_MUSIC_EXPORT_UTIL_ERROR_INITIALIZE = 0x8002c60a, }; int cellMusicExportInitialize() diff --git a/rpcs3/Emu/SysCalls/Modules/cellNetCtl.cpp b/rpcs3/Emu/SysCalls/Modules/cellNetCtl.cpp index 6c4dfa6e4c..1486bb32ee 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellNetCtl.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellNetCtl.cpp @@ -8,41 +8,41 @@ Module cellNetCtl(0x0014, cellNetCtl_init); // Error Codes enum { - CELL_NET_CTL_ERROR_NOT_INITIALIZED = 0x80130101, - CELL_NET_CTL_ERROR_NOT_TERMINATED = 0x80130102, - CELL_NET_CTL_ERROR_HANDLER_MAX = 0x80130103, - CELL_NET_CTL_ERROR_ID_NOT_FOUND = 0x80130104, - CELL_NET_CTL_ERROR_INVALID_ID = 0x80130105, - CELL_NET_CTL_ERROR_INVALID_CODE = 0x80130106, - CELL_NET_CTL_ERROR_INVALID_ADDR = 0x80130107, - CELL_NET_CTL_ERROR_NOT_CONNECTED = 0x80130108, - CELL_NET_CTL_ERROR_NOT_AVAIL = 0x80130109, - CELL_NET_CTL_ERROR_INVALID_TYPE = 0x8013010a, - CELL_NET_CTL_ERROR_INVALID_SIZE = 0x8013010b, - CELL_NET_CTL_ERROR_NET_DISABLED = 0x80130181, - CELL_NET_CTL_ERROR_NET_NOT_CONNECTED = 0x80130182, - CELL_NET_CTL_ERROR_NP_NO_ACCOUNT = 0x80130183, - CELL_NET_CTL_ERROR_NP_RESERVED1 = 0x80130184, - CELL_NET_CTL_ERROR_NP_RESERVED2 = 0x80130185, - CELL_NET_CTL_ERROR_NET_CABLE_NOT_CONNECTED = 0x80130186, - CELL_NET_CTL_ERROR_DIALOG_CANCELED = 0x80130190, - CELL_NET_CTL_ERROR_DIALOG_ABORTED = 0x80130191, + CELL_NET_CTL_ERROR_NOT_INITIALIZED = 0x80130101, + CELL_NET_CTL_ERROR_NOT_TERMINATED = 0x80130102, + CELL_NET_CTL_ERROR_HANDLER_MAX = 0x80130103, + CELL_NET_CTL_ERROR_ID_NOT_FOUND = 0x80130104, + CELL_NET_CTL_ERROR_INVALID_ID = 0x80130105, + CELL_NET_CTL_ERROR_INVALID_CODE = 0x80130106, + CELL_NET_CTL_ERROR_INVALID_ADDR = 0x80130107, + CELL_NET_CTL_ERROR_NOT_CONNECTED = 0x80130108, + CELL_NET_CTL_ERROR_NOT_AVAIL = 0x80130109, + CELL_NET_CTL_ERROR_INVALID_TYPE = 0x8013010a, + CELL_NET_CTL_ERROR_INVALID_SIZE = 0x8013010b, + CELL_NET_CTL_ERROR_NET_DISABLED = 0x80130181, + CELL_NET_CTL_ERROR_NET_NOT_CONNECTED = 0x80130182, + CELL_NET_CTL_ERROR_NP_NO_ACCOUNT = 0x80130183, + CELL_NET_CTL_ERROR_NP_RESERVED1 = 0x80130184, + CELL_NET_CTL_ERROR_NP_RESERVED2 = 0x80130185, + CELL_NET_CTL_ERROR_NET_CABLE_NOT_CONNECTED = 0x80130186, + CELL_NET_CTL_ERROR_DIALOG_CANCELED = 0x80130190, + CELL_NET_CTL_ERROR_DIALOG_ABORTED = 0x80130191, - CELL_NET_CTL_ERROR_WLAN_DEAUTHED = 0x80130137, - CELL_NET_CTL_ERROR_WLAN_KEYINFO_EXCHNAGE_TIMEOUT = 0x8013013d, - CELL_NET_CTL_ERROR_WLAN_ASSOC_FAILED = 0x8013013e, - CELL_NET_CTL_ERROR_WLAN_AP_DISAPPEARED = 0x8013013f, - CELL_NET_CTL_ERROR_PPPOE_SESSION_INIT = 0x80130409, - CELL_NET_CTL_ERROR_PPPOE_SESSION_NO_PADO = 0x8013040a, - CELL_NET_CTL_ERROR_PPPOE_SESSION_NO_PADS = 0x8013040b, - CELL_NET_CTL_ERROR_PPPOE_SESSION_GET_PADT = 0x8013040d, - CELL_NET_CTL_ERROR_PPPOE_SESSION_SERVICE_NAME = 0x8013040f, - CELL_NET_CTL_ERROR_PPPOE_SESSION_AC_SYSTEM = 0x80130410, - CELL_NET_CTL_ERROR_PPPOE_SESSION_GENERIC = 0x80130411, - CELL_NET_CTL_ERROR_PPPOE_STATUS_AUTH = 0x80130412, - CELL_NET_CTL_ERROR_PPPOE_STATUS_NETWORK = 0x80130413, - CELL_NET_CTL_ERROR_PPPOE_STATUS_TERMINATE = 0x80130414, - CELL_NET_CTL_ERROR_DHCP_LEASE_TIME = 0x80130504, + CELL_NET_CTL_ERROR_WLAN_DEAUTHED = 0x80130137, + CELL_NET_CTL_ERROR_WLAN_KEYINFO_EXCHNAGE_TIMEOUT = 0x8013013d, + CELL_NET_CTL_ERROR_WLAN_ASSOC_FAILED = 0x8013013e, + CELL_NET_CTL_ERROR_WLAN_AP_DISAPPEARED = 0x8013013f, + CELL_NET_CTL_ERROR_PPPOE_SESSION_INIT = 0x80130409, + CELL_NET_CTL_ERROR_PPPOE_SESSION_NO_PADO = 0x8013040a, + CELL_NET_CTL_ERROR_PPPOE_SESSION_NO_PADS = 0x8013040b, + CELL_NET_CTL_ERROR_PPPOE_SESSION_GET_PADT = 0x8013040d, + CELL_NET_CTL_ERROR_PPPOE_SESSION_SERVICE_NAME = 0x8013040f, + CELL_NET_CTL_ERROR_PPPOE_SESSION_AC_SYSTEM = 0x80130410, + CELL_NET_CTL_ERROR_PPPOE_SESSION_GENERIC = 0x80130411, + CELL_NET_CTL_ERROR_PPPOE_STATUS_AUTH = 0x80130412, + CELL_NET_CTL_ERROR_PPPOE_STATUS_NETWORK = 0x80130413, + CELL_NET_CTL_ERROR_PPPOE_STATUS_TERMINATE = 0x80130414, + CELL_NET_CTL_ERROR_DHCP_LEASE_TIME = 0x80130504, }; // Network connection states diff --git a/rpcs3/Emu/SysCalls/Modules/cellPamf.h b/rpcs3/Emu/SysCalls/Modules/cellPamf.h index 152faa29c0..fd1b9a6a7e 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellPamf.h +++ b/rpcs3/Emu/SysCalls/Modules/cellPamf.h @@ -3,13 +3,13 @@ // Error Codes enum { - CELL_PAMF_ERROR_STREAM_NOT_FOUND = 0x80610501, - CELL_PAMF_ERROR_INVALID_PAMF = 0x80610502, - CELL_PAMF_ERROR_INVALID_ARG = 0x80610503, - CELL_PAMF_ERROR_UNKNOWN_TYPE = 0x80610504, - CELL_PAMF_ERROR_UNSUPPORTED_VERSION = 0x80610505, - CELL_PAMF_ERROR_UNKNOWN_STREAM = 0x80610506, - CELL_PAMF_ERROR_EP_NOT_FOUND = 0x80610507, + CELL_PAMF_ERROR_STREAM_NOT_FOUND = 0x80610501, + CELL_PAMF_ERROR_INVALID_PAMF = 0x80610502, + CELL_PAMF_ERROR_INVALID_ARG = 0x80610503, + CELL_PAMF_ERROR_UNKNOWN_TYPE = 0x80610504, + CELL_PAMF_ERROR_UNSUPPORTED_VERSION = 0x80610505, + CELL_PAMF_ERROR_UNKNOWN_STREAM = 0x80610506, + CELL_PAMF_ERROR_EP_NOT_FOUND = 0x80610507, }; // PamfReaderInitialize Attribute Flags @@ -21,14 +21,14 @@ enum enum CellPamfStreamType { - CELL_PAMF_STREAM_TYPE_AVC = 0, - CELL_PAMF_STREAM_TYPE_M2V = 1, + CELL_PAMF_STREAM_TYPE_AVC = 0, + CELL_PAMF_STREAM_TYPE_M2V = 1, CELL_PAMF_STREAM_TYPE_ATRAC3PLUS = 2, - CELL_PAMF_STREAM_TYPE_PAMF_LPCM = 3, - CELL_PAMF_STREAM_TYPE_AC3 = 4, - CELL_PAMF_STREAM_TYPE_USER_DATA = 5, - CELL_PAMF_STREAM_TYPE_VIDEO = 20, - CELL_PAMF_STREAM_TYPE_AUDIO = 21, + CELL_PAMF_STREAM_TYPE_PAMF_LPCM = 3, + CELL_PAMF_STREAM_TYPE_AC3 = 4, + CELL_PAMF_STREAM_TYPE_USER_DATA = 5, + CELL_PAMF_STREAM_TYPE_VIDEO = 20, + CELL_PAMF_STREAM_TYPE_AUDIO = 21, }; enum @@ -61,77 +61,77 @@ enum enum { CELL_PAMF_AVC_FRC_24000DIV1001 = 0, - CELL_PAMF_AVC_FRC_24 = 1, - CELL_PAMF_AVC_FRC_25 = 2, + CELL_PAMF_AVC_FRC_24 = 1, + CELL_PAMF_AVC_FRC_25 = 2, CELL_PAMF_AVC_FRC_30000DIV1001 = 3, - CELL_PAMF_AVC_FRC_30 = 4, - CELL_PAMF_AVC_FRC_50 = 5, + CELL_PAMF_AVC_FRC_30 = 4, + CELL_PAMF_AVC_FRC_50 = 5, CELL_PAMF_AVC_FRC_60000DIV1001 = 6, }; enum { - CELL_PAMF_M2V_MP_ML = 1, - CELL_PAMF_M2V_MP_H14 = 2, - CELL_PAMF_M2V_MP_HL = 3, + CELL_PAMF_M2V_MP_ML = 1, + CELL_PAMF_M2V_MP_H14 = 2, + CELL_PAMF_M2V_MP_HL = 3, CELL_PAMF_M2V_UNKNOWN = 255, }; enum { CELL_PAMF_M2V_FRC_24000DIV1001 = 1, - CELL_PAMF_M2V_FRC_24 = 2, - CELL_PAMF_M2V_FRC_25 = 3, + CELL_PAMF_M2V_FRC_24 = 2, + CELL_PAMF_M2V_FRC_25 = 3, CELL_PAMF_M2V_FRC_30000DIV1001 = 4, - CELL_PAMF_M2V_FRC_30 = 5, - CELL_PAMF_M2V_FRC_50 = 6, + CELL_PAMF_M2V_FRC_30 = 5, + CELL_PAMF_M2V_FRC_50 = 6, CELL_PAMF_M2V_FRC_60000DIV1001 = 7, }; enum { - CELL_PAMF_ASPECT_RATIO_1_1 = 1, + CELL_PAMF_ASPECT_RATIO_1_1 = 1, CELL_PAMF_ASPECT_RATIO_12_11 = 2, CELL_PAMF_ASPECT_RATIO_10_11 = 3, CELL_PAMF_ASPECT_RATIO_16_11 = 4, CELL_PAMF_ASPECT_RATIO_40_33 = 5, - CELL_PAMF_ASPECT_RATIO_4_3 = 14, + CELL_PAMF_ASPECT_RATIO_4_3 = 14, }; enum { - CELL_PAMF_COLOUR_PRIMARIES_ITR_R_BT_709 = 1, - CELL_PAMF_COLOUR_PRIMARIES_UNSPECIFIED = 2, - CELL_PAMF_COLOUR_PRIMARIES_ITU_R_BT_470_SYS_M = 4, + CELL_PAMF_COLOUR_PRIMARIES_ITR_R_BT_709 = 1, + CELL_PAMF_COLOUR_PRIMARIES_UNSPECIFIED = 2, + CELL_PAMF_COLOUR_PRIMARIES_ITU_R_BT_470_SYS_M = 4, CELL_PAMF_COLOUR_PRIMARIES_ITU_R_BT_470_SYS_BG = 5, - CELL_PAMF_COLOUR_PRIMARIES_SMPTE_170_M = 6, - CELL_PAMF_COLOUR_PRIMARIES_SMPTE_240_M = 7, - CELL_PAMF_COLOUR_PRIMARIES_GENERIC_FILM = 8, + CELL_PAMF_COLOUR_PRIMARIES_SMPTE_170_M = 6, + CELL_PAMF_COLOUR_PRIMARIES_SMPTE_240_M = 7, + CELL_PAMF_COLOUR_PRIMARIES_GENERIC_FILM = 8, }; enum { - CELL_PAMF_TRANSFER_CHARACTERISTICS_ITU_R_BT_709 = 1, - CELL_PAMF_TRANSFER_CHARACTERISTICS_UNSPECIFIED = 2, - CELL_PAMF_TRANSFER_CHARACTERISTICS_ITU_R_BT_470_SYS_M = 4, + CELL_PAMF_TRANSFER_CHARACTERISTICS_ITU_R_BT_709 = 1, + CELL_PAMF_TRANSFER_CHARACTERISTICS_UNSPECIFIED = 2, + CELL_PAMF_TRANSFER_CHARACTERISTICS_ITU_R_BT_470_SYS_M = 4, CELL_PAMF_TRANSFER_CHARACTERISTICS_ITU_R_BT_470_SYS_BG = 5, - CELL_PAMF_TRANSFER_CHARACTERISTICS_SMPTE_170_M = 6, - CELL_PAMF_TRANSFER_CHARACTERISTICS_SMPTE_240_M = 7, - CELL_PAMF_TRANSFER_CHARACTERISTICS_LINEAR = 8, - CELL_PAMF_TRANSFER_CHARACTERISTICS_LOG_100_1 = 9, - CELL_PAMF_TRANSFER_CHARACTERISTICS_LOG_316_1 = 10, + CELL_PAMF_TRANSFER_CHARACTERISTICS_SMPTE_170_M = 6, + CELL_PAMF_TRANSFER_CHARACTERISTICS_SMPTE_240_M = 7, + CELL_PAMF_TRANSFER_CHARACTERISTICS_LINEAR = 8, + CELL_PAMF_TRANSFER_CHARACTERISTICS_LOG_100_1 = 9, + CELL_PAMF_TRANSFER_CHARACTERISTICS_LOG_316_1 = 10, }; enum { - CELL_PAMF_MATRIX_GBR = 0, - CELL_PAMF_MATRIX_ITU_R_BT_709 = 1, - CELL_PAMF_MATRIX_UNSPECIFIED = 2, - CELL_PAMF_MATRIX_FCC = 4, + CELL_PAMF_MATRIX_GBR = 0, + CELL_PAMF_MATRIX_ITU_R_BT_709 = 1, + CELL_PAMF_MATRIX_UNSPECIFIED = 2, + CELL_PAMF_MATRIX_FCC = 4, CELL_PAMF_MATRIX_ITU_R_BT_470_SYS_BG = 5, - CELL_PAMF_MATRIX_SMPTE_170_M = 6, - CELL_PAMF_MATRIX_SMPTE_240_M = 7, - CELL_PAMF_MATRIX_YCGCO = 8, + CELL_PAMF_MATRIX_SMPTE_170_M = 6, + CELL_PAMF_MATRIX_SMPTE_240_M = 7, + CELL_PAMF_MATRIX_YCGCO = 8, }; // Timestamp information (time in increments of 90 kHz) diff --git a/rpcs3/Emu/SysCalls/Modules/cellPhotoDecode.cpp b/rpcs3/Emu/SysCalls/Modules/cellPhotoDecode.cpp index 78c5cb8673..fc6eab17f3 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellPhotoDecode.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellPhotoDecode.cpp @@ -8,14 +8,14 @@ Module cellPhotoDecode(0xf02e, cellPhotoDecode_init); // 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, - CELL_PHOTO_DECODE_ERROR_ACCESS_ERROR = 0x8002c904, - CELL_PHOTO_DECODE_ERROR_INITIALIZE = 0x8002c905, - CELL_PHOTO_DECODE_ERROR_DECODE = 0x8002c906, + 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, + CELL_PHOTO_DECODE_ERROR_ACCESS_ERROR = 0x8002c904, + CELL_PHOTO_DECODE_ERROR_INITIALIZE = 0x8002c905, + CELL_PHOTO_DECODE_ERROR_DECODE = 0x8002c906, }; // Datatypes diff --git a/rpcs3/Emu/SysCalls/Modules/cellPhotoExport.cpp b/rpcs3/Emu/SysCalls/Modules/cellPhotoExport.cpp index fb4d4d8d61..b47b8cc348 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellPhotoExport.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellPhotoExport.cpp @@ -8,18 +8,18 @@ Module cellPhotoExport(0xf029, cellPhotoExport_init); // 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, - CELL_PHOTO_EXPORT_UTIL_ERROR_ACCESS_ERROR = 0x8002c204, - CELL_PHOTO_EXPORT_UTIL_ERROR_DB_INTERNAL = 0x8002c205, - CELL_PHOTO_EXPORT_UTIL_ERROR_DB_REGIST = 0x8002c206, - CELL_PHOTO_EXPORT_UTIL_ERROR_SET_META = 0x8002c207, - CELL_PHOTO_EXPORT_UTIL_ERROR_FLUSH_META = 0x8002c208, - CELL_PHOTO_EXPORT_UTIL_ERROR_MOVE = 0x8002c209, - CELL_PHOTO_EXPORT_UTIL_ERROR_INITIALIZE = 0x8002c20a, + 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, + CELL_PHOTO_EXPORT_UTIL_ERROR_ACCESS_ERROR = 0x8002c204, + CELL_PHOTO_EXPORT_UTIL_ERROR_DB_INTERNAL = 0x8002c205, + CELL_PHOTO_EXPORT_UTIL_ERROR_DB_REGIST = 0x8002c206, + CELL_PHOTO_EXPORT_UTIL_ERROR_SET_META = 0x8002c207, + CELL_PHOTO_EXPORT_UTIL_ERROR_FLUSH_META = 0x8002c208, + CELL_PHOTO_EXPORT_UTIL_ERROR_MOVE = 0x8002c209, + CELL_PHOTO_EXPORT_UTIL_ERROR_INITIALIZE = 0x8002c20a, }; int cellPhotoExportInitialize() diff --git a/rpcs3/Emu/SysCalls/Modules/cellPhotoImport.cpp b/rpcs3/Emu/SysCalls/Modules/cellPhotoImport.cpp index 5b072a0fcd..b8e1ffb0c0 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellPhotoImport.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellPhotoImport.cpp @@ -8,14 +8,14 @@ Module cellPhotoImport(0xf02b, cellPhotoImport_init); // 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, - CELL_PHOTO_IMPORT_ERROR_ACCESS_ERROR = 0x8002c704, - CELL_PHOTO_IMPORT_ERROR_COPY = 0x8002c705, - CELL_PHOTO_IMPORT_ERROR_INITIALIZE = 0x8002c706, + 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, + CELL_PHOTO_IMPORT_ERROR_ACCESS_ERROR = 0x8002c704, + CELL_PHOTO_IMPORT_ERROR_COPY = 0x8002c705, + CELL_PHOTO_IMPORT_ERROR_INITIALIZE = 0x8002c706, }; // Datatypes @@ -29,10 +29,10 @@ struct CellPhotoImportFileDataSub struct CellPhotoImportFileData { - char dstFileName; //[CELL_FS_MAX_FS_FILE_NAME_LENGTH]; - char photo_title; //[CELL_PHOTO_IMPORT_PHOTO_TITLE_MAX_LENGTH*3]; - char game_title; //[CELL_PHOTO_IMPORT_GAME_TITLE_MAX_SIZE]; - char game_comment; //[CELL_PHOTO_IMPORT_GAME_COMMENT_MAX_SIZE]; + char dstFileName; //[CELL_FS_MAX_FS_FILE_NAME_LENGTH]; + char photo_title; //[CELL_PHOTO_IMPORT_PHOTO_TITLE_MAX_LENGTH*3]; + char game_title; //[CELL_PHOTO_IMPORT_GAME_TITLE_MAX_SIZE]; + char game_comment; //[CELL_PHOTO_IMPORT_GAME_COMMENT_MAX_SIZE]; CellPhotoImportFileDataSub* data_sub; }; diff --git a/rpcs3/Emu/SysCalls/Modules/cellPngDec.cpp b/rpcs3/Emu/SysCalls/Modules/cellPngDec.cpp index f2d925218c..530a074f29 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellPngDec.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellPngDec.cpp @@ -114,19 +114,19 @@ int cellPngDecReadHeader(u32 mainHandle, u32 subHandle, mem_ptr_t()[25]) { - case 0: current_info.colorSpace = CELL_PNGDEC_GRAYSCALE; current_info.numComponents = 1; break; - case 2: current_info.colorSpace = CELL_PNGDEC_RGB; current_info.numComponents = 3; break; - case 3: current_info.colorSpace = CELL_PNGDEC_PALETTE; current_info.numComponents = 1; break; - case 4: current_info.colorSpace = CELL_PNGDEC_GRAYSCALE_ALPHA; current_info.numComponents = 2; break; - case 6: current_info.colorSpace = CELL_PNGDEC_RGBA; current_info.numComponents = 4; break; + case 0: current_info.colorSpace = CELL_PNGDEC_GRAYSCALE; current_info.numComponents = 1; break; + case 2: current_info.colorSpace = CELL_PNGDEC_RGB; current_info.numComponents = 3; break; + case 3: current_info.colorSpace = CELL_PNGDEC_PALETTE; current_info.numComponents = 1; break; + case 4: current_info.colorSpace = CELL_PNGDEC_GRAYSCALE_ALPHA; current_info.numComponents = 2; break; + case 6: current_info.colorSpace = CELL_PNGDEC_RGBA; current_info.numComponents = 4; break; default: return CELL_PNGDEC_ERROR_HEADER; // Not supported color type } - current_info.imageWidth = buffer[4]; - current_info.imageHeight = buffer[5]; - current_info.bitDepth = buffer.To()[24]; - current_info.interlaceMethod = buffer.To()[28]; - current_info.chunkInformation = 0; // Unimplemented + current_info.imageWidth = buffer[4]; + current_info.imageHeight = buffer[5]; + current_info.bitDepth = buffer.To()[24]; + current_info.interlaceMethod = buffer.To()[28]; + current_info.chunkInformation = 0; // Unimplemented *info = current_info; @@ -253,28 +253,29 @@ int cellPngDecSetParameter(u32 mainHandle, u32 subHandle, const mem_ptr_tinfo; CellPngDecOutParam& current_outParam = subHandle_data->outParam; - current_outParam.outputWidthByte = (current_info.imageWidth * current_info.numComponents * current_info.bitDepth) / 8; - current_outParam.outputWidth = current_info.imageWidth; - current_outParam.outputHeight = current_info.imageHeight; - current_outParam.outputColorSpace = inParam->outputColorSpace; + current_outParam.outputWidthByte = (current_info.imageWidth * current_info.numComponents * current_info.bitDepth) / 8; + current_outParam.outputWidth = current_info.imageWidth; + current_outParam.outputHeight = current_info.imageHeight; + current_outParam.outputColorSpace = inParam->outputColorSpace; + switch (current_outParam.outputColorSpace) { case CELL_PNGDEC_PALETTE: - case CELL_PNGDEC_GRAYSCALE: current_outParam.outputComponents = 1; break; + case CELL_PNGDEC_GRAYSCALE: current_outParam.outputComponents = 1; break; - case CELL_PNGDEC_GRAYSCALE_ALPHA: current_outParam.outputComponents = 2; break; + case CELL_PNGDEC_GRAYSCALE_ALPHA: current_outParam.outputComponents = 2; break; - case CELL_PNGDEC_RGB: current_outParam.outputComponents = 3; break; + case CELL_PNGDEC_RGB: current_outParam.outputComponents = 3; break; case CELL_PNGDEC_RGBA: - case CELL_PNGDEC_ARGB: current_outParam.outputComponents = 4; break; + case CELL_PNGDEC_ARGB: current_outParam.outputComponents = 4; break; - default: return CELL_PNGDEC_ERROR_ARG; // Not supported color space + default: return CELL_PNGDEC_ERROR_ARG; // Not supported color space } - current_outParam.outputBitDepth = inParam->outputBitDepth; - current_outParam.outputMode = inParam->outputMode; - current_outParam.useMemorySpace = 0; // Unimplemented + current_outParam.outputBitDepth = inParam->outputBitDepth; + current_outParam.outputMode = inParam->outputMode; + current_outParam.useMemorySpace = 0; // Unimplemented *outParam = current_outParam; diff --git a/rpcs3/Emu/SysCalls/Modules/cellPngDec.h b/rpcs3/Emu/SysCalls/Modules/cellPngDec.h index dec65eabe5..77f9ce56fb 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellPngDec.h +++ b/rpcs3/Emu/SysCalls/Modules/cellPngDec.h @@ -3,38 +3,38 @@ //Return Codes enum { - CELL_PNGDEC_ERROR_HEADER = 0x80611201, - CELL_PNGDEC_ERROR_STREAM_FORMAT = 0x80611202, - CELL_PNGDEC_ERROR_ARG = 0x80611203, - CELL_PNGDEC_ERROR_SEQ = 0x80611204, - CELL_PNGDEC_ERROR_BUSY = 0x80611205, - CELL_PNGDEC_ERROR_FATAL = 0x80611206, - CELL_PNGDEC_ERROR_OPEN_FILE = 0x80611207, - CELL_PNGDEC_ERROR_SPU_UNSUPPORT = 0x80611208, - CELL_PNGDEC_ERROR_SPU_ERROR = 0x80611209, - CELL_PNGDEC_ERROR_CB_PARAM = 0x8061120a, + CELL_PNGDEC_ERROR_HEADER = 0x80611201, + CELL_PNGDEC_ERROR_STREAM_FORMAT = 0x80611202, + CELL_PNGDEC_ERROR_ARG = 0x80611203, + CELL_PNGDEC_ERROR_SEQ = 0x80611204, + CELL_PNGDEC_ERROR_BUSY = 0x80611205, + CELL_PNGDEC_ERROR_FATAL = 0x80611206, + CELL_PNGDEC_ERROR_OPEN_FILE = 0x80611207, + CELL_PNGDEC_ERROR_SPU_UNSUPPORT = 0x80611208, + CELL_PNGDEC_ERROR_SPU_ERROR = 0x80611209, + CELL_PNGDEC_ERROR_CB_PARAM = 0x8061120a, }; enum CellPngDecColorSpace { - CELL_PNGDEC_GRAYSCALE = 1, - CELL_PNGDEC_RGB = 2, - CELL_PNGDEC_PALETTE = 4, - CELL_PNGDEC_GRAYSCALE_ALPHA = 9, - CELL_PNGDEC_RGBA = 10, - CELL_PNGDEC_ARGB = 20, + CELL_PNGDEC_GRAYSCALE = 1, + CELL_PNGDEC_RGB = 2, + CELL_PNGDEC_PALETTE = 4, + CELL_PNGDEC_GRAYSCALE_ALPHA = 9, + CELL_PNGDEC_RGBA = 10, + CELL_PNGDEC_ARGB = 20, }; enum CellPngDecDecodeStatus { - CELL_PNGDEC_DEC_STATUS_FINISH = 0, //Decoding finished - CELL_PNGDEC_DEC_STATUS_STOP = 1, //Decoding halted + CELL_PNGDEC_DEC_STATUS_FINISH = 0, //Decoding finished + CELL_PNGDEC_DEC_STATUS_STOP = 1, //Decoding halted }; enum CellPngDecStreamSrcSel { - CELL_PNGDEC_FILE = 0, - CELL_PNGDEC_BUFFER = 1, + CELL_PNGDEC_FILE = 0, + CELL_PNGDEC_BUFFER = 1, }; enum CellPngDecInterlaceMode diff --git a/rpcs3/Emu/SysCalls/Modules/cellPngEnc.cpp b/rpcs3/Emu/SysCalls/Modules/cellPngEnc.cpp index 730f193559..d614eb535e 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellPngEnc.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellPngEnc.cpp @@ -8,12 +8,12 @@ Module cellPngEnc(0x0052, cellPngEnc_init); // Error Codes enum { - CELL_PNGENC_ERROR_ARG = 0x80611291, - CELL_PNGENC_ERROR_SEQ = 0x80611292, - CELL_PNGENC_ERROR_BUSY = 0x80611293, - CELL_PNGENC_ERROR_EMPTY = 0x80611294, - CELL_PNGENC_ERROR_RESET = 0x80611295, - CELL_PNGENC_ERROR_FATAL = 0x80611296, + CELL_PNGENC_ERROR_ARG = 0x80611291, + CELL_PNGENC_ERROR_SEQ = 0x80611292, + CELL_PNGENC_ERROR_BUSY = 0x80611293, + CELL_PNGENC_ERROR_EMPTY = 0x80611294, + CELL_PNGENC_ERROR_RESET = 0x80611295, + CELL_PNGENC_ERROR_FATAL = 0x80611296, }; int cellPngEncQueryAttr() diff --git a/rpcs3/Emu/SysCalls/Modules/cellPrint.cpp b/rpcs3/Emu/SysCalls/Modules/cellPrint.cpp index bc8ac442dc..c620eaa20f 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellPrint.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellPrint.cpp @@ -8,14 +8,14 @@ Module cellPrint(0xf02a, cellPrint_init); // Error Codes enum { - CELL_PRINT_ERROR_INTERNAL = 0x8002c401, - CELL_PRINT_ERROR_NO_MEMORY = 0x8002c402, - CELL_PRINT_ERROR_PRINTER_NOT_FOUND = 0x8002c403, - CELL_PRINT_ERROR_INVALID_PARAM = 0x8002c404, - CELL_PRINT_ERROR_INVALID_FUNCTION = 0x8002c405, - CELL_PRINT_ERROR_NOT_SUPPORT = 0x8002c406, - CELL_PRINT_ERROR_OCCURRED = 0x8002c407, - CELL_PRINT_ERROR_CANCELED_BY_PRINTER = 0x8002c408, + CELL_PRINT_ERROR_INTERNAL = 0x8002c401, + CELL_PRINT_ERROR_NO_MEMORY = 0x8002c402, + CELL_PRINT_ERROR_PRINTER_NOT_FOUND = 0x8002c403, + CELL_PRINT_ERROR_INVALID_PARAM = 0x8002c404, + CELL_PRINT_ERROR_INVALID_FUNCTION = 0x8002c405, + CELL_PRINT_ERROR_NOT_SUPPORT = 0x8002c406, + CELL_PRINT_ERROR_OCCURRED = 0x8002c407, + CELL_PRINT_ERROR_CANCELED_BY_PRINTER = 0x8002c408, }; int cellPrintLoadAsync() diff --git a/rpcs3/Emu/SysCalls/Modules/cellResc.cpp b/rpcs3/Emu/SysCalls/Modules/cellResc.cpp index 6971894250..790053ff67 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellResc.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellResc.cpp @@ -119,7 +119,7 @@ void BuildupVertexBufferNR() switch(s_rescInternalInstance->m_initConfig.ratioMode){ case CELL_RESC_LETTERBOX: goto NR_LETTERBOX; case CELL_RESC_PANSCAN: goto NR_PANSCAN; - default: goto NR_FULLSCREEN; + default: goto NR_FULLSCREEN; } } else { goto NR_FULLSCREEN; @@ -262,7 +262,7 @@ u8 RescDstFormat2SysutilFormat(u32 dstFormat) { switch (dstFormat) { case CELL_RESC_SURFACE_F_W16Z16Y16X16: return CELL_VIDEO_OUT_BUFFER_COLOR_FORMAT_R16G16B16X16_FLOAT; - default: return CELL_VIDEO_OUT_BUFFER_COLOR_FORMAT_X8R8G8B8; + default: return CELL_VIDEO_OUT_BUFFER_COLOR_FORMAT_X8R8G8B8; } } @@ -346,8 +346,8 @@ bool CheckInitConfig(mem_ptr_t initConfig) } if( InternalVersion() >= 3 ){ - if(initConfig->interlaceMode > 4) return false; - if(initConfig->flipMode > 1) return false; + if(initConfig->interlaceMode > 4) return false; + if(initConfig->flipMode > 1) return false; } return true; diff --git a/rpcs3/Emu/SysCalls/Modules/cellResc.h b/rpcs3/Emu/SysCalls/Modules/cellResc.h index 56e5c2a333..8816237e00 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellResc.h +++ b/rpcs3/Emu/SysCalls/Modules/cellResc.h @@ -2,10 +2,10 @@ enum CellRescBufferMode { - CELL_RESC_720x480 = 0x1, - CELL_RESC_720x576 = 0x2, - CELL_RESC_1280x720 = 0x4, - CELL_RESC_1920x1080 = 0x8, + CELL_RESC_720x480 = 0x1, + CELL_RESC_720x576 = 0x2, + CELL_RESC_1280x720 = 0x4, + CELL_RESC_1920x1080 = 0x8, }; enum CellRescPalTemporalMode diff --git a/rpcs3/Emu/SysCalls/Modules/cellRudp.cpp b/rpcs3/Emu/SysCalls/Modules/cellRudp.cpp index 323229921c..a0792580df 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellRudp.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellRudp.cpp @@ -8,45 +8,45 @@ Module cellRudp(0x0057, cellRudp_init); // Return Codes enum { - CELL_RUDP_SUCCESS = 0, - CELL_RUDP_ERROR_NOT_INITIALIZED = 0x80770001, - CELL_RUDP_ERROR_ALREADY_INITIALIZED = 0x80770002, - CELL_RUDP_ERROR_INVALID_CONTEXT_ID = 0x80770003, - CELL_RUDP_ERROR_INVALID_ARGUMENT = 0x80770004, - CELL_RUDP_ERROR_INVALID_OPTION = 0x80770005, - CELL_RUDP_ERROR_INVALID_MUXMODE = 0x80770006, - CELL_RUDP_ERROR_MEMORY = 0x80770007, - CELL_RUDP_ERROR_INTERNAL = 0x80770008, - CELL_RUDP_ERROR_CONN_RESET = 0x80770009, - CELL_RUDP_ERROR_CONN_REFUSED = 0x8077000a, - CELL_RUDP_ERROR_CONN_TIMEOUT = 0x8077000b, - CELL_RUDP_ERROR_CONN_VERSION_MISMATCH = 0x8077000c, - CELL_RUDP_ERROR_CONN_TRANSPORT_TYPE_MISMATCH = 0x8077000d, - CELL_RUDP_ERROR_QUALITY_LEVEL_MISMATCH = 0x8077000e, - CELL_RUDP_ERROR_THREAD = 0x8077000f, - CELL_RUDP_ERROR_THREAD_IN_USE = 0x80770010, - CELL_RUDP_ERROR_NOT_ACCEPTABLE = 0x80770011, - CELL_RUDP_ERROR_MSG_TOO_LARGE = 0x80770012, - CELL_RUDP_ERROR_NOT_BOUND = 0x80770013, - CELL_RUDP_ERROR_CANCELLED = 0x80770014, - CELL_RUDP_ERROR_INVALID_VPORT = 0x80770015, - CELL_RUDP_ERROR_WOULDBLOCK = 0x80770016, - CELL_RUDP_ERROR_VPORT_IN_USE = 0x80770017, - CELL_RUDP_ERROR_VPORT_EXHAUSTED = 0x80770018, - CELL_RUDP_ERROR_INVALID_SOCKET = 0x80770019, - CELL_RUDP_ERROR_BUFFER_TOO_SMALL = 0x8077001a, - CELL_RUDP_ERROR_MSG_MALFORMED = 0x8077001b, - CELL_RUDP_ERROR_ADDR_IN_USE = 0x8077001c, - CELL_RUDP_ERROR_ALREADY_BOUND = 0x8077001d, - CELL_RUDP_ERROR_ALREADY_EXISTS = 0x8077001e, - CELL_RUDP_ERROR_INVALID_POLL_ID = 0x8077001f, - CELL_RUDP_ERROR_TOO_MANY_CONTEXTS = 0x80770020, - CELL_RUDP_ERROR_IN_PROGRESS = 0x80770021, - CELL_RUDP_ERROR_NO_EVENT_HANDLER = 0x80770022, - CELL_RUDP_ERROR_PAYLOAD_TOO_LARGE = 0x80770023, - CELL_RUDP_ERROR_END_OF_DATA = 0x80770024, - CELL_RUDP_ERROR_ALREADY_ESTABLISHED = 0x80770025, - CELL_RUDP_ERROR_KEEP_ALIVE_FAILURE = 0x80770026, + CELL_RUDP_SUCCESS = 0, + CELL_RUDP_ERROR_NOT_INITIALIZED = 0x80770001, + CELL_RUDP_ERROR_ALREADY_INITIALIZED = 0x80770002, + CELL_RUDP_ERROR_INVALID_CONTEXT_ID = 0x80770003, + CELL_RUDP_ERROR_INVALID_ARGUMENT = 0x80770004, + CELL_RUDP_ERROR_INVALID_OPTION = 0x80770005, + CELL_RUDP_ERROR_INVALID_MUXMODE = 0x80770006, + CELL_RUDP_ERROR_MEMORY = 0x80770007, + CELL_RUDP_ERROR_INTERNAL = 0x80770008, + CELL_RUDP_ERROR_CONN_RESET = 0x80770009, + CELL_RUDP_ERROR_CONN_REFUSED = 0x8077000a, + CELL_RUDP_ERROR_CONN_TIMEOUT = 0x8077000b, + CELL_RUDP_ERROR_CONN_VERSION_MISMATCH = 0x8077000c, + CELL_RUDP_ERROR_CONN_TRANSPORT_TYPE_MISMATCH = 0x8077000d, + CELL_RUDP_ERROR_QUALITY_LEVEL_MISMATCH = 0x8077000e, + CELL_RUDP_ERROR_THREAD = 0x8077000f, + CELL_RUDP_ERROR_THREAD_IN_USE = 0x80770010, + CELL_RUDP_ERROR_NOT_ACCEPTABLE = 0x80770011, + CELL_RUDP_ERROR_MSG_TOO_LARGE = 0x80770012, + CELL_RUDP_ERROR_NOT_BOUND = 0x80770013, + CELL_RUDP_ERROR_CANCELLED = 0x80770014, + CELL_RUDP_ERROR_INVALID_VPORT = 0x80770015, + CELL_RUDP_ERROR_WOULDBLOCK = 0x80770016, + CELL_RUDP_ERROR_VPORT_IN_USE = 0x80770017, + CELL_RUDP_ERROR_VPORT_EXHAUSTED = 0x80770018, + CELL_RUDP_ERROR_INVALID_SOCKET = 0x80770019, + CELL_RUDP_ERROR_BUFFER_TOO_SMALL = 0x8077001a, + CELL_RUDP_ERROR_MSG_MALFORMED = 0x8077001b, + CELL_RUDP_ERROR_ADDR_IN_USE = 0x8077001c, + CELL_RUDP_ERROR_ALREADY_BOUND = 0x8077001d, + CELL_RUDP_ERROR_ALREADY_EXISTS = 0x8077001e, + CELL_RUDP_ERROR_INVALID_POLL_ID = 0x8077001f, + CELL_RUDP_ERROR_TOO_MANY_CONTEXTS = 0x80770020, + CELL_RUDP_ERROR_IN_PROGRESS = 0x80770021, + CELL_RUDP_ERROR_NO_EVENT_HANDLER = 0x80770022, + CELL_RUDP_ERROR_PAYLOAD_TOO_LARGE = 0x80770023, + CELL_RUDP_ERROR_END_OF_DATA = 0x80770024, + CELL_RUDP_ERROR_ALREADY_ESTABLISHED = 0x80770025, + CELL_RUDP_ERROR_KEEP_ALIVE_FAILURE = 0x80770026, }; int cellRudpInit() diff --git a/rpcs3/Emu/SysCalls/Modules/cellSail.cpp b/rpcs3/Emu/SysCalls/Modules/cellSail.cpp index 08c005ee3e..7d5037437c 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellSail.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellSail.cpp @@ -8,18 +8,18 @@ Module cellSail(0x001d, cellSail_init); // Error Codes enum { - CELL_SAIL_ERROR_INVALID_ARG = 0x80610701, - CELL_SAIL_ERROR_INVALID_STATE = 0x80610702, - CELL_SAIL_ERROR_UNSUPPORTED_STREAM = 0x80610703, - CELL_SAIL_ERROR_INDEX_OUT_OF_RANGE = 0x80610704, - CELL_SAIL_ERROR_EMPTY = 0x80610705, - CELL_SAIL_ERROR_FULLED = 0x80610706, - CELL_SAIL_ERROR_USING = 0x80610707, - CELL_SAIL_ERROR_NOT_AVAILABLE = 0x80610708, - CELL_SAIL_ERROR_CANCEL = 0x80610709, - CELL_SAIL_ERROR_MEMORY = 0x806107F0, - CELL_SAIL_ERROR_INVALID_FD = 0x806107F1, - CELL_SAIL_ERROR_FATAL = 0x806107FF, + CELL_SAIL_ERROR_INVALID_ARG = 0x80610701, + CELL_SAIL_ERROR_INVALID_STATE = 0x80610702, + CELL_SAIL_ERROR_UNSUPPORTED_STREAM = 0x80610703, + CELL_SAIL_ERROR_INDEX_OUT_OF_RANGE = 0x80610704, + CELL_SAIL_ERROR_EMPTY = 0x80610705, + CELL_SAIL_ERROR_FULLED = 0x80610706, + CELL_SAIL_ERROR_USING = 0x80610707, + CELL_SAIL_ERROR_NOT_AVAILABLE = 0x80610708, + CELL_SAIL_ERROR_CANCEL = 0x80610709, + CELL_SAIL_ERROR_MEMORY = 0x806107F0, + CELL_SAIL_ERROR_INVALID_FD = 0x806107F1, + CELL_SAIL_ERROR_FATAL = 0x806107FF, }; int cellSailMemAllocatorInitialize() diff --git a/rpcs3/Emu/SysCalls/Modules/cellSailRec.cpp b/rpcs3/Emu/SysCalls/Modules/cellSailRec.cpp index 759008f903..c0adc9b1b7 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellSailRec.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellSailRec.cpp @@ -8,18 +8,18 @@ Module cellSailRec(0xf034, cellSailRec_init); // Error Codes enum { - CELL_SAIL_ERROR_INVALID_ARG = 0x80610701, - CELL_SAIL_ERROR_INVALID_STATE = 0x80610702, - CELL_SAIL_ERROR_UNSUPPORTED_STREAM = 0x80610703, - CELL_SAIL_ERROR_INDEX_OUT_OF_RANGE = 0x80610704, - CELL_SAIL_ERROR_EMPTY = 0x80610705, - CELL_SAIL_ERROR_FULLED = 0x80610706, - CELL_SAIL_ERROR_USING = 0x80610707, - CELL_SAIL_ERROR_NOT_AVAILABLE = 0x80610708, - CELL_SAIL_ERROR_CANCEL = 0x80610709, - CELL_SAIL_ERROR_MEMORY = 0x806107F0, - CELL_SAIL_ERROR_INVALID_FD = 0x806107F1, - CELL_SAIL_ERROR_FATAL = 0x806107FF, + CELL_SAIL_ERROR_INVALID_ARG = 0x80610701, + CELL_SAIL_ERROR_INVALID_STATE = 0x80610702, + CELL_SAIL_ERROR_UNSUPPORTED_STREAM = 0x80610703, + CELL_SAIL_ERROR_INDEX_OUT_OF_RANGE = 0x80610704, + CELL_SAIL_ERROR_EMPTY = 0x80610705, + CELL_SAIL_ERROR_FULLED = 0x80610706, + CELL_SAIL_ERROR_USING = 0x80610707, + CELL_SAIL_ERROR_NOT_AVAILABLE = 0x80610708, + CELL_SAIL_ERROR_CANCEL = 0x80610709, + CELL_SAIL_ERROR_MEMORY = 0x806107F0, + CELL_SAIL_ERROR_INVALID_FD = 0x806107F1, + CELL_SAIL_ERROR_FATAL = 0x806107FF, }; int cellSailProfileSetEsAudioParameter() diff --git a/rpcs3/Emu/SysCalls/Modules/cellScreenshot.cpp b/rpcs3/Emu/SysCalls/Modules/cellScreenshot.cpp index 9f00f5d99e..af5f53c5c7 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellScreenshot.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellScreenshot.cpp @@ -8,12 +8,12 @@ Module cellScreenshot(0x004e, cellScreenshot_init); // Return Codes enum { - CELL_SCREENSHOT_OK = 0x0, - CELL_SCREENSHOT_ERROR_INTERNAL = 0x8002d101, - CELL_SCREENSHOT_ERROR_PARAM = 0x8002d102, - CELL_SCREENSHOT_ERROR_DECODE = 0x8002d103, - CELL_SCREENSHOT_ERROR_NOSPACE = 0x8002d104, - CELL_SCREENSHOT_ERROR_UNSUPPORTED_COLOR_FORMAT = 0x8002d105, + CELL_SCREENSHOT_OK = 0x0, + CELL_SCREENSHOT_ERROR_INTERNAL = 0x8002d101, + CELL_SCREENSHOT_ERROR_PARAM = 0x8002d102, + CELL_SCREENSHOT_ERROR_DECODE = 0x8002d103, + CELL_SCREENSHOT_ERROR_NOSPACE = 0x8002d104, + CELL_SCREENSHOT_ERROR_UNSUPPORTED_COLOR_FORMAT = 0x8002d105, }; // Datatypes diff --git a/rpcs3/Emu/SysCalls/Modules/cellSearch.cpp b/rpcs3/Emu/SysCalls/Modules/cellSearch.cpp index a258f7eac7..8a2aeaf029 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellSearch.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellSearch.cpp @@ -8,27 +8,27 @@ Module cellSearch(0xf02f, cellSearch_init); // Error Codes enum { - CELL_SEARCH_OK = 0, - CELL_SEARCH_CANCELED = 1, - CELL_SEARCH_ERROR_PARAM = 0x8002C801, - CELL_SEARCH_ERROR_BUSY = 0x8002C802, - CELL_SEARCH_ERROR_NO_MEMORY = 0x8002C803, - CELL_SEARCH_ERROR_UNKNOWN_MODE = 0x8002C804, - CELL_SEARCH_ERROR_ALREADY_INITIALIZED = 0x8002C805, - CELL_SEARCH_ERROR_NOT_INITIALIZED = 0x8002C806, - CELL_SEARCH_ERROR_FINALIZING = 0x8002C807, - CELL_SEARCH_ERROR_NOT_SUPPORTED_SEARCH = 0x8002C808, - CELL_SEARCH_ERROR_CONTENT_OBSOLETE = 0x8002C809, - CELL_SEARCH_ERROR_CONTENT_NOT_FOUND = 0x8002C80A, - CELL_SEARCH_ERROR_NOT_LIST = 0x8002C80B, - CELL_SEARCH_ERROR_OUT_OF_RANGE = 0x8002C80C, - CELL_SEARCH_ERROR_INVALID_SEARCHID = 0x8002C80D, - CELL_SEARCH_ERROR_ALREADY_GOT_RESULT = 0x8002C80E, - CELL_SEARCH_ERROR_NOT_SUPPORTED_CONTEXT = 0x8002C80F, - CELL_SEARCH_ERROR_INVALID_CONTENTTYPE = 0x8002C810, - CELL_SEARCH_ERROR_DRM = 0x8002C811, - CELL_SEARCH_ERROR_TAG = 0x8002C812, - CELL_SEARCH_ERROR_GENERIC = 0x8002C8FF, + CELL_SEARCH_OK = 0, + CELL_SEARCH_CANCELED = 1, + CELL_SEARCH_ERROR_PARAM = 0x8002C801, + CELL_SEARCH_ERROR_BUSY = 0x8002C802, + CELL_SEARCH_ERROR_NO_MEMORY = 0x8002C803, + CELL_SEARCH_ERROR_UNKNOWN_MODE = 0x8002C804, + CELL_SEARCH_ERROR_ALREADY_INITIALIZED = 0x8002C805, + CELL_SEARCH_ERROR_NOT_INITIALIZED = 0x8002C806, + CELL_SEARCH_ERROR_FINALIZING = 0x8002C807, + CELL_SEARCH_ERROR_NOT_SUPPORTED_SEARCH = 0x8002C808, + CELL_SEARCH_ERROR_CONTENT_OBSOLETE = 0x8002C809, + CELL_SEARCH_ERROR_CONTENT_NOT_FOUND = 0x8002C80A, + CELL_SEARCH_ERROR_NOT_LIST = 0x8002C80B, + CELL_SEARCH_ERROR_OUT_OF_RANGE = 0x8002C80C, + CELL_SEARCH_ERROR_INVALID_SEARCHID = 0x8002C80D, + CELL_SEARCH_ERROR_ALREADY_GOT_RESULT = 0x8002C80E, + CELL_SEARCH_ERROR_NOT_SUPPORTED_CONTEXT = 0x8002C80F, + CELL_SEARCH_ERROR_INVALID_CONTENTTYPE = 0x8002C810, + CELL_SEARCH_ERROR_DRM = 0x8002C811, + CELL_SEARCH_ERROR_TAG = 0x8002C812, + CELL_SEARCH_ERROR_GENERIC = 0x8002C8FF, }; int cellSearchInitialize() diff --git a/rpcs3/Emu/SysCalls/Modules/cellSheap.cpp b/rpcs3/Emu/SysCalls/Modules/cellSheap.cpp index 7b86225d4e..9ec9baab78 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellSheap.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellSheap.cpp @@ -8,10 +8,10 @@ Module cellSheap(0x000c, cellSheap_init); // Return Codes enum { - CELL_SHEAP_ERROR_INVAL = 0x80410302, - CELL_SHEAP_ERROR_BUSY = 0x8041030A, - CELL_SHEAP_ERROR_ALIGN = 0x80410310, - CELL_SHEAP_ERROR_SHORTAGE = 0x80410312, + CELL_SHEAP_ERROR_INVAL = 0x80410302, + CELL_SHEAP_ERROR_BUSY = 0x8041030A, + CELL_SHEAP_ERROR_ALIGN = 0x80410310, + CELL_SHEAP_ERROR_SHORTAGE = 0x80410312, }; int cellSheapInitialize() diff --git a/rpcs3/Emu/SysCalls/Modules/cellSpurs.h b/rpcs3/Emu/SysCalls/Modules/cellSpurs.h index d13ed3d523..391a81f54d 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellSpurs.h +++ b/rpcs3/Emu/SysCalls/Modules/cellSpurs.h @@ -4,33 +4,33 @@ // Core return codes. enum { - CELL_SPURS_CORE_ERROR_AGAIN = 0x80410701, - CELL_SPURS_CORE_ERROR_INVAL = 0x80410702, - CELL_SPURS_CORE_ERROR_NOMEM = 0x80410704, - CELL_SPURS_CORE_ERROR_SRCH = 0x80410705, - CELL_SPURS_CORE_ERROR_PERM = 0x80410709, - CELL_SPURS_CORE_ERROR_BUSY = 0x8041070A, - CELL_SPURS_CORE_ERROR_STAT = 0x8041070F, - CELL_SPURS_CORE_ERROR_ALIGN = 0x80410710, - CELL_SPURS_CORE_ERROR_NULL_POINTER = 0x80410711, + CELL_SPURS_CORE_ERROR_AGAIN = 0x80410701, + CELL_SPURS_CORE_ERROR_INVAL = 0x80410702, + CELL_SPURS_CORE_ERROR_NOMEM = 0x80410704, + CELL_SPURS_CORE_ERROR_SRCH = 0x80410705, + CELL_SPURS_CORE_ERROR_PERM = 0x80410709, + CELL_SPURS_CORE_ERROR_BUSY = 0x8041070A, + CELL_SPURS_CORE_ERROR_STAT = 0x8041070F, + CELL_SPURS_CORE_ERROR_ALIGN = 0x80410710, + CELL_SPURS_CORE_ERROR_NULL_POINTER = 0x80410711, }; // Task return codes. enum { - CELL_SPURS_TASK_ERROR_AGAIN = 0x80410901, - CELL_SPURS_TASK_ERROR_INVAL = 0x80410902, - CELL_SPURS_TASK_ERROR_NOMEM = 0x80410904, - CELL_SPURS_TASK_ERROR_SRCH = 0x80410905, - CELL_SPURS_TASK_ERROR_NOEXEC = 0x80410907, - CELL_SPURS_TASK_ERROR_PERM = 0x80410909, - CELL_SPURS_TASK_ERROR_BUSY = 0x8041090A, - CELL_SPURS_TASK_ERROR_FAULT = 0x8041090D, - CELL_SPURS_TASK_ERROR_STAT = 0x8041090F, - CELL_SPURS_TASK_ERROR_ALIGN = 0x80410910, - CELL_SPURS_TASK_ERROR_NULL_POINTER = 0x80410911, - CELL_SPURS_TASK_ERROR_FATAL = 0x80410914, - CELL_SPURS_TASK_ERROR_SHUTDOWN = 0x80410920, + CELL_SPURS_TASK_ERROR_AGAIN = 0x80410901, + CELL_SPURS_TASK_ERROR_INVAL = 0x80410902, + CELL_SPURS_TASK_ERROR_NOMEM = 0x80410904, + CELL_SPURS_TASK_ERROR_SRCH = 0x80410905, + CELL_SPURS_TASK_ERROR_NOEXEC = 0x80410907, + CELL_SPURS_TASK_ERROR_PERM = 0x80410909, + CELL_SPURS_TASK_ERROR_BUSY = 0x8041090A, + CELL_SPURS_TASK_ERROR_FAULT = 0x8041090D, + CELL_SPURS_TASK_ERROR_STAT = 0x8041090F, + CELL_SPURS_TASK_ERROR_ALIGN = 0x80410910, + CELL_SPURS_TASK_ERROR_NULL_POINTER = 0x80410911, + CELL_SPURS_TASK_ERROR_FATAL = 0x80410914, + CELL_SPURS_TASK_ERROR_SHUTDOWN = 0x80410920, }; // Core CellSpurs structures. @@ -56,11 +56,11 @@ struct CellSpursInfo be_t ppuThreadPriority; bool exitIfNoWork; bool spurs2; - be_t traceBuffer_addr; //void *traceBuffer; + be_t traceBuffer_addr; //void *traceBuffer; be_t traceBufferSize; be_t traceMode; - be_t spuThreadGroup; //typedef u32 sys_spu_thread_group_t; - be_t spuThreads[8]; //typedef u32 sys_spu_thread_t; + be_t spuThreadGroup; //typedef u32 sys_spu_thread_group_t; + be_t spuThreads[8]; //typedef u32 sys_spu_thread_t; be_t spursHandlerThread0; be_t spursHandlerThread1; s8 namePrefix[CELL_SPURS_NAME_MAX_LENGTH+1]; diff --git a/rpcs3/Emu/SysCalls/Modules/cellSubdisplay.cpp b/rpcs3/Emu/SysCalls/Modules/cellSubdisplay.cpp index 3d6ac0b2f9..8effb950c6 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellSubdisplay.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellSubdisplay.cpp @@ -8,14 +8,14 @@ Module cellSubdisplay(0x0034, cellSubdisplay_init); // Return Codes enum { - CELL_SUBDISPLAY_ERROR_OUT_OF_MEMORY = 0x80029851, - CELL_SUBDISPLAY_ERROR_FATAL = 0x80029852, - CELL_SUBDISPLAY_ERROR_NOT_FOUND = 0x80029853, - CELL_SUBDISPLAY_ERROR_INVALID_VALUE = 0x80029854, - CELL_SUBDISPLAY_ERROR_NOT_INITIALIZED = 0x80029855, - CELL_SUBDISPLAY_ERROR_SET_SAMPLE = 0x80029860, - CELL_SUBDISPLAY_ERROR_AUDIOOUT_IS_BUSY = 0x80029861, - CELL_SUBDISPLAY_ERROR_ZERO_REGISTERED = 0x80029813, + CELL_SUBDISPLAY_ERROR_OUT_OF_MEMORY = 0x80029851, + CELL_SUBDISPLAY_ERROR_FATAL = 0x80029852, + CELL_SUBDISPLAY_ERROR_NOT_FOUND = 0x80029853, + CELL_SUBDISPLAY_ERROR_INVALID_VALUE = 0x80029854, + CELL_SUBDISPLAY_ERROR_NOT_INITIALIZED = 0x80029855, + CELL_SUBDISPLAY_ERROR_SET_SAMPLE = 0x80029860, + CELL_SUBDISPLAY_ERROR_AUDIOOUT_IS_BUSY = 0x80029861, + CELL_SUBDISPLAY_ERROR_ZERO_REGISTERED = 0x80029813, }; int cellSubDisplayInit() diff --git a/rpcs3/Emu/SysCalls/Modules/cellSync.cpp b/rpcs3/Emu/SysCalls/Modules/cellSync.cpp index ba812cb2cb..d5035677df 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellSync.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellSync.cpp @@ -9,18 +9,18 @@ Module cellSync("cellSync", cellSync_init); // Return Codes enum { - CELL_SYNC_ERROR_AGAIN = 0x80410101, - CELL_SYNC_ERROR_INVAL = 0x80410102, - CELL_SYNC_ERROR_NOMEM = 0x80410104, - CELL_SYNC_ERROR_DEADLK = 0x80410108, - CELL_SYNC_ERROR_PERM = 0x80410109, - CELL_SYNC_ERROR_BUSY = 0x8041010A, - CELL_SYNC_ERROR_STAT = 0x8041010F, - CELL_SYNC_ERROR_ALIGN = 0x80410110, - CELL_SYNC_ERROR_NULL_POINTER = 0x80410111, - CELL_SYNC_ERROR_NOT_SUPPORTED_THREAD = 0x80410112, - CELL_SYNC_ERROR_NO_NOTIFIER = 0x80410113, - CELL_SYNC_ERROR_NO_SPU_CONTEXT_STORAGE = 0x80410114, + CELL_SYNC_ERROR_AGAIN = 0x80410101, + CELL_SYNC_ERROR_INVAL = 0x80410102, + CELL_SYNC_ERROR_NOMEM = 0x80410104, + CELL_SYNC_ERROR_DEADLK = 0x80410108, + CELL_SYNC_ERROR_PERM = 0x80410109, + CELL_SYNC_ERROR_BUSY = 0x8041010A, + CELL_SYNC_ERROR_STAT = 0x8041010F, + CELL_SYNC_ERROR_ALIGN = 0x80410110, + CELL_SYNC_ERROR_NULL_POINTER = 0x80410111, + CELL_SYNC_ERROR_NOT_SUPPORTED_THREAD = 0x80410112, + CELL_SYNC_ERROR_NO_NOTIFIER = 0x80410113, + CELL_SYNC_ERROR_NO_SPU_CONTEXT_STORAGE = 0x80410114, }; #pragma pack(push, 1) diff --git a/rpcs3/Emu/SysCalls/Modules/cellSync2.cpp b/rpcs3/Emu/SysCalls/Modules/cellSync2.cpp index ad4d219277..b3e78f078d 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellSync2.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellSync2.cpp @@ -8,18 +8,18 @@ Module cellSync2(0x0055, cellSync2_init); // Return Codes enum { - CELL_SYNC2_ERROR_AGAIN = 0x80410C01, - CELL_SYNC2_ERROR_INVAL = 0x80410C02, - CELL_SYNC2_ERROR_NOMEM = 0x80410C04, - CELL_SYNC2_ERROR_DEADLK = 0x80410C08, - CELL_SYNC2_ERROR_PERM = 0x80410C09, - CELL_SYNC2_ERROR_BUSY = 0x80410C0A, - CELL_SYNC2_ERROR_STAT = 0x80410C0F, - CELL_SYNC2_ERROR_ALIGN = 0x80410C10, - CELL_SYNC2_ERROR_NULL_POINTER = 0x80410C11, - CELL_SYNC2_ERROR_NOT_SUPPORTED_THREAD = 0x80410C12, - CELL_SYNC2_ERROR_NO_NOTIFIER = 0x80410C13, - CELL_SYNC2_ERROR_NO_SPU_CONTEXT_STORAGE = 0x80410C14, + CELL_SYNC2_ERROR_AGAIN = 0x80410C01, + CELL_SYNC2_ERROR_INVAL = 0x80410C02, + CELL_SYNC2_ERROR_NOMEM = 0x80410C04, + CELL_SYNC2_ERROR_DEADLK = 0x80410C08, + CELL_SYNC2_ERROR_PERM = 0x80410C09, + CELL_SYNC2_ERROR_BUSY = 0x80410C0A, + CELL_SYNC2_ERROR_STAT = 0x80410C0F, + CELL_SYNC2_ERROR_ALIGN = 0x80410C10, + CELL_SYNC2_ERROR_NULL_POINTER = 0x80410C11, + CELL_SYNC2_ERROR_NOT_SUPPORTED_THREAD = 0x80410C12, + CELL_SYNC2_ERROR_NO_NOTIFIER = 0x80410C13, + CELL_SYNC2_ERROR_NO_SPU_CONTEXT_STORAGE = 0x80410C14, }; int _cellSync2MutexAttributeInitialize() diff --git a/rpcs3/Emu/SysCalls/Modules/cellSysmodule.cpp b/rpcs3/Emu/SysCalls/Modules/cellSysmodule.cpp index a7f435a56e..c73db9be67 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellSysmodule.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellSysmodule.cpp @@ -7,12 +7,12 @@ Module cellSysmodule("cellSysmodule", cellSysmodule_init); enum { - CELL_SYSMODULE_LOADED = CELL_OK, - CELL_SYSMODULE_ERROR_DUPLICATED = 0x80012001, - CELL_SYSMODULE_ERROR_UNKNOWN = 0x80012002, - CELL_SYSMODULE_ERROR_UNLOADED = 0x80012003, - CELL_SYSMODULE_ERROR_INVALID_MEMCONTAINER = 0x80012004, - CELL_SYSMODULE_ERROR_FATAL = 0x800120ff, + CELL_SYSMODULE_LOADED = CELL_OK, + CELL_SYSMODULE_ERROR_DUPLICATED = 0x80012001, + CELL_SYSMODULE_ERROR_UNKNOWN = 0x80012002, + CELL_SYSMODULE_ERROR_UNLOADED = 0x80012003, + CELL_SYSMODULE_ERROR_INVALID_MEMCONTAINER = 0x80012004, + CELL_SYSMODULE_ERROR_FATAL = 0x800120ff, }; const char *getModuleName(int id) { diff --git a/rpcs3/Emu/SysCalls/Modules/cellSysutilAp.cpp b/rpcs3/Emu/SysCalls/Modules/cellSysutilAp.cpp index 345958529b..5244dda86b 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellSysutilAp.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellSysutilAp.cpp @@ -8,14 +8,14 @@ Module cellSysutilAp(0x0039, cellSysutilAp_init); // Return Codes enum { - CELL_SYSUTIL_AP_ERROR_OUT_OF_MEMORY = 0x8002cd00, - CELL_SYSUTIL_AP_ERROR_FATAL = 0x8002cd01, - CELL_SYSUTIL_AP_ERROR_INVALID_VALUE = 0x8002cd02, - CELL_SYSUTIL_AP_ERROR_NOT_INITIALIZED = 0x8002cd03, - CELL_SYSUTIL_AP_ERROR_ZERO_REGISTERED = 0x8002cd13, - CELL_SYSUTIL_AP_ERROR_NETIF_DISABLED = 0x8002cd14, - CELL_SYSUTIL_AP_ERROR_NETIF_NO_CABLE = 0x8002cd15, - CELL_SYSUTIL_AP_ERROR_NETIF_CANNOT_CONNECT = 0x8002cd16, + CELL_SYSUTIL_AP_ERROR_OUT_OF_MEMORY = 0x8002cd00, + CELL_SYSUTIL_AP_ERROR_FATAL = 0x8002cd01, + CELL_SYSUTIL_AP_ERROR_INVALID_VALUE = 0x8002cd02, + CELL_SYSUTIL_AP_ERROR_NOT_INITIALIZED = 0x8002cd03, + CELL_SYSUTIL_AP_ERROR_ZERO_REGISTERED = 0x8002cd13, + CELL_SYSUTIL_AP_ERROR_NETIF_DISABLED = 0x8002cd14, + CELL_SYSUTIL_AP_ERROR_NETIF_NO_CABLE = 0x8002cd15, + CELL_SYSUTIL_AP_ERROR_NETIF_CANNOT_CONNECT = 0x8002cd16, }; s32 cellSysutilApGetRequiredMemSize() diff --git a/rpcs3/Emu/SysCalls/Modules/cellUsbd.cpp b/rpcs3/Emu/SysCalls/Modules/cellUsbd.cpp index 2fb0b67e70..efeb9551a1 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellUsbd.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellUsbd.cpp @@ -8,24 +8,24 @@ Module cellUsbd(0x001c, cellUsbd_init); // Return Codes enum { - CELL_USBD_ERROR_NOT_INITIALIZED = 0x80110001, - CELL_USBD_ERROR_ALREADY_INITIALIZED = 0x80110002, - CELL_USBD_ERROR_NO_MEMORY = 0x80110003, - CELL_USBD_ERROR_INVALID_PARAM = 0x80110004, - CELL_USBD_ERROR_INVALID_TRANSFER_TYPE = 0x80110005, - CELL_USBD_ERROR_LDD_ALREADY_REGISTERED = 0x80110006, - CELL_USBD_ERROR_LDD_NOT_ALLOCATED = 0x80110007, - CELL_USBD_ERROR_LDD_NOT_RELEASED = 0x80110008, - CELL_USBD_ERROR_LDD_NOT_FOUND = 0x80110009, - CELL_USBD_ERROR_DEVICE_NOT_FOUND = 0x8011000a, - CELL_USBD_ERROR_PIPE_NOT_ALLOCATED = 0x8011000b, - CELL_USBD_ERROR_PIPE_NOT_RELEASED = 0x8011000c, - CELL_USBD_ERROR_PIPE_NOT_FOUND = 0x8011000d, - CELL_USBD_ERROR_IOREQ_NOT_ALLOCATED = 0x8011000e, - CELL_USBD_ERROR_IOREQ_NOT_RELEASED = 0x8011000f, - CELL_USBD_ERROR_IOREQ_NOT_FOUND = 0x80110010, - CELL_USBD_ERROR_CANNOT_GET_DESCRIPTOR = 0x80110011, - CELL_USBD_ERROR_FATAL = 0x801100ff, + CELL_USBD_ERROR_NOT_INITIALIZED = 0x80110001, + CELL_USBD_ERROR_ALREADY_INITIALIZED = 0x80110002, + CELL_USBD_ERROR_NO_MEMORY = 0x80110003, + CELL_USBD_ERROR_INVALID_PARAM = 0x80110004, + CELL_USBD_ERROR_INVALID_TRANSFER_TYPE = 0x80110005, + CELL_USBD_ERROR_LDD_ALREADY_REGISTERED = 0x80110006, + CELL_USBD_ERROR_LDD_NOT_ALLOCATED = 0x80110007, + CELL_USBD_ERROR_LDD_NOT_RELEASED = 0x80110008, + CELL_USBD_ERROR_LDD_NOT_FOUND = 0x80110009, + CELL_USBD_ERROR_DEVICE_NOT_FOUND = 0x8011000a, + CELL_USBD_ERROR_PIPE_NOT_ALLOCATED = 0x8011000b, + CELL_USBD_ERROR_PIPE_NOT_RELEASED = 0x8011000c, + CELL_USBD_ERROR_PIPE_NOT_FOUND = 0x8011000d, + CELL_USBD_ERROR_IOREQ_NOT_ALLOCATED = 0x8011000e, + CELL_USBD_ERROR_IOREQ_NOT_RELEASED = 0x8011000f, + CELL_USBD_ERROR_IOREQ_NOT_FOUND = 0x80110010, + CELL_USBD_ERROR_CANNOT_GET_DESCRIPTOR = 0x80110011, + CELL_USBD_ERROR_FATAL = 0x801100ff, }; int cellUsbdInit() diff --git a/rpcs3/Emu/SysCalls/Modules/cellUsbpspcm.cpp b/rpcs3/Emu/SysCalls/Modules/cellUsbpspcm.cpp index 0d8195cac3..406c6cc3b5 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellUsbpspcm.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellUsbpspcm.cpp @@ -8,18 +8,18 @@ Module cellUsbpspcm(0x0030, cellUsbpspcm_init); // Return Codes enum { - CELL_USBPSPCM_ERROR_NOT_INITIALIZED = 0x80110401, - CELL_USBPSPCM_ERROR_ALREADY = 0x80110402, - CELL_USBPSPCM_ERROR_INVALID = 0x80110403, - CELL_USBPSPCM_ERROR_NO_MEMORY = 0x80110404, - CELL_USBPSPCM_ERROR_BUSY = 0x80110405, - CELL_USBPSPCM_ERROR_INPROGRESS = 0x80110406, - CELL_USBPSPCM_ERROR_NO_SPACE = 0x80110407, - CELL_USBPSPCM_ERROR_CANCELED = 0x80110408, - CELL_USBPSPCM_ERROR_RESETTING = 0x80110409, - CELL_USBPSPCM_ERROR_RESET_END = 0x8011040A, - CELL_USBPSPCM_ERROR_CLOSED = 0x8011040B, - CELL_USBPSPCM_ERROR_NO_DATA = 0x8011040C, + CELL_USBPSPCM_ERROR_NOT_INITIALIZED = 0x80110401, + CELL_USBPSPCM_ERROR_ALREADY = 0x80110402, + CELL_USBPSPCM_ERROR_INVALID = 0x80110403, + CELL_USBPSPCM_ERROR_NO_MEMORY = 0x80110404, + CELL_USBPSPCM_ERROR_BUSY = 0x80110405, + CELL_USBPSPCM_ERROR_INPROGRESS = 0x80110406, + CELL_USBPSPCM_ERROR_NO_SPACE = 0x80110407, + CELL_USBPSPCM_ERROR_CANCELED = 0x80110408, + CELL_USBPSPCM_ERROR_RESETTING = 0x80110409, + CELL_USBPSPCM_ERROR_RESET_END = 0x8011040A, + CELL_USBPSPCM_ERROR_CLOSED = 0x8011040B, + CELL_USBPSPCM_ERROR_NO_DATA = 0x8011040C, }; int cellUsbPspcmInit() diff --git a/rpcs3/Emu/SysCalls/Modules/cellVdec.h b/rpcs3/Emu/SysCalls/Modules/cellVdec.h index 65adee08e0..b0cc5cee54 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellVdec.h +++ b/rpcs3/Emu/SysCalls/Modules/cellVdec.h @@ -7,20 +7,20 @@ // Error Codes enum { - CELL_VDEC_ERROR_ARG = 0x80610101, - CELL_VDEC_ERROR_SEQ = 0x80610102, - CELL_VDEC_ERROR_BUSY = 0x80610103, - CELL_VDEC_ERROR_EMPTY = 0x80610104, - CELL_VDEC_ERROR_AU = 0x80610105, - CELL_VDEC_ERROR_PIC = 0x80610106, - CELL_VDEC_ERROR_FATAL = 0x80610180, + CELL_VDEC_ERROR_ARG = 0x80610101, + CELL_VDEC_ERROR_SEQ = 0x80610102, + CELL_VDEC_ERROR_BUSY = 0x80610103, + CELL_VDEC_ERROR_EMPTY = 0x80610104, + CELL_VDEC_ERROR_AU = 0x80610105, + CELL_VDEC_ERROR_PIC = 0x80610106, + CELL_VDEC_ERROR_FATAL = 0x80610180, }; enum CellVdecCodecType { - CELL_VDEC_CODEC_TYPE_MPEG2 = 0x00000000, - CELL_VDEC_CODEC_TYPE_AVC = 0x00000001, - CELL_VDEC_CODEC_TYPE_DIVX = 0x00000005, + CELL_VDEC_CODEC_TYPE_MPEG2 = 0x00000000, + CELL_VDEC_CODEC_TYPE_AVC = 0x00000001, + CELL_VDEC_CODEC_TYPE_DIVX = 0x00000005, }; // Callback Messages @@ -65,14 +65,14 @@ enum CellVdecPicAttr // Universal Frame Rate Code enum CellVdecFrameRate : u8 { - CELL_VDEC_FRC_24000DIV1001 = 0x80, - CELL_VDEC_FRC_24 = 0x81, - CELL_VDEC_FRC_25 = 0x82, - CELL_VDEC_FRC_30000DIV1001 = 0x83, - CELL_VDEC_FRC_30 = 0x84, - CELL_VDEC_FRC_50 = 0x85, - CELL_VDEC_FRC_60000DIV1001 = 0x86, - CELL_VDEC_FRC_60 = 0x87, + CELL_VDEC_FRC_24000DIV1001 = 0x80, + CELL_VDEC_FRC_24 = 0x81, + CELL_VDEC_FRC_25 = 0x82, + CELL_VDEC_FRC_30000DIV1001 = 0x83, + CELL_VDEC_FRC_30 = 0x84, + CELL_VDEC_FRC_50 = 0x85, + CELL_VDEC_FRC_60000DIV1001 = 0x86, + CELL_VDEC_FRC_60 = 0x87, }; // Codec Type Information diff --git a/rpcs3/Emu/SysCalls/Modules/cellVoice.cpp b/rpcs3/Emu/SysCalls/Modules/cellVoice.cpp index a6ee0abd85..e97c3bcf23 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellVoice.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellVoice.cpp @@ -8,24 +8,24 @@ Module cellVoice(0x0046, cellVoice_init); // Error Codes enum { - CELL_VOICE_ERROR_ADDRESS_INVALID = 0x8031080a, - CELL_VOICE_ERROR_ARGUMENT_INVALID = 0x80310805, - CELL_VOICE_ERROR_CONTAINER_INVALID = 0x80310806, - CELL_VOICE_ERROR_DEVICE_NOT_PRESENT = 0x80310812, - CELL_VOICE_ERROR_EVENT_DISPATCH = 0x80310811, - CELL_VOICE_ERROR_EVENT_QUEUE = 0x8031080f, - CELL_VOICE_ERROR_GENERAL = 0x80310803, - CELL_VOICE_ERROR_LIBVOICE_INITIALIZED = 0x80310802, - CELL_VOICE_ERROR_LIBVOICE_NOT_INIT = 0x80310801, - CELL_VOICE_ERROR_NOT_IMPLEMENTED = 0x80310809, - CELL_VOICE_ERROR_PORT_INVALID = 0x80310804, - CELL_VOICE_ERROR_RESOURCE_INSUFFICIENT = 0x80310808, - CELL_VOICE_ERROR_SERVICE_ATTACHED = 0x8031080c, - CELL_VOICE_ERROR_SERVICE_DETACHED = 0x8031080b, - CELL_VOICE_ERROR_SERVICE_HANDLE = 0x80310810, - CELL_VOICE_ERROR_SERVICE_NOT_FOUND = 0x8031080d, - CELL_VOICE_ERROR_SHAREDMEMORY = 0x8031080e, - CELL_VOICE_ERROR_TOPOLOGY = 0x80310807, + CELL_VOICE_ERROR_ADDRESS_INVALID = 0x8031080a, + CELL_VOICE_ERROR_ARGUMENT_INVALID = 0x80310805, + CELL_VOICE_ERROR_CONTAINER_INVALID = 0x80310806, + CELL_VOICE_ERROR_DEVICE_NOT_PRESENT = 0x80310812, + CELL_VOICE_ERROR_EVENT_DISPATCH = 0x80310811, + CELL_VOICE_ERROR_EVENT_QUEUE = 0x8031080f, + CELL_VOICE_ERROR_GENERAL = 0x80310803, + CELL_VOICE_ERROR_LIBVOICE_INITIALIZED = 0x80310802, + CELL_VOICE_ERROR_LIBVOICE_NOT_INIT = 0x80310801, + CELL_VOICE_ERROR_NOT_IMPLEMENTED = 0x80310809, + CELL_VOICE_ERROR_PORT_INVALID = 0x80310804, + CELL_VOICE_ERROR_RESOURCE_INSUFFICIENT = 0x80310808, + CELL_VOICE_ERROR_SERVICE_ATTACHED = 0x8031080c, + CELL_VOICE_ERROR_SERVICE_DETACHED = 0x8031080b, + CELL_VOICE_ERROR_SERVICE_HANDLE = 0x80310810, + CELL_VOICE_ERROR_SERVICE_NOT_FOUND = 0x8031080d, + CELL_VOICE_ERROR_SHAREDMEMORY = 0x8031080e, + CELL_VOICE_ERROR_TOPOLOGY = 0x80310807, }; int cellVoiceConnectIPortToOPort() diff --git a/rpcs3/Emu/SysCalls/Modules/cellVpost.h b/rpcs3/Emu/SysCalls/Modules/cellVpost.h index ab54a695fa..e69cf9e09a 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellVpost.h +++ b/rpcs3/Emu/SysCalls/Modules/cellVpost.h @@ -3,138 +3,138 @@ // Error Codes enum { - CELL_VPOST_ERROR_Q_ARG_CFG_NULL = 0x80610410, - CELL_VPOST_ERROR_Q_ARG_CFG_INVALID = 0x80610411, - CELL_VPOST_ERROR_Q_ARG_ATTR_NULL = 0x80610412, - CELL_VPOST_ERROR_O_ARG_CFG_NULL = 0x80610440, - CELL_VPOST_ERROR_O_ARG_CFG_INVALID = 0x80610441, - CELL_VPOST_ERROR_O_ARG_RSRC_NULL = 0x80610442, - CELL_VPOST_ERROR_O_ARG_RSRC_INVALID = 0x80610443, - CELL_VPOST_ERROR_O_ARG_HDL_NULL = 0x80610444, - CELL_VPOST_ERROR_O_FATAL_QUERY_FAIL = 0x80610460, - CELL_VPOST_ERROR_O_FATAL_CREATEMON_FAIL = 0x80610461, - CELL_VPOST_ERROR_O_FATAL_INITSPURS_FAIL = 0x80610462, - CELL_VPOST_ERROR_C_ARG_HDL_NULL = 0x80610470, - CELL_VPOST_ERROR_C_ARG_HDL_INVALID = 0x80610471, - CELL_VPOST_ERROR_C_FATAL_LOCKMON_FAIL = 0x80610490, - CELL_VPOST_ERROR_C_FATAL_UNLOCKMON_FAIL = 0x80610491, - CELL_VPOST_ERROR_C_FATAL_DESTROYMON_FAIL = 0x80610492, - CELL_VPOST_ERROR_C_FATAL_FINSPURS_FAIL = 0x80610463, - CELL_VPOST_ERROR_E_ARG_HDL_NULL = 0x806104a0, - CELL_VPOST_ERROR_E_ARG_HDL_INVALID = 0x806104a1, - CELL_VPOST_ERROR_E_ARG_INPICBUF_NULL = 0x806104a2, - CELL_VPOST_ERROR_E_ARG_INPICBUF_INVALID = 0x806104a3, - CELL_VPOST_ERROR_E_ARG_CTRL_NULL = 0x806104a4, - CELL_VPOST_ERROR_E_ARG_CTRL_INVALID = 0x806104a5, - CELL_VPOST_ERROR_E_ARG_OUTPICBUF_NULL = 0x806104a6, - CELL_VPOST_ERROR_E_ARG_OUTPICBUF_INVALID = 0x806104a7, - CELL_VPOST_ERROR_E_ARG_PICINFO_NULL = 0x806104a8, - CELL_VPOST_ERROR_E_FATAL_LOCKMON_FAIL = 0x806104c0, - CELL_VPOST_ERROR_E_FATAL_UNLOCKMON_FAIL = 0x806104c1, - CELL_VPOST_ENT_ERROR_Q_ARG_ATTR_NULL = 0x80618110, - CELL_VPOST_ENT_ERROR_O_ARG_RSRC_NULL = 0x80618140, - CELL_VPOST_ENT_ERROR_O_ARG_RSRC_INVALID = 0x80618141, - CELL_VPOST_ENT_ERROR_O_ARG_HDL_NULL = 0x80618142, - CELL_VPOST_ENT_ERROR_O_FATAL_QUERY_FAIL = 0x80618160, - CELL_VPOST_ENT_ERROR_O_FATAL_CSPUCORE_FAIL = 0x80618161, - CELL_VPOST_ENT_ERROR_C_ARG_HDL_NULL = 0x80618170, - CELL_VPOST_ENT_ERROR_C_ARG_HDL_INVALID = 0x80618171, - CELL_VPOST_ENT_ERROR_C_FATAL_SNDCMD_FAIL = 0x80618190, - CELL_VPOST_ENT_ERROR_C_FATAL_RCVRES_FAIL = 0x80618191, - CELL_VPOST_ENT_ERROR_C_FATAL_DSPUCORE_FAIL = 0x80618192, - CELL_VPOST_ENT_ERROR_E_ARG_HDL_NULL = 0x806181a0, - CELL_VPOST_ENT_ERROR_E_ARG_HDL_INVALID = 0x806181a1, - CELL_VPOST_ENT_ERROR_E_ARG_INPICBUF_NULL = 0x806181a2, - CELL_VPOST_ENT_ERROR_E_ARG_INPICBUF_INVALID = 0x806181a3, - CELL_VPOST_ENT_ERROR_E_ARG_INPICINFO_NULL = 0x806181a4, - CELL_VPOST_ENT_ERROR_E_ARG_INPICINFO_INVALID = 0x806181a5, - CELL_VPOST_ENT_ERROR_E_ARG_CTRL_NULL = 0x806181a6, - CELL_VPOST_ENT_ERROR_E_ARG_CTRL_INVALID = 0x806181a7, - CELL_VPOST_ENT_ERROR_E_ARG_COMB_INVALID = 0x806181a8, - CELL_VPOST_ENT_ERROR_E_ARG_OUTPICBUF_NULL = 0x806181a9, - CELL_VPOST_ENT_ERROR_E_ARG_OUTPICBUF_INVALID = 0x806181aa, - CELL_VPOST_ENT_ERROR_E_ARG_OUTPICINFO_NULL = 0x806181ab, - CELL_VPOST_ENT_ERROR_E_FATAL_SNDCMD_FAIL = 0x806181c0, - CELL_VPOST_ENT_ERROR_E_FATAL_RCVRES_FAIL = 0x806181c1, - CELL_VPOST_ENT_ERROR_E_FATAL_SPUCORE_FAIL = 0x806181c2, - CELL_VPOST_IPC_ERROR_Q_ARG_ATTR_NULL = 0x80618210, - CELL_VPOST_IPC_ERROR_O_ARG_RSRC_NULL = 0x80618240, - CELL_VPOST_IPC_ERROR_O_ARG_RSRC_INVALID = 0x80618241, - CELL_VPOST_IPC_ERROR_O_ARG_HDL_NULL = 0x80618242, - CELL_VPOST_IPC_ERROR_O_FATAL_QUERY_FAIL = 0x80618260, - CELL_VPOST_IPC_ERROR_O_FATAL_CSPUCORE_FAIL = 0x80618261, - CELL_VPOST_IPC_ERROR_C_ARG_HDL_NULL = 0x80618270, - CELL_VPOST_IPC_ERROR_C_ARG_HDL_INVALID = 0x80618271, - CELL_VPOST_IPC_ERROR_C_FATAL_SNDCMD_FAIL = 0x80618290, - CELL_VPOST_IPC_ERROR_C_FATAL_RCVRES_FAIL = 0x80618291, - CELL_VPOST_IPC_ERROR_C_FATAL_DSPUCORE_FAIL = 0x80618292, - CELL_VPOST_IPC_ERROR_E_ARG_HDL_NULL = 0x806182a0, - CELL_VPOST_IPC_ERROR_E_ARG_HDL_INVALID = 0x806182a1, - CELL_VPOST_IPC_ERROR_E_ARG_INPICBUF_NULL = 0x806182a2, - CELL_VPOST_IPC_ERROR_E_ARG_INPICBUF_INVALID = 0x806182a3, - CELL_VPOST_IPC_ERROR_E_ARG_INPICINFO_NULL = 0x806182a4, - CELL_VPOST_IPC_ERROR_E_ARG_INPICINFO_INVALID = 0x806182a5, - CELL_VPOST_IPC_ERROR_E_ARG_CTRL_NULL = 0x806182a6, - CELL_VPOST_IPC_ERROR_E_ARG_CTRL_INVALID = 0x806182a7, - CELL_VPOST_IPC_ERROR_E_ARG_COMB_INVALID = 0x806182a8, - CELL_VPOST_IPC_ERROR_E_ARG_OUTPICBUF_NULL = 0x806182a9, - CELL_VPOST_IPC_ERROR_E_ARG_OUTPICBUF_INVALID = 0x806182aa, - CELL_VPOST_IPC_ERROR_E_ARG_OUTPICINFO_NULL = 0x806182ab, - CELL_VPOST_IPC_ERROR_E_FATAL_SNDCMD_FAIL = 0x806182c0, - CELL_VPOST_IPC_ERROR_E_FATAL_RCVRES_FAIL = 0x806182c1, - CELL_VPOST_IPC_ERROR_E_FATAL_SPUCORE_FAIL = 0x806182c2, - CELL_VPOST_VSC_ERROR_Q_ARG_ATTR_NULL = 0x80618310, - CELL_VPOST_VSC_ERROR_O_ARG_RSRC_NULL = 0x80618340, - CELL_VPOST_VSC_ERROR_O_ARG_RSRC_INVALID = 0x80618341, - CELL_VPOST_VSC_ERROR_O_ARG_HDL_NULL = 0x80618342, - CELL_VPOST_VSC_ERROR_O_FATAL_QUERY_FAIL = 0x80618360, - CELL_VPOST_VSC_ERROR_O_FATAL_CSPUCORE_FAIL = 0x80618361, - CELL_VPOST_VSC_ERROR_C_ARG_HDL_NULL = 0x80618370, - CELL_VPOST_VSC_ERROR_C_ARG_HDL_INVALID = 0x80618371, - CELL_VPOST_VSC_ERROR_C_FATAL_SNDCMD_FAIL = 0x80618390, - CELL_VPOST_VSC_ERROR_C_FATAL_RCVRES_FAIL = 0x80618391, - CELL_VPOST_VSC_ERROR_C_FATAL_DSPUCORE_FAIL = 0x80618392, - CELL_VPOST_VSC_ERROR_E_ARG_HDL_NULL = 0x806183a0, - CELL_VPOST_VSC_ERROR_E_ARG_HDL_INVALID = 0x806183a1, - CELL_VPOST_VSC_ERROR_E_ARG_INPICBUF_NULL = 0x806183a2, - CELL_VPOST_VSC_ERROR_E_ARG_INPICBUF_INVALID = 0x806183a3, - CELL_VPOST_VSC_ERROR_E_ARG_INPICINFO_NULL = 0x806183a4, - CELL_VPOST_VSC_ERROR_E_ARG_INPICINFO_INVALID = 0x806183a5, - CELL_VPOST_VSC_ERROR_E_ARG_CTRL_NULL = 0x806183a6, - CELL_VPOST_VSC_ERROR_E_ARG_CTRL_INVALID = 0x806183a7, - CELL_VPOST_VSC_ERROR_E_ARG_COMB_INVALID = 0x806183a8, - CELL_VPOST_VSC_ERROR_E_ARG_OUTPICBUF_NULL = 0x806183a9, - CELL_VPOST_VSC_ERROR_E_ARG_OUTPICBUF_INVALID = 0x806183aa, - CELL_VPOST_VSC_ERROR_E_ARG_OUTPICINFO_NULL = 0x806183ab, - CELL_VPOST_VSC_ERROR_E_FATAL_SNDCMD_FAIL = 0x806183c0, - CELL_VPOST_VSC_ERROR_E_FATAL_RCVRES_FAIL = 0x806183c1, - CELL_VPOST_VSC_ERROR_E_FATAL_SPUCORE_FAIL = 0x806183c2, - CELL_VPOST_CSC_ERROR_Q_ARG_ATTR_NULL = 0x80618410, - CELL_VPOST_CSC_ERROR_O_ARG_RSRC_NULL = 0x80618440, - CELL_VPOST_CSC_ERROR_O_ARG_RSRC_INVALID = 0x80618441, - CELL_VPOST_CSC_ERROR_O_ARG_HDL_NULL = 0x80618442, - CELL_VPOST_CSC_ERROR_O_FATAL_QUERY_FAIL = 0x80618460, - CELL_VPOST_CSC_ERROR_O_FATAL_CSPUCORE_FAIL = 0x80618461, - CELL_VPOST_CSC_ERROR_C_ARG_HDL_NULL = 0x80618470, - CELL_VPOST_CSC_ERROR_C_ARG_HDL_INVALID = 0x80618471, - CELL_VPOST_CSC_ERROR_C_FATAL_SNDCMD_FAIL = 0x80618490, - CELL_VPOST_CSC_ERROR_C_FATAL_RCVRES_FAIL = 0x80618491, - CELL_VPOST_CSC_ERROR_C_FATAL_DSPUCORE_FAIL = 0x80618492, - CELL_VPOST_CSC_ERROR_E_ARG_HDL_NULL = 0x806184a0, - CELL_VPOST_CSC_ERROR_E_ARG_HDL_INVALID = 0x806184a1, - CELL_VPOST_CSC_ERROR_E_ARG_INPICBUF_NULL = 0x806184a2, - CELL_VPOST_CSC_ERROR_E_ARG_INPICBUF_INVALID = 0x806184a3, - CELL_VPOST_CSC_ERROR_E_ARG_INPICINFO_NULL = 0x806184a4, - CELL_VPOST_CSC_ERROR_E_ARG_INPICINFO_INVALID = 0x806184a5, - CELL_VPOST_CSC_ERROR_E_ARG_CTRL_NULL = 0x806184a6, - CELL_VPOST_CSC_ERROR_E_ARG_CTRL_INVALID = 0x806184a7, - CELL_VPOST_CSC_ERROR_E_ARG_COMB_INVALID = 0x806184a8, - CELL_VPOST_CSC_ERROR_E_ARG_OUTPICBUF_NULL = 0x806184a9, - CELL_VPOST_CSC_ERROR_E_ARG_OUTPICBUF_INVALID = 0x806184aa, - CELL_VPOST_CSC_ERROR_E_ARG_OUTPICINFO_NULL = 0x806184ab, - CELL_VPOST_CSC_ERROR_E_FATAL_SNDCMD_FAIL = 0x806184c0, - CELL_VPOST_CSC_ERROR_E_FATAL_RCVRES_FAIL = 0x806184c1, - CELL_VPOST_CSC_ERROR_E_FATAL_SPUCORE_FAIL = 0x806184c2, + CELL_VPOST_ERROR_Q_ARG_CFG_NULL = 0x80610410, + CELL_VPOST_ERROR_Q_ARG_CFG_INVALID = 0x80610411, + CELL_VPOST_ERROR_Q_ARG_ATTR_NULL = 0x80610412, + CELL_VPOST_ERROR_O_ARG_CFG_NULL = 0x80610440, + CELL_VPOST_ERROR_O_ARG_CFG_INVALID = 0x80610441, + CELL_VPOST_ERROR_O_ARG_RSRC_NULL = 0x80610442, + CELL_VPOST_ERROR_O_ARG_RSRC_INVALID = 0x80610443, + CELL_VPOST_ERROR_O_ARG_HDL_NULL = 0x80610444, + CELL_VPOST_ERROR_O_FATAL_QUERY_FAIL = 0x80610460, + CELL_VPOST_ERROR_O_FATAL_CREATEMON_FAIL = 0x80610461, + CELL_VPOST_ERROR_O_FATAL_INITSPURS_FAIL = 0x80610462, + CELL_VPOST_ERROR_C_ARG_HDL_NULL = 0x80610470, + CELL_VPOST_ERROR_C_ARG_HDL_INVALID = 0x80610471, + CELL_VPOST_ERROR_C_FATAL_LOCKMON_FAIL = 0x80610490, + CELL_VPOST_ERROR_C_FATAL_UNLOCKMON_FAIL = 0x80610491, + CELL_VPOST_ERROR_C_FATAL_DESTROYMON_FAIL = 0x80610492, + CELL_VPOST_ERROR_C_FATAL_FINSPURS_FAIL = 0x80610463, + CELL_VPOST_ERROR_E_ARG_HDL_NULL = 0x806104a0, + CELL_VPOST_ERROR_E_ARG_HDL_INVALID = 0x806104a1, + CELL_VPOST_ERROR_E_ARG_INPICBUF_NULL = 0x806104a2, + CELL_VPOST_ERROR_E_ARG_INPICBUF_INVALID = 0x806104a3, + CELL_VPOST_ERROR_E_ARG_CTRL_NULL = 0x806104a4, + CELL_VPOST_ERROR_E_ARG_CTRL_INVALID = 0x806104a5, + CELL_VPOST_ERROR_E_ARG_OUTPICBUF_NULL = 0x806104a6, + CELL_VPOST_ERROR_E_ARG_OUTPICBUF_INVALID = 0x806104a7, + CELL_VPOST_ERROR_E_ARG_PICINFO_NULL = 0x806104a8, + CELL_VPOST_ERROR_E_FATAL_LOCKMON_FAIL = 0x806104c0, + CELL_VPOST_ERROR_E_FATAL_UNLOCKMON_FAIL = 0x806104c1, + CELL_VPOST_ENT_ERROR_Q_ARG_ATTR_NULL = 0x80618110, + CELL_VPOST_ENT_ERROR_O_ARG_RSRC_NULL = 0x80618140, + CELL_VPOST_ENT_ERROR_O_ARG_RSRC_INVALID = 0x80618141, + CELL_VPOST_ENT_ERROR_O_ARG_HDL_NULL = 0x80618142, + CELL_VPOST_ENT_ERROR_O_FATAL_QUERY_FAIL = 0x80618160, + CELL_VPOST_ENT_ERROR_O_FATAL_CSPUCORE_FAIL = 0x80618161, + CELL_VPOST_ENT_ERROR_C_ARG_HDL_NULL = 0x80618170, + CELL_VPOST_ENT_ERROR_C_ARG_HDL_INVALID = 0x80618171, + CELL_VPOST_ENT_ERROR_C_FATAL_SNDCMD_FAIL = 0x80618190, + CELL_VPOST_ENT_ERROR_C_FATAL_RCVRES_FAIL = 0x80618191, + CELL_VPOST_ENT_ERROR_C_FATAL_DSPUCORE_FAIL = 0x80618192, + CELL_VPOST_ENT_ERROR_E_ARG_HDL_NULL = 0x806181a0, + CELL_VPOST_ENT_ERROR_E_ARG_HDL_INVALID = 0x806181a1, + CELL_VPOST_ENT_ERROR_E_ARG_INPICBUF_NULL = 0x806181a2, + CELL_VPOST_ENT_ERROR_E_ARG_INPICBUF_INVALID = 0x806181a3, + CELL_VPOST_ENT_ERROR_E_ARG_INPICINFO_NULL = 0x806181a4, + CELL_VPOST_ENT_ERROR_E_ARG_INPICINFO_INVALID = 0x806181a5, + CELL_VPOST_ENT_ERROR_E_ARG_CTRL_NULL = 0x806181a6, + CELL_VPOST_ENT_ERROR_E_ARG_CTRL_INVALID = 0x806181a7, + CELL_VPOST_ENT_ERROR_E_ARG_COMB_INVALID = 0x806181a8, + CELL_VPOST_ENT_ERROR_E_ARG_OUTPICBUF_NULL = 0x806181a9, + CELL_VPOST_ENT_ERROR_E_ARG_OUTPICBUF_INVALID = 0x806181aa, + CELL_VPOST_ENT_ERROR_E_ARG_OUTPICINFO_NULL = 0x806181ab, + CELL_VPOST_ENT_ERROR_E_FATAL_SNDCMD_FAIL = 0x806181c0, + CELL_VPOST_ENT_ERROR_E_FATAL_RCVRES_FAIL = 0x806181c1, + CELL_VPOST_ENT_ERROR_E_FATAL_SPUCORE_FAIL = 0x806181c2, + CELL_VPOST_IPC_ERROR_Q_ARG_ATTR_NULL = 0x80618210, + CELL_VPOST_IPC_ERROR_O_ARG_RSRC_NULL = 0x80618240, + CELL_VPOST_IPC_ERROR_O_ARG_RSRC_INVALID = 0x80618241, + CELL_VPOST_IPC_ERROR_O_ARG_HDL_NULL = 0x80618242, + CELL_VPOST_IPC_ERROR_O_FATAL_QUERY_FAIL = 0x80618260, + CELL_VPOST_IPC_ERROR_O_FATAL_CSPUCORE_FAIL = 0x80618261, + CELL_VPOST_IPC_ERROR_C_ARG_HDL_NULL = 0x80618270, + CELL_VPOST_IPC_ERROR_C_ARG_HDL_INVALID = 0x80618271, + CELL_VPOST_IPC_ERROR_C_FATAL_SNDCMD_FAIL = 0x80618290, + CELL_VPOST_IPC_ERROR_C_FATAL_RCVRES_FAIL = 0x80618291, + CELL_VPOST_IPC_ERROR_C_FATAL_DSPUCORE_FAIL = 0x80618292, + CELL_VPOST_IPC_ERROR_E_ARG_HDL_NULL = 0x806182a0, + CELL_VPOST_IPC_ERROR_E_ARG_HDL_INVALID = 0x806182a1, + CELL_VPOST_IPC_ERROR_E_ARG_INPICBUF_NULL = 0x806182a2, + CELL_VPOST_IPC_ERROR_E_ARG_INPICBUF_INVALID = 0x806182a3, + CELL_VPOST_IPC_ERROR_E_ARG_INPICINFO_NULL = 0x806182a4, + CELL_VPOST_IPC_ERROR_E_ARG_INPICINFO_INVALID = 0x806182a5, + CELL_VPOST_IPC_ERROR_E_ARG_CTRL_NULL = 0x806182a6, + CELL_VPOST_IPC_ERROR_E_ARG_CTRL_INVALID = 0x806182a7, + CELL_VPOST_IPC_ERROR_E_ARG_COMB_INVALID = 0x806182a8, + CELL_VPOST_IPC_ERROR_E_ARG_OUTPICBUF_NULL = 0x806182a9, + CELL_VPOST_IPC_ERROR_E_ARG_OUTPICBUF_INVALID = 0x806182aa, + CELL_VPOST_IPC_ERROR_E_ARG_OUTPICINFO_NULL = 0x806182ab, + CELL_VPOST_IPC_ERROR_E_FATAL_SNDCMD_FAIL = 0x806182c0, + CELL_VPOST_IPC_ERROR_E_FATAL_RCVRES_FAIL = 0x806182c1, + CELL_VPOST_IPC_ERROR_E_FATAL_SPUCORE_FAIL = 0x806182c2, + CELL_VPOST_VSC_ERROR_Q_ARG_ATTR_NULL = 0x80618310, + CELL_VPOST_VSC_ERROR_O_ARG_RSRC_NULL = 0x80618340, + CELL_VPOST_VSC_ERROR_O_ARG_RSRC_INVALID = 0x80618341, + CELL_VPOST_VSC_ERROR_O_ARG_HDL_NULL = 0x80618342, + CELL_VPOST_VSC_ERROR_O_FATAL_QUERY_FAIL = 0x80618360, + CELL_VPOST_VSC_ERROR_O_FATAL_CSPUCORE_FAIL = 0x80618361, + CELL_VPOST_VSC_ERROR_C_ARG_HDL_NULL = 0x80618370, + CELL_VPOST_VSC_ERROR_C_ARG_HDL_INVALID = 0x80618371, + CELL_VPOST_VSC_ERROR_C_FATAL_SNDCMD_FAIL = 0x80618390, + CELL_VPOST_VSC_ERROR_C_FATAL_RCVRES_FAIL = 0x80618391, + CELL_VPOST_VSC_ERROR_C_FATAL_DSPUCORE_FAIL = 0x80618392, + CELL_VPOST_VSC_ERROR_E_ARG_HDL_NULL = 0x806183a0, + CELL_VPOST_VSC_ERROR_E_ARG_HDL_INVALID = 0x806183a1, + CELL_VPOST_VSC_ERROR_E_ARG_INPICBUF_NULL = 0x806183a2, + CELL_VPOST_VSC_ERROR_E_ARG_INPICBUF_INVALID = 0x806183a3, + CELL_VPOST_VSC_ERROR_E_ARG_INPICINFO_NULL = 0x806183a4, + CELL_VPOST_VSC_ERROR_E_ARG_INPICINFO_INVALID = 0x806183a5, + CELL_VPOST_VSC_ERROR_E_ARG_CTRL_NULL = 0x806183a6, + CELL_VPOST_VSC_ERROR_E_ARG_CTRL_INVALID = 0x806183a7, + CELL_VPOST_VSC_ERROR_E_ARG_COMB_INVALID = 0x806183a8, + CELL_VPOST_VSC_ERROR_E_ARG_OUTPICBUF_NULL = 0x806183a9, + CELL_VPOST_VSC_ERROR_E_ARG_OUTPICBUF_INVALID = 0x806183aa, + CELL_VPOST_VSC_ERROR_E_ARG_OUTPICINFO_NULL = 0x806183ab, + CELL_VPOST_VSC_ERROR_E_FATAL_SNDCMD_FAIL = 0x806183c0, + CELL_VPOST_VSC_ERROR_E_FATAL_RCVRES_FAIL = 0x806183c1, + CELL_VPOST_VSC_ERROR_E_FATAL_SPUCORE_FAIL = 0x806183c2, + CELL_VPOST_CSC_ERROR_Q_ARG_ATTR_NULL = 0x80618410, + CELL_VPOST_CSC_ERROR_O_ARG_RSRC_NULL = 0x80618440, + CELL_VPOST_CSC_ERROR_O_ARG_RSRC_INVALID = 0x80618441, + CELL_VPOST_CSC_ERROR_O_ARG_HDL_NULL = 0x80618442, + CELL_VPOST_CSC_ERROR_O_FATAL_QUERY_FAIL = 0x80618460, + CELL_VPOST_CSC_ERROR_O_FATAL_CSPUCORE_FAIL = 0x80618461, + CELL_VPOST_CSC_ERROR_C_ARG_HDL_NULL = 0x80618470, + CELL_VPOST_CSC_ERROR_C_ARG_HDL_INVALID = 0x80618471, + CELL_VPOST_CSC_ERROR_C_FATAL_SNDCMD_FAIL = 0x80618490, + CELL_VPOST_CSC_ERROR_C_FATAL_RCVRES_FAIL = 0x80618491, + CELL_VPOST_CSC_ERROR_C_FATAL_DSPUCORE_FAIL = 0x80618492, + CELL_VPOST_CSC_ERROR_E_ARG_HDL_NULL = 0x806184a0, + CELL_VPOST_CSC_ERROR_E_ARG_HDL_INVALID = 0x806184a1, + CELL_VPOST_CSC_ERROR_E_ARG_INPICBUF_NULL = 0x806184a2, + CELL_VPOST_CSC_ERROR_E_ARG_INPICBUF_INVALID = 0x806184a3, + CELL_VPOST_CSC_ERROR_E_ARG_INPICINFO_NULL = 0x806184a4, + CELL_VPOST_CSC_ERROR_E_ARG_INPICINFO_INVALID = 0x806184a5, + CELL_VPOST_CSC_ERROR_E_ARG_CTRL_NULL = 0x806184a6, + CELL_VPOST_CSC_ERROR_E_ARG_CTRL_INVALID = 0x806184a7, + CELL_VPOST_CSC_ERROR_E_ARG_COMB_INVALID = 0x806184a8, + CELL_VPOST_CSC_ERROR_E_ARG_OUTPICBUF_NULL = 0x806184a9, + CELL_VPOST_CSC_ERROR_E_ARG_OUTPICBUF_INVALID = 0x806184aa, + CELL_VPOST_CSC_ERROR_E_ARG_OUTPICINFO_NULL = 0x806184ab, + CELL_VPOST_CSC_ERROR_E_FATAL_SNDCMD_FAIL = 0x806184c0, + CELL_VPOST_CSC_ERROR_E_FATAL_RCVRES_FAIL = 0x806184c1, + CELL_VPOST_CSC_ERROR_E_FATAL_SPUCORE_FAIL = 0x806184c2, }; enum CellVpostPictureDepth diff --git a/rpcs3/Emu/SysCalls/Modules/libmixer.h b/rpcs3/Emu/SysCalls/Modules/libmixer.h index 590e6e2110..7e4c33a1fa 100644 --- a/rpcs3/Emu/SysCalls/Modules/libmixer.h +++ b/rpcs3/Emu/SysCalls/Modules/libmixer.h @@ -1,16 +1,15 @@ #pragma once -enum +enum //libmixer Error Codes { - //libmixer Error Codes - CELL_LIBMIXER_ERROR_NOT_INITIALIZED = 0x80310002, - CELL_LIBMIXER_ERROR_INVALID_PARAMATER = 0x80310003, - CELL_LIBMIXER_ERROR_NO_MEMORY = 0x80310005, - CELL_LIBMIXER_ERROR_ALREADY_EXIST = 0x80310006, - CELL_LIBMIXER_ERROR_FULL = 0x80310007, - CELL_LIBMIXER_ERROR_NOT_EXIST = 0x80310008, - CELL_LIBMIXER_ERROR_TYPE_MISMATCH = 0x80310009, - CELL_LIBMIXER_ERROR_NOT_FOUND = 0x8031000a, + CELL_LIBMIXER_ERROR_NOT_INITIALIZED = 0x80310002, + CELL_LIBMIXER_ERROR_INVALID_PARAMATER = 0x80310003, + CELL_LIBMIXER_ERROR_NO_MEMORY = 0x80310005, + CELL_LIBMIXER_ERROR_ALREADY_EXIST = 0x80310006, + CELL_LIBMIXER_ERROR_FULL = 0x80310007, + CELL_LIBMIXER_ERROR_NOT_EXIST = 0x80310008, + CELL_LIBMIXER_ERROR_TYPE_MISMATCH = 0x80310009, + CELL_LIBMIXER_ERROR_NOT_FOUND = 0x8031000a, }; typedef int (*CellSurMixerNotifyCallbackFunction)(void *arg, u32 counter, u32 samples); diff --git a/rpcs3/Emu/SysCalls/Modules/sceNpTrophy.h b/rpcs3/Emu/SysCalls/Modules/sceNpTrophy.h index 6245c0688c..e54088feaf 100644 --- a/rpcs3/Emu/SysCalls/Modules/sceNpTrophy.h +++ b/rpcs3/Emu/SysCalls/Modules/sceNpTrophy.h @@ -3,50 +3,50 @@ enum { - SCE_NP_TROPHY_ERROR_ALREADY_INITIALIZED = 0x80022901, - SCE_NP_TROPHY_ERROR_NOT_INITIALIZED = 0x80022902, - SCE_NP_TROPHY_ERROR_NOT_SUPPORTED = 0x80022903, - SCE_NP_TROPHY_ERROR_CONTEXT_NOT_REGISTERED = 0x80022904, - SCE_NP_TROPHY_ERROR_OUT_OF_MEMORY = 0x80022905, - SCE_NP_TROPHY_ERROR_INVALID_ARGUMENT = 0x80022906, - SCE_NP_TROPHY_ERROR_EXCEEDS_MAX = 0x80022907, - SCE_NP_TROPHY_ERROR_INSUFFICIENT = 0x80022909, - SCE_NP_TROPHY_ERROR_UNKNOWN_CONTEXT = 0x8002290a, - SCE_NP_TROPHY_ERROR_INVALID_FORMAT = 0x8002290b, - SCE_NP_TROPHY_ERROR_BAD_RESPONSE = 0x8002290c, - SCE_NP_TROPHY_ERROR_INVALID_GRADE = 0x8002290d, - SCE_NP_TROPHY_ERROR_INVALID_CONTEXT = 0x8002290e, - SCE_NP_TROPHY_ERROR_PROCESSING_ABORTED = 0x8002290f, - SCE_NP_TROPHY_ERROR_ABORT = 0x80022910, - SCE_NP_TROPHY_ERROR_UNKNOWN_HANDLE = 0x80022911, - SCE_NP_TROPHY_ERROR_LOCKED = 0x80022912, - SCE_NP_TROPHY_ERROR_HIDDEN = 0x80022913, - SCE_NP_TROPHY_ERROR_CANNOT_UNLOCK_PLATINUM = 0x80022914, - SCE_NP_TROPHY_ERROR_ALREADY_UNLOCKED = 0x80022915, - SCE_NP_TROPHY_ERROR_INVALID_TYPE = 0x80022916, - SCE_NP_TROPHY_ERROR_INVALID_HANDLE = 0x80022917, - SCE_NP_TROPHY_ERROR_INVALID_NP_COMM_ID = 0x80022918, - SCE_NP_TROPHY_ERROR_UNKNOWN_NP_COMM_ID = 0x80022919, - SCE_NP_TROPHY_ERROR_DISC_IO = 0x8002291a, - SCE_NP_TROPHY_ERROR_CONF_DOES_NOT_EXIST = 0x8002291b, - SCE_NP_TROPHY_ERROR_UNSUPPORTED_FORMAT = 0x8002291c, - SCE_NP_TROPHY_ERROR_ALREADY_INSTALLED = 0x8002291d, - SCE_NP_TROPHY_ERROR_BROKEN_DATA = 0x8002291e, - SCE_NP_TROPHY_ERROR_VERIFICATION_FAILURE = 0x8002291f, - SCE_NP_TROPHY_ERROR_INVALID_TROPHY_ID = 0x80022920, - SCE_NP_TROPHY_ERROR_UNKNOWN_TROPHY_ID = 0x80022921, - SCE_NP_TROPHY_ERROR_UNKNOWN_TITLE = 0x80022922, - SCE_NP_TROPHY_ERROR_UNKNOWN_FILE = 0x80022923, - SCE_NP_TROPHY_ERROR_DISC_NOT_MOUNTED = 0x80022924, - SCE_NP_TROPHY_ERROR_SHUTDOWN = 0x80022925, - SCE_NP_TROPHY_ERROR_TITLE_ICON_NOT_FOUND = 0x80022926, - SCE_NP_TROPHY_ERROR_TROPHY_ICON_NOT_FOUND = 0x80022927, - SCE_NP_TROPHY_ERROR_INSUFFICIENT_DISK_SPACE = 0x80022928, - SCE_NP_TROPHY_ERROR_ILLEGAL_UPDATE = 0x8002292a, + SCE_NP_TROPHY_ERROR_ALREADY_INITIALIZED = 0x80022901, + SCE_NP_TROPHY_ERROR_NOT_INITIALIZED = 0x80022902, + SCE_NP_TROPHY_ERROR_NOT_SUPPORTED = 0x80022903, + SCE_NP_TROPHY_ERROR_CONTEXT_NOT_REGISTERED = 0x80022904, + SCE_NP_TROPHY_ERROR_OUT_OF_MEMORY = 0x80022905, + SCE_NP_TROPHY_ERROR_INVALID_ARGUMENT = 0x80022906, + SCE_NP_TROPHY_ERROR_EXCEEDS_MAX = 0x80022907, + SCE_NP_TROPHY_ERROR_INSUFFICIENT = 0x80022909, + SCE_NP_TROPHY_ERROR_UNKNOWN_CONTEXT = 0x8002290a, + SCE_NP_TROPHY_ERROR_INVALID_FORMAT = 0x8002290b, + SCE_NP_TROPHY_ERROR_BAD_RESPONSE = 0x8002290c, + SCE_NP_TROPHY_ERROR_INVALID_GRADE = 0x8002290d, + SCE_NP_TROPHY_ERROR_INVALID_CONTEXT = 0x8002290e, + SCE_NP_TROPHY_ERROR_PROCESSING_ABORTED = 0x8002290f, + SCE_NP_TROPHY_ERROR_ABORT = 0x80022910, + SCE_NP_TROPHY_ERROR_UNKNOWN_HANDLE = 0x80022911, + SCE_NP_TROPHY_ERROR_LOCKED = 0x80022912, + SCE_NP_TROPHY_ERROR_HIDDEN = 0x80022913, + SCE_NP_TROPHY_ERROR_CANNOT_UNLOCK_PLATINUM = 0x80022914, + SCE_NP_TROPHY_ERROR_ALREADY_UNLOCKED = 0x80022915, + SCE_NP_TROPHY_ERROR_INVALID_TYPE = 0x80022916, + SCE_NP_TROPHY_ERROR_INVALID_HANDLE = 0x80022917, + SCE_NP_TROPHY_ERROR_INVALID_NP_COMM_ID = 0x80022918, + SCE_NP_TROPHY_ERROR_UNKNOWN_NP_COMM_ID = 0x80022919, + SCE_NP_TROPHY_ERROR_DISC_IO = 0x8002291a, + SCE_NP_TROPHY_ERROR_CONF_DOES_NOT_EXIST = 0x8002291b, + SCE_NP_TROPHY_ERROR_UNSUPPORTED_FORMAT = 0x8002291c, + SCE_NP_TROPHY_ERROR_ALREADY_INSTALLED = 0x8002291d, + SCE_NP_TROPHY_ERROR_BROKEN_DATA = 0x8002291e, + SCE_NP_TROPHY_ERROR_VERIFICATION_FAILURE = 0x8002291f, + SCE_NP_TROPHY_ERROR_INVALID_TROPHY_ID = 0x80022920, + SCE_NP_TROPHY_ERROR_UNKNOWN_TROPHY_ID = 0x80022921, + SCE_NP_TROPHY_ERROR_UNKNOWN_TITLE = 0x80022922, + SCE_NP_TROPHY_ERROR_UNKNOWN_FILE = 0x80022923, + SCE_NP_TROPHY_ERROR_DISC_NOT_MOUNTED = 0x80022924, + SCE_NP_TROPHY_ERROR_SHUTDOWN = 0x80022925, + SCE_NP_TROPHY_ERROR_TITLE_ICON_NOT_FOUND = 0x80022926, + SCE_NP_TROPHY_ERROR_TROPHY_ICON_NOT_FOUND = 0x80022927, + SCE_NP_TROPHY_ERROR_INSUFFICIENT_DISK_SPACE = 0x80022928, + SCE_NP_TROPHY_ERROR_ILLEGAL_UPDATE = 0x8002292a, SCE_NP_TROPHY_ERROR_SAVEDATA_USER_DOES_NOT_MATCH = 0x8002292b, - SCE_NP_TROPHY_ERROR_TROPHY_ID_DOES_NOT_EXIST = 0x8002292c, - SCE_NP_TROPHY_ERROR_SERVICE_UNAVAILABLE = 0x8002292d, - SCE_NP_TROPHY_ERROR_UNKNOWN = 0x800229ff, + SCE_NP_TROPHY_ERROR_TROPHY_ID_DOES_NOT_EXIST = 0x8002292c, + SCE_NP_TROPHY_ERROR_SERVICE_UNAVAILABLE = 0x8002292d, + SCE_NP_TROPHY_ERROR_UNKNOWN = 0x800229ff, }; enum diff --git a/rpcs3/Emu/SysCalls/lv2/SC_FileSystem.h b/rpcs3/Emu/SysCalls/lv2/SC_FileSystem.h index 4029d50201..d705b37d6f 100644 --- a/rpcs3/Emu/SysCalls/lv2/SC_FileSystem.h +++ b/rpcs3/Emu/SysCalls/lv2/SC_FileSystem.h @@ -2,15 +2,15 @@ enum CellFsOflag { - CELL_O_RDONLY = 000000, - CELL_O_WRONLY = 000001, - CELL_O_RDWR = 000002, - CELL_O_ACCMODE = 000003, - CELL_O_CREAT = 000100, - CELL_O_EXCL = 000200, - CELL_O_TRUNC = 001000, - CELL_O_APPEND = 002000, - CELL_O_MSELF = 010000, + CELL_O_RDONLY = 000000, + CELL_O_WRONLY = 000001, + CELL_O_RDWR = 000002, + CELL_O_ACCMODE = 000003, + CELL_O_CREAT = 000100, + CELL_O_EXCL = 000200, + CELL_O_TRUNC = 001000, + CELL_O_APPEND = 002000, + CELL_O_MSELF = 010000, }; static const u32 CELL_FS_TYPE_UNKNOWN = 0; @@ -31,43 +31,43 @@ enum CellFsLength enum { - CELL_FS_S_IFDIR = 0040000, //directory - CELL_FS_S_IFREG = 0100000, //regular - CELL_FS_S_IFLNK = 0120000, //symbolic link - CELL_FS_S_IFWHT = 0160000, //unknown + CELL_FS_S_IFDIR = 0040000, //directory + CELL_FS_S_IFREG = 0100000, //regular + CELL_FS_S_IFLNK = 0120000, //symbolic link + CELL_FS_S_IFWHT = 0160000, //unknown - CELL_FS_S_IRUSR = 0000400, //R for owner - CELL_FS_S_IWUSR = 0000200, //W for owner - CELL_FS_S_IXUSR = 0000100, //X for owner + CELL_FS_S_IRUSR = 0000400, //R for owner + CELL_FS_S_IWUSR = 0000200, //W for owner + CELL_FS_S_IXUSR = 0000100, //X for owner - CELL_FS_S_IRGRP = 0000040, //R for group - CELL_FS_S_IWGRP = 0000020, //W for group - CELL_FS_S_IXGRP = 0000010, //X for group + CELL_FS_S_IRGRP = 0000040, //R for group + CELL_FS_S_IWGRP = 0000020, //W for group + CELL_FS_S_IXGRP = 0000010, //X for group - CELL_FS_S_IROTH = 0000004, //R for other - CELL_FS_S_IWOTH = 0000002, //W for other - CELL_FS_S_IXOTH = 0000001, //X for other + CELL_FS_S_IROTH = 0000004, //R for other + CELL_FS_S_IWOTH = 0000002, //W for other + CELL_FS_S_IXOTH = 0000001, //X for other }; enum FsDirentType { - CELL_FS_TYPE_DIRECTORY = 1, - CELL_FS_TYPE_REGULAR = 2, - CELL_FS_TYPE_SYMLINK = 3, + CELL_FS_TYPE_DIRECTORY = 1, + CELL_FS_TYPE_REGULAR = 2, + CELL_FS_TYPE_SYMLINK = 3, }; enum CellFsRingBufferCopy { - CELL_FS_ST_COPY = 0, - CELL_FS_ST_COPYLESS = 1, + CELL_FS_ST_COPY = 0, + CELL_FS_ST_COPYLESS = 1, }; enum cellFsStStatus { - CELL_FS_ST_INITIALIZED = 0x0001, - CELL_FS_ST_NOT_INITIALIZED = 0x0002, - CELL_FS_ST_STOP = 0x0100, - CELL_FS_ST_PROGRESS = 0x0200, + CELL_FS_ST_INITIALIZED = 0x0001, + CELL_FS_ST_NOT_INITIALIZED = 0x0002, + CELL_FS_ST_STOP = 0x0100, + CELL_FS_ST_PROGRESS = 0x0200, }; diff --git a/rpcs3/Emu/SysCalls/lv2/SC_Keyboard.cpp b/rpcs3/Emu/SysCalls/lv2/SC_Keyboard.cpp index ccd3b09acc..a076cfe88f 100644 --- a/rpcs3/Emu/SysCalls/lv2/SC_Keyboard.cpp +++ b/rpcs3/Emu/SysCalls/lv2/SC_Keyboard.cpp @@ -6,14 +6,14 @@ extern Module sys_io; enum CELL_KB_ERROR_CODE { - CELL_KB_ERROR_FATAL = 0x80121001, - CELL_KB_ERROR_INVALID_PARAMETER = 0x80121002, - CELL_KB_ERROR_ALREADY_INITIALIZED = 0x80121003, - CELL_KB_ERROR_UNINITIALIZED = 0x80121004, - CELL_KB_ERROR_RESOURCE_ALLOCATION_FAILED = 0x80121005, - CELL_KB_ERROR_READ_FAILED = 0x80121006, - CELL_KB_ERROR_NO_DEVICE = 0x80121007, - CELL_KB_ERROR_SYS_SETTING_FAILED = 0x80121008, + CELL_KB_ERROR_FATAL = 0x80121001, + CELL_KB_ERROR_INVALID_PARAMETER = 0x80121002, + CELL_KB_ERROR_ALREADY_INITIALIZED = 0x80121003, + CELL_KB_ERROR_UNINITIALIZED = 0x80121004, + CELL_KB_ERROR_RESOURCE_ALLOCATION_FAILED = 0x80121005, + CELL_KB_ERROR_READ_FAILED = 0x80121006, + CELL_KB_ERROR_NO_DEVICE = 0x80121007, + CELL_KB_ERROR_SYS_SETTING_FAILED = 0x80121008, }; int cellKbInit(u32 max_connect) @@ -58,17 +58,17 @@ u16 cellKbCnvRawCode(u32 arrange, u32 mkey, u32 led, u16 rawcode) } // CELL_KB_NUMPAD - if (rawcode >= 0x59 && rawcode <= 0x61) return (rawcode - 0x28) | 0x4000; // '1' - '9' - if (rawcode == 0x62) return 0x30 | 0x4000; // '0' - if (rawcode == 0x53) return 0x00 | 0x4000; // 'Num Lock' - if (rawcode == 0x54) return 0x2F | 0x4000; // '/' - if (rawcode == 0x55) return 0x2A | 0x4000; // '*' - if (rawcode == 0x56) return 0x2D | 0x4000; // '-' - if (rawcode == 0x57) return 0x2B | 0x4000; // '+' - if (rawcode == 0x58) return 0x0A | 0x4000; // '\n' + if (rawcode >= 0x59 && rawcode <= 0x61) return (rawcode - 0x28) | 0x4000; // '1' - '9' + if (rawcode == 0x62) return 0x30 | 0x4000; // '0' + if (rawcode == 0x53) return 0x00 | 0x4000; // 'Num Lock' + if (rawcode == 0x54) return 0x2F | 0x4000; // '/' + if (rawcode == 0x55) return 0x2A | 0x4000; // '*' + if (rawcode == 0x56) return 0x2D | 0x4000; // '-' + if (rawcode == 0x57) return 0x2B | 0x4000; // '+' + if (rawcode == 0x58) return 0x0A | 0x4000; // '\n' // ASCII - if (rawcode >= 0x04 && rawcode <= 0x1D) // 'A' - 'Z' + if (rawcode >= 0x04 && rawcode <= 0x1D) // 'A' - 'Z' { rawcode -= (mkey&(CELL_KB_MKEY_L_SHIFT|CELL_KB_MKEY_R_SHIFT)) ? @@ -76,17 +76,17 @@ u16 cellKbCnvRawCode(u32 arrange, u32 mkey, u32 led, u16 rawcode) ((led&(CELL_KB_LED_CAPS_LOCK)) ? 0x20 : 0); return rawcode + 0x5D; } - if (rawcode >= 0x1E && rawcode <= 0x26) return rawcode + 0x13; // '1' - '9' - if (rawcode == 0x27) return 0x30; // '0' - if (rawcode == 0x28) return 0x0A; // '\n' - if (rawcode == 0x2B) return 0x09; // '\t' - if (rawcode == 0x2C) return 0x20; // ' ' - if (rawcode == 0x2D) return 0x2D; // '-' - if (rawcode == 0x2E) return 0x3D; // '=' - if (rawcode == 0x36) return 0x2C; // ',' - if (rawcode == 0x37) return 0x2E; // '.' - if (rawcode == 0x38) return 0x2F; // '/' - if (rawcode == 0x87) return 0x5C; // '\' + if (rawcode >= 0x1E && rawcode <= 0x26) return rawcode + 0x13; // '1' - '9' + if (rawcode == 0x27) return 0x30; // '0' + if (rawcode == 0x28) return 0x0A; // '\n' + if (rawcode == 0x2B) return 0x09; // '\t' + if (rawcode == 0x2C) return 0x20; // ' ' + if (rawcode == 0x2D) return 0x2D; // '-' + if (rawcode == 0x2E) return 0x3D; // '=' + if (rawcode == 0x36) return 0x2C; // ',' + if (rawcode == 0x37) return 0x2E; // '.' + if (rawcode == 0x38) return 0x2F; // '/' + if (rawcode == 0x87) return 0x5C; // '\' // (TODO: Add more cases) diff --git a/rpcs3/Emu/SysCalls/lv2/SC_Memory.h b/rpcs3/Emu/SysCalls/lv2/SC_Memory.h index 5a09b05016..6203c4fd7e 100644 --- a/rpcs3/Emu/SysCalls/lv2/SC_Memory.h +++ b/rpcs3/Emu/SysCalls/lv2/SC_Memory.h @@ -1,15 +1,15 @@ #pragma once -#define SYS_MEMORY_CONTAINER_ID_INVALID 0xFFFFFFFF -#define SYS_MEMORY_ACCESS_RIGHT_NONE 0x00000000000000F0ULL +#define SYS_MEMORY_CONTAINER_ID_INVALID 0xFFFFFFFF +#define SYS_MEMORY_ACCESS_RIGHT_NONE 0x00000000000000F0ULL #define SYS_MEMORY_ACCESS_RIGHT_PPU_THREAD 0x0000000000000008ULL #define SYS_MEMORY_ACCESS_RIGHT_HANDLER 0x0000000000000004ULL #define SYS_MEMORY_ACCESS_RIGHT_SPU_THREAD 0x0000000000000002ULL -#define SYS_MEMORY_ACCESS_RIGHT_SPU_RAW 0x0000000000000001ULL -#define SYS_MEMORY_ATTR_READ_ONLY 0x0000000000080000ULL -#define SYS_MEMORY_ATTR_READ_WRITE 0x0000000000040000ULL -#define SYS_MMAPPER_FIXED_ADDR 0xB0000000 -#define SYS_MMAPPER_FIXED_SIZE 0x10000000 +#define SYS_MEMORY_ACCESS_RIGHT_SPU_RAW 0x0000000000000001ULL +#define SYS_MEMORY_ATTR_READ_ONLY 0x0000000000080000ULL +#define SYS_MEMORY_ATTR_READ_WRITE 0x0000000000040000ULL +#define SYS_MMAPPER_FIXED_ADDR 0xB0000000 +#define SYS_MMAPPER_FIXED_SIZE 0x10000000 #define SYS_VM_TEST_INVALID 0x0000ULL #define SYS_VM_TEST_UNUSED 0x0001ULL #define SYS_VM_TEST_ALLOCATED 0x0002ULL diff --git a/rpcs3/Emu/SysCalls/lv2/SC_Mouse.cpp b/rpcs3/Emu/SysCalls/lv2/SC_Mouse.cpp index 4145989fb6..8116c8bb9a 100644 --- a/rpcs3/Emu/SysCalls/lv2/SC_Mouse.cpp +++ b/rpcs3/Emu/SysCalls/lv2/SC_Mouse.cpp @@ -6,14 +6,14 @@ extern Module sys_io; enum CELL_MOUSE_ERROR_CODE { - CELL_MOUSE_ERROR_FATAL = 0x80121201, - CELL_MOUSE_ERROR_INVALID_PARAMETER = 0x80121202, - CELL_MOUSE_ERROR_ALREADY_INITIALIZED = 0x80121203, - CELL_MOUSE_ERROR_UNINITIALIZED = 0x80121204, - CELL_MOUSE_ERROR_RESOURCE_ALLOCATION_FAILED = 0x80121205, - CELL_MOUSE_ERROR_DATA_READ_FAILED = 0x80121206, - CELL_MOUSE_ERROR_NO_DEVICE = 0x80121207, - CELL_MOUSE_ERROR_SYS_SETTING_FAILED = 0x80121208, + CELL_MOUSE_ERROR_FATAL = 0x80121201, + CELL_MOUSE_ERROR_INVALID_PARAMETER = 0x80121202, + CELL_MOUSE_ERROR_ALREADY_INITIALIZED = 0x80121203, + CELL_MOUSE_ERROR_UNINITIALIZED = 0x80121204, + CELL_MOUSE_ERROR_RESOURCE_ALLOCATION_FAILED = 0x80121205, + CELL_MOUSE_ERROR_DATA_READ_FAILED = 0x80121206, + CELL_MOUSE_ERROR_NO_DEVICE = 0x80121207, + CELL_MOUSE_ERROR_SYS_SETTING_FAILED = 0x80121208, }; int cellMouseInit(u32 max_connect) diff --git a/rpcs3/Emu/SysCalls/lv2/SC_Pad.cpp b/rpcs3/Emu/SysCalls/lv2/SC_Pad.cpp index 54a786ba13..1d88693643 100644 --- a/rpcs3/Emu/SysCalls/lv2/SC_Pad.cpp +++ b/rpcs3/Emu/SysCalls/lv2/SC_Pad.cpp @@ -6,16 +6,16 @@ extern Module sys_io; enum CELL_PAD_ERROR_CODE { - CELL_PAD_ERROR_FATAL = 0x80121101, - CELL_PAD_ERROR_INVALID_PARAMETER = 0x80121102, - CELL_PAD_ERROR_ALREADY_INITIALIZED = 0x80121103, - CELL_PAD_ERROR_UNINITIALIZED = 0x80121104, - CELL_PAD_ERROR_RESOURCE_ALLOCATION_FAILED = 0x80121105, - CELL_PAD_ERROR_DATA_READ_FAILED = 0x80121106, - CELL_PAD_ERROR_NO_DEVICE = 0x80121107, - CELL_PAD_ERROR_UNSUPPORTED_GAMEPAD = 0x80121108, - CELL_PAD_ERROR_TOO_MANY_DEVICES = 0x80121109, - CELL_PAD_ERROR_EBUSY = 0x8012110a, + CELL_PAD_ERROR_FATAL = 0x80121101, + CELL_PAD_ERROR_INVALID_PARAMETER = 0x80121102, + CELL_PAD_ERROR_ALREADY_INITIALIZED = 0x80121103, + CELL_PAD_ERROR_UNINITIALIZED = 0x80121104, + CELL_PAD_ERROR_RESOURCE_ALLOCATION_FAILED = 0x80121105, + CELL_PAD_ERROR_DATA_READ_FAILED = 0x80121106, + CELL_PAD_ERROR_NO_DEVICE = 0x80121107, + CELL_PAD_ERROR_UNSUPPORTED_GAMEPAD = 0x80121108, + CELL_PAD_ERROR_TOO_MANY_DEVICES = 0x80121109, + CELL_PAD_ERROR_EBUSY = 0x8012110a, }; struct CellPadData diff --git a/rpcs3/Emu/SysCalls/lv2/SC_VM.cpp b/rpcs3/Emu/SysCalls/lv2/SC_VM.cpp index 827c6214f2..0b53f887df 100644 --- a/rpcs3/Emu/SysCalls/lv2/SC_VM.cpp +++ b/rpcs3/Emu/SysCalls/lv2/SC_VM.cpp @@ -277,9 +277,9 @@ int sys_vm_get_statistics(u32 addr, u32 stat_addr) stats.physical_mem_used = 0; // Physical memory in use by the virtual memory area. stats.timestamp = 0; // Current time. stats.vm_crash_ppu = 0; // Number of bad virtual memory accesses from a PPU thread. - stats.vm_crash_spu = 0; // Number of bad virtual memory accesses from a SPU thread. + stats.vm_crash_spu = 0; // Number of bad virtual memory accesses from a SPU thread. stats.vm_read = 0; // Number of virtual memory backup reading operations. - stats.vm_write = 0; // Number of virtual memory backup writing operations. + stats.vm_write = 0; // Number of virtual memory backup writing operations. Memory.WriteData(stat_addr, stats); // Faking. return CELL_OK; diff --git a/rpcs3/Emu/System.h b/rpcs3/Emu/System.h index 6953dc8c3a..d963e6d0e5 100644 --- a/rpcs3/Emu/System.h +++ b/rpcs3/Emu/System.h @@ -108,20 +108,20 @@ public: void SetPath(const std::string& path, const std::string& elf_path = ""); void SetTitleID(const std::string& id); - CPUThreadManager& GetCPU() { return m_thread_manager; } - PadManager& GetPadManager() { return m_pad_manager; } - KeyboardManager& GetKeyboardManager() { return m_keyboard_manager; } - MouseManager& GetMouseManager() { return m_mouse_manager; } - IdManager& GetIdManager() { return m_id_manager; } - DbgConsole& GetDbgCon() { return *m_dbg_console; } - GSManager& GetGSManager() { return m_gs_manager; } - AudioManager& GetAudioManager() { return m_audio_manager; } - CallbackManager& GetCallbackManager() { return m_callback_manager; } - VFS& GetVFS() { return m_vfs; } - Array& GetBreakPoints() { return m_break_points; } - Array& GetMarkedPoints() { return m_marked_points; } - CPUThread& GetCallbackThread() { return *m_ppu_callback_thr; } - EventManager& GetEventManager() { return *m_event_manager; } + CPUThreadManager& GetCPU() { return m_thread_manager; } + PadManager& GetPadManager() { return m_pad_manager; } + KeyboardManager& GetKeyboardManager() { return m_keyboard_manager; } + MouseManager& GetMouseManager() { return m_mouse_manager; } + IdManager& GetIdManager() { return m_id_manager; } + DbgConsole& GetDbgCon() { return *m_dbg_console; } + GSManager& GetGSManager() { return m_gs_manager; } + AudioManager& GetAudioManager() { return m_audio_manager; } + CallbackManager& GetCallbackManager() { return m_callback_manager; } + VFS& GetVFS() { return m_vfs; } + Array& GetBreakPoints() { return m_break_points; } + Array& GetMarkedPoints() { return m_marked_points; } + CPUThread& GetCallbackThread() { return *m_ppu_callback_thr; } + EventManager& GetEventManager() { return *m_event_manager; } void AddModuleInit(ModuleInitializer* m) { @@ -156,10 +156,10 @@ public: void SavePoints(const std::string& path); void LoadPoints(const std::string& path); - __forceinline bool IsRunning() const { return m_status == Running; } - __forceinline bool IsPaused() const { return m_status == Paused; } - __forceinline bool IsStopped() const { return m_status == Stopped; } - __forceinline bool IsReady() const { return m_status == Ready; } + __forceinline bool IsRunning() const { return m_status == Running; } + __forceinline bool IsPaused() const { return m_status == Paused; } + __forceinline bool IsStopped() const { return m_status == Stopped; } + __forceinline bool IsReady() const { return m_status == Ready; } }; extern Emulator Emu; \ No newline at end of file diff --git a/rpcs3/Gui/CompilerELF.cpp b/rpcs3/Gui/CompilerELF.cpp index 622a54865c..04a42ec123 100644 --- a/rpcs3/Gui/CompilerELF.cpp +++ b/rpcs3/Gui/CompilerELF.cpp @@ -55,19 +55,19 @@ CompilerELF::CompilerELF(wxWindow* parent) FrameBase::LoadInfo(); Connect(asm_list->GetId(), wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler(CompilerELF::OnUpdate)); - Connect(id_analyze_code, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(CompilerELF::AnalyzeCode)); - Connect(id_compile_code, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(CompilerELF::CompileCode)); - Connect(id_load_elf, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(CompilerELF::LoadElf)); + Connect(id_analyze_code, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(CompilerELF::AnalyzeCode)); + Connect(id_compile_code, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(CompilerELF::CompileCode)); + Connect(id_load_elf, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(CompilerELF::LoadElf)); asm_list->SetFont(wxFont(-1, wxFONTFAMILY_MODERN, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL)); hex_list->SetFont(wxFont(-1, wxFONTFAMILY_MODERN, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL)); - m_app_connector.Connect(wxEVT_SCROLLWIN_TOP, wxScrollWinEventHandler(CompilerELF::OnScroll), (wxObject*)0, this); - m_app_connector.Connect(wxEVT_SCROLLWIN_BOTTOM, wxScrollWinEventHandler(CompilerELF::OnScroll), (wxObject*)0, this); - m_app_connector.Connect(wxEVT_SCROLLWIN_LINEUP, wxScrollWinEventHandler(CompilerELF::OnScroll), (wxObject*)0, this); - m_app_connector.Connect(wxEVT_SCROLLWIN_LINEDOWN, wxScrollWinEventHandler(CompilerELF::OnScroll), (wxObject*)0, this); - m_app_connector.Connect(wxEVT_SCROLLWIN_THUMBTRACK, wxScrollWinEventHandler(CompilerELF::OnScroll), (wxObject*)0, this); - m_app_connector.Connect(wxEVT_SCROLLWIN_THUMBRELEASE,wxScrollWinEventHandler(CompilerELF::OnScroll), (wxObject*)0, this); + m_app_connector.Connect(wxEVT_SCROLLWIN_TOP, wxScrollWinEventHandler(CompilerELF::OnScroll), (wxObject*)0, this); + m_app_connector.Connect(wxEVT_SCROLLWIN_BOTTOM, wxScrollWinEventHandler(CompilerELF::OnScroll), (wxObject*)0, this); + m_app_connector.Connect(wxEVT_SCROLLWIN_LINEUP, wxScrollWinEventHandler(CompilerELF::OnScroll), (wxObject*)0, this); + m_app_connector.Connect(wxEVT_SCROLLWIN_LINEDOWN, wxScrollWinEventHandler(CompilerELF::OnScroll), (wxObject*)0, this); + m_app_connector.Connect(wxEVT_SCROLLWIN_THUMBTRACK, wxScrollWinEventHandler(CompilerELF::OnScroll), (wxObject*)0, this); + m_app_connector.Connect(wxEVT_SCROLLWIN_THUMBRELEASE, wxScrollWinEventHandler(CompilerELF::OnScroll), (wxObject*)0, this); m_app_connector.Connect(asm_list->GetId(), wxEVT_MOUSEWHEEL, wxMouseEventHandler(CompilerELF::MouseWheel), (wxObject*)0, this); m_app_connector.Connect(hex_list->GetId(), wxEVT_MOUSEWHEEL, wxMouseEventHandler(CompilerELF::MouseWheel), (wxObject*)0, this); @@ -180,12 +180,12 @@ void CompilerELF::OnKeyDown(wxKeyEvent& event) switch(event.GetKeyCode()) { - case WXK_RETURN: UpdateStatus( 1); break; - case WXK_UP: UpdateStatus(-1); break; - case WXK_DOWN: UpdateStatus( 1); break; + case WXK_RETURN: UpdateStatus( 1); break; + case WXK_UP: UpdateStatus(-1); break; + case WXK_DOWN: UpdateStatus( 1); break; case WXK_LEFT: - case WXK_RIGHT: UpdateStatus(); break; + case WXK_RIGHT: UpdateStatus(); break; case WXK_PAGEUP: scrool_event.SetEventType(wxEVT_SCROLLWIN_PAGEUP); diff --git a/rpcs3/Gui/ConLog.cpp b/rpcs3/Gui/ConLog.cpp index 4bb1c7a252..ef68f84a9f 100644 --- a/rpcs3/Gui/ConLog.cpp +++ b/rpcs3/Gui/ConLog.cpp @@ -42,9 +42,9 @@ struct _LogBuffer : public MTPacketBuffer void _push(const LogPacket& data) { - const u32 sprefix = data.m_prefix.length(); - const u32 stext = data.m_text.length(); - const u32 scolour = data.m_colour.length(); + const u32 sprefix = data.m_prefix.length(); + const u32 stext = data.m_text.length(); + const u32 scolour = data.m_colour.length(); m_buffer.Reserve( sizeof(u32) + sprefix + diff --git a/rpcs3/Gui/Debugger.cpp b/rpcs3/Gui/Debugger.cpp index 010ea4edf5..53a907b1b3 100644 --- a/rpcs3/Gui/Debugger.cpp +++ b/rpcs3/Gui/Debugger.cpp @@ -16,24 +16,24 @@ class DbgEmuPanel : public wxPanel public: DbgEmuPanel(wxWindow* parent) : wxPanel(parent) { - m_btn_run = new wxButton(this, wxID_ANY, "Run"); - m_btn_stop = new wxButton(this, wxID_ANY, "Stop"); - m_btn_restart = new wxButton(this, wxID_ANY, "Restart"); + m_btn_run = new wxButton(this, wxID_ANY, "Run"); + m_btn_stop = new wxButton(this, wxID_ANY, "Stop"); + m_btn_restart = new wxButton(this, wxID_ANY, "Restart"); wxBoxSizer& s_b_main = *new wxBoxSizer(wxHORIZONTAL); - s_b_main.Add(m_btn_run, wxSizerFlags().Border(wxALL, 5)); - s_b_main.Add(m_btn_stop, wxSizerFlags().Border(wxALL, 5)); + s_b_main.Add(m_btn_run, wxSizerFlags().Border(wxALL, 5)); + s_b_main.Add(m_btn_stop, wxSizerFlags().Border(wxALL, 5)); s_b_main.Add(new wxStaticLine(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL), 0, wxEXPAND); - s_b_main.Add(m_btn_restart, wxSizerFlags().Border(wxALL, 5)); + s_b_main.Add(m_btn_restart, wxSizerFlags().Border(wxALL, 5)); SetSizerAndFit(&s_b_main); Layout(); UpdateUI(); - Connect(m_btn_run->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(DbgEmuPanel::OnRun)); - Connect(m_btn_stop->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(DbgEmuPanel::OnStop)); - Connect(m_btn_restart->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(DbgEmuPanel::OnRestart)); + Connect(m_btn_run->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(DbgEmuPanel::OnRun)); + Connect(m_btn_stop->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(DbgEmuPanel::OnStop)); + Connect(m_btn_restart->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(DbgEmuPanel::OnRestart)); m_app_connector.Connect(wxEVT_DBG_COMMAND, wxCommandEventHandler(DbgEmuPanel::HandleCommand), (wxObject*)0, this); } diff --git a/rpcs3/Gui/DisAsmFrame.cpp b/rpcs3/Gui/DisAsmFrame.cpp index 586e9b8edf..aa365cbb8f 100644 --- a/rpcs3/Gui/DisAsmFrame.cpp +++ b/rpcs3/Gui/DisAsmFrame.cpp @@ -20,14 +20,14 @@ DisAsmFrame::DisAsmFrame(PPCThread& cpu) m_disasm_list = new wxListView(this); - wxButton& b_fprev = *new wxButton(this, wxID_ANY, L"<<"); - wxButton& b_prev = *new wxButton(this, wxID_ANY, L"<"); - wxButton& b_next = *new wxButton(this, wxID_ANY, L">"); - wxButton& b_fnext = *new wxButton(this, wxID_ANY, L">>"); + wxButton& b_fprev = *new wxButton(this, wxID_ANY, L"<<"); + wxButton& b_prev = *new wxButton(this, wxID_ANY, L"<"); + wxButton& b_next = *new wxButton(this, wxID_ANY, L">"); + wxButton& b_fnext = *new wxButton(this, wxID_ANY, L">>"); - wxButton& b_dump = *new wxButton(this, wxID_ANY, L"Dump code"); + wxButton& b_dump = *new wxButton(this, wxID_ANY, L"Dump code"); - wxButton& b_setpc = *new wxButton(this, wxID_ANY, L"Set PC"); + wxButton& b_setpc = *new wxButton(this, wxID_ANY, L"Set PC"); s_b_panel.Add(&b_fprev); s_b_panel.Add(&b_prev); diff --git a/rpcs3/Gui/InterpreterDisAsm.cpp b/rpcs3/Gui/InterpreterDisAsm.cpp index 26fae5083c..f240878ab7 100644 --- a/rpcs3/Gui/InterpreterDisAsm.cpp +++ b/rpcs3/Gui/InterpreterDisAsm.cpp @@ -34,16 +34,16 @@ InterpreterDisAsmFrame::InterpreterDisAsmFrame(wxWindow* parent) wxButton& b_go_to_addr = *new wxButton(this, wxID_ANY, "Go To Address"); wxButton& b_go_to_pc = *new wxButton(this, wxID_ANY, "Go To PC"); - m_btn_step = new wxButton(this, wxID_ANY, "Step"); - m_btn_run = new wxButton(this, wxID_ANY, "Run"); - m_btn_pause = new wxButton(this, wxID_ANY, "Pause"); + m_btn_step = new wxButton(this, wxID_ANY, "Step"); + m_btn_run = new wxButton(this, wxID_ANY, "Run"); + m_btn_pause = new wxButton(this, wxID_ANY, "Pause"); - s_b_main.Add(&b_go_to_addr, wxSizerFlags().Border(wxALL, 5)); - s_b_main.Add(&b_go_to_pc, wxSizerFlags().Border(wxALL, 5)); - s_b_main.Add(m_btn_step, wxSizerFlags().Border(wxALL, 5)); - s_b_main.Add(m_btn_run, wxSizerFlags().Border(wxALL, 5)); - s_b_main.Add(m_btn_pause, wxSizerFlags().Border(wxALL, 5)); - s_b_main.Add(m_choice_units, wxSizerFlags().Border(wxALL, 5)); + s_b_main.Add(&b_go_to_addr, wxSizerFlags().Border(wxALL, 5)); + s_b_main.Add(&b_go_to_pc, wxSizerFlags().Border(wxALL, 5)); + s_b_main.Add(m_btn_step, wxSizerFlags().Border(wxALL, 5)); + s_b_main.Add(m_btn_run, wxSizerFlags().Border(wxALL, 5)); + s_b_main.Add(m_btn_pause, wxSizerFlags().Border(wxALL, 5)); + s_b_main.Add(m_choice_units, wxSizerFlags().Border(wxALL, 5)); //Registers m_regs = new wxTextCtrl(this, wxID_ANY, wxEmptyString, @@ -76,15 +76,15 @@ InterpreterDisAsmFrame::InterpreterDisAsmFrame(wxWindow* parent) m_list->InsertItem(m_list->GetItemCount(), wxEmptyString); } - Connect(m_regs->GetId(), wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler(InterpreterDisAsmFrame::OnUpdate)); - Connect(b_go_to_addr.GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(InterpreterDisAsmFrame::Show_Val)); - Connect(b_go_to_pc.GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(InterpreterDisAsmFrame::Show_PC)); - Connect(m_btn_step->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(InterpreterDisAsmFrame::DoStep)); - Connect(m_btn_run->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(InterpreterDisAsmFrame::DoRun)); - Connect(m_btn_pause->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(InterpreterDisAsmFrame::DoPause)); - Connect(m_list->GetId(), wxEVT_COMMAND_LIST_KEY_DOWN, wxListEventHandler(InterpreterDisAsmFrame::InstrKey)); - Connect(m_list->GetId(), wxEVT_COMMAND_LIST_ITEM_ACTIVATED, wxListEventHandler(InterpreterDisAsmFrame::DClick)); - Connect(m_choice_units->GetId(),wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler(InterpreterDisAsmFrame::OnSelectUnit)); + Connect(m_regs->GetId(), wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler(InterpreterDisAsmFrame::OnUpdate)); + Connect(b_go_to_addr.GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(InterpreterDisAsmFrame::Show_Val)); + Connect(b_go_to_pc.GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(InterpreterDisAsmFrame::Show_PC)); + Connect(m_btn_step->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(InterpreterDisAsmFrame::DoStep)); + Connect(m_btn_run->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(InterpreterDisAsmFrame::DoRun)); + Connect(m_btn_pause->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(InterpreterDisAsmFrame::DoPause)); + Connect(m_list->GetId(), wxEVT_COMMAND_LIST_KEY_DOWN, wxListEventHandler(InterpreterDisAsmFrame::InstrKey)); + Connect(m_list->GetId(), wxEVT_COMMAND_LIST_ITEM_ACTIVATED, wxListEventHandler(InterpreterDisAsmFrame::DClick)); + Connect(m_choice_units->GetId(), wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler(InterpreterDisAsmFrame::OnSelectUnit)); Connect(wxEVT_SIZE, wxSizeEventHandler(InterpreterDisAsmFrame::OnResize)); m_app_connector.Connect(m_list->GetId(), wxEVT_MOUSEWHEEL, wxMouseEventHandler(InterpreterDisAsmFrame::MouseWheel), (wxObject*)0, this); m_app_connector.Connect(wxEVT_KEY_DOWN, wxKeyEventHandler(InterpreterDisAsmFrame::OnKeyDown), (wxObject*)0, this); @@ -176,10 +176,10 @@ void InterpreterDisAsmFrame::OnKeyDown(wxKeyEvent& event) { switch(event.GetKeyCode()) { - case WXK_PAGEUP: ShowAddr( PC - (m_item_count * 2) * 4 ); return; - case WXK_PAGEDOWN: ShowAddr( PC ); return; - case WXK_UP: ShowAddr( PC - (m_item_count + 1) * 4 ); return; - case WXK_DOWN: ShowAddr( PC - (m_item_count - 1) * 4 ); return; + case WXK_PAGEUP: ShowAddr( PC - (m_item_count * 2) * 4 ); return; + case WXK_PAGEDOWN: ShowAddr( PC ); return; + case WXK_UP: ShowAddr( PC - (m_item_count + 1) * 4 ); return; + case WXK_DOWN: ShowAddr( PC - (m_item_count - 1) * 4 ); return; } } diff --git a/rpcs3/Gui/MainFrame.cpp b/rpcs3/Gui/MainFrame.cpp index 85a5a83a33..e374be004e 100644 --- a/rpcs3/Gui/MainFrame.cpp +++ b/rpcs3/Gui/MainFrame.cpp @@ -124,13 +124,13 @@ MainFrame::MainFrame() AddPane(m_debugger_frame, "Debugger", wxAUI_DOCK_RIGHT); // Events - Connect( id_boot_game, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MainFrame::BootGame) ); - Connect( id_install_pkg, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MainFrame::InstallPkg) ); - Connect( id_boot_elf, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MainFrame::BootElf) ); + Connect( id_boot_game, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MainFrame::BootGame) ); + Connect( id_install_pkg, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MainFrame::InstallPkg) ); + Connect( id_boot_elf, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MainFrame::BootElf) ); Connect( id_sys_pause, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MainFrame::Pause) ); Connect( id_sys_stop, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MainFrame::Stop) ); - Connect( id_sys_send_open_menu, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MainFrame::SendOpenCloseSysMenu) ); + Connect( id_sys_send_open_menu, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MainFrame::SendOpenCloseSysMenu) ); Connect( id_sys_send_exit, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MainFrame::SendExit) ); Connect( id_config_emu, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MainFrame::Config) ); @@ -138,7 +138,7 @@ MainFrame::MainFrame() Connect( id_config_vfs_manager, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MainFrame::ConfigVFS) ); Connect( id_config_vhdd_manager, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MainFrame::ConfigVHDD) ); - Connect( id_tools_compiler, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MainFrame::OpenELFCompiler)); + Connect( id_tools_compiler, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MainFrame::OpenELFCompiler)); Connect( id_tools_memory_viewer, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MainFrame::OpenMemoryViewer)); Connect( id_tools_rsx_debugger, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MainFrame::OpenRSXDebugger)); @@ -326,20 +326,20 @@ void MainFrame::Config(wxCommandEvent& WXUNUSED(event)) static const u32 width = 385; // Settings panels - wxNotebook* nb_config = new wxNotebook(&diag, wxID_ANY, wxPoint(6,6), wxSize(width, height)); - wxPanel* p_system = new wxPanel(nb_config, wxID_ANY); - wxPanel* p_cpu = new wxPanel(nb_config, wxID_ANY); - wxPanel* p_graphics = new wxPanel(nb_config, wxID_ANY); - wxPanel* p_audio = new wxPanel(nb_config, wxID_ANY); - wxPanel* p_io = new wxPanel(nb_config, wxID_ANY); - wxPanel* p_hle = new wxPanel(nb_config, wxID_ANY); + wxNotebook* nb_config = new wxNotebook(&diag, wxID_ANY, wxPoint(6,6), wxSize(width, height)); + wxPanel* p_system = new wxPanel(nb_config, wxID_ANY); + wxPanel* p_cpu = new wxPanel(nb_config, wxID_ANY); + wxPanel* p_graphics = new wxPanel(nb_config, wxID_ANY); + wxPanel* p_audio = new wxPanel(nb_config, wxID_ANY); + wxPanel* p_io = new wxPanel(nb_config, wxID_ANY); + wxPanel* p_hle = new wxPanel(nb_config, wxID_ANY); - nb_config->AddPage(p_cpu, wxT("Core")); - nb_config->AddPage(p_graphics, wxT("Graphics")); - nb_config->AddPage(p_audio, wxT("Audio")); - nb_config->AddPage(p_io, wxT("Input / Output")); - nb_config->AddPage(p_hle, wxT("HLE / Misc.")); - nb_config->AddPage(p_system, wxT("System")); + nb_config->AddPage(p_cpu, wxT("Core")); + nb_config->AddPage(p_graphics, wxT("Graphics")); + nb_config->AddPage(p_audio, wxT("Audio")); + nb_config->AddPage(p_io, wxT("Input / Output")); + nb_config->AddPage(p_hle, wxT("HLE / Misc.")); + nb_config->AddPage(p_system, wxT("System")); wxBoxSizer* s_subpanel_system(new wxBoxSizer(wxVERTICAL)); wxBoxSizer* s_subpanel_cpu(new wxBoxSizer(wxVERTICAL)); @@ -592,86 +592,86 @@ void MainFrame::ConfigPad(wxCommandEvent& WXUNUSED(event)) wxBoxSizer* s_subpanel5(new wxBoxSizer(wxVERTICAL)); wxStaticBoxSizer* s_round_pad_controls( new wxStaticBoxSizer( wxVERTICAL, &diag, _("Controls") ) ); - wxStaticBoxSizer* s_round_pad_left( new wxStaticBoxSizer( wxVERTICAL, &diag, _("LEFT") ) ); - wxStaticBoxSizer* s_round_pad_down( new wxStaticBoxSizer( wxVERTICAL, &diag, _("DOWN") ) ); - wxStaticBoxSizer* s_round_pad_right( new wxStaticBoxSizer( wxVERTICAL, &diag, _("RIGHT") ) ); - wxStaticBoxSizer* s_round_pad_up( new wxStaticBoxSizer( wxVERTICAL, &diag, _("UP") ) ); + wxStaticBoxSizer* s_round_pad_left( new wxStaticBoxSizer( wxVERTICAL, &diag, _("LEFT") ) ); + wxStaticBoxSizer* s_round_pad_down( new wxStaticBoxSizer( wxVERTICAL, &diag, _("DOWN") ) ); + wxStaticBoxSizer* s_round_pad_right( new wxStaticBoxSizer( wxVERTICAL, &diag, _("RIGHT") ) ); + wxStaticBoxSizer* s_round_pad_up( new wxStaticBoxSizer( wxVERTICAL, &diag, _("UP") ) ); wxStaticBoxSizer* s_round_pad_shifts_l( new wxStaticBoxSizer( wxVERTICAL, &diag, _("Shifts") ) ); - wxStaticBoxSizer* s_round_pad_l1( new wxStaticBoxSizer( wxVERTICAL, &diag, _("L1") ) ); - wxStaticBoxSizer* s_round_pad_l2( new wxStaticBoxSizer( wxVERTICAL, &diag, _("L2") ) ); - wxStaticBoxSizer* s_round_pad_l3( new wxStaticBoxSizer( wxVERTICAL, &diag, _("L3") ) ); + wxStaticBoxSizer* s_round_pad_l1( new wxStaticBoxSizer( wxVERTICAL, &diag, _("L1") ) ); + wxStaticBoxSizer* s_round_pad_l2( new wxStaticBoxSizer( wxVERTICAL, &diag, _("L2") ) ); + wxStaticBoxSizer* s_round_pad_l3( new wxStaticBoxSizer( wxVERTICAL, &diag, _("L3") ) ); - wxStaticBoxSizer* s_round_pad_system( new wxStaticBoxSizer( wxVERTICAL, &diag, _("System") ) ); - wxStaticBoxSizer* s_round_pad_select( new wxStaticBoxSizer( wxVERTICAL, &diag, _("SELECT") ) ); - wxStaticBoxSizer* s_round_pad_start( new wxStaticBoxSizer( wxVERTICAL, &diag, _("START") ) ); + wxStaticBoxSizer* s_round_pad_system( new wxStaticBoxSizer( wxVERTICAL, &diag, _("System") ) ); + wxStaticBoxSizer* s_round_pad_select( new wxStaticBoxSizer( wxVERTICAL, &diag, _("SELECT") ) ); + wxStaticBoxSizer* s_round_pad_start( new wxStaticBoxSizer( wxVERTICAL, &diag, _("START") ) ); wxStaticBoxSizer* s_round_pad_shifts_r( new wxStaticBoxSizer( wxVERTICAL, &diag, _("Shifts") ) ); - wxStaticBoxSizer* s_round_pad_r1( new wxStaticBoxSizer( wxVERTICAL, &diag, _("R1") ) ); - wxStaticBoxSizer* s_round_pad_r2( new wxStaticBoxSizer( wxVERTICAL, &diag, _("R2") ) ); - wxStaticBoxSizer* s_round_pad_r3( new wxStaticBoxSizer( wxVERTICAL, &diag, _("R3") ) ); + wxStaticBoxSizer* s_round_pad_r1( new wxStaticBoxSizer( wxVERTICAL, &diag, _("R1") ) ); + wxStaticBoxSizer* s_round_pad_r2( new wxStaticBoxSizer( wxVERTICAL, &diag, _("R2") ) ); + wxStaticBoxSizer* s_round_pad_r3( new wxStaticBoxSizer( wxVERTICAL, &diag, _("R3") ) ); - wxStaticBoxSizer* s_round_pad_buttons( new wxStaticBoxSizer( wxVERTICAL, &diag, _("Buttons") ) ); - wxStaticBoxSizer* s_round_pad_square( new wxStaticBoxSizer( wxVERTICAL, &diag, _("SQUARE") ) ); - wxStaticBoxSizer* s_round_pad_cross( new wxStaticBoxSizer( wxVERTICAL, &diag, _("CROSS") ) ); - wxStaticBoxSizer* s_round_pad_circle( new wxStaticBoxSizer( wxVERTICAL, &diag, _("CIRCLE") ) ); + wxStaticBoxSizer* s_round_pad_buttons( new wxStaticBoxSizer( wxVERTICAL, &diag, _("Buttons") ) ); + wxStaticBoxSizer* s_round_pad_square( new wxStaticBoxSizer( wxVERTICAL, &diag, _("SQUARE") ) ); + wxStaticBoxSizer* s_round_pad_cross( new wxStaticBoxSizer( wxVERTICAL, &diag, _("CROSS") ) ); + wxStaticBoxSizer* s_round_pad_circle( new wxStaticBoxSizer( wxVERTICAL, &diag, _("CIRCLE") ) ); wxStaticBoxSizer* s_round_pad_triangle( new wxStaticBoxSizer( wxVERTICAL, &diag, _("TRIANGLE") ) ); - wxComboBox* cbox_pad_left = new wxComboBox(&diag, wxID_ANY); - wxComboBox* cbox_pad_down = new wxComboBox(&diag, wxID_ANY); - wxComboBox* cbox_pad_right = new wxComboBox(&diag, wxID_ANY); - wxComboBox* cbox_pad_up = new wxComboBox(&diag, wxID_ANY); - wxComboBox* cbox_pad_start = new wxComboBox(&diag, wxID_ANY); - wxComboBox* cbox_pad_r3 = new wxComboBox(&diag, wxID_ANY); - wxComboBox* cbox_pad_l3 = new wxComboBox(&diag, wxID_ANY); - wxComboBox* cbox_pad_select = new wxComboBox(&diag, wxID_ANY); - wxComboBox* cbox_pad_square = new wxComboBox(&diag, wxID_ANY); - wxComboBox* cbox_pad_cross = new wxComboBox(&diag, wxID_ANY); - wxComboBox* cbox_pad_circle = new wxComboBox(&diag, wxID_ANY); + wxComboBox* cbox_pad_left = new wxComboBox(&diag, wxID_ANY); + wxComboBox* cbox_pad_down = new wxComboBox(&diag, wxID_ANY); + wxComboBox* cbox_pad_right = new wxComboBox(&diag, wxID_ANY); + wxComboBox* cbox_pad_up = new wxComboBox(&diag, wxID_ANY); + wxComboBox* cbox_pad_start = new wxComboBox(&diag, wxID_ANY); + wxComboBox* cbox_pad_r3 = new wxComboBox(&diag, wxID_ANY); + wxComboBox* cbox_pad_l3 = new wxComboBox(&diag, wxID_ANY); + wxComboBox* cbox_pad_select = new wxComboBox(&diag, wxID_ANY); + wxComboBox* cbox_pad_square = new wxComboBox(&diag, wxID_ANY); + wxComboBox* cbox_pad_cross = new wxComboBox(&diag, wxID_ANY); + wxComboBox* cbox_pad_circle = new wxComboBox(&diag, wxID_ANY); wxComboBox* cbox_pad_triangle = new wxComboBox(&diag, wxID_ANY); - wxComboBox* cbox_pad_r1 = new wxComboBox(&diag, wxID_ANY); - wxComboBox* cbox_pad_l1 = new wxComboBox(&diag, wxID_ANY); - wxComboBox* cbox_pad_r2 = new wxComboBox(&diag, wxID_ANY); - wxComboBox* cbox_pad_l2 = new wxComboBox(&diag, wxID_ANY); + wxComboBox* cbox_pad_r1 = new wxComboBox(&diag, wxID_ANY); + wxComboBox* cbox_pad_l1 = new wxComboBox(&diag, wxID_ANY); + wxComboBox* cbox_pad_r2 = new wxComboBox(&diag, wxID_ANY); + wxComboBox* cbox_pad_l2 = new wxComboBox(&diag, wxID_ANY); for(int i=0; i<128; i++) { - cbox_pad_left->Append (wxString::Format("%c", static_cast(i) ) ); - cbox_pad_down->Append (wxString::Format("%c", static_cast(i) ) ); - cbox_pad_right->Append (wxString::Format("%c", static_cast(i) ) ); - cbox_pad_up->Append (wxString::Format("%c", static_cast(i) ) ); - cbox_pad_r3->Append (wxString::Format("%c", static_cast(i) ) ); - cbox_pad_l3->Append (wxString::Format("%c", static_cast(i) ) ); - cbox_pad_square->Append (wxString::Format("%c", static_cast(i) ) ); - cbox_pad_cross->Append (wxString::Format("%c", static_cast(i) ) ); - cbox_pad_circle->Append (wxString::Format("%c", static_cast(i) ) ); - cbox_pad_triangle->Append (wxString::Format("%c", static_cast(i) ) ); - cbox_pad_r1->Append (wxString::Format("%c", static_cast(i) ) ); - cbox_pad_l1->Append (wxString::Format("%c", static_cast(i) ) ); - cbox_pad_r2->Append (wxString::Format("%c", static_cast(i) ) ); - cbox_pad_l2->Append (wxString::Format("%c", static_cast(i) ) ); + cbox_pad_left->Append (wxString::Format("%c", static_cast(i) ) ); + cbox_pad_down->Append (wxString::Format("%c", static_cast(i) ) ); + cbox_pad_right->Append (wxString::Format("%c", static_cast(i) ) ); + cbox_pad_up->Append (wxString::Format("%c", static_cast(i) ) ); + cbox_pad_r3->Append (wxString::Format("%c", static_cast(i) ) ); + cbox_pad_l3->Append (wxString::Format("%c", static_cast(i) ) ); + cbox_pad_square->Append (wxString::Format("%c", static_cast(i) ) ); + cbox_pad_cross->Append (wxString::Format("%c", static_cast(i) ) ); + cbox_pad_circle->Append (wxString::Format("%c", static_cast(i) ) ); + cbox_pad_triangle->Append(wxString::Format("%c", static_cast(i) ) ); + cbox_pad_r1->Append (wxString::Format("%c", static_cast(i) ) ); + cbox_pad_l1->Append (wxString::Format("%c", static_cast(i) ) ); + cbox_pad_r2->Append (wxString::Format("%c", static_cast(i) ) ); + cbox_pad_l2->Append (wxString::Format("%c", static_cast(i) ) ); } cbox_pad_start->Append("Enter"); cbox_pad_select->Append("Space"); - cbox_pad_left->SetSelection (Ini.PadHandlerLeft.GetValue()); - cbox_pad_down->SetSelection (Ini.PadHandlerDown.GetValue()); - cbox_pad_right->SetSelection (Ini.PadHandlerRight.GetValue()); - cbox_pad_up->SetSelection (Ini.PadHandlerUp.GetValue()); - cbox_pad_start->SetSelection (Ini.PadHandlerStart.GetValue()); - cbox_pad_r3->SetSelection (Ini.PadHandlerR3.GetValue()); - cbox_pad_l3->SetSelection (Ini.PadHandlerL3.GetValue()); - cbox_pad_select->SetSelection (Ini.PadHandlerSelect.GetValue()); - cbox_pad_square->SetSelection (Ini.PadHandlerSquare.GetValue()); - cbox_pad_cross->SetSelection (Ini.PadHandlerCross.GetValue()); - cbox_pad_circle->SetSelection (Ini.PadHandlerCircle.GetValue()); - cbox_pad_triangle->SetSelection (Ini.PadHandlerTriangle.GetValue()); - cbox_pad_r1->SetSelection (Ini.PadHandlerR1.GetValue()); - cbox_pad_l1->SetSelection (Ini.PadHandlerL1.GetValue()); - cbox_pad_r2->SetSelection (Ini.PadHandlerR2.GetValue()); - cbox_pad_l2->SetSelection (Ini.PadHandlerL2.GetValue()); + cbox_pad_left->SetSelection (Ini.PadHandlerLeft.GetValue()); + cbox_pad_down->SetSelection (Ini.PadHandlerDown.GetValue()); + cbox_pad_right->SetSelection (Ini.PadHandlerRight.GetValue()); + cbox_pad_up->SetSelection (Ini.PadHandlerUp.GetValue()); + cbox_pad_start->SetSelection (Ini.PadHandlerStart.GetValue()); + cbox_pad_r3->SetSelection (Ini.PadHandlerR3.GetValue()); + cbox_pad_l3->SetSelection (Ini.PadHandlerL3.GetValue()); + cbox_pad_select->SetSelection (Ini.PadHandlerSelect.GetValue()); + cbox_pad_square->SetSelection (Ini.PadHandlerSquare.GetValue()); + cbox_pad_cross->SetSelection (Ini.PadHandlerCross.GetValue()); + cbox_pad_circle->SetSelection (Ini.PadHandlerCircle.GetValue()); + cbox_pad_triangle->SetSelection (Ini.PadHandlerTriangle.GetValue()); + cbox_pad_r1->SetSelection (Ini.PadHandlerR1.GetValue()); + cbox_pad_l1->SetSelection (Ini.PadHandlerL1.GetValue()); + cbox_pad_r2->SetSelection (Ini.PadHandlerR2.GetValue()); + cbox_pad_l2->SetSelection (Ini.PadHandlerL2.GetValue()); s_round_pad_left->Add(cbox_pad_left, wxSizerFlags().Border(wxALL, 5).Expand()); s_round_pad_down->Add(cbox_pad_down, wxSizerFlags().Border(wxALL, 5).Expand()); diff --git a/rpcs3/Gui/VHDDManager.cpp b/rpcs3/Gui/VHDDManager.cpp index d8e028cc32..6683715d81 100644 --- a/rpcs3/Gui/VHDDManager.cpp +++ b/rpcs3/Gui/VHDDManager.cpp @@ -69,18 +69,18 @@ VHDDExplorer::VHDDExplorer(wxWindow* parent, const std::string& hdd_path) : wxDi m_hdd = new vfsHDD(nullptr, hdd_path); UpdateList(); - Connect(m_list->GetId(), wxEVT_COMMAND_LIST_BEGIN_DRAG, wxListEventHandler(VHDDExplorer::OnListDrag)); - Connect(m_list->GetId(), wxEVT_COMMAND_LIST_ITEM_ACTIVATED, wxListEventHandler(VHDDExplorer::DClick)); - Connect(m_list->GetId(), wxEVT_COMMAND_RIGHT_CLICK, wxCommandEventHandler(VHDDExplorer::OnContextMenu)); + Connect(m_list->GetId(), wxEVT_COMMAND_LIST_BEGIN_DRAG, wxListEventHandler(VHDDExplorer::OnListDrag)); + Connect(m_list->GetId(), wxEVT_COMMAND_LIST_ITEM_ACTIVATED, wxListEventHandler(VHDDExplorer::DClick)); + Connect(m_list->GetId(), wxEVT_COMMAND_RIGHT_CLICK, wxCommandEventHandler(VHDDExplorer::OnContextMenu)); m_list->Connect(wxEVT_DROP_FILES, wxDropFilesEventHandler(VHDDExplorer::OnDropFiles), (wxObject*)0, this); - Connect(id_open, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(VHDDExplorer::OnOpen)); - Connect(id_rename, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(VHDDExplorer::OnRename)); - Connect(id_remove, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(VHDDExplorer::OnRemove)); - Connect(id_create_dir, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(VHDDExplorer::OnCreateDir)); - Connect(id_create_file, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(VHDDExplorer::OnCreateFile)); - Connect(id_import, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(VHDDExplorer::OnImport)); - Connect(id_export, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(VHDDExplorer::OnExport)); + Connect(id_open, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(VHDDExplorer::OnOpen)); + Connect(id_rename, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(VHDDExplorer::OnRename)); + Connect(id_remove, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(VHDDExplorer::OnRemove)); + Connect(id_create_dir, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(VHDDExplorer::OnCreateDir)); + Connect(id_create_file, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(VHDDExplorer::OnCreateFile)); + Connect(id_import, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(VHDDExplorer::OnImport)); + Connect(id_export, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(VHDDExplorer::OnExport)); } void VHDDExplorer::UpdateList() @@ -389,13 +389,13 @@ VHDDManagerDialog::VHDDManagerDialog(wxWindow* parent) m_list->InsertColumn(0, "Path"); //m_list->InsertColumn(1, "Size"); //m_list->InsertColumn(2, "Block size"); - Connect(m_list->GetId(), wxEVT_COMMAND_LIST_ITEM_ACTIVATED, wxListEventHandler(VHDDManagerDialog::DClick)); - Connect(m_list->GetId(), wxEVT_COMMAND_RIGHT_CLICK, wxCommandEventHandler(VHDDManagerDialog::OnContextMenu)); + Connect(m_list->GetId(), wxEVT_COMMAND_LIST_ITEM_ACTIVATED, wxListEventHandler(VHDDManagerDialog::DClick)); + Connect(m_list->GetId(), wxEVT_COMMAND_RIGHT_CLICK, wxCommandEventHandler(VHDDManagerDialog::OnContextMenu)); - Connect(id_add_hdd, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(VHDDManagerDialog::AddHDD)); - Connect(id_open, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(VHDDManagerDialog::OnOpen)); - Connect(id_remove, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(VHDDManagerDialog::OnRemove)); - Connect(id_create_hdd, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(VHDDManagerDialog::OnCreateHDD)); + Connect(id_add_hdd, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(VHDDManagerDialog::AddHDD)); + Connect(id_open, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(VHDDManagerDialog::OnOpen)); + Connect(id_remove, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(VHDDManagerDialog::OnRemove)); + Connect(id_create_hdd, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(VHDDManagerDialog::OnCreateHDD)); Connect(wxEVT_CLOSE_WINDOW, wxCloseEventHandler(VHDDManagerDialog::OnClose)); LoadPaths(); UpdateList(); diff --git a/rpcs3/Loader/ELF32.h b/rpcs3/Loader/ELF32.h index 50713431fc..62fa2d1583 100644 --- a/rpcs3/Loader/ELF32.h +++ b/rpcs3/Loader/ELF32.h @@ -26,25 +26,25 @@ struct Elf32_Ehdr void Show() { #ifdef LOADER_DEBUG - ConLog.Write("Magic: %08x", e_magic); - ConLog.Write("Class: %s", "ELF32"); - ConLog.Write("Data: %s", Ehdr_DataToString(e_data).c_str()); - ConLog.Write("Current Version: %d", e_curver); - ConLog.Write("OS/ABI: %s", Ehdr_OS_ABIToString(e_os_abi).c_str()); - ConLog.Write("ABI version: %lld", e_abi_ver); - ConLog.Write("Type: %s", Ehdr_TypeToString(e_type).c_str()); - ConLog.Write("Machine: %s", Ehdr_MachineToString(e_machine).c_str()); - ConLog.Write("Version: %d", e_version); - ConLog.Write("Entry point address: 0x%x", e_entry); - ConLog.Write("Program headers offset: 0x%08x", e_phoff); - ConLog.Write("Section headers offset: 0x%08x", e_shoff); - ConLog.Write("Flags: 0x%x", e_flags); - ConLog.Write("Size of this header: %d", e_ehsize); - ConLog.Write("Size of program headers: %d", e_phentsize); - ConLog.Write("Number of program headers: %d", e_phnum); - ConLog.Write("Size of section headers: %d", e_shentsize); - ConLog.Write("Number of section headers: %d", e_shnum); - ConLog.Write("Section header string table index: %d", e_shstrndx); + ConLog.Write("Magic: %08x", e_magic); + ConLog.Write("Class: %s", "ELF32"); + ConLog.Write("Data: %s", Ehdr_DataToString(e_data).c_str()); + ConLog.Write("Current Version: %d", e_curver); + ConLog.Write("OS/ABI: %s", Ehdr_OS_ABIToString(e_os_abi).c_str()); + ConLog.Write("ABI version: %lld", e_abi_ver); + ConLog.Write("Type: %s", Ehdr_TypeToString(e_type).c_str()); + ConLog.Write("Machine: %s", Ehdr_MachineToString(e_machine).c_str()); + ConLog.Write("Version: %d", e_version); + ConLog.Write("Entry point address: 0x%x", e_entry); + ConLog.Write("Program headers offset: 0x%08x", e_phoff); + ConLog.Write("Section headers offset: 0x%08x", e_shoff); + ConLog.Write("Flags: 0x%x", e_flags); + ConLog.Write("Size of this header: %d", e_ehsize); + ConLog.Write("Size of program headers: %d", e_phentsize); + ConLog.Write("Number of program headers: %d", e_phnum); + ConLog.Write("Size of section headers: %d", e_shentsize); + ConLog.Write("Number of section headers: %d", e_shnum); + ConLog.Write("Section header string table index: %d", e_shstrndx); #endif } @@ -55,44 +55,44 @@ struct Elf32_Ehdr void Load(vfsStream& f) { - e_magic = Read32(f); - e_class = Read8(f); - e_data = Read8(f); - e_curver = Read8(f); - e_os_abi = Read8(f); + e_magic = Read32(f); + e_class = Read8(f); + e_data = Read8(f); + e_curver = Read8(f); + e_os_abi = Read8(f); if(IsLittleEndian()) { - e_abi_ver = Read64LE(f); - e_type = Read16LE(f); - e_machine = Read16LE(f); - e_version = Read32LE(f); - e_entry = Read32LE(f); - e_phoff = Read32LE(f); - e_shoff = Read32LE(f); - e_flags = Read32LE(f); - e_ehsize = Read16LE(f); + e_abi_ver = Read64LE(f); + e_type = Read16LE(f); + e_machine = Read16LE(f); + e_version = Read32LE(f); + e_entry = Read32LE(f); + e_phoff = Read32LE(f); + e_shoff = Read32LE(f); + e_flags = Read32LE(f); + e_ehsize = Read16LE(f); e_phentsize = Read16LE(f); - e_phnum = Read16LE(f); + e_phnum = Read16LE(f); e_shentsize = Read16LE(f); - e_shnum = Read16LE(f); + e_shnum = Read16LE(f); e_shstrndx = Read16LE(f); } else { - e_abi_ver = Read64(f); - e_type = Read16(f); - e_machine = Read16(f); - e_version = Read32(f); - e_entry = Read32(f); - e_phoff = Read32(f); - e_shoff = Read32(f); - e_flags = Read32(f); - e_ehsize = Read16(f); + e_abi_ver = Read64(f); + e_type = Read16(f); + e_machine = Read16(f); + e_version = Read32(f); + e_entry = Read32(f); + e_phoff = Read32(f); + e_shoff = Read32(f); + e_flags = Read32(f); + e_ehsize = Read16(f); e_phentsize = Read16(f); - e_phnum = Read16(f); + e_phnum = Read16(f); e_shentsize = Read16(f); - e_shnum = Read16(f); + e_shnum = Read16(f); e_shstrndx = Read16(f); } } @@ -187,45 +187,45 @@ struct Elf32_Shdr void Load(vfsStream& f) { - sh_name = Read32(f); - sh_type = Read32(f); - sh_flags = Read32(f); - sh_addr = Read32(f); - sh_offset = Read32(f); - sh_size = Read32(f); - sh_link = Read32(f); - sh_info = Read32(f); - sh_addralign = Read32(f); - sh_entsize = Read32(f); + sh_name = Read32(f); + sh_type = Read32(f); + sh_flags = Read32(f); + sh_addr = Read32(f); + sh_offset = Read32(f); + sh_size = Read32(f); + sh_link = Read32(f); + sh_info = Read32(f); + sh_addralign = Read32(f); + sh_entsize = Read32(f); } void LoadLE(vfsStream& f) { - sh_name = Read32LE(f); - sh_type = Read32LE(f); - sh_flags = Read32LE(f); - sh_addr = Read32LE(f); - sh_offset = Read32LE(f); - sh_size = Read32LE(f); - sh_link = Read32LE(f); - sh_info = Read32LE(f); - sh_addralign = Read32LE(f); - sh_entsize = Read32LE(f); + sh_name = Read32LE(f); + sh_type = Read32LE(f); + sh_flags = Read32LE(f); + sh_addr = Read32LE(f); + sh_offset = Read32LE(f); + sh_size = Read32LE(f); + sh_link = Read32LE(f); + sh_info = Read32LE(f); + sh_addralign = Read32LE(f); + sh_entsize = Read32LE(f); } void Show() { #ifdef LOADER_DEBUG - ConLog.Write("Name offset: %x", sh_name); - ConLog.Write("Type: %d", sh_type); - ConLog.Write("Addr: %x", sh_addr); - ConLog.Write("Offset: %x", sh_offset); - ConLog.Write("Size: %x", sh_size); - ConLog.Write("EntSize: %d", sh_entsize); - ConLog.Write("Flags: %x", sh_flags); - ConLog.Write("Link: %x", sh_link); - ConLog.Write("Info: %d", sh_info); - ConLog.Write("Address align: %x", sh_addralign); + ConLog.Write("Name offset: %x", sh_name); + ConLog.Write("Type: %d", sh_type); + ConLog.Write("Addr: %x", sh_addr); + ConLog.Write("Offset: %x", sh_offset); + ConLog.Write("Size: %x", sh_size); + ConLog.Write("EntSize: %d", sh_entsize); + ConLog.Write("Flags: %x", sh_flags); + ConLog.Write("Link: %x", sh_link); + ConLog.Write("Info: %d", sh_info); + ConLog.Write("Address align: %x", sh_addralign); #endif } }; @@ -243,39 +243,39 @@ struct Elf32_Phdr void Load(vfsStream& f) { - p_type = Read32(f); - p_offset = Read32(f); - p_vaddr = Read32(f); - p_paddr = Read32(f); - p_filesz = Read32(f); - p_memsz = Read32(f); - p_flags = Read32(f); - p_align = Read32(f); + p_type = Read32(f); + p_offset = Read32(f); + p_vaddr = Read32(f); + p_paddr = Read32(f); + p_filesz = Read32(f); + p_memsz = Read32(f); + p_flags = Read32(f); + p_align = Read32(f); } void LoadLE(vfsStream& f) { - p_type = Read32LE(f); - p_offset = Read32LE(f); - p_vaddr = Read32LE(f); - p_paddr = Read32LE(f); - p_filesz = Read32LE(f); - p_memsz = Read32LE(f); - p_flags = Read32LE(f); - p_align = Read32LE(f); + p_type = Read32LE(f); + p_offset = Read32LE(f); + p_vaddr = Read32LE(f); + p_paddr = Read32LE(f); + p_filesz = Read32LE(f); + p_memsz = Read32LE(f); + p_flags = Read32LE(f); + p_align = Read32LE(f); } void Show() { #ifdef LOADER_DEBUG - ConLog.Write("Type: %s", Phdr_TypeToString(p_type).c_str()); - ConLog.Write("Offset: 0x%08x", p_offset); - ConLog.Write("Virtual address: 0x%08x", p_vaddr); - ConLog.Write("Physical address: 0x%08x", p_paddr); - ConLog.Write("File size: 0x%08x", p_filesz); - ConLog.Write("Memory size: 0x%08x", p_memsz); - ConLog.Write("Flags: %s", Phdr_FlagsToString(p_flags).c_str()); - ConLog.Write("Align: 0x%x", p_align); + ConLog.Write("Type: %s", Phdr_TypeToString(p_type).c_str()); + ConLog.Write("Offset: 0x%08x", p_offset); + ConLog.Write("Virtual address: 0x%08x", p_vaddr); + ConLog.Write("Physical address: 0x%08x", p_paddr); + ConLog.Write("File size: 0x%08x", p_filesz); + ConLog.Write("Memory size: 0x%08x", p_memsz); + ConLog.Write("Flags: %s", Phdr_FlagsToString(p_flags).c_str()); + ConLog.Write("Align: 0x%x", p_align); #endif } }; diff --git a/rpcs3/Loader/ELF64.h b/rpcs3/Loader/ELF64.h index 8d56e0cf73..b8be844a6e 100644 --- a/rpcs3/Loader/ELF64.h +++ b/rpcs3/Loader/ELF64.h @@ -25,49 +25,49 @@ struct Elf64_Ehdr void Load(vfsStream& f) { - e_magic = Read32(f); - e_class = Read8(f); - e_data = Read8(f); - e_curver = Read8(f); - e_os_abi = Read8(f); - e_abi_ver = Read64(f); - e_type = Read16(f); - e_machine = Read16(f); - e_version = Read32(f); - e_entry = Read64(f); - e_phoff = Read64(f); - e_shoff = Read64(f); - e_flags = Read32(f); - e_ehsize = Read16(f); + e_magic = Read32(f); + e_class = Read8(f); + e_data = Read8(f); + e_curver = Read8(f); + e_os_abi = Read8(f); + e_abi_ver = Read64(f); + e_type = Read16(f); + e_machine = Read16(f); + e_version = Read32(f); + e_entry = Read64(f); + e_phoff = Read64(f); + e_shoff = Read64(f); + e_flags = Read32(f); + e_ehsize = Read16(f); e_phentsize = Read16(f); - e_phnum = Read16(f); + e_phnum = Read16(f); e_shentsize = Read16(f); - e_shnum = Read16(f); + e_shnum = Read16(f); e_shstrndx = Read16(f); } void Show() { #ifdef LOADER_DEBUG - ConLog.Write("Magic: %08x", e_magic); - ConLog.Write("Class: %s", "ELF64"); - ConLog.Write("Data: %s", Ehdr_DataToString(e_data).c_str()); - ConLog.Write("Current Version: %d", e_curver); - ConLog.Write("OS/ABI: %s", Ehdr_OS_ABIToString(e_os_abi).c_str()); - ConLog.Write("ABI version: %lld", e_abi_ver); - ConLog.Write("Type: %s", Ehdr_TypeToString(e_type).c_str()); - ConLog.Write("Machine: %s", Ehdr_MachineToString(e_machine).c_str()); - ConLog.Write("Version: %d", e_version); - ConLog.Write("Entry point address: 0x%08llx", e_entry); - ConLog.Write("Program headers offset: 0x%08llx", e_phoff); - ConLog.Write("Section headers offset: 0x%08llx", e_shoff); - ConLog.Write("Flags: 0x%x", e_flags); - ConLog.Write("Size of this header: %d", e_ehsize); - ConLog.Write("Size of program headers: %d", e_phentsize); - ConLog.Write("Number of program headers: %d", e_phnum); - ConLog.Write("Size of section headers: %d", e_shentsize); - ConLog.Write("Number of section headers: %d", e_shnum); - ConLog.Write("Section header string table index: %d", e_shstrndx); + ConLog.Write("Magic: %08x", e_magic); + ConLog.Write("Class: %s", "ELF64"); + ConLog.Write("Data: %s", Ehdr_DataToString(e_data).c_str()); + ConLog.Write("Current Version: %d", e_curver); + ConLog.Write("OS/ABI: %s", Ehdr_OS_ABIToString(e_os_abi).c_str()); + ConLog.Write("ABI version: %lld", e_abi_ver); + ConLog.Write("Type: %s", Ehdr_TypeToString(e_type).c_str()); + ConLog.Write("Machine: %s", Ehdr_MachineToString(e_machine).c_str()); + ConLog.Write("Version: %d", e_version); + ConLog.Write("Entry point address: 0x%08llx", e_entry); + ConLog.Write("Program headers offset: 0x%08llx", e_phoff); + ConLog.Write("Section headers offset: 0x%08llx", e_shoff); + ConLog.Write("Flags: 0x%x", e_flags); + ConLog.Write("Size of this header: %d", e_ehsize); + ConLog.Write("Size of program headers: %d", e_phentsize); + ConLog.Write("Number of program headers: %d", e_phnum); + ConLog.Write("Size of section headers: %d", e_shentsize); + ConLog.Write("Number of section headers: %d", e_shnum); + ConLog.Write("Section header string table index: %d", e_shstrndx); #endif } @@ -90,31 +90,31 @@ struct Elf64_Shdr void Load(vfsStream& f) { - sh_name = Read32(f); - sh_type = Read32(f); - sh_flags = Read64(f); - sh_addr = Read64(f); - sh_offset = Read64(f); - sh_size = Read64(f); - sh_link = Read32(f); - sh_info = Read32(f); - sh_addralign = Read64(f); - sh_entsize = Read64(f); + sh_name = Read32(f); + sh_type = Read32(f); + sh_flags = Read64(f); + sh_addr = Read64(f); + sh_offset = Read64(f); + sh_size = Read64(f); + sh_link = Read32(f); + sh_info = Read32(f); + sh_addralign = Read64(f); + sh_entsize = Read64(f); } void Show() { #ifdef LOADER_DEBUG - ConLog.Write("Name offset: %x", sh_name); - ConLog.Write("Type: %d", sh_type); - ConLog.Write("Addr: %llx", sh_addr); - ConLog.Write("Offset: %llx", sh_offset); - ConLog.Write("Size: %llx", sh_size); - ConLog.Write("EntSize: %lld", sh_entsize); - ConLog.Write("Flags: %llx", sh_flags); - ConLog.Write("Link: %x", sh_link); - ConLog.Write("Info: %x", sh_info); - ConLog.Write("Address align: %llx", sh_addralign); + ConLog.Write("Name offset: %x", sh_name); + ConLog.Write("Type: %d", sh_type); + ConLog.Write("Addr: %llx", sh_addr); + ConLog.Write("Offset: %llx", sh_offset); + ConLog.Write("Size: %llx", sh_size); + ConLog.Write("EntSize: %lld", sh_entsize); + ConLog.Write("Flags: %llx", sh_flags); + ConLog.Write("Link: %x", sh_link); + ConLog.Write("Info: %x", sh_info); + ConLog.Write("Address align: %llx", sh_addralign); #endif } }; @@ -132,27 +132,27 @@ struct Elf64_Phdr void Load(vfsStream& f) { - p_type = Read32(f); - p_flags = Read32(f); - p_offset = Read64(f); - p_vaddr = Read64(f); - p_paddr = Read64(f); - p_filesz = Read64(f); - p_memsz = Read64(f); - p_align = Read64(f); + p_type = Read32(f); + p_flags = Read32(f); + p_offset = Read64(f); + p_vaddr = Read64(f); + p_paddr = Read64(f); + p_filesz = Read64(f); + p_memsz = Read64(f); + p_align = Read64(f); } void Show() { #ifdef LOADER_DEBUG - ConLog.Write("Type: %s", Phdr_TypeToString(p_type).c_str()); - ConLog.Write("Offset: 0x%08llx", p_offset); - ConLog.Write("Virtual address: 0x%08llx", p_vaddr); - ConLog.Write("Physical address: 0x%08llx", p_paddr); - ConLog.Write("File size: 0x%08llx", p_filesz); - ConLog.Write("Memory size: 0x%08llx", p_memsz); - ConLog.Write("Flags: %s", Phdr_FlagsToString(p_flags).c_str()); - ConLog.Write("Align: 0x%llx", p_align); + ConLog.Write("Type: %s", Phdr_TypeToString(p_type).c_str()); + ConLog.Write("Offset: 0x%08llx", p_offset); + ConLog.Write("Virtual address: 0x%08llx", p_vaddr); + ConLog.Write("Physical address: 0x%08llx", p_paddr); + ConLog.Write("File size: 0x%08llx", p_filesz); + ConLog.Write("Memory size: 0x%08llx", p_memsz); + ConLog.Write("Flags: %s", Phdr_FlagsToString(p_flags).c_str()); + ConLog.Write("Align: 0x%llx", p_align); #endif } }; diff --git a/rpcs3/Loader/Loader.h b/rpcs3/Loader/Loader.h index c650a876b9..ca69ec408a 100644 --- a/rpcs3/Loader/Loader.h +++ b/rpcs3/Loader/Loader.h @@ -32,10 +32,10 @@ enum ShdrType enum ShdrFlag { - SHF_WRITE = 0x1, - SHF_ALLOC = 0x2, - SHF_EXECINSTR = 0x4, - SHF_MASKPROC = 0xf0000000, + SHF_WRITE = 0x1, + SHF_ALLOC = 0x2, + SHF_EXECINSTR = 0x4, + SHF_MASKPROC = 0xf0000000, }; __forceinline static u8 Read8(vfsStream& f) diff --git a/rpcs3/Loader/SELF.h b/rpcs3/Loader/SELF.h index 63ac82f90f..5a312e4e44 100644 --- a/rpcs3/Loader/SELF.h +++ b/rpcs3/Loader/SELF.h @@ -13,25 +13,25 @@ struct SceHeader void Load(vfsStream& f) { - se_magic = Read32(f); - se_hver = Read32(f); - se_flags = Read16(f); - se_type = Read16(f); - se_meta = Read32(f); - se_hsize = Read64(f); - se_esize = Read64(f); + se_magic = Read32(f); + se_hver = Read32(f); + se_flags = Read16(f); + se_type = Read16(f); + se_meta = Read32(f); + se_hsize = Read64(f); + se_esize = Read64(f); } void Show() { - ConLog.Write("Magic: %08x", se_magic); - ConLog.Write("Class: %s", "SELF"); - ConLog.Write("hver: 0x%08x", se_hver); - ConLog.Write("flags: 0x%04x", se_flags); - ConLog.Write("type: 0x%04x", se_type); - ConLog.Write("meta: 0x%08x", se_meta); - ConLog.Write("hsize: 0x%llx", se_hsize); - ConLog.Write("esize: 0x%llx", se_esize); + ConLog.Write("Magic: %08x", se_magic); + ConLog.Write("Class: %s", "SELF"); + ConLog.Write("hver: 0x%08x", se_hver); + ConLog.Write("flags: 0x%04x", se_flags); + ConLog.Write("type: 0x%04x", se_type); + ConLog.Write("meta: 0x%08x", se_meta); + ConLog.Write("hsize: 0x%llx", se_hsize); + ConLog.Write("esize: 0x%llx", se_esize); } bool CheckMagic() const { return se_magic == 0x53434500; } @@ -52,29 +52,29 @@ struct SelfHeader void Load(vfsStream& f) { - se_htype = Read64(f); - se_appinfooff = Read64(f); - se_elfoff = Read64(f); - se_phdroff = Read64(f); - se_shdroff = Read64(f); - se_secinfoff = Read64(f); - se_sceveroff = Read64(f); - se_controloff = Read64(f); - se_controlsize = Read64(f); - pad = Read64(f); + se_htype = Read64(f); + se_appinfooff = Read64(f); + se_elfoff = Read64(f); + se_phdroff = Read64(f); + se_shdroff = Read64(f); + se_secinfoff = Read64(f); + se_sceveroff = Read64(f); + se_controloff = Read64(f); + se_controlsize = Read64(f); + pad = Read64(f); } void Show() { - ConLog.Write("header type: 0x%llx", se_htype); - ConLog.Write("app info offset: 0x%llx", se_appinfooff); - ConLog.Write("elf offset: 0x%llx", se_elfoff); - ConLog.Write("program header offset: 0x%llx", se_phdroff); - ConLog.Write("section header offset: 0x%llx", se_shdroff); - ConLog.Write("section info offset: 0x%llx", se_secinfoff); - ConLog.Write("sce version offset: 0x%llx", se_sceveroff); - ConLog.Write("control info offset: 0x%llx", se_controloff); - ConLog.Write("control info size: 0x%llx", se_controlsize); + ConLog.Write("header type: 0x%llx", se_htype); + ConLog.Write("app info offset: 0x%llx", se_appinfooff); + ConLog.Write("elf offset: 0x%llx", se_elfoff); + ConLog.Write("program header offset: 0x%llx", se_phdroff); + ConLog.Write("section header offset: 0x%llx", se_shdroff); + ConLog.Write("section info offset: 0x%llx", se_secinfoff); + ConLog.Write("sce version offset: 0x%llx", se_sceveroff); + ConLog.Write("control info offset: 0x%llx", se_controloff); + ConLog.Write("control info size: 0x%llx", se_controlsize); } };