Skip to content

Commit

Permalink
Code style
Browse files Browse the repository at this point in the history 
Also fixes ed64_ll_set_ram_bank
  • Loading branch information
@networkfusion
networkfusion committed Oct 20, 2023
1 parent 58c3753 commit 05d37cc
Show file tree
Hide file tree
Showing 3 changed files with 98 additions and 115 deletions.
125 changes: 43 additions & 82 deletions src/flashcart/ed64/ed64.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@

extern int ed_exit(void);

static flashcart_err_t ed64_init(void)
{
static flashcart_err_t ed64_init(void) {

// TODO: partly already done, see https://github.com/DragonMinded/libdragon/blob/4ec469d26b6dc4e308caf3d5b86c2b340b708bbd/src/libcart/cart.c#L1064

// FIXME: Update firmware if needed.
Expand All @@ -38,8 +38,7 @@ static flashcart_err_t ed64_init(void)
// older everdrives cannot save during gameplay so we need to the reset method.
// works by checking if a file exists.

if (file_exists(strip_sd_prefix(RESET_CHECK_FILE_PATH)))
{
if (file_exists(strip_sd_prefix(RESET_CHECK_FILE_PATH))) {

// make sure next boot doesnt trigger the check by deleting the reset file
f_unlink(strip_sd_prefix(RESET_CHECK_FILE_PATH));
Expand All @@ -48,23 +47,20 @@ static flashcart_err_t ed64_init(void)
FIL lrp_fil;
UINT lrp_br;

if (f_open(&lrp_fil, strip_sd_prefix(LAST_SAVE_FILE_PATH), FA_READ) != FR_OK)
{
if (f_open(&lrp_fil, strip_sd_prefix(LAST_SAVE_FILE_PATH), FA_READ) != FR_OK) {
return FLASHCART_ERR_LOAD;
}

int lrp_size = f_size(&lrp_fil);

TCHAR lrp_path[lrp_size++];

if (f_read(&lrp_fil, lrp_path, lrp_size, &lrp_br) != FR_OK)
{
if (f_read(&lrp_fil, lrp_path, lrp_size, &lrp_br) != FR_OK) {
f_close(&lrp_fil);
return FLASHCART_ERR_LOAD;
}

if (f_close(&lrp_fil) != FR_OK)
{
if (f_close(&lrp_fil) != FR_OK) {
return FLASHCART_ERR_LOAD;
}

Expand All @@ -74,58 +70,49 @@ static flashcart_err_t ed64_init(void)
uint8_t cartsave_data[KiB(128)];

// find the path to last save
if (file_exists(strip_sd_prefix(lrp_path)))
{
if (file_exists(strip_sd_prefix(lrp_path))) {

int save_size = file_get_size(strip_sd_prefix(lrp_path));

if ((f_open(&fil, strip_sd_prefix(lrp_path), FA_CREATE_ALWAYS | FA_READ | FA_WRITE)) != FR_OK)
{
if ((f_open(&fil, strip_sd_prefix(lrp_path), FA_CREATE_ALWAYS | FA_READ | FA_WRITE)) != FR_OK) {
return FLASHCART_ERR_LOAD;
}

// everdrive doesn't care about the save type other than flash sram and eeprom
// so minus flashram we can just check the size
if (file_exists(strip_sd_prefix(FLASHRAM_CHECK_FILE_PATH)))
{ // flashram is bugged atm
if (file_exists(strip_sd_prefix(FLASHRAM_CHECK_FILE_PATH))) { // flashram is bugged atm
ed64_ll_get_fram(cartsave_data, save_size);
// deletes flag
f_unlink(strip_sd_prefix(FLASHRAM_CHECK_FILE_PATH));
}
else if (save_size > KiB(2))
{ // sram
else if (save_size > KiB(2)) { // sram
ed64_ll_get_sram(cartsave_data, save_size);
}
else
{ // eeprom
else { // eeprom
ed64_ll_get_eeprom(cartsave_data, save_size);
}

if (f_write(&fil, cartsave_data, save_size, &br) != FR_OK)
{
if (f_write(&fil, cartsave_data, save_size, &br) != FR_OK) {
return FLASHCART_ERR_LOAD;
}

if (f_close(&fil) != FR_OK)
{
if (f_close(&fil) != FR_OK) {
return FLASHCART_ERR_LOAD;
}
}
}
return FLASHCART_OK;
}

static flashcart_err_t ed64_deinit(void)
{
static flashcart_err_t ed64_deinit(void) {

// For the moment, just use libCart exit.
ed_exit();

return FLASHCART_OK;
}

static bool ed64_has_feature(flashcart_features_t feature)
{
static bool ed64_has_feature(flashcart_features_t feature) {
switch (feature)
{
case FLASHCART_FEATURE_64DD:
Expand All @@ -135,13 +122,12 @@ static bool ed64_has_feature(flashcart_features_t feature)
}
}

static flashcart_err_t ed64_load_rom(char *rom_path, flashcart_progress_callback_t *progress)
{
static flashcart_err_t ed64_load_rom(char *rom_path, flashcart_progress_callback_t *progress) {

FIL fil;
UINT br;

if (f_open(&fil, strip_sd_prefix(rom_path), FA_READ) != FR_OK)
{
if (f_open(&fil, strip_sd_prefix(rom_path), FA_READ) != FR_OK) {
return FLASHCART_ERR_LOAD;
}

Expand All @@ -152,14 +138,12 @@ static flashcart_err_t ed64_load_rom(char *rom_path, flashcart_progress_callback
// FIXME: if the cart is not V3 or X5 or X7, we need probably need to - 128KiB for save compatibility.
// Or somehow warn that certain ROM's will have corruption due to the address space being used for saves.
// Conker's Bad Fur Day doesn't have this issue because eeprom data is at a fixed address in pif ram.
if (rom_size > MiB(64))
{
if (rom_size > MiB(64)) {
f_close(&fil);
return FLASHCART_ERR_LOAD;
}

if (rom_size == MiB(64))
{
if (rom_size == MiB(64)) {
rom_size -= KiB(128);
}

Expand All @@ -169,24 +153,20 @@ static flashcart_err_t ed64_load_rom(char *rom_path, flashcart_progress_callback
for (int offset = 0; offset < sdram_size; offset += chunk_size)
{
size_t block_size = MIN(sdram_size - offset, chunk_size);
if (f_read(&fil, (void *)(ROM_ADDRESS + offset), block_size, &br) != FR_OK)
{
if (f_read(&fil, (void *)(ROM_ADDRESS + offset), block_size, &br) != FR_OK) {
f_close(&fil);
return FLASHCART_ERR_LOAD;
}
if (progress)
{
if (progress) {
progress(f_tell(&fil) / (float)(f_size(&fil)));
}
}
/*if (f_tell(&fil) != sdram_size)
{
/*if (f_tell(&fil) != sdram_size) {
f_close(&fil);
return FLASHCART_ERR_LOAD;
}*/

if (f_close(&fil) != FR_OK)
{
if (f_close(&fil) != FR_OK) {
return FLASHCART_ERR_LOAD;
}

Expand All @@ -198,8 +178,7 @@ static flashcart_err_t ed64_load_file(char *file_path, uint32_t rom_offset, uint
FIL fil;
UINT br;

if (f_open(&fil, strip_sd_prefix(file_path), FA_READ) != FR_OK)
{
if (f_open(&fil, strip_sd_prefix(file_path), FA_READ) != FR_OK) {
return FLASHCART_ERR_LOAD;
}

Expand All @@ -210,60 +189,51 @@ static flashcart_err_t ed64_load_file(char *file_path, uint32_t rom_offset, uint
// FIXME: if the cart is not V3 or X5 or X7, we need probably need to - 128KiB for save compatibility.
// Or somehow warn that certain ROM's will have corruption due to the address space being used for saves.

if (file_size > (MiB(64) - rom_offset))
{
if (file_size > (MiB(64) - rom_offset)) {
f_close(&fil);
return FLASHCART_ERR_ARGS;
}

if (f_lseek(&fil, file_offset) != FR_OK)
{
if (f_lseek(&fil, file_offset) != FR_OK) {
f_close(&fil);
return FLASHCART_ERR_LOAD;
}

if (f_read(&fil, (void *)(ROM_ADDRESS + rom_offset), file_size, &br) != FR_OK)
{
if (f_read(&fil, (void *)(ROM_ADDRESS + rom_offset), file_size, &br) != FR_OK) {
f_close(&fil);
return FLASHCART_ERR_LOAD;
}
if (br != file_size)
{
if (br != file_size) {
f_close(&fil);
return FLASHCART_ERR_LOAD;
}

if (f_close(&fil) != FR_OK)
{
if (f_close(&fil) != FR_OK) {
return FLASHCART_ERR_LOAD;
}

return FLASHCART_OK;
}

static flashcart_err_t ed64_load_save(char *save_path)
{
static flashcart_err_t ed64_load_save(char *save_path) {

FIL fil;
UINT br;

if (f_open(&fil, strip_sd_prefix(save_path), FA_READ) != FR_OK)
{
if (f_open(&fil, strip_sd_prefix(save_path), FA_READ) != FR_OK) {
f_close(&fil);
return FLASHCART_ERR_LOAD;
}

size_t save_size = file_get_size(strip_sd_prefix(save_path));
uint8_t cartsave_data[save_size];

if (f_read(&fil, cartsave_data, save_size, &br) != FR_OK)
{
if (f_read(&fil, cartsave_data, save_size, &br) != FR_OK) {
f_close(&fil);
return FLASHCART_ERR_LOAD;
}

if (f_close(&fil) != FR_OK)
{
if (f_close(&fil) != FR_OK) {
return FLASHCART_ERR_LOAD;
}

Expand All @@ -283,14 +253,12 @@ static flashcart_err_t ed64_load_save(char *save_path)
// a cold and warm boot has no way of seeing save types and most types can be determined by size
// this tells the cart to use flash instead of sram 128 since they are the same size
FIL flashfil;
if (f_open(&flashfil, strip_sd_prefix(FLASHRAM_CHECK_FILE_PATH), FA_CREATE_ALWAYS) != FR_OK)
{
if (f_open(&flashfil, strip_sd_prefix(FLASHRAM_CHECK_FILE_PATH), FA_CREATE_ALWAYS) != FR_OK) {
f_close(&flashfil);
return FLASHCART_ERR_LOAD;
}

if (f_close(&flashfil) != FR_OK)
{
if (f_close(&flashfil) != FR_OK) {
return FLASHCART_OK;
}
break;
Expand All @@ -302,41 +270,35 @@ static flashcart_err_t ed64_load_save(char *save_path)
FIL lsp_fil;
UINT lsp_bw;

if (f_open(&lsp_fil, strip_sd_prefix(LAST_SAVE_FILE_PATH), FA_WRITE | FA_CREATE_ALWAYS) != FR_OK)
{
if (f_open(&lsp_fil, strip_sd_prefix(LAST_SAVE_FILE_PATH), FA_WRITE | FA_CREATE_ALWAYS) != FR_OK) {
return FLASHCART_ERR_LOAD;
}
if (f_write(&lsp_fil, strip_sd_prefix(save_path), strlen(save_path), &lsp_bw) != FR_OK)
{
if (f_write(&lsp_fil, strip_sd_prefix(save_path), strlen(save_path), &lsp_bw) != FR_OK) {
f_close(&lsp_fil);
return FLASHCART_ERR_LOAD;
}

if (f_close(&lsp_fil) != FR_OK)
{
if (f_close(&lsp_fil) != FR_OK) {
return FLASHCART_ERR_LOAD;
}

FIL rsfil;

// simulate a unix touch command to create a file as it only needs to exist to detect a reset

if (f_open(&rsfil, strip_sd_prefix(RESET_CHECK_FILE_PATH), FA_CREATE_ALWAYS) != FR_OK)
{
if (f_open(&rsfil, strip_sd_prefix(RESET_CHECK_FILE_PATH), FA_CREATE_ALWAYS) != FR_OK) {
f_close(&rsfil);
return FLASHCART_ERR_LOAD;
}

if (f_close(&rsfil) != FR_OK)
{
if (f_close(&rsfil) != FR_OK) {
return FLASHCART_OK;
}

return FLASHCART_OK;
}

static flashcart_err_t ed64_set_save_type(flashcart_save_type_t save_type)
{
static flashcart_err_t ed64_set_save_type(flashcart_save_type_t save_type) {
ed64_save_type_t type;

switch (save_type)
Expand Down Expand Up @@ -383,7 +345,6 @@ static flashcart_t flashcart_ed64 = {
.set_save_writeback = NULL,
};

flashcart_t *ed64_get_flashcart(void)
{
flashcart_t *ed64_get_flashcart(void) {
return &flashcart_ed64;
}
Loading

0 comments on commit 05d37cc

Please sign in to comment.