niklascfw/hekate
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

fixes for compiling with gcc 10

Browse Source 
gcc 10 no longer lets you get away with not externing global variables in header files. This adds the necessary extern and adds defines in appropriate c files
This commit is contained in:
Dave Murphy
2020-05-08 23:32:44 +01:00
parent 9698cbc9d7
commit cc54df87d7
28 changed files with 102 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nyx/nyx_gui/storage/nx_emmc.c
View File

@@ -21,6 +21,10 @@
#include "../mem/heap.h"
#include "../utils/list.h"
sdmmc_t emmc_sdmmc;
sdmmc_storage_t emmc_storage;
FATFS emmc_fs;
void nx_emmc_gpt_parse(link_t *gpt, sdmmc_storage_t *storage)
{
gpt_t *gpt_buf = (gpt_t *)calloc(NX_GPT_NUM_BLOCKS, NX_EMMC_BLOCKSIZE);

6
nyx/nyx_gui/storage/nx_emmc.h
View File

@@ -36,9 +36,9 @@ typedef struct _emmc_part_t
link_t link;
} emmc_part_t;
sdmmc_t emmc_sdmmc;
sdmmc_storage_t emmc_storage;
FATFS emmc_fs;
extern sdmmc_t emmc_sdmmc;
extern sdmmc_storage_t emmc_storage;
extern FATFS emmc_fs;
void nx_emmc_gpt_parse(link_t *gpt, sdmmc_storage_t *storage);
void nx_emmc_gpt_free(link_t *gpt);

4
nyx/nyx_gui/storage/nx_sd.c
View File

@@ -27,6 +27,10 @@ static bool sd_init_done = false;
static u16 sd_errors[3] = { 0 }; // Init and Read/Write errors.
static u32 sd_mode = SD_UHS_SDR104;
sdmmc_t sd_sdmmc;
sdmmc_storage_t sd_storage;
FATFS sd_fs;
void sd_error_count_increment(u8 type)
{
switch (type)

6
nyx/nyx_gui/storage/nx_sd.h
View File

@@ -38,9 +38,9 @@ enum
SD_ERROR_RW_RETRY = 2
};
sdmmc_t sd_sdmmc;
sdmmc_storage_t sd_storage;
FATFS sd_fs;
extern sdmmc_t sd_sdmmc;
extern sdmmc_storage_t sd_storage;
extern FATFS sd_fs;
void sd_error_count_increment(u8 type);
u16 *sd_get_error_count();

2
nyx/nyx_gui/storage/sdmmc.c
View File

@@ -28,6 +28,8 @@
//#define DPRINTF(...) gfx_printf(__VA_ARGS__)
#define DPRINTF(...)
u32 sd_power_cycle_time_start;
static inline u32 unstuff_bits(u32 *resp, u32 start, u32 size)
{
const u32 mask = (size < 32 ? 1 << size : 0) - 1;

2
nyx/nyx_gui/storage/sdmmc.h
View File

@@ -21,7 +21,7 @@
#include "../utils/types.h"
#include "sdmmc_driver.h"
u32 sd_power_cycle_time_start;
extern u32 sd_power_cycle_time_start;
typedef enum _sdmmc_type
{