From 81c8d3f27ab3dca17d05c81f6ff1d99c03852226 Mon Sep 17 00:00:00 2001 From: Nekotekina Date: Sun, 14 May 2017 23:30:52 +0300 Subject: [PATCH] Added CELL_CANCEL --- rpcs3/Emu/Cell/ErrorCodes.h | 13 ++++--------- rpcs3/Emu/PSP2/ErrorCodes.h | 12 +++--------- 2 files changed, 7 insertions(+), 18 deletions(-) diff --git a/rpcs3/Emu/Cell/ErrorCodes.h b/rpcs3/Emu/Cell/ErrorCodes.h index 54995d2605..beebe4b2e3 100644 --- a/rpcs3/Emu/Cell/ErrorCodes.h +++ b/rpcs3/Emu/Cell/ErrorCodes.h @@ -1,18 +1,13 @@ #pragma once -struct CellOk +enum CellNotAnError : s32 { - enum : s32 - { - __not_an_error, + CELL_OK = 0, + CELL_CANCEL = 1, - CELL_OK = 0 - }; + __not_an_error }; -// Temporary workaround -constexpr auto CELL_OK = CellOk::CELL_OK; - enum CellError : u32 { CELL_EAGAIN = 0x80010001, // The resource is temporarily unavailable diff --git a/rpcs3/Emu/PSP2/ErrorCodes.h b/rpcs3/Emu/PSP2/ErrorCodes.h index 854c5a2e75..f8bd7a56f6 100644 --- a/rpcs3/Emu/PSP2/ErrorCodes.h +++ b/rpcs3/Emu/PSP2/ErrorCodes.h @@ -1,18 +1,12 @@ #pragma once -struct SceOk +enum SceNotAnError : s32 { - enum : s32 - { - __not_an_error, + SCE_OK = 0, - SCE_OK = 0 - }; + __not_an_error }; -// Temporary workaround -constexpr auto SCE_OK = SceOk::SCE_OK; - enum SceError : u32 { SCE_ERROR_ERRNO_EPERM = 0x80010001,