libctru/include/3ds/services/cfgu.h

@@ -20,19 +20,18 @@ typedef enum
 /// Configuration language values.
 typedef enum
 {
-	CFG_LANGUAGE_DEFAULT = -1, ///< Use system language in errorInit
+	CFG_LANGUAGE_JP = 0,  ///< Japanese
-	CFG_LANGUAGE_JP,           ///< Japanese
+	CFG_LANGUAGE_EN = 1,  ///< English
-	CFG_LANGUAGE_EN,           ///< English
+	CFG_LANGUAGE_FR = 2,  ///< French
-	CFG_LANGUAGE_FR,           ///< French
+	CFG_LANGUAGE_DE = 3,  ///< German
-	CFG_LANGUAGE_DE,           ///< German
+	CFG_LANGUAGE_IT = 4,  ///< Italian
-	CFG_LANGUAGE_IT,           ///< Italian
+	CFG_LANGUAGE_ES = 5,  ///< Spanish
-	CFG_LANGUAGE_ES,           ///< Spanish
+	CFG_LANGUAGE_ZH = 6,  ///< Simplified Chinese
-	CFG_LANGUAGE_ZH,           ///< Simplified Chinese
+	CFG_LANGUAGE_KO = 7,  ///< Korean
-	CFG_LANGUAGE_KO,           ///< Korean
+	CFG_LANGUAGE_NL = 8,  ///< Dutch
-	CFG_LANGUAGE_NL,           ///< Dutch
+	CFG_LANGUAGE_PT = 9,  ///< Portugese
-	CFG_LANGUAGE_PT,           ///< Portugese
+	CFG_LANGUAGE_RU = 10, ///< Russian
-	CFG_LANGUAGE_RU,           ///< Russian
+	CFG_LANGUAGE_TW = 11, ///< Traditional Chinese
-	CFG_LANGUAGE_TW,           ///< Traditional Chinese
 } CFG_Language;
 
 // Configuration system model values.

libctru/source/applets/error.c

