Utilize hekate's BDK for hekate main and Nyx

nyx/nyx_gui/hos/hos.c

@@ -22,24 +22,24 @@
 
 #include "hos.h"
 #include "sept.h"
-#include "../config/config.h"
-#include "../gfx/di.h"
-#include "../gfx/gfx.h"
-#include "../mem/heap.h"
-#include "../mem/mc.h"
-#include "../sec/se.h"
-#include "../sec/se_t210.h"
-#include "../sec/tsec.h"
-#include "../soc/bpmp.h"
-#include "../soc/fuse.h"
-#include "../soc/pmc.h"
-#include "../soc/smmu.h"
-#include "../soc/t210.h"
-#include "../storage/mbr_gpt.h"
+#include "../config.h"
+#include <gfx/di.h>
+#include <gfx_utils.h>
+#include <mem/heap.h>
+#include <mem/mc.h>
+#include <mem/smmu.h>
+#include <sec/se.h>
+#include <sec/se_t210.h>
+#include <sec/tsec.h>
+#include <soc/bpmp.h>
+#include <soc/fuse.h>
+#include <soc/pmc.h>
+#include <soc/t210.h>
+#include <storage/mbr_gpt.h>
 #include "../storage/nx_emmc.h"
-#include "../storage/nx_sd.h"
-#include "../storage/sdmmc.h"
-#include "../utils/util.h"
+#include <storage/nx_sd.h>
+#include <storage/sdmmc.h>
+#include <utils/util.h>
 
 extern hekate_config h_cfg;
 

nyx/nyx_gui/hos/hos.h

@@ -20,9 +20,9 @@
 
 #include "pkg1.h"
 #include "pkg2.h"
-#include "../utils/types.h"
-#include "../config/ini.h"
-#include "../sec/tsec.h"
+#include <utils/types.h>
+#include <utils/ini.h>
+#include <sec/tsec.h>
 
 #include <assert.h>
 

nyx/nyx_gui/hos/pkg1.c

@@ -20,10 +20,10 @@
 #include <string.h>
 
 #include "pkg1.h"
-#include "../gfx/gfx.h"
-#include "../mem/heap.h"
-#include "../sec/se.h"
-#include "../utils/aarch64_util.h"
+#include <gfx_utils.h>
+#include <mem/heap.h>
+#include <sec/se.h>
+#include <utils/aarch64_util.h>
 
 /*
  * package1.1 header: <wb, ldr, sm>

nyx/nyx_gui/hos/pkg1.h

@@ -17,7 +17,7 @@
 #ifndef _PKG1_H_
 #define _PKG1_H_
 
-#include "../utils/types.h"
+#include <utils/types.h>
 
 typedef struct _pkg1_id_t
 {

nyx/nyx_gui/hos/pkg2.c

@@ -20,14 +20,13 @@
 #include "pkg2.h"
 #include "hos.h"
 
-#include "../config/config.h"
-#include "../libs/fatfs/ff.h"
-#include "../utils/aarch64_util.h"
-#include "../mem/heap.h"
-#include "../sec/se.h"
-#include "../libs/compr/blz.h"
+#include "../config.h"
+#include <libs/fatfs/ff.h>
+#include <mem/heap.h>
+#include <sec/se.h>
+#include <libs/compr/blz.h>
 
-#include "../gfx/gfx.h"
+#include <gfx_utils.h>
 
 extern hekate_config h_cfg;
 extern const u8 package2_keyseed[];
@@ -36,7 +35,7 @@ u32 pkg2_newkern_ini1_val;
 u32 pkg2_newkern_ini1_start;
 u32 pkg2_newkern_ini1_end;
 
-/*#include "util.h"
+/*#include <utils/util.h>
 #define DPRINTF(...) gfx_printf(__VA_ARGS__)
 #define DEBUG_PRINTING*/
 #define DPRINTF(...)

nyx/nyx_gui/hos/pkg2.h

@@ -18,8 +18,8 @@
 #ifndef _PKG2_H_
 #define _PKG2_H_
 
-#include "../utils/types.h"
-#include "../utils/list.h"
+#include <utils/types.h>
+#include <utils/list.h>
 
 #define PKG2_MAGIC 0x31324B50
 #define PKG2_SEC_BASE 0x80000000

nyx/nyx_gui/hos/sept.c

@@ -18,22 +18,22 @@
 
 #include "hos.h"
 #include "sept.h"
-#include "../config/config.h"
-#include "../gfx/di.h"
-#include "../ianos/ianos.h"
-#include "../libs/fatfs/ff.h"
-#include "../mem/heap.h"
-#include "../soc/hw_init.h"
-#include "../soc/pmc.h"
-#include "../soc/t210.h"
+#include "../config.h"
+#include <gfx/di.h>
+#include <ianos/ianos.h>
+#include <libs/fatfs/ff.h>
+#include <mem/heap.h>
+#include <soc/hw_init.h>
+#include <soc/pmc.h>
+#include <soc/t210.h>
 #include "../storage/nx_emmc.h"
-#include "../storage/nx_sd.h"
-#include "../storage/sdmmc.h"
-#include "../utils/btn.h"
-#include "../utils/types.h"
-#include "../utils/util.h"
+#include <storage/nx_sd.h>
+#include <storage/sdmmc.h>
+#include <utils/btn.h>
+#include <utils/types.h>
+#include <utils/util.h>
 
-#include "../gfx/gfx.h"
+#include <gfx_utils.h>
 
 #define RELOC_META_OFF   0x7C
 #define PATCHED_RELOC_SZ 0x94

nyx/nyx_gui/hos/sept.h

@@ -17,7 +17,7 @@
 #ifndef _SEPT_H_
 #define _SEPT_H_
 
-#include "../utils/types.h"
+#include <utils/types.h>
 
 void check_sept();
 int reboot_to_sept(const u8 *tsec_fw, u32 kb);