From dc34d5b350eeadeb6fea8a4c477af17e0ab31da0 Mon Sep 17 00:00:00 2001 From: AnnieL Date: Thu, 14 Jul 2016 22:02:07 +0100 Subject: [PATCH] cell: add several error (return) codes and definitions (#1914) * cellHttp: add error codes Adds error codes for cellHttp and cellHttps * libDaisy: adds error codes and definitions Adds error codes, assertations and definitions for cellDaisy. * cellHttpUtil: add error codes Adds error codes for cellHttpUtil. * cellCelp8Enc: moves error codes, adds definitions Moves error codes to cellCelp8Enc.h, adds some definitions. * cellCelpEnc: moves error codes, adds definitions * cellJpgEnc: adds error codes and definitions Moves the existant error codes to cellJpgEnc.h and adds more error codes / definitions. * cellVoice: moves error codes, adds definitions Moves error codes to cellVoice.h, adds most cellVoice definitions * Fix typos --- rpcs3/Emu/Cell/Modules/cellCelp8Enc.cpp | 12 +-- rpcs3/Emu/Cell/Modules/cellCelp8Enc.h | 37 +++++++ rpcs3/Emu/Cell/Modules/cellCelpEnc.cpp | 12 +-- rpcs3/Emu/Cell/Modules/cellCelpEnc.h | 32 ++++++ rpcs3/Emu/Cell/Modules/cellDaisy.cpp | 2 + rpcs3/Emu/Cell/Modules/cellDaisy.h | 84 +++++++++++++++ rpcs3/Emu/Cell/Modules/cellHttp.cpp | 2 + rpcs3/Emu/Cell/Modules/cellHttp.h | 132 ++++++++++++++++++++++++ rpcs3/Emu/Cell/Modules/cellHttpUtil.cpp | 2 + rpcs3/Emu/Cell/Modules/cellHttpUtil.h | 20 ++++ rpcs3/Emu/Cell/Modules/cellJpgEnc.cpp | 12 +-- rpcs3/Emu/Cell/Modules/cellJpgEnc.h | 44 ++++++++ rpcs3/Emu/Cell/Modules/cellVoice.cpp | 27 +---- rpcs3/Emu/Cell/Modules/cellVoice.h | 91 ++++++++++++++++ 14 files changed, 456 insertions(+), 53 deletions(-) create mode 100644 rpcs3/Emu/Cell/Modules/cellCelp8Enc.h create mode 100644 rpcs3/Emu/Cell/Modules/cellCelpEnc.h create mode 100644 rpcs3/Emu/Cell/Modules/cellDaisy.h create mode 100644 rpcs3/Emu/Cell/Modules/cellHttp.h create mode 100644 rpcs3/Emu/Cell/Modules/cellHttpUtil.h create mode 100644 rpcs3/Emu/Cell/Modules/cellJpgEnc.h create mode 100644 rpcs3/Emu/Cell/Modules/cellVoice.h diff --git a/rpcs3/Emu/Cell/Modules/cellCelp8Enc.cpp b/rpcs3/Emu/Cell/Modules/cellCelp8Enc.cpp index b834d9b57d..de1f854639 100644 --- a/rpcs3/Emu/Cell/Modules/cellCelp8Enc.cpp +++ b/rpcs3/Emu/Cell/Modules/cellCelp8Enc.cpp @@ -2,18 +2,10 @@ #include "Emu/System.h" #include "Emu/Cell/PPUModule.h" +#include "cellCelp8Enc.h" + logs::channel cellCelp8Enc("cellCelp8Enc", logs::level::notice); -// 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, -}; s32 cellCelp8EncQueryAttr() { diff --git a/rpcs3/Emu/Cell/Modules/cellCelp8Enc.h b/rpcs3/Emu/Cell/Modules/cellCelp8Enc.h new file mode 100644 index 0000000000..a2e55ae9fb --- /dev/null +++ b/rpcs3/Emu/Cell/Modules/cellCelp8Enc.h @@ -0,0 +1,37 @@ +#pragma once + +namespace vm { using namespace ps3; } + +// libCelp8Enc = 0x806140a1 - 0x806140bf + +// 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, +}; + +// Definitions +enum +{ + CELL_CELP8ENC_FS_8kHz = 1, + + CELL_CELP8ENC_EXCITATION_MODE_MPE = 0, + + CELL_CELP8ENC_MPE_CONFIG_0 = 0, + CELL_CELP8ENC_MPE_CONFIG_2 = 2, + CELL_CELP8ENC_MPE_CONFIG_6 = 6, + CELL_CELP8ENC_MPE_CONFIG_9 = 9, + CELL_CELP8ENC_MPE_CONFIG_12 = 12, + CELL_CELP8ENC_MPE_CONFIG_15 = 15, + CELL_CELP8ENC_MPE_CONFIG_18 = 18, + CELL_CELP8ENC_MPE_CONFIG_21 = 21, + CELL_CELP8ENC_MPE_CONFIG_24 = 24, + CELL_CELP8ENC_MPE_CONFIG_26 = 26, + + CELL_CELP8ENC_WORD_SZ_FLOAT, +}; diff --git a/rpcs3/Emu/Cell/Modules/cellCelpEnc.cpp b/rpcs3/Emu/Cell/Modules/cellCelpEnc.cpp index 0cd61d2504..43c4e57ed6 100644 --- a/rpcs3/Emu/Cell/Modules/cellCelpEnc.cpp +++ b/rpcs3/Emu/Cell/Modules/cellCelpEnc.cpp @@ -2,18 +2,10 @@ #include "Emu/System.h" #include "Emu/Cell/PPUModule.h" +#include "cellCelpEnc.h" + logs::channel cellCelpEnc("cellCelpEnc", logs::level::notice); -// 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, -}; s32 cellCelpEncQueryAttr() { diff --git a/rpcs3/Emu/Cell/Modules/cellCelpEnc.h b/rpcs3/Emu/Cell/Modules/cellCelpEnc.h new file mode 100644 index 0000000000..079920f389 --- /dev/null +++ b/rpcs3/Emu/Cell/Modules/cellCelpEnc.h @@ -0,0 +1,32 @@ +#pragma once + +namespace vm { using namespace ps3; } + +// libCelpEnc = 0x80614001 - 0x806140ff + +// 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, +}; + +// Definitions +enum +{ + CELL_CELPENC_FS_16kHz = 2, + + CELL_CELPENC_EXCITATION_MODE_RPE = 1, + + CELL_CELPENC_RPE_CONFIG_0, + CELL_CELPENC_RPE_CONFIG_1, + CELL_CELPENC_RPE_CONFIG_2, + CELL_CELPENC_RPE_CONFIG_3, + + CELL_CELPENC_WORD_SZ_INI16_LE, + CELL_CELPENC_WORD_SZ_FLOAT, +}; diff --git a/rpcs3/Emu/Cell/Modules/cellDaisy.cpp b/rpcs3/Emu/Cell/Modules/cellDaisy.cpp index 4f37bc46e7..968446f933 100644 --- a/rpcs3/Emu/Cell/Modules/cellDaisy.cpp +++ b/rpcs3/Emu/Cell/Modules/cellDaisy.cpp @@ -1,6 +1,8 @@ #include "stdafx.h" #include "Emu/Cell/PPUModule.h" +#include "cellDaisy.h" + logs::channel cellDaisy("cellDaisy", logs::level::notice); s32 _ZN4cell5Daisy17LFQueue2PushCloseEPNS0_8LFQueue2EPFiPvjE() diff --git a/rpcs3/Emu/Cell/Modules/cellDaisy.h b/rpcs3/Emu/Cell/Modules/cellDaisy.h new file mode 100644 index 0000000000..7ddd53f68a --- /dev/null +++ b/rpcs3/Emu/Cell/Modules/cellDaisy.h @@ -0,0 +1,84 @@ +#pragma once + +namespace vm { using namespace ps3; } + +// libDaisy = 0x80410501 - 0x804105ff + +// Error codes +enum +{ + CELL_DAISY_ERROR_NO_BEGIN = 0x80410501, + CELL_DAISY_ERROR_INVALID_PORT_ATTACH = 0x80410502, + CELL_DAISY_ERROR_NOT_IMPLEMENTED = 0x80410503, + CELL_DAISY_ERROR_AGAIN = 0x80410511, + CELL_DAISY_ERROR_INVAL = 0x80410512, + CELL_DAISY_ERROR_PERM = 0x80410509, + CELL_DAISY_ERROR_BUSY = 0x8041051A, + CELL_DAISY_ERROR_STAT = 0x8041050F, +}; + +// Return codes +enum +{ + QUEUE_IS_BUSY = 2, + TERMINATED = 3, + GLUE_ACTIVE = 4, +}; + +// Assertations +enum +{ + CELL_DAISY_MIN_QUEUE_SIZE = 1, + CELL_DAISY_MAX_LOCAL_QUEUE_SIZE = 32, + CELL_DAISY_MAX_ATO_QUEUE_SIZE = 32, + CELL_DAISY_MAX_SNR_QUEUE_SIZE = 12, + CELL_DAISY_MIN_ENTRY_SIZE = 16, + CELL_DAISY_MAX_ENTRY_SIZE = (16*1024), + CELL_DAISY_MAX_DMA_TAG = 31, + + // CELL_DAISY_ENTRY_SIZE(x) + // CELL_DAISY_EA_ATOMIC(x) + // CELL_DAISY_EA_DMA(x) +}; + +// Definitions +// The following are prefixed with DAISY_ to prevent name conflits +enum +{ + // Queue IO + DAISY_OUTPUT, + DAISY_INPUT, + + // Block Mode + DAISY_NOT_STALL = 0, + DAISY_STALL = 1, + + // Queue Status + DAISY_PTR_UNAVAILABLE = 0x40000001, + DAISY_PTR_TERMINATED = 0x40000002, + + // Buffer Mode + DAISY_COPY = 0, + DAISY_REFERENCE = 1, + + // Constructor Mode + DAISY_NO_PARAMETER = 0, + DAISY_PARAMETER = 1, + + // Glue Mode + DAISY_ONE_PORT = 1, + DAISY_TWO_PORT = 2, + + // Queue Mode + DAISY_IN_ORDER, + DAISY_OUT_OF_ORDER, + + // Buffer Type + DAISY_BUFFER_TYPE_REMOTE = 1, + DAISY_BUFFER_TYPE_LOCAL = 2, + + // Queue Control Type + DAISY_QCTL_TYPE_ATOMIC = 1, + DAISY_QCTL_TYPE_LOCAL = 2, + DAISY_QCTL_TYPE_SIGNAL_NOTIFICATION = 3, +}; diff --git a/rpcs3/Emu/Cell/Modules/cellHttp.cpp b/rpcs3/Emu/Cell/Modules/cellHttp.cpp index e8036bdc30..088241c209 100644 --- a/rpcs3/Emu/Cell/Modules/cellHttp.cpp +++ b/rpcs3/Emu/Cell/Modules/cellHttp.cpp @@ -1,6 +1,8 @@ #include "stdafx.h" #include "Emu/Cell/PPUModule.h" +#include "cellHttp.h" + logs::channel cellHttp("cellHttp", logs::level::notice); s32 cellHttpInit() diff --git a/rpcs3/Emu/Cell/Modules/cellHttp.h b/rpcs3/Emu/Cell/Modules/cellHttp.h new file mode 100644 index 0000000000..3b6ad50d21 --- /dev/null +++ b/rpcs3/Emu/Cell/Modules/cellHttp.h @@ -0,0 +1,132 @@ +#pragma once + +namespace vm { using namespace ps3; } + +// libHttp = 0x80710001 - 0x80710fff +// libHttps = 0x80710a01 - 0x80710aff + +// Error Codes - Http +enum +{ + CELL_HTTP_NET_ERROR_TYPE_MASK = 0xffffff00, + CELL_HTTP_NET_ERROR_MASK = 0xff, + + // CELL_HTTP_NET_ERROR + // CELL_HTTP_IS_NET_RESOLVER_ERROR + + CELL_HTTP_ERROR_ALREADY_INITIALIZED = 0x80710001, + CELL_HTTP_ERROR_NOT_INITIALIZED = 0x80710002, + CELL_HTTP_ERROR_NO_MEMORY = 0x80710003, + CELL_HTTP_ERROR_NO_BUFFER = 0x80710004, + CELL_HTTP_ERROR_NO_STRING = 0x80710005, + CELL_HTTP_ERROR_INSUFFICIENT = 0x80710006, + CELL_HTTP_ERROR_INVALID_URI = 0x80710007, + CELL_HTTP_ERROR_INVALID_HEADER = 0x80710008, + CELL_HTTP_ERROR_BAD_METHOD = 0x80710009, + CELL_HTTP_ERROR_BAD_CLIENT = 0x80710010, + CELL_HTTP_ERROR_BAD_TRANS = 0x80710011, + CELL_HTTP_ERROR_NO_CONNECTION = 0x80710012, + CELL_HTTP_ERROR_NO_REQUEST_SENT = 0x80710013, + CELL_HTTP_ERROR_ALREADY_BUILT = 0x80710014, + CELL_HTTP_ERROR_ALREADY_SENT = 0x80710015, + CELL_HTTP_ERROR_NO_HEADER = 0x80710016, + CELL_HTTP_ERROR_NO_CONTENT_LENGTH = 0x80710017, + CELL_HTTP_ERROR_TOO_MANY_REDIRECTS = 0x80710018, + CELL_HTTP_ERROR_TOO_MANY_AUTHS = 0x80710019, + CELL_HTTP_ERROR_TRANS_NO_CONNECTION = 0x80710020, + CELL_HTTP_ERROR_CB_FAILED = 0x80710021, + CELL_HTTP_ERROR_NOT_PIPED = 0x80710022, + CELL_HTTP_ERROR_OUT_OF_ORDER_PIPE = 0x80710023, + CELL_HTTP_ERROR_TRANS_ABORTED = 0x80710024, + CELL_HTTP_ERROR_BROKEN_PIPELINE = 0x80710025, + CELL_HTTP_ERROR_UNAVAILABLE = 0x80710026, + CELL_HTTP_ERROR_INVALID_VALUE = 0x80710027, + CELL_HTTP_ERROR_CANNOT_AUTHENTICATE = 0x80710028, + CELL_HTTP_ERROR_COOKIE_NOT_FOUND = 0x80710041, + CELL_HTTP_ERROR_COOKIE_INVALID_DOMAIN = 0x80710042, + CELL_HTTP_ERROR_CACHE_ALREADY_INITIALIZED = 0x80710043, + CELL_HTTP_ERROR_CACHE_NOT_INITIALIZED = 0x80710044, + CELL_HTTP_ERROR_LINE_EXCEEDS_MAX = 0x80710045, + CELL_HTTP_ERROR_REQUIRES_BASIC_AUTH = 0x80710046, + + CELL_HTTP_ERROR_UNKNOWN = 0x80710051, + CELL_HTTP_ERROR_INTERNAL = 0x80710052, + CELL_HTTP_ERROR_NONREMOVABLE = 0x80710053, + CELL_HTTP_ERROR_BAD_CONN = 0x80710054, + CELL_HTTP_ERROR_BAD_MAN = 0x80710055, + CELL_HTTP_ERROR_NO_POOL = 0x80710056, + CELL_HTTP_ERROR_NO_REQUEST = 0x80710057, + CELL_HTTP_ERROR_LOCK_FAILED = 0x80710058, + CELL_HTTP_ERROR_INVALID_DATA = 0x80710059, + CELL_HTTP_ERROR_BROKEN_CHUNK = 0x8071005a, + CELL_HTTP_ERROR_DECODE_SETUP = 0x8071005b, + CELL_HTTP_ERROR_DECODE_STREAM = 0x8071005c, + CELL_HTTP_ERROR_BROKEN_DECODE_STREAM = 0x8071005d, + + CELL_HTTP_ERROR_INVALID_DCACHE_PATH = 0x80710060, + CELL_HTTP_ERROR_DCACHE_ALREADY_INITIALIZED = 0x80710061, + CELL_HTTP_ERROR_DCACHE_NOT_INITIALIZED = 0x80710062, + CELL_HTTP_ERROR_TOO_MANY_DCACHE_ENTRY = 0x80710063, + CELL_HTTP_ERROR_DUP_DCACHE_ENTRY = 0x80710064, + CELL_HTTP_ERROR_WRITE_DCACHE = 0x80710065, + CELL_HTTP_ERROR_READ_DCACHE = 0x80710066, + CELL_HTTP_ERROR_CACHE_TOO_LARGE = 0x80710067, + CELL_HTTP_ERROR_INVALID_DCACHE_VERSION = 0x80710068, + CELL_HTTP_ERROR_DCACHE_FILE_BROKEN = 0x80710069, + CELL_HTTP_ERROR_DCACHE_EXCEEDS_MAX = 0x8071006a, + CELL_HTTP_ERROR_DCACHE_BUSY = 0x8071006b, + CELL_HTTP_ERROR_DCACHE_INDEX_BROKEN = 0x8071006c, + CELL_HTTP_ERROR_INVALID_DCACHE_INDEX_NODE = 0x8071006d, + CELL_HTTP_ERROR_DCACHE_FILE_INCONSISTENCY = 0x8071006e, + CELL_HTTP_ERROR_DCACHE_URI_TOO_LONG = 0x8071006f, + CELL_HTTP_ERROR_READ_DCACHE_EOF = 0x80710070, + CELL_HTTP_ERROR_END_OF_DCACHE_INDEX_NODE = 0x80710071, + CELL_HTTP_ERROR_NO_CACHE_MEMORY = 0x80710072, + CELL_HTTP_ERROR_DCACHE_BROKEN = 0x80710073, + CELL_HTTP_ERROR_DCACHE_TOO_MANY_WRITE = 0x80710074, + CELL_HTTP_ERROR_DCACHE_TOO_MANY_READ = 0x80710075, + CELL_HTTP_ERROR_DCACHE_FATAL = 0x80710076, + CELL_HTTP_ERROR_DCACHE_UNSUPPORTED_FEATURE = 0x80710077, + CELL_HTTP_ERROR_DCACHE_INDEX_IS_ALREADY_OPEN = 0x80710078, + CELL_HTTP_ERROR_DCACHE_INDEX_IS_OPENING = 0x80710079, + CELL_HTTP_ERROR_DCACHE_UNKNOWN = 0x80710080, + CELL_HTTP_ERROR_DCACHE_INDEX_IS_CLOSED = 0x80710081, + CELL_HTTP_ERROR_DCACHE_ABORTED = 0x80710082, + CELL_HTTP_ERROR_DCACHE_INDEX_IS_CLOSING = 0x80710083, + CELL_HTTP_ERROR_DCACHE_UNKNOWN_INDEX_STATE = 0x80710084, + + CELL_HTTP_ERROR_NET_FIN = 0x80710091, + CELL_HTTP_ERROR_NET_CONNECT_TIMEOUT = 0x80710092, + CELL_HTTP_ERROR_NET_SELECT_TIMEOUT = 0x80710093, + CELL_HTTP_ERROR_NET_SEND_TIMEOUT = 0x80710094, + + CELL_HTTP_ERROR_NET_RESOLVER = 0x80710100, + CELL_HTTP_ERROR_NET_ABORT = 0x80710200, + CELL_HTTP_ERROR_NET_OPTION = 0x80710300, + CELL_HTTP_ERROR_NET_SOCKET = 0x80710400, + CELL_HTTP_ERROR_NET_CONNECT = 0x80710500, + CELL_HTTP_ERROR_NET_SEND = 0x80710600, + CELL_HTTP_ERROR_NET_RECV = 0x80710700, + CELL_HTTP_ERROR_NET_SELECT = 0x80710800, +}; + +// Error Codes - Https +enum +{ + CELL_HTTPS_ERROR_CERTIFICATE_LOAD = 0x80710a01, + CELL_HTTPS_ERROR_BAD_MEMORY = 0x80710a02, + CELL_HTTPS_ERROR_CONTEXT_CREATION = 0x80710a03, + CELL_HTTPS_ERROR_CONNECTION_CREATION = 0x80710a04, + CELL_HTTPS_ERROR_SOCKET_ASSOCIATION = 0x80710a05, + CELL_HTTPS_ERROR_HANDSHAKE = 0x80710a06, + CELL_HTTPS_ERROR_LOOKUP_CERTIFICATE = 0x80710a07, + CELL_HTTPS_ERROR_NO_SSL = 0x80710a08, + CELL_HTTPS_ERROR_KEY_LOAD = 0x80710a09, + CELL_HTTPS_ERROR_CERT_KEY_MISMATCH = 0x80710a0a, + CELL_HTTPS_ERROR_KEY_NEEDS_CERT = 0x80710a0b, + CELL_HTTPS_ERROR_CERT_NEEDS_KEY = 0x80710a0c, + CELL_HTTPS_ERROR_RETRY_CONNECTION = 0x80710a01d, + CELL_HTTPS_ERROR_NET_SSL_CONNECT = 0x80710b00, + CELL_HTTPS_ERROR_NET_SSL_SEND = 0x80710c00, + CELL_HTTPS_ERROR_NET_SSL_RECV = 0x80710d00, +}; diff --git a/rpcs3/Emu/Cell/Modules/cellHttpUtil.cpp b/rpcs3/Emu/Cell/Modules/cellHttpUtil.cpp index c68c4344ce..25eb5d6d73 100644 --- a/rpcs3/Emu/Cell/Modules/cellHttpUtil.cpp +++ b/rpcs3/Emu/Cell/Modules/cellHttpUtil.cpp @@ -1,6 +1,8 @@ #include "stdafx.h" #include "Emu/Cell/PPUModule.h" +#include "cellHttpUtil.h" + logs::channel cellHttpUtil("cellHttpUtil", logs::level::notice); s32 cellHttpUtilParseUri() diff --git a/rpcs3/Emu/Cell/Modules/cellHttpUtil.h b/rpcs3/Emu/Cell/Modules/cellHttpUtil.h new file mode 100644 index 0000000000..caac30340b --- /dev/null +++ b/rpcs3/Emu/Cell/Modules/cellHttpUtil.h @@ -0,0 +1,20 @@ +#pragma once + +namespace vm { using namespace ps3; } + +// libHttp_Util: 0x80711001 - 0x807110ff + +// Error Codes +enum +{ + CELL_HTTP_UTIL_ERROR_NO_MEMORY = 0x80711001, + CELL_HTTP_UTIL_ERROR_NO_BUFFER = 0x80711002, + CELL_HTTP_UTIL_ERROR_NO_STRING = 0x80711003, + CELL_HTTP_UTIL_ERROR_INSUFFICIENT = 0x80711004, + CELL_HTTP_UTIL_ERROR_INVALID_URI = 0x80711005, + CELL_HTTP_UTIL_ERROR_INVALID_HEADER = 0x80711006, + CELL_HTTP_UTIL_ERROR_INVALID_REQUEST = 0x80711007, + CELL_HTTP_UTIL_ERROR_INVALID_RESPONSE = 0x80711008, + CELL_HTTP_UTIL_ERROR_INVALID_LENGTH = 0x80711009, + CELL_HTTP_UTIL_ERROR_INVALID_CHARACTER = 0x8071100a, +}; diff --git a/rpcs3/Emu/Cell/Modules/cellJpgEnc.cpp b/rpcs3/Emu/Cell/Modules/cellJpgEnc.cpp index 96a46b3900..6c6a1fbb1c 100644 --- a/rpcs3/Emu/Cell/Modules/cellJpgEnc.cpp +++ b/rpcs3/Emu/Cell/Modules/cellJpgEnc.cpp @@ -1,18 +1,10 @@ #include "stdafx.h" #include "Emu/Cell/PPUModule.h" +#include "cellJpgEnc.h" + logs::channel cellJpgEnc("cellJpgEnc", logs::level::notice); -// 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, -}; s32 cellJpgEncQueryAttr() { diff --git a/rpcs3/Emu/Cell/Modules/cellJpgEnc.h b/rpcs3/Emu/Cell/Modules/cellJpgEnc.h new file mode 100644 index 0000000000..154def9f5a --- /dev/null +++ b/rpcs3/Emu/Cell/Modules/cellJpgEnc.h @@ -0,0 +1,44 @@ +#pragma once + +namespace vm { using namespace ps3; } + +// 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_STREAM_ABORT = 0x806111A1, + CELL_JPGENC_ERROR_STREAM_SKIP = 0x806111A2, + CELL_JPGENC_ERROR_STREAM_OVERFLOW = 0x806111A3, + CELL_JPGENC_ERROR_STREAM_FILE_OPEN = 0x806111A4, +}; + +// Definitions +enum +{ + CELL_JPGENC_COLOR_SPACE_GRAYSCALE = 1, + CELL_JPGENC_COLOR_SPACE_RGB = 2, + CELL_JPGENC_COLOR_SPACE_YCbCr = 3, + CELL_JPGENC_COLOR_SPACE_RGBA = 10, + CELL_JPGENC_COLOR_SPACE_ARGB = 20, + + CELL_JPGENC_SAMPLING_FMT_YCbCr444, + CELL_JPGENC_SAMPLING_FMT_YCbCr422, + CELL_JPGENC_SAMPLING_FMT_YCbCr420, + CELL_JPGENC_SAMPLING_FMT_YCbCr411, + CELL_JPGENC_SAMPLING_FMT_FULL, + + CELL_JPGENC_DCT_METHOD_QUALITY = 0, + CELL_JPGENC_DCT_METHOD_FAST = 5, + + CELL_JPGENC_COMPR_MODE_CONSTANT_QUALITY, + CELL_JPGENC_COMPR_MODE_STREAM_SIZE_LIMIT, + + CELL_JPGENC_LOCATION_FILE, + CELL_JPGENC_LOCATION_BUFFER, +}; diff --git a/rpcs3/Emu/Cell/Modules/cellVoice.cpp b/rpcs3/Emu/Cell/Modules/cellVoice.cpp index b9ae6d2331..660c9f3cd1 100644 --- a/rpcs3/Emu/Cell/Modules/cellVoice.cpp +++ b/rpcs3/Emu/Cell/Modules/cellVoice.cpp @@ -2,30 +2,10 @@ #include "Emu/System.h" #include "Emu/Cell/PPUModule.h" +#include "cellVoice.h" + logs::channel cellVoice("cellVoice", logs::level::notice); -// 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, -}; s32 cellVoiceConnectIPortToOPort() { @@ -221,7 +201,8 @@ s32 cellVoiceWriteToIPortEx() s32 cellVoiceWriteToIPortEx2() { - throw EXCEPTION(""); + UNIMPLEMENTED_FUNC(cellVoice); + return CELL_OK; } s32 cellVoiceReadFromOPort() diff --git a/rpcs3/Emu/Cell/Modules/cellVoice.h b/rpcs3/Emu/Cell/Modules/cellVoice.h new file mode 100644 index 0000000000..4255f355d6 --- /dev/null +++ b/rpcs3/Emu/Cell/Modules/cellVoice.h @@ -0,0 +1,91 @@ +#pragma once + +namespace vm { using namespace ps3; } + +// libvoice = 0x80310801 - 0x803108ff +// libvoice version 100 + +// 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, +}; + +// Definitions +enum +{ + CELLVOICE_MAX_IN_VOICE_PORT = 32, + CELLVOICE_MAX_OUT_VOICE_PORT = 4, + CELLVOICE_GAME_1MB_MAX_IN_VOICE_PORT = 8, + CELLVOICE_GAME_1MB_MAX_OUT_VOICE_PORT = 2, + CELLVOICE_MAX_PORT = 128, + CELLVOICE_INVALID_PORT_ID = 0xff, + + CELLVOICE_PORTTYPE_NULL = -1, + CELLVOICE_PORTTYPE_IN_MIC = 0, + CELLVOICE_PORTTYPE_IN_PCMAUDIO = 1, + CELLVOICE_PORTTYPE_IN_VOICE = 2, + CELLVOICE_PORTTYPE_OUT_PCMAUDIO = 3, + CELLVOICE_PORTTYPE_OUT_VOICE = 4, + CELLVOICE_PORTTYPE_OUT_SECONDARY = 5, + + CELLVOICE_PORTSTATE_NULL = -1, + CELLVOICE_PORTSTATE_IDLE = 0, + CELLVOICE_PORTSTATE_READY = 1, + CELLVOICE_PORTSTATE_BUFFERING = 2, + CELLVOICE_PORTSTATE_RUNNING = 3, + + CELLVOICE_BITRATE_NULL = -1, + CELLVOICE_BITRATE_3850 = 3850, + CELLVOICE_BITRATE_4650 = 4650, + CELLVOICE_BITRATE_5700 = 5700, + CELLVOICE_BITRATE_7300 = 7300, + CELLVOICE_BITRATE_14400 = 14400, + CELLVOICE_BITRATE_16000 = 16000, + CELLVOICE_BITRATE_22533 = 22533, + + CELLVOICE_SAMPLINGRATE_NULL = -1, + CELLVOICE_SAMPLINGRATE_16000 = 16000, + + CELLVOICE_EVENT_DATA_ERROR = 1 << 0, + CELLVOICE_EVENT_PORT_ATTACHED = 1 << 1, + CELLVOICE_EVENT_PORT_DETACHED = 1 << 2, + CELLVOICE_EVENT_SERVICE_ATTACHED = 1 << 3, + CELLVOICE_EVENT_SERVICE_DETACHED = 1 << 4, + CELLVOICE_EVENT_PORT_WEAK_ATTACHED = 1 << 5, + CELLVOICE_EVENT_PORT_WEAK_DETACHED = 1 << 6, + + CELLVOICE_PCM_NULL = -1, + CELLVOICE_PCM_FLOAT = 0, + CELLVOICE_PCM_FLOAT_LITTLE_ENDIAN = 1, + CELLVOICE_PCM_SHORT = 2, + CELLVOICE_PCM_SHORT_LITTLE_ENDIAN = 3, + CELLVOICE_PCM_INTEGER = 4, + CELLVOICE_PCM_INTEGER_LITTLE_ENDIAN = 5, + + CELLVOICE_ATTR_ENERGY_LEVEL = 1000, + CELLVOICE_ATTR_VAD = 1001, + CELLVOICE_ATTR_DTX = 1002, + CELLVOICE_ATTR_AUTO_RESAMPLE = 1003, + CELLVOICE_ATTR_LATENCY = 1004, + CELLVOICE_ATTR_SILENCE_THRESHOLD = 1005, + + CELLVOICE_APPTYPE_GAME_1MB = 1 << 29 +};