@@ -10,7 +10,7 @@ void errorInit(errorConf* err, errorType type, CFG_Language lang)
 {
 	memset(err, 0, sizeof(*err));
 	err->type = type;
-	err->useLanguage = lang + 1;
+	err->useLanguage = lang;
 	err->upperScreenFlag = ERROR_NORMAL;
 	err->eulaVersion =  0;
 	err->homeButton = true;

libctru/source/services/gspgpu.c

@@ -184,12 +184,6 @@ Result gspInit(void)
 	gspSharedMem = mappableAlloc(0x1000);
 	svcMapMemoryBlock(gspSharedMemHandle, (u32)gspSharedMem, MEMPERM_READWRITE, MEMPERM_DONTCARE);
 
-	// Initialize interrupt queue header
-	s32* sharedGspCmdBuf = (s32*)((u8*)gspSharedMem + 0x800 + gspThreadId*0x200);
-	do {
-		__ldrex(sharedGspCmdBuf);
-	} while (__strex(sharedGspCmdBuf, 0));
-
 	// Start event handling thread
 	gspRunEvents = true;
 	gspLastEvent = -1;

libctru/source/services/soc/soc_accept.c

@@ -6,10 +6,10 @@
 int accept(int sockfd, struct sockaddr *addr, socklen_t *addrlen)
 {
 	int ret = 0;
-	int tmp_addrlen = ADDR_STORAGE_LEN;
+	int tmp_addrlen = 0x1c;
 	int fd, dev;
 	u32 *cmdbuf = getThreadCommandBuffer();
-	u8 tmpaddr[ADDR_STORAGE_LEN];
+	u8 tmpaddr[0x1c];
 	u32 saved_threadstorage[2];
 
 	sockfd = soc_get_fd(sockfd);
@@ -27,7 +27,7 @@ int accept(int sockfd, struct sockaddr *addr, socklen_t *addrlen)
 	fd = __alloc_handle(dev);
 	if(fd < 0) return fd;
 
-	memset(tmpaddr, 0, ADDR_STORAGE_LEN);
+	memset(tmpaddr, 0, 0x1c);
 
 	cmdbuf[0] = IPC_MakeHeader(0x4,2,2); // 0x40082
 	cmdbuf[1] = (u32)sockfd;
@@ -61,14 +61,9 @@ int accept(int sockfd, struct sockaddr *addr, socklen_t *addrlen)
 
 	if(ret >= 0 && addr != NULL) {
 		addr->sa_family = tmpaddr[1];
-
+		if(*addrlen > tmpaddr[0])
-		socklen_t user_addrlen = tmpaddr[0];
+			*addrlen = tmpaddr[0];
-		if(addr->sa_family == AF_INET)
+		memcpy(addr->sa_data, &tmpaddr[2], *addrlen - 2);
-		    user_addrlen += 8; // Accounting for the 8 bytes of sin_zero padding, which must be written for compatibility.
-
-		if(*addrlen > user_addrlen)
-			*addrlen = user_addrlen;
-		memcpy(addr->sa_data, &tmpaddr[2], *addrlen - sizeof(addr->sa_family));
 	}
 
 	if(ret < 0) {

libctru/source/services/soc/soc_bind.c

@@ -8,7 +8,7 @@ int bind(int sockfd, const struct sockaddr *addr, socklen_t addrlen)
 	int ret = 0;
 	int tmp_addrlen = 0;
 	u32 *cmdbuf = getThreadCommandBuffer();
-	u8 tmpaddr[ADDR_STORAGE_LEN];
+	u8 tmpaddr[0x1c];
 
 	sockfd = soc_get_fd(sockfd);
 	if(sockfd < 0) {
@@ -16,12 +16,12 @@ int bind(int sockfd, const struct sockaddr *addr, socklen_t addrlen)
 		return -1;
 	}
 
-	memset(tmpaddr, 0, ADDR_STORAGE_LEN);
+	memset(tmpaddr, 0, 0x1c);
 
 	if(addr->sa_family == AF_INET)
 		tmp_addrlen = 8;
 	else
-		tmp_addrlen = ADDR_STORAGE_LEN;
+		tmp_addrlen = 0x1c;
 
 	if(addrlen < tmp_addrlen) {
 		errno = EINVAL;

libctru/source/services/soc/soc_common.h

@@ -10,7 +10,6 @@
 #include <3ds/services/soc.h>
 
 #define SYNC_ERROR ENODEV
-#define ADDR_STORAGE_LEN sizeof(struct sockaddr_storage)
 
 extern Handle	SOCU_handle;
 extern Handle	socMemhandle;

libctru/source/services/soc/soc_connect.c

@@ -8,7 +8,7 @@ int connect(int sockfd, const struct sockaddr *addr, socklen_t addrlen)
 	int ret = 0;
 	int tmp_addrlen = 0;
 	u32 *cmdbuf = getThreadCommandBuffer();
-	u8 tmpaddr[ADDR_STORAGE_LEN];
+	u8 tmpaddr[0x1c];
 
 	sockfd = soc_get_fd(sockfd);
 	if(sockfd < 0) {
@@ -16,12 +16,12 @@ int connect(int sockfd, const struct sockaddr *addr, socklen_t addrlen)
 		return -1;
 	}
 
-	memset(tmpaddr, 0, ADDR_STORAGE_LEN);
+	memset(tmpaddr, 0, 0x1c);
 
 	if(addr->sa_family == AF_INET)
 		tmp_addrlen = 8;
 	else
-		tmp_addrlen = ADDR_STORAGE_LEN;
+		tmp_addrlen = 0x1c;
 
 	if(addrlen < tmp_addrlen) {
 		errno = EINVAL;

libctru/source/services/soc/soc_getnameinfo.c

@@ -8,7 +8,7 @@ int getnameinfo(const struct sockaddr *sa, socklen_t salen, char *host, socklen_
 	int i,tmp_addrlen;
 	u32 *cmdbuf = getThreadCommandBuffer();
 	u32 saved_threadstorage[4];
-	u8 tmpaddr[ADDR_STORAGE_LEN]; // sockaddr size for the kernel is 0x1C (sockaddr_in6?)
+	u8 tmpaddr[0x1c]; // sockaddr size for the kernel is 0x1C (sockaddr_in6?)
 
 	if((host == NULL || hostlen == 0) && (serv == NULL || servlen == 0))
 	{
@@ -18,7 +18,7 @@ int getnameinfo(const struct sockaddr *sa, socklen_t salen, char *host, socklen_
 	if(sa->sa_family == AF_INET)
 		tmp_addrlen = 8;
 	else
-		tmp_addrlen = ADDR_STORAGE_LEN;
+		tmp_addrlen = 0x1c;
 
 	if(salen < tmp_addrlen) {
 		errno = EINVAL;

libctru/source/services/soc/soc_getpeername.c

@@ -8,7 +8,7 @@ int getpeername(int sockfd, struct sockaddr *addr, socklen_t *addrlen)
 	int ret = 0;
 	u32 *cmdbuf = getThreadCommandBuffer();
 	u32 saved_threadstorage[2];
-	u8 tmpaddr[ADDR_STORAGE_LEN];
+	u8 tmpaddr[0x1c];
 
 	sockfd = soc_get_fd(sockfd);
 	if(sockfd < 0) {
@@ -16,18 +16,16 @@ int getpeername(int sockfd, struct sockaddr *addr, socklen_t *addrlen)
 		return -1;
 	}
 
-	memset(tmpaddr, 0, ADDR_STORAGE_LEN);
-
 	cmdbuf[0] = IPC_MakeHeader(0x18,2,2); // 0x180082
 	cmdbuf[1] = (u32)sockfd;
-	cmdbuf[2] = ADDR_STORAGE_LEN;
+	cmdbuf[2] = 0x1c;
 	cmdbuf[3] = IPC_Desc_CurProcessId();
 
 	u32 * staticbufs = getThreadStaticBuffers();
 	saved_threadstorage[0] = staticbufs[0];
 	saved_threadstorage[1] = staticbufs[1];
 
-	staticbufs[0] = IPC_Desc_StaticBuffer(ADDR_STORAGE_LEN,0);
+	staticbufs[0] = IPC_Desc_StaticBuffer(0x1c,0);
 	staticbufs[1] = (u32)tmpaddr;
 
 	ret = svcSendSyncRequest(SOCU_handle);
@@ -49,15 +47,11 @@ int getpeername(int sockfd, struct sockaddr *addr, socklen_t *addrlen)
 		return -1;
 	}
 
+	if(*addrlen > tmpaddr[0])
+		*addrlen = tmpaddr[0];
+	memset(addr, 0, sizeof(struct sockaddr));
 	addr->sa_family = tmpaddr[1];
-
+	memcpy(addr->sa_data, &tmpaddr[2], *addrlen - 2);
-	socklen_t user_addrlen = tmpaddr[0];
-	if(addr->sa_family == AF_INET)
-		user_addrlen += 8;
-
-	if(*addrlen > user_addrlen)
-		*addrlen = user_addrlen;
-	memcpy(addr->sa_data, &tmpaddr[2], *addrlen - sizeof(addr->sa_family));
 
 	return ret;
 }

libctru/source/services/soc/soc_getsockname.c

@@ -8,7 +8,7 @@ int getsockname(int sockfd, struct sockaddr *addr, socklen_t *addrlen)
 	int ret = 0;
 	u32 *cmdbuf = getThreadCommandBuffer();
 	u32 saved_threadstorage[2];
-	u8 tmpaddr[ADDR_STORAGE_LEN];
+	u8 tmpaddr[0x1c];
 
 	sockfd = soc_get_fd(sockfd);
 	if(sockfd < 0)	{
@@ -16,18 +16,16 @@ int getsockname(int sockfd, struct sockaddr *addr, socklen_t *addrlen)
 		return -1;
 	}
 
-	memset(tmpaddr, 0, ADDR_STORAGE_LEN);
-
 	cmdbuf[0] = IPC_MakeHeader(0x17,2,2); // 0x170082
 	cmdbuf[1] = (u32)sockfd;
-	cmdbuf[2] = ADDR_STORAGE_LEN;
+	cmdbuf[2] = 0x1c;
 	cmdbuf[3] = IPC_Desc_CurProcessId();
 
 	u32 * staticbufs = getThreadStaticBuffers();
 	saved_threadstorage[0] = staticbufs[0];
 	saved_threadstorage[1] = staticbufs[1];
 
-	staticbufs[0] = IPC_Desc_StaticBuffer(ADDR_STORAGE_LEN,0);
+	staticbufs[0] = IPC_Desc_StaticBuffer(0x1c,0);
 	staticbufs[1] = (u32)tmpaddr;
 
 	ret = svcSendSyncRequest(SOCU_handle);
@@ -49,15 +47,11 @@ int getsockname(int sockfd, struct sockaddr *addr, socklen_t *addrlen)
 		return -1;
 	}
 
+	if(*addrlen > tmpaddr[0])
+		*addrlen = tmpaddr[0];
+	memset(addr, 0, sizeof(struct sockaddr));
 	addr->sa_family = tmpaddr[1];
-
+	memcpy(addr->sa_data, &tmpaddr[2], *addrlen - 2);
-	socklen_t user_addrlen = tmpaddr[0];
-	if(addr->sa_family == AF_INET)
-		user_addrlen += 8;
-
-	if(*addrlen > user_addrlen)
-		*addrlen = user_addrlen;
-	memcpy(addr->sa_data, &tmpaddr[2], *addrlen - sizeof(addr->sa_family));
 
 	return ret;
 }

libctru/source/services/soc/soc_recvfrom.c

@@ -8,13 +8,13 @@ ssize_t socuipc_cmd7(int sockfd, void *buf, size_t len, int flags, struct sockad
 	int ret = 0;
 	u32 *cmdbuf = getThreadCommandBuffer();
 	u32 tmp_addrlen = 0;
-	u8 tmpaddr[ADDR_STORAGE_LEN];
+	u8 tmpaddr[0x1c];
 	u32 saved_threadstorage[2];
 
-	memset(tmpaddr, 0, ADDR_STORAGE_LEN);
+	memset(tmpaddr, 0, 0x1c);
 
 	if(src_addr)
-		tmp_addrlen = ADDR_STORAGE_LEN;
+		tmp_addrlen = 0x1c;
 
 	cmdbuf[0] = IPC_MakeHeader(0x7,4,4); // 0x70104
 	cmdbuf[1] = (u32)sockfd;
@@ -53,14 +53,9 @@ ssize_t socuipc_cmd7(int sockfd, void *buf, size_t len, int flags, struct sockad
 
 	if(src_addr != NULL) {
 		src_addr->sa_family = tmpaddr[1];
-
+		if(*addrlen > tmpaddr[0])
-		socklen_t user_addrlen = tmpaddr[0];
+			*addrlen = tmpaddr[0];
-		if(src_addr->sa_family == AF_INET)
+		memcpy(src_addr->sa_data, &tmpaddr[2], *addrlen - 2);
-			user_addrlen += 8;
-
-		if(*addrlen > user_addrlen)
-			*addrlen = user_addrlen;
-		memcpy(src_addr->sa_data, &tmpaddr[2], *addrlen - sizeof(src_addr->sa_family));
 	}
 
 	return ret;
@@ -71,13 +66,13 @@ ssize_t socuipc_cmd8(int sockfd, void *buf, size_t len, int flags, struct sockad
 	int ret = 0;
 	u32 *cmdbuf = getThreadCommandBuffer();
 	u32 tmp_addrlen = 0;
-	u8 tmpaddr[ADDR_STORAGE_LEN];
+	u8 tmpaddr[0x1c];
 	u32 saved_threadstorage[4];
 
 	if(src_addr)
-		tmp_addrlen = ADDR_STORAGE_LEN;
+		tmp_addrlen = 0x1c;
 
-	memset(tmpaddr, 0, ADDR_STORAGE_LEN);
+	memset(tmpaddr, 0, 0x1c);
 
 	cmdbuf[0] = 0x00080102;
 	cmdbuf[1] = (u32)sockfd;
@@ -118,14 +113,9 @@ ssize_t socuipc_cmd8(int sockfd, void *buf, size_t len, int flags, struct sockad
 
 	if(src_addr != NULL) {
 		src_addr->sa_family = tmpaddr[1];
-
+		if(*addrlen > tmpaddr[0])
-		socklen_t user_addrlen = tmpaddr[0];
+			*addrlen = tmpaddr[0];
-		if(src_addr->sa_family == AF_INET)
+		memcpy(src_addr->sa_data, &tmpaddr[2], *addrlen - 2);
-			user_addrlen += 8;
-
-		if(*addrlen > user_addrlen)
-			*addrlen = user_addrlen;
-		memcpy(src_addr->sa_data, &tmpaddr[2], *addrlen - sizeof(src_addr->sa_family));
 	}
 
 	return ret;

libctru/source/services/soc/soc_sendto.c

@@ -8,15 +8,15 @@ ssize_t socuipc_cmd9(int sockfd, const void *buf, size_t len, int flags, const s
 	int ret = 0;
 	u32 *cmdbuf = getThreadCommandBuffer();
 	u32 tmp_addrlen = 0;
-	u8 tmpaddr[ADDR_STORAGE_LEN];
+	u8 tmpaddr[0x1c];
 
-	memset(tmpaddr, 0, ADDR_STORAGE_LEN);
+	memset(tmpaddr, 0, 0x1c);
 
 	if(dest_addr) {
 		if(dest_addr->sa_family == AF_INET)
 			tmp_addrlen = 8;
 		else
-			tmp_addrlen = ADDR_STORAGE_LEN;
+			tmp_addrlen = 0x1c;
 
 		if(addrlen < tmp_addrlen) {
 			errno = EINVAL;
@@ -62,15 +62,15 @@ ssize_t socuipc_cmda(int sockfd, const void *buf, size_t len, int flags, const s
 	int ret = 0;
 	u32 *cmdbuf = getThreadCommandBuffer();
 	u32 tmp_addrlen = 0;
-	u8 tmpaddr[ADDR_STORAGE_LEN];
+	u8 tmpaddr[0x1c];
 
-	memset(tmpaddr, 0, ADDR_STORAGE_LEN);
+	memset(tmpaddr, 0, 0x1c);
 
 	if(dest_addr) {
 		if(dest_addr->sa_family == AF_INET)
 			tmp_addrlen = 8;
 		else
-			tmp_addrlen = ADDR_STORAGE_LEN;
+			tmp_addrlen = 0x1c;
 
 		if(addrlen < tmp_addrlen) {
 			errno = EINVAL;