From a08b6c13403f56ac4789628011548bcb3592b1b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Wed, 6 Aug 2025 00:49:55 +0200 Subject: [PATCH] More error code cleanup --- Core/HLE/ErrorCodes.h | 14 ++++ Core/HLE/NetInetConstants.h | 138 ------------------------------------ Core/HLE/sceKernel.cpp | 2 + Core/HLE/sceNetInet.cpp | 3 +- 4 files changed, 18 insertions(+), 139 deletions(-) diff --git a/Core/HLE/ErrorCodes.h b/Core/HLE/ErrorCodes.h index f917f16d51..fdbba377fe 100644 --- a/Core/HLE/ErrorCodes.h +++ b/Core/HLE/ErrorCodes.h @@ -515,6 +515,20 @@ enum PSPErrorCode : u32 { SCE_MP3_ERROR_BAD_ADDR = 0x80671002, SCE_MP3_ERROR_BAD_SIZE = 0x80671003, + // pspnet_inet + SCE_NET_INET_ERROR_ALREADY_INITIALIZED = 0x80410201, + // Are these used? + SCE_NET_INET_ERROR_SOCKET_BUSY = 0x80410202, + SCE_NET_INET_ERROR_CONFIG_INVALID_ARG = 0x80410203, + SCE_NET_INET_ERROR_GET_IFADDR = 0x80410204, + SCE_NET_INET_ERROR_SET_IFADDR = 0x80410205, + SCE_NET_INET_ERROR_DEL_IFADDR = 0x80410206, + SCE_NET_INET_ERROR_NO_DEFAULT_ROUTE = 0x80410207, + SCE_NET_INET_ERROR_GET_ROUTE = 0x80410208, + SCE_NET_INET_ERROR_SET_ROUTE = 0x80410209, + SCE_NET_INET_ERROR_FLUSH_ROUTE = 0x8041020a, + SCE_NET_INET_ERROR_INVALID_ARG = 0x8041020b, + // pspnet_resolver SCE_NET_RESOLVER_ERROR_NOT_TERMINATED = 0x80410401, SCE_NET_RESOLVER_ERROR_NO_DNS_SERVER = 0x80410402, diff --git a/Core/HLE/NetInetConstants.h b/Core/HLE/NetInetConstants.h index 595676d0f8..1ed42a84b9 100644 --- a/Core/HLE/NetInetConstants.h +++ b/Core/HLE/NetInetConstants.h @@ -302,144 +302,6 @@ enum { #define SHUT_RDWR SD_BOTH //0x02 #endif -enum { - // from pspsdk's pspnet.h which is similar to https://docs.vitasdk.org/net_2net_8h_source.html - SCE_NET_ERROR_EPERM = 0x80410101, - SCE_NET_ERROR_ENOENT = 0x80410102, - SCE_NET_ERROR_ESRCH = 0x80410103, - SCE_NET_ERROR_EINTR = 0x80410104, - SCE_NET_ERROR_EIO = 0x80410105, - SCE_NET_ERROR_ENXIO = 0x80410106, - SCE_NET_ERROR_E2BIG = 0x80410107, - - SCE_NET_ERROR_ENOEXEC = 0x80410108, - SCE_NET_ERROR_EBADF = 0x80410109, - SCE_NET_ERROR_ECHILD = 0x8041010A, - SCE_NET_ERROR_EDEADLK = 0x8041010B, - SCE_NET_ERROR_ENOMEM = 0x8041010C, - SCE_NET_ERROR_EACCES = 0x8041010D, - SCE_NET_ERROR_EFAULT = 0x8041010E, - SCE_NET_ERROR_ENOTBLK = 0x8041010F, - SCE_NET_ERROR_EBUSY = 0x80410110, - SCE_NET_ERROR_EEXIST = 0x80410111, - SCE_NET_ERROR_EXDEV = 0x80410112, - SCE_NET_ERROR_ENODEV = 0x80410113, - SCE_NET_ERROR_ENOTDIR = 0x80410114, - SCE_NET_ERROR_EISDIR = 0x80410115, - SCE_NET_ERROR_EINVAL = 0x80410116, - SCE_NET_ERROR_ENFILE = 0x80410117, - SCE_NET_ERROR_EMFILE = 0x80410118, - SCE_NET_ERROR_ENOTTY = 0x80410119, - SCE_NET_ERROR_ETXTBSY = 0x8041011A, - SCE_NET_ERROR_EFBIG = 0x8041011B, - SCE_NET_ERROR_ENOSPC = 0x8041011C, - SCE_NET_ERROR_ESPIPE = 0x8041011D, - SCE_NET_ERROR_EROFS = 0x8041011E, - SCE_NET_ERROR_EMLINK = 0x8041011F, - SCE_NET_ERROR_EPIPE = 0x80410120, - SCE_NET_ERROR_EDOM = 0x80410121, - SCE_NET_ERROR_ERANGE = 0x80410122, - SCE_NET_ERROR_EAGAIN = 0x80410123, - SCE_NET_ERROR_EWOULDBLOCK = 0x80410123, - SCE_NET_ERROR_EINPROGRESS = 0x80410124, - SCE_NET_ERROR_EALREADY = 0x80410125, - SCE_NET_ERROR_ENOTSOCK = 0x80410126, - SCE_NET_ERROR_EDESTADDRREQ = 0x80410127, - SCE_NET_ERROR_EMSGSIZE = 0x80410128, - SCE_NET_ERROR_EPROTOTYPE = 0x80410129, - SCE_NET_ERROR_ENOPROTOOPT = 0x8041012A, - SCE_NET_ERROR_EPROTONOSUPPORT = 0x8041012B, - SCE_NET_ERROR_ESOCKTNOSUPPORT = 0x8041012C, - SCE_NET_ERROR_EOPNOTSUPP = 0x8041012D, - SCE_NET_ERROR_EPFNOSUPPORT = 0x8041012E, - SCE_NET_ERROR_EAFNOSUPPORT = 0x8041012F, - SCE_NET_ERROR_EADDRINUSE = 0x80410130, - SCE_NET_ERROR_EADDRNOTAVAIL = 0x80410131, - SCE_NET_ERROR_ENETDOWN = 0x80410132, - SCE_NET_ERROR_ENETUNREACH = 0x80410133, - SCE_NET_ERROR_ENETRESET = 0x80410134, - SCE_NET_ERROR_ECONNABORTED = 0x80410135, - SCE_NET_ERROR_ECONNRESET = 0x80410136, - SCE_NET_ERROR_ENOBUFS = 0x80410137, - SCE_NET_ERROR_EISCONN = 0x80410138, - SCE_NET_ERROR_ENOTCONN = 0x80410139, - SCE_NET_ERROR_ESHUTDOWN = 0x8041013A, - SCE_NET_ERROR_ETOOMANYREFS = 0x8041013B, - SCE_NET_ERROR_ETIMEDOUT = 0x8041013C, - SCE_NET_ERROR_ECONNREFUSED = 0x8041013D, - SCE_NET_ERROR_ELOOP = 0x8041013E, - SCE_NET_ERROR_ENAMETOOLONG = 0x8041013F, - SCE_NET_ERROR_EHOSTDOWN = 0x80410140, - SCE_NET_ERROR_EHOSTUNREACH = 0x80410141, - SCE_NET_ERROR_ENOTEMPTY = 0x80410142, - SCE_NET_ERROR_EPROCLIM = 0x80410143, - SCE_NET_ERROR_EUSERS = 0x80410144, - SCE_NET_ERROR_EDQUOT = 0x80410145, - SCE_NET_ERROR_ESTALE = 0x80410146, - SCE_NET_ERROR_EREMOTE = 0x80410147, - SCE_NET_ERROR_EBADRPC = 0x80410148, - SCE_NET_ERROR_ERPCMISMATCH = 0x80410149, - SCE_NET_ERROR_EPROGUNAVAIL = 0x8041014A, - SCE_NET_ERROR_EPROGMISMATCH = 0x8041014B, - SCE_NET_ERROR_EPROCUNAVAIL = 0x8041014C, - SCE_NET_ERROR_ENOLCK = 0x8041014D, - SCE_NET_ERROR_ENOSYS = 0x8041014E, - SCE_NET_ERROR_EFTYPE = 0x8041014F, - SCE_NET_ERROR_EAUTH = 0x80410150, - SCE_NET_ERROR_ENEEDAUTH = 0x80410151, - SCE_NET_ERROR_EIDRM = 0x80410152, - SCE_NET_ERROR_ENOMS = 0x80410153, - SCE_NET_ERROR_EOVERFLOW = 0x80410154, - SCE_NET_ERROR_EILSEQ = 0x80410155, - SCE_NET_ERROR_ENOTSUP = 0x80410156, - SCE_NET_ERROR_ECANCELED = 0x80410157, - SCE_NET_ERROR_EBADMSG = 0x80410158, - SCE_NET_ERROR_ENODATA = 0x80410159, - SCE_NET_ERROR_ENOSR = 0x8041015A, - SCE_NET_ERROR_ENOSTR = 0x8041015B, - SCE_NET_ERROR_ETIME = 0x8041015C, - - SCE_NET_ERROR_EADHOC = 0x804101A0, - SCE_NET_ERROR_EDISABLEDIF = 0x804101A1, - SCE_NET_ERROR_ERESUME = 0x804101A2, - - SCE_NET_ERROR_ENOTINIT = 0x804101C8, - SCE_NET_ERROR_ENOLIBMEM = 0x804101C9, - SCE_NET_ERROR_ERESERVED202 = 0x804101CA, - SCE_NET_ERROR_ECALLBACK = 0x804101CB, - SCE_NET_ERROR_EINTERNAL = 0x804101CC, - SCE_NET_ERROR_ERETURN = 0x804101CD, - - SCE_NET_ERROR_RESOLVER_EINTERNAL = 0x804101DC, - SCE_NET_ERROR_RESOLVER_EBUSY = 0x804101DD, - SCE_NET_ERROR_RESOLVER_ENOSPACE = 0x804101DE, - SCE_NET_ERROR_RESOLVER_EPACKET = 0x804101DF, - SCE_NET_ERROR_RESOLVER_ERESERVED22 = 0x804101E0, - SCE_NET_ERROR_RESOLVER_ENODNS = 0x804101E1, - SCE_NET_ERROR_RESOLVER_ETIMEDOUT = 0x804101E2, - SCE_NET_ERROR_RESOLVER_ENOSUPPORT = 0x804101E3, - SCE_NET_ERROR_RESOLVER_EFORMAT = 0x804101E4, - SCE_NET_ERROR_RESOLVER_ESERVERFAILURE = 0x804101E5, - SCE_NET_ERROR_RESOLVER_ENOHOST = 0x804101E6, - SCE_NET_ERROR_RESOLVER_ENOTIMPLEMENTED = 0x804101E7, - SCE_NET_ERROR_RESOLVER_ESERVERREFUSED = 0x804101E8, - SCE_NET_ERROR_RESOLVER_ENORECORD = 0x804101E9, - SCE_NET_ERROR_RESOLVER_EALIGNMENT = 0x804101EA, - - // pspnet_inet - ERROR_NET_INET_ALREADY_INITIALIZED = 0x80410201, - ERROR_NET_INET_SOCKET_BUSY = 0x80410202, - ERROR_NET_INET_CONFIG_INVALID_ARG = 0x80410203, - ERROR_NET_INET_GET_IFADDR = 0x80410204, - ERROR_NET_INET_SET_IFADDR = 0x80410205, - ERROR_NET_INET_DEL_IFADDR = 0x80410206, - ERROR_NET_INET_NO_DEFAULT_ROUTE = 0x80410207, - ERROR_NET_INET_GET_ROUTE = 0x80410208, - ERROR_NET_INET_SET_ROUTE = 0x80410209, - ERROR_NET_INET_FLUSH_ROUTE = 0x8041020a, - ERROR_NET_INET_INVALID_ARG = 0x8041020b, -}; - int convertMsgFlagPSP2Host(int flag); int convertMsgFlagHost2PSP(int flag); int convertMSGFlagsPSP2Host(int flags); diff --git a/Core/HLE/sceKernel.cpp b/Core/HLE/sceKernel.cpp index 5dcd22479a..60b5132443 100644 --- a/Core/HLE/sceKernel.cpp +++ b/Core/HLE/sceKernel.cpp @@ -1512,6 +1512,8 @@ const char *KernelErrorToString(u32 err) { case SCE_MP3_ERROR_BAD_ADDR: return "SCE_MP3_ERROR_BAD_ADDR"; case SCE_MP3_ERROR_BAD_SIZE: return "SCE_MP3_ERROR_BAD_SIZE"; + case SCE_NET_INET_ERROR_ALREADY_INITIALIZED: return "SCE_NET_INET_ERROR_ALREADY_INITIALIZED"; + case SCE_NET_RESOLVER_ERROR_NOT_TERMINATED: return "SCE_NET_RESOLVER_ERROR_NOT_TERMINATED"; case SCE_NET_RESOLVER_ERROR_NO_DNS_SERVER: return "SCE_NET_RESOLVER_ERROR_NO_DNS_SERVER"; case SCE_NET_RESOLVER_ERROR_INVALID_PTR: return "SCE_NET_RESOLVER_ERROR_INVALID_PTR"; diff --git a/Core/HLE/sceNetInet.cpp b/Core/HLE/sceNetInet.cpp index faea20206f..aa8431742e 100644 --- a/Core/HLE/sceNetInet.cpp +++ b/Core/HLE/sceNetInet.cpp @@ -8,6 +8,7 @@ #include "Core/HLE/SocketManager.h" #include "Core/HLE/HLE.h" +#include "Core/HLE/ErrorCodes.h" #include "Core/HLE/FunctionWrappers.h" #include "Core/HLE/sceNet.h" #include "Core/HLE/sceNetAdhoc.h" @@ -69,7 +70,7 @@ void __NetInetShutdown() { static int sceNetInetInit() { if (netInetInited) - return hleLogError(Log::sceNet, ERROR_NET_INET_ALREADY_INITIALIZED); + return hleLogError(Log::sceNet, SCE_NET_INET_ERROR_ALREADY_INITIALIZED); g_inetLastErrno.clear(); netInetInited = true; return hleLogDebug(Log::sceNet, 0);