diff --git a/misc/3ds/Makefile b/misc/3ds/Makefile index 408642232..901cd841a 100644 --- a/misc/3ds/Makefile +++ b/misc/3ds/Makefile @@ -12,7 +12,7 @@ include $(DEVKITARM)/3ds_rules #--------------------------------------------------------------------------------- # configurable options #--------------------------------------------------------------------------------- -APP_ICON := $(TOPDIR)/misc/CC_48x48.png +APP_ICON := $(TOPDIR)/misc/3ds/icon.png APP_TITLE := ClassiCube APP_DESCRIPTION := Simple block building sandbox APP_AUTHOR := UnknownShadow200 diff --git a/misc/3ds/banner.png b/misc/3ds/banner.png new file mode 100644 index 000000000..8f9c5661f Binary files /dev/null and b/misc/3ds/banner.png differ diff --git a/misc/CC_48x48.png b/misc/3ds/icon.png similarity index 100% rename from misc/CC_48x48.png rename to misc/3ds/icon.png diff --git a/src/Platform_PS3.c b/src/Platform_PS3.c index 0eb3c315f..aee2e7840 100644 --- a/src/Platform_PS3.c +++ b/src/Platform_PS3.c @@ -35,15 +35,13 @@ const cc_result ReturnCode_FileShareViolation = 1000000000; // not used const cc_result ReturnCode_FileNotFound = 0x80010006; // ENOENT; -//const cc_result ReturnCode_SocketInProgess = 0x80010032; // EINPROGRESS -//const cc_result ReturnCode_SocketWouldBlock = 0x80010001; // EWOULDBLOCK; -const cc_result ReturnCode_DirectoryExists = 0x80010014; // EEXIST - const cc_result ReturnCode_SocketInProgess = NET_EINPROGRESS; const cc_result ReturnCode_SocketWouldBlock = NET_EWOULDBLOCK; +const cc_result ReturnCode_DirectoryExists = 0x80010014; // EEXIST + const char* Platform_AppNameSuffix = " PS3"; -SYS_PROCESS_PARAM(1001, 128 * 1024); // 128kb stack size +SYS_PROCESS_PARAM(1001, 256 * 1024); // 256kb stack size /*########################################################################################################################* *------------------------------------------------------Logging/Time-------------------------------------------------------* @@ -415,13 +413,12 @@ void Socket_Close(cc_socket s) { static cc_result Socket_Poll(cc_socket s, int mode, cc_bool* success) { struct pollfd pfd; - int flags, res; + int flags; pfd.fd = s; pfd.events = mode == SOCKET_POLL_READ ? POLLIN : POLLOUT; - res = netPoll(&pfd, 1, 0); - if (res) return net_errno; + if (netPoll(&pfd, 1, 0) < 0) return net_errno; /* to match select, closed socket still counts as readable */ flags = mode == SOCKET_POLL_READ ? (POLLIN | POLLHUP) : POLLOUT; @@ -438,7 +435,7 @@ cc_result Socket_CheckWritable(cc_socket s, cc_bool* writable) { cc_result res = Socket_Poll(s, SOCKET_POLL_WRITE, writable); if (res || *writable) return res; - /* https://stackoverflow.com/questions/29479953/so-error-value-after-successful-socket-operation */ + // https://stackoverflow.com/questions/29479953/so-error-value-after-successful-socket-operation netGetSockOpt(s, SOL_SOCKET, SO_ERROR, &res, &resultSize); return res; } diff --git a/src/Window_PS3.c b/src/Window_PS3.c index 2603a9c84..6a874aecf 100644 --- a/src/Window_PS3.c +++ b/src/Window_PS3.c @@ -59,8 +59,8 @@ void Window_Init(void) { WindowInfo.Exists = true; Input.Sources = INPUT_SOURCE_GAMEPAD; - DisplayInfo.ContentOffsetX = 10; - DisplayInfo.ContentOffsetY = 10; + DisplayInfo.ContentOffsetX = 20; + DisplayInfo.ContentOffsetY = 20; ioPadInit(MAX_PORT_NUM); ioKbInit(MAX_KB_PORT_NUM);