config: move externs into header

2025-08-08 15:03:56 +03:00
parent 081f8b9664
commit 2ea496d9d1
21 changed files with 7 additions and 37 deletions
--- a/nyx/nyx_gui/config.c
+++ b/nyx/nyx_gui/config.c
@@ -22,9 +22,6 @@
 #include "config.h"
 #include <libs/fatfs/ff.h>

-extern hekate_config h_cfg;
-extern nyx_config n_cfg;
-
 void set_default_configuration()
 {
 	h_cfg.t210b01 = hw_get_chip_id() == GP_HIDREV_MAJOR_T210B01;
--- a/nyx/nyx_gui/config.h
+++ b/nyx/nyx_gui/config.h
@@ -57,6 +57,9 @@ typedef struct _nyx_config
 	u32 bpmp_clock;
 } nyx_config;

+extern hekate_config h_cfg;
+extern nyx_config n_cfg;
+
 void set_default_configuration();
 void set_nyx_default_configuration();
 int create_config_entry();
--- a/nyx/nyx_gui/frontend/gui.c
+++ b/nyx/nyx_gui/frontend/gui.c
@@ -30,8 +30,6 @@
 #include "../config.h"
 #include <libs/fatfs/ff.h>

-extern hekate_config h_cfg;
-extern nyx_config n_cfg;
 extern volatile boot_cfg_t *b_cfg;
 extern volatile nyx_storage_t *nyx_str;

--- a/nyx/nyx_gui/frontend/gui_emmc_tools.c
+++ b/nyx/nyx_gui/frontend/gui_emmc_tools.c
@@ -29,7 +29,6 @@
 #include <libs/fatfs/ff.h>

 extern boot_cfg_t b_cfg;
-extern hekate_config h_cfg;

 extern char *emmcsn_path_impl(char *path, char *sub_dir, char *filename, sdmmc_storage_t *storage);

--- a/nyx/nyx_gui/frontend/gui_info.c
+++ b/nyx/nyx_gui/frontend/gui_info.c
@@ -28,7 +28,6 @@

 #define SECTORS_TO_MIB_COEFF 11

-extern hekate_config h_cfg;
 extern volatile boot_cfg_t *b_cfg;
 extern volatile nyx_storage_t *nyx_str;

--- a/nyx/nyx_gui/frontend/gui_options.c
+++ b/nyx/nyx_gui/frontend/gui_options.c
@@ -28,9 +28,6 @@
 #define CLOCK_MAX_YEAR (CLOCK_MIN_YEAR + 10)
 #define CLOCK_YEARLIST "2025\n2026\n2027\n2028\n2029\n2030\n2031\n2032\n2033\n2034\n2035"

-extern hekate_config h_cfg;
-extern nyx_config n_cfg;
-
 static lv_obj_t *autoboot_btn;
 static bool autoboot_first_time = true;

--- a/nyx/nyx_gui/frontend/gui_tools.c
+++ b/nyx/nyx_gui/frontend/gui_tools.c
@@ -31,8 +31,6 @@
 #include <libs/fatfs/ff.h>

 extern volatile boot_cfg_t *b_cfg;
-extern hekate_config h_cfg;
-extern nyx_config n_cfg;

 lv_obj_t *ums_mbox;

--- a/nyx/nyx_gui/hos/hos.c
+++ b/nyx/nyx_gui/hos/hos.c
@@ -25,8 +25,6 @@
 #include "hos.h"
 #include "../config.h"

-extern hekate_config h_cfg;
-
 u8 *cal0_buf = NULL;
 static u8 *bis_keys = NULL;

--- a/nyx/nyx_gui/hos/pkg1.c
+++ b/nyx/nyx_gui/hos/pkg1.c
@@ -25,8 +25,6 @@
 #include "pkg1.h"
 #include "../config.h"

-extern hekate_config h_cfg;
-
 /*
 * package1.1 header: <wb, ldr, sm>
 * package1.1 layout:
--- a/nyx/nyx_gui/hos/pkg2.c
+++ b/nyx/nyx_gui/hos/pkg2.c
@@ -26,7 +26,6 @@
 #include <libs/fatfs/ff.h>
 #include <libs/compr/blz.h>

-extern hekate_config h_cfg;
 extern const u8 package2_keyseed[];

 u32 pkg2_newkern_ini1_start;