atari800-3ds 0.3.8, fix #3

Author: asiekierka

Makefile.3ds

@@ -34,7 +34,7 @@ INCLUDES	:=	src
 ROMFS		:=	src/3ds/romfs
 
 APP_TITLE=atari800
-APP_VERSION=0.3.7
+APP_VERSION=0.3.8
 APP_DESCRIPTION=\"Atari 8-bit computer emulator ($(APP_VERSION))\"
 APP_AUTHOR=\"atari800 development team\"
 ICON = src/3ds/banner/atari800-icon.png
@@ -218,7 +218,8 @@ $(BUILD):
 clean:
 	@echo clean ...
 	@rm -fr $(BUILD) $(TARGET).3dsx $(OUTPUT).smdh $(TARGET).elf
-	@rm -fr src/*.d src/*.o src/3ds/*.d src/3ds/*.o
+	@rm -fr src/*.d src/*.o src/3ds/*.d src/3ds/*.o src/codecs/*.d src/codecs/*.o
+	@rm -fr src/roms/*.d src/roms/*.o
 
 
 #---------------------------------------------------------------------------------

src/3ds/config.h

@@ -405,7 +405,7 @@
 #define PACKAGE_NAME "Atari800"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "Atari800 git (2022-04-24)"
+#define PACKAGE_STRING "Atari800 git (2022-06-06)"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "atari800"
@@ -414,7 +414,7 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "3DS 0.3.6"
+#define PACKAGE_VERSION "3DS 0.3.8"
 
 /* Define to use page-based attribute array. */
 #define PAGED_ATTRIB 1

src/3ds/main.c

@@ -24,7 +24,9 @@
 
 #include <3ds.h>
 #include <citro3d.h>
+#include <malloc.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 
 /* Atari800 includes */
@@ -43,9 +45,24 @@
 #include "videomode.h"
 
 static bool PLATFORM_IsNew3DS;
+static u32 PLATFORM_NetworkInitialized = 0;
+static u32 *PLATFORM_SocketBuffer;
 
 extern int dpad_as_keyboard;
 
+void PLATFORM_InitNetwork(void)
+{
+	if (PLATFORM_NetworkInitialized == 0) {
+		PLATFORM_SocketBuffer = (u32*) memalign(0x1000, 0x80000);
+		PLATFORM_NetworkInitialized = 1;
+		if (PLATFORM_SocketBuffer != NULL) {
+			if (socInit(PLATFORM_SocketBuffer, 0x80000) == 0) {
+				PLATFORM_NetworkInitialized = 2;
+			}
+		}
+	}
+}
+
 int PLATFORM_Configure(char *option, char *parameters)
 {
 	if (strcmp(option, "N3DS_DPAD_MODE") == 0)
@@ -92,6 +109,11 @@ int PLATFORM_Exit(int run_monitor)
 	if (run_monitor) {
 		return 1;
 	} else {
+		if (PLATFORM_NetworkInitialized >= 2) {
+			socExit();
+			free(PLATFORM_SocketBuffer);
+		}
+
 		N3DS_ExitVideo();
 
 		romfsExit();

src/platform.h

@@ -13,6 +13,8 @@
 
 /* This include file defines prototypes for platform-specific functions. */
 
+void PLATFORM_InitNetwork(void);
+
 int PLATFORM_Initialise(int *argc, char *argv[]);
 int PLATFORM_Exit(int run_monitor);
 int PLATFORM_Keyboard(void);

src/rdevice.c

@@ -73,6 +73,7 @@
  */
 
 #include "config.h"
+#include "platform.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -746,6 +747,8 @@ static void open_connection(char * address, int port)
 #endif /* HAVE_WINDOWS_H */
   if((address != NULL) && (strlen(address) > 0))
   {
+    PLATFORM_InitNetwork();
+
     close(rdev_fd);
     close(sock);
     do_once = 1;