Utilize hekate's BDK for hekate main and Nyx

bdk/mem/heap.c

@@ -1,7 +1,6 @@
 /*
  * Copyright (c) 2018 naehrwert
  * Copyright (c) 2018-2020 CTCaer
- * Copyright (c) 2018 M4xw
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -18,8 +17,7 @@
 
 #include <string.h>
 #include "heap.h"
-#include "../gfx/gfx.h"
-#include "../../common/common_heap.h"
+#include <gfx_utils.h>
 
 static void _heap_create(heap_t *heap, u32 start)
 {

bdk/mem/heap.h

@@ -18,8 +18,28 @@
 #ifndef _HEAP_H_
 #define _HEAP_H_
 
-#include "../utils/types.h"
-#include "../../common/common_heap.h"
+#include <utils/types.h>
+
+typedef struct _hnode
+{
+	int used;
+	u32 size;
+	struct _hnode *prev;
+	struct _hnode *next;
+	u32 align[4]; // Align to arch cache line size.
+} hnode_t;
+
+typedef struct _heap
+{
+	u32 start;
+	hnode_t *first;
+} heap_t;
+
+typedef struct
+{
+    u32 total;
+    u32 used;
+} heap_monitor_t;
 
 void heap_init(u32 base);
 void heap_copy(heap_t *heap);

bdk/mem/mc.c

@@ -1,7 +1,24 @@
-#include "../mem/mc.h"
-#include "../soc/t210.h"
-#include "../soc/clock.h"
-#include "../utils/util.h"
+/*
+ * Copyright (c) 2018 naehrwert
+ * Copyright (c) 2018 CTCaer
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <mem/mc.h>
+#include <soc/t210.h>
+#include <soc/clock.h>
+#include <utils/util.h>
 
 void mc_config_tsec_carveout(u32 bom, u32 size1mb, bool lock)
 {

bdk/mem/mc.h

@@ -1,8 +1,24 @@
+/*
+ * Copyright (c) 2018 naehrwert
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #ifndef _MC_H_
 #define _MC_H_
 
-#include "../utils/types.h"
-#include "../mem/mc_t210.h"
+#include <utils/types.h>
+#include <mem/mc_t210.h>
 
 void mc_config_tsec_carveout(u32 bom, u32 size1mb, bool lock);
 void mc_config_carveout();

bdk/mem/minerva.c

@@ -18,13 +18,13 @@
 #include <stdlib.h>
 
 #include "minerva.h"
-#include "../soc/fuse.h"
-#include "../utils/util.h"
 
-#include "../soc/clock.h"
-#include "../ianos/ianos.h"
-#include "../soc/fuse.h"
-#include "../soc/t210.h"
+#include <soc/clock.h>
+#include <ianos/ianos.h>
+#include <soc/clock.h>
+#include <soc/fuse.h>
+#include <soc/t210.h>
+#include <utils/util.h>
 
 extern volatile nyx_storage_t *nyx_str;
 

bdk/mem/minerva.h

@@ -18,7 +18,7 @@
 #define _FE_MINERVA_H_
 
 #include "mtc_table.h"
-#include "../utils/types.h"
+#include <utils/types.h>
 
 #define MTC_INIT_MAGIC 0x3043544D
 #define MTC_NEW_MAGIC  0x5243544D

bdk/mem/mtc_table.h

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

bdk/mem/sdram.c

@@ -18,23 +18,23 @@
 
 #include <string.h>
 
-#include "mc.h"
-#include "emc.h"
-#include "sdram_param_t210.h"
-#include "../../common/memory_map.h"
-#include "../power/max77620.h"
-#include "../power/max7762x.h"
-#include "../soc/clock.h"
-#include "../soc/fuse.h"
-#include "../soc/i2c.h"
-#include "../soc/pmc.h"
-#include "../soc/t210.h"
-#include "../utils/util.h"
+#include <mem/mc.h>
+#include <mem/emc.h>
+#include <mem/sdram_param_t210.h>
+#include <memory_map.h>
+#include <power/max77620.h>
+#include <power/max7762x.h>
+#include <soc/clock.h>
+#include <soc/fuse.h>
+#include <soc/i2c.h>
+#include <soc/pmc.h>
+#include <soc/t210.h>
+#include <utils/util.h>
 
 #define CONFIG_SDRAM_KEEP_ALIVE
 
 #ifdef CONFIG_SDRAM_COMPRESS_CFG
-#include "../libs/compr/lz.h"
+#include <libs/compr/lz.h>
 #include "sdram_config_lz.inl"
 #else
 #include "sdram_config.inl"

bdk/mem/sdram.h

@@ -17,8 +17,8 @@
 #ifndef _SDRAM_H_
 #define _SDRAM_H_
 
-#include "emc.h"
-#include "sdram_param_t210.h"
+#include <mem/emc.h>
+#include <mem/sdram_param_t210.h>
 
 void sdram_init();
 sdram_params_t *sdram_get_params();

bdk/mem/sdram_lp0.c

@@ -14,9 +14,9 @@
  * more details.
  */
 
-#include "../soc/t210.h"
-#include "../soc/pmc_lp0_t210.h"
-#include "sdram_lp0_param_t210.h"
+#include <soc/t210.h>
+#include <soc/pmc_lp0_t210.h>
+#include <mem/sdram_lp0_param_t210.h>
 
 /*
  * This function reads SDRAM parameters from the common BCT format and

bdk/mem/sdram_lp0_param_t210.h

@@ -23,7 +23,7 @@
 #ifndef __SOC_NVIDIA_TEGRA210_SDRAM_PARAM_H__
 #define __SOC_NVIDIA_TEGRA210_SDRAM_PARAM_H__
 
-#include "../utils/types.h"
+#include <utils/types.h>
 
 enum
 {

bdk/mem/smmu.c

@@ -17,12 +17,12 @@
 
 #include <string.h>
 
-#include "smmu.h"
-#include "../soc/ccplex.h"
-#include "../soc/t210.h"
-#include "../mem/mc_t210.h"
-#include "../utils/util.h"
-#include "../utils/aarch64_util.h"
+#include <soc/ccplex.h>
+#include <soc/t210.h>
+#include <mem/mc_t210.h>
+#include <mem/smmu.h>
+#include <utils/util.h>
+#include <utils/aarch64_util.h>
 
 bool smmu_used = false;
 u8 *_pageheap = (u8 *)SMMU_HEAP_ADDR;

bdk/mem/smmu.h

@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../utils/types.h"
+#include <utils/types.h>
 
 #define SMMU_HEAP_ADDR 0xA0000000