OmniNX/Atmosphere
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename sd_utils to fs_utils, etc

Browse Source
This commit is contained in:
TuxSH
2018-05-13 23:49:50 +02:00
parent a3792d94dc
commit 8df624a10d
12 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
fusee/fusee-primary/src/sd_utils.c → fusee/fusee-primary/src/fs_utils.c
View File

@@ -1,4 +1,4 @@
#include "sd_utils.h"
#include "fs_utils.h"
#include "hwinit.h"
#include "sdmmc.h"
#include "lib/printk.h"
@@ -18,7 +18,7 @@ int mount_sd(void) {
return mounted_sd;
}
size_t read_sd_file(void *dst, size_t dst_size, const char *filename) {
size_t read_from_file(void *dst, size_t dst_size, const char *filename) {
if (!mounted_sd && mount_sd() == 0) {
return 0;
}

9
fusee/fusee-primary/src/fs_utils.h Normal file
View File

@@ -0,0 +1,9 @@
#ifndef FUSEE_FS_UTILS_H
#define FUSEE_FS_UTILS_H
#include "utils.h"
#include "sdmmc.h"
size_t read_from_file(void *dst, size_t dst_size, const char *filename);
#endif

4
fusee/fusee-primary/src/main.c
View File

@@ -2,7 +2,7 @@
#include "hwinit.h"
#include "fuse.h"
#include "se.h"
#include "sd_utils.h"
#include "fs_utils.h"
#include "stage2.h"
#include "chainloader.h"
#include "sdmmc.h"
@@ -23,7 +23,7 @@ static char g_bct0_buffer[BCTO_MAX_SIZE];
"stage2_entrypoint = 0xF0000000\n"
static const char *load_config(void) {
if (!read_sd_file(g_bct0_buffer, BCTO_MAX_SIZE, "BCT.ini")) {
if (!read_from_file(g_bct0_buffer, BCTO_MAX_SIZE, "BCT.ini")) {
printk("Failed to read BCT0 from SD!\n");
printk("[DEBUG] Using default BCT0!\n");
memcpy(g_bct0_buffer, DEFAULT_BCT0_FOR_DEBUG, sizeof(DEFAULT_BCT0_FOR_DEBUG));

9
fusee/fusee-primary/src/sd_utils.h
View File

@@ -1,9 +0,0 @@
#ifndef FUSEE_SD_UTILS_H
#define FUSEE_SD_UTILS_H
#include "utils.h"
#include "sdmmc.h"
size_t read_sd_file(void *dst, size_t dst_size, const char *filename);
#endif

4
fusee/fusee-primary/src/stage2.c
View File

@@ -1,7 +1,7 @@
#include "utils.h"
#include <stdint.h>
#include "display/video_fb.h"
#include "sd_utils.h"
#include "fs_utils.h"
#include "stage2.h"
#include "chainloader.h"
#include "lib/printk.h"
@@ -105,7 +105,7 @@ void load_stage2(const char *bct0) {
tmp_addr = config.load_address;
}
if (read_sd_file((void *)tmp_addr, size, config.path) != size) {
if (read_from_file((void *)tmp_addr, size, config.path) != size) {
printk("Error: Failed to read stage2 (%s)!\n", config.path);
generic_panic();
}