Minor adjustments

- Increase default file buffer size for FTP
- Remove unused include statments from main.c
- Allow screenshots to be taken in FTP mode.

Author: joel16

app/source/ftppsp.c

@@ -20,7 +20,7 @@
 #define UNUSED(x) (void)(x)
 
 #define FTP_PORT 1337
-#define DEFAULT_FILE_BUF_SIZE (1 * 1024)
+#define DEFAULT_FILE_BUF_SIZE (1 * 1024 * 1024)
 
 #define FTP_DEFAULT_PATH   "/"
 

app/source/main.c

@@ -2,12 +2,10 @@
 #include <pspctrl.h>
 #include <pspkernel.h>
 #include <psppower.h>
-#include <pspsdk.h>
 #include <sys/unistd.h>
 
 #include "common.h"
 #include "config.h"
-#include "fs.h"
 #include "menus/menu_main.h"
 #include "kubridge.h"
 #include "systemctrl.h"

app/source/menus/menu_ftp.c

@@ -14,6 +14,7 @@
 #include "dirbrowse.h"
 #include "ftppsp.h"
 #include "glib2d_helper.h"
+#include "screenshot.h"
 #include "status_bar.h"
 #include "textures.h"
 #include "utils.h"
@@ -44,7 +45,6 @@ int FTP_DisplayNetDialog(void) {
 
 	while(running) {
 		g2dClear(BLACK_BG);
-		StatusBar_DisplayTime();
 		g2dFlip(G2D_VSYNC);
 
 		switch(sceUtilityNetconfGetStatus()) {
@@ -113,13 +113,18 @@ void Menu_DisplayFTP(void) {
 
 	FTP_DisplayNetDialog();
 
-	if (running == 0) {
-		FTP_NetTerm();
-		return;
-	}
-
 	ret = ftppsp_init(psp_ip, &psp_port);
-	ftppsp_add_device("ms0:/");
+
+	if (is_psp_go) {
+		if (is_ms_inserted) {
+			ftppsp_add_device("ms0:");
+			ftppsp_add_device("ef0:");
+		}
+		else
+			ftppsp_add_device("ef0:");
+	}
+	else
+		ftppsp_add_device("ms0:");
 
 	char *msg = malloc(64);
 
@@ -161,6 +166,9 @@ void Menu_DisplayFTP(void) {
 
 		Utils_ReadControls();
 
+		if (((Utils_IsButtonHeld(PSP_CTRL_LTRIGGER)) && (Utils_IsButtonPressed(PSP_CTRL_RTRIGGER))) || ((Utils_IsButtonHeld(PSP_CTRL_RTRIGGER)) && (Utils_IsButtonPressed(PSP_CTRL_LTRIGGER))))
+			Screenshot_Capture();
+
 		if ((Utils_IsButtonPressed(PSP_CTRL_ENTER)) || (Utils_IsButtonPressed(PSP_CTRL_CANCEL))) {
 			sceKernelDelayThread(100 * 1000);
 			break;