From a2d18f0848d1b5b5b45136d47f4dfbb92003fd5d Mon Sep 17 00:00:00 2001
From: CTCaer <ctcaer@gmail.com>
Date: Fri, 17 Sep 2021 23:20:39 +0300
Subject: [PATCH] hos: update fss0 parser

- Move extra key checks in the parser
- Remove some sept leftover checks
- Update printing to reflect PK3 name (FSS0 -> FSS/PK3)
---
 bootloader/hos/fss.c        | 36 +++++++++++++++++++-----------------
 bootloader/hos/hos.h        |  1 -
 bootloader/hos/hos_config.c |  9 ---------
 3 files changed, 19 insertions(+), 27 deletions(-)

diff --git a/bootloader/hos/fss.c b/bootloader/hos/fss.c
index 312113f..2056130 100644
--- a/bootloader/hos/fss.c
+++ b/bootloader/hos/fss.c
@@ -1,5 +1,5 @@
 /*
- * Atmosphère Fusée Secondary Storage parser.
+ * Atmosphère Fusée Secondary Storage (Package3) parser.
  *
  * Copyright (c) 2019-2021 CTCaer
  *
@@ -82,9 +82,9 @@ typedef struct _fss_content_t
 	char name[0x10];
 } fss_content_t;
 
-static void _update_r2p(launch_ctxt_t *ctxt, const char *path)
+static void _set_fss_path_and_update_r2p(launch_ctxt_t *ctxt, const char *path)
 {
-	char *r2p_path = malloc(512);
+	char *r2p_path = malloc(256);
 	u32 path_len = strlen(path);
 
 	strcpy(r2p_path, path);
@@ -101,15 +101,10 @@ static void _update_r2p(launch_ctxt_t *ctxt, const char *path)
 
 			free(r2p_payload);
 
-			// Save fss0 parrent path.
-			if (ctxt)
-			{
-				r2p_path[path_len] = 0;
-				ctxt->fss0_main_path = r2p_path;
-				return;
-			}
-
-			break;
+			// Save FSS0 parent path.
+			r2p_path[path_len] = 0;
+			ctxt->fss0_main_path = r2p_path;
+			return;
 		}
 		path_len--;
 	}
@@ -122,6 +117,7 @@ int parse_fss(launch_ctxt_t *ctxt, const char *path)
 	FIL fp;
 
 	bool stock = false;
+	bool experimental = false;
 
 	// Skip if stock and Exosphere and warmboot are not needed.
 	bool pkg1_old = ctxt->pkg1_id->kb <= KB_FIRMWARE_VERSION_620; // Should check if t210b01?
@@ -132,6 +128,10 @@ int parse_fss(launch_ctxt_t *ctxt, const char *path)
 		if (!strcmp("stock", kv->key))
 			if (kv->val[0] == '1')
 				stock = true;
+
+		if (!strcmp("fss0experimental", kv->key))
+			if (kv->val[0] == '1')
+				experimental = true;
 	}
 
 #ifdef HOS_MARIKO_STOCK_SECMON
@@ -142,12 +142,13 @@ int parse_fss(launch_ctxt_t *ctxt, const char *path)
 		return 1;
 #endif
 
+	// Try to open FSS0.
 	if (f_open(&fp, path, FA_READ) != FR_OK)
 		return 0;
 
 	void *fss = malloc(f_size(&fp));
 
-	// Read first 1024 bytes of the fss file.
+	// Read first 1024 bytes of the FSS0 file.
 	f_read(&fp, fss, 1024, NULL);
 
 	// Get FSS0 Meta header offset.
@@ -157,7 +158,7 @@ int parse_fss(launch_ctxt_t *ctxt, const char *path)
 	// Check if valid FSS0 and parse it.
 	if (fss_meta->magic == FSS0_MAGIC)
 	{
-		gfx_printf("Found FSS0, Atmosphere %d.%d.%d-%08x\n"
+		gfx_printf("Found FSS/PK3, Atmosphere %d.%d.%d-%08x\n"
 			"Max HOS: %d.%d.%d\n"
 			"Unpacking..  ",
 			fss_meta->version >> 24, (fss_meta->version >> 16) & 0xFF, (fss_meta->version >> 8) & 0xFF, fss_meta->git_rev,
@@ -177,8 +178,8 @@ int parse_fss(launch_ctxt_t *ctxt, const char *path)
 			if ((curr_fss_cnt[i].offset + curr_fss_cnt[i].size) > fss_meta->size)
 				continue;
 
-			// If content is experimental and experimental flag is not enabled, skip it.
-			if ((curr_fss_cnt[i].flags0 & CNT_FLAG0_EXPERIMENTAL) && !ctxt->fss0_experimental)
+			// If content is experimental and experimental config is not enabled, skip it.
+			if ((curr_fss_cnt[i].flags0 & CNT_FLAG0_EXPERIMENTAL) && !experimental)
 				continue;
 
 			// Prepare content.
@@ -229,7 +230,8 @@ int parse_fss(launch_ctxt_t *ctxt, const char *path)
 		gfx_printf("Done!\n");
 		f_close(&fp);
 
-		_update_r2p(ctxt, path);
+		// Set FSS0 path and update r2p if needed.
+		_set_fss_path_and_update_r2p(ctxt, path);
 
 		return 1;
 	}
diff --git a/bootloader/hos/hos.h b/bootloader/hos/hos.h
index a7f9dbb..d24af8b 100644
--- a/bootloader/hos/hos.h
+++ b/bootloader/hos/hos.h
@@ -102,7 +102,6 @@ typedef struct _launch_ctxt_t
 
 	char *fss0_main_path;
 	u32   fss0_hosver;
-	bool  fss0_experimental;
 	bool  atmosphere;
 
 	exo_ctxt_t exo_ctx;
diff --git a/bootloader/hos/hos_config.c b/bootloader/hos/hos_config.c
index 03bc25f..406e50d 100644
--- a/bootloader/hos/hos_config.c
+++ b/bootloader/hos/hos_config.c
@@ -262,15 +262,6 @@ static int _config_exo_cal0_writes_enable(launch_ctxt_t *ctxt, const char *value
 
 static int _config_fss(launch_ctxt_t *ctxt, const char *value)
 {
-	LIST_FOREACH_ENTRY(ini_kv_t, kv, &ctxt->cfg->kvs, link)
-	{
-		if (!strcmp("fss0experimental", kv->key))
-		{
-			ctxt->fss0_experimental = *kv->val == '1';
-			break;
-		}
-	}
-
 	return parse_fss(ctxt, value);
 }