Merge hekate changes, sorta

source/utils/types.h

@@ -81,9 +81,22 @@ typedef int bool;
 #define BOOT_CFG_AUTOBOOT_EN (1 << 0)
 #define BOOT_CFG_FROM_LAUNCH (1 << 1)
 #define BOOT_CFG_SEPT_RUN    (1 << 7)
+#define BOOT_CFG_TO_EMUMMC   (1 << 3)
+#define EXTRA_CFG_NYX_UMS    (1 << 5)
 
 #define EXTRA_CFG_DUMP_EMUMMC (1 << 0)
 
+typedef enum _nyx_ums_type
+{
+	NYX_UMS_SD_CARD = 0,
+	NYX_UMS_EMMC_BOOT0,
+	NYX_UMS_EMMC_BOOT1,
+	NYX_UMS_EMMC_GPP,
+	NYX_UMS_EMUMMC_BOOT0,
+	NYX_UMS_EMUMMC_BOOT1,
+	NYX_UMS_EMUMMC_GPP
+} nyx_ums_type;
+
 typedef struct __attribute__((__packed__)) _boot_cfg_t
 {
 	u8 boot_cfg;
@@ -95,11 +108,21 @@ typedef struct __attribute__((__packed__)) _boot_cfg_t
 		struct
 		{
 			char id[8];
+			char emummc_path[0x78];
 		};
+		u8 ums; // nyx_ums_type.
 		u8 xt_str[0x80];
 	};
 } boot_cfg_t;
 
+typedef struct __attribute__((__packed__)) _ipl_ver_meta_t
+{
+	u32 magic;
+	u32 version;
+	u16 rsvd0;
+	u16 rsvd1;
+} ipl_ver_meta_t;
+
 typedef struct __attribute__((__packed__)) _reloc_meta_t
 {
 	u32 start;

source/utils/util.c

@@ -17,6 +17,7 @@
 
 #include "util.h"
 #include "../gfx/di.h"
+#include "../mem/heap.h"
 #include "../mem/minerva.h"
 #include "../power/max77620.h"
 #include "../rtc/max77620-rtc.h"
@@ -24,13 +25,12 @@
 #include "../soc/i2c.h"
 #include "../soc/pmc.h"
 #include "../soc/t210.h"
+#include "../storage/nx_sd.h"
 
 #define USE_RTC_TIMER
 
 extern volatile nyx_storage_t *nyx_str;
 
-extern void sd_unmount();
-
 u32 get_tmr_s()
 {
 	return RTC(APBDEV_RTC_SECONDS);
@@ -82,6 +82,43 @@ void exec_cfg(u32 *base, const cfg_op_t *ops, u32 num_ops)
 		base[ops[i].off] = ops[i].val;
 }
 
+u32 crc32_calc(u32 crc, const u8 *buf, u32 len)
+{
+	const u8 *p, *q;
+	static u32 *table = NULL;
+
+	// Calculate CRC table.
+	if (!table)
+	{
+		table = calloc(256, sizeof(u32));
+		for (u32 i = 0; i < 256; i++)
+		{
+			u32 rem = i;
+			for (u32 j = 0; j < 8; j++)
+			{
+				if (rem & 1)
+				{
+					rem >>= 1;
+					rem ^= 0xedb88320;
+				}
+				else
+					rem >>= 1;
+			}
+			table[i] = rem;
+		}
+	}
+
+	crc = ~crc;
+	q = buf + len;
+	for (p = buf; p < q; p++)
+	{
+		u8 oct = *p;
+		crc = (crc >> 8) ^ table[(crc & 0xff) ^ oct];
+	}
+
+	return ~crc;
+}
+
 void panic(u32 val)
 {
 	// Set panic code.
@@ -117,7 +154,7 @@ void reboot_rcm()
 
 	nyx_str->mtc_cfg.init_done = 0;
 
-	PMC(APBDEV_PMC_SCRATCH0) = 2; // Reboot into rcm.
+	PMC(APBDEV_PMC_SCRATCH0) = PMC_SCRATCH0_MODE_RCM;
 	PMC(APBDEV_PMC_CNTRL) |= PMC_CNTRL_MAIN_RST;
 
 	while (true)
@@ -128,6 +165,8 @@ void power_off()
 {
 	sd_unmount();
 	display_end();
+	
+	nyx_str->mtc_cfg.init_done = 0;
 
 	// Stop the alarm, in case we injected and powered off too fast.
 	max77620_rtc_stop_alarm();

source/utils/util.h

@@ -21,8 +21,19 @@
 #include "types.h"
 #include "../mem/minerva.h"
 
-#define NYX_CFG_DUMP    (1 << 7)
-#define NYX_CFG_MINERVA (1 << 8)
+typedef enum
+{
+	NYX_CFG_UMS     = (1 << 6),
+	NYX_CFG_DUMP    = (1 << 7),
+} nyx_cfg_t;
+
+typedef enum
+{
+	ERR_LIBSYS_LP0 = (1 << 0),
+	ERR_SYSOLD_NYX = (1 << 1),
+	ERR_SYSOLD_MTC = (1 << 2),
+	ERR_EXCEPT_ENB = (1 << 31),
+} hekate_errors_t;
 
 #define byte_swap_32(num) (((num >> 24) & 0xff) | ((num << 8) & 0xff0000) | \
 						((num >> 8 )& 0xff00) | ((num << 24) & 0xff000000))
@@ -35,7 +46,7 @@ typedef struct _cfg_op_t
 
 typedef struct _nyx_info_t
 {
-	u32 rsvd;
+	u32 disp_id;
 	u32 errors;
 } nyx_info_t;
 
@@ -61,5 +72,6 @@ void reboot_normal();
 void reboot_rcm();
 void power_off();
 void exec_cfg(u32 *base, const cfg_op_t *ops, u32 num_ops);
+u32  crc32_calc(u32 crc, const u8 *buf, u32 len);
 
 #endif