moparisthebest/altra64
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

updated mpk file reads

Browse Source
This commit is contained in:
Robin Jones 2017-10-15 18:13:18 +01:00
parent e805617d99
commit 756fbc15ce
1 changed files with 184 additions and 147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
src/memorypak.c
View File

@ -9,6 +9,7 @@
#include <stdio.h>
#include "types.h"
#include "memorypak.h"
#include "ff.h"
#include "fat_old.h"
#include "menu.h"
#include "mem.h"
@ -91,16 +92,19 @@ char ___CountBlocks(char *bMemPakBinary, char *aNoteSizes)
//old method to write a file to the mempak at controller 1
void file_to_mpk(display_context_t disp, u8 *filename)
{
u8 tmp[32];
u8 buff[64];
u8 ok = 0;
printText(filename, 9, -1, disp);
FatRecord rec_tmpf;
ok = fatFindRecord(filename, &rec_tmpf, 0);
u8 resp = 0;
resp = fatOpenFileByName(filename, 0);
FRESULT result;
FIL file;
UINT bytesread;
result = f_open(&file, filename, FA_READ);
if (result == FR_OK)
{
//int fsize = f_size(&file);
u8 *pch;
pch = strrchr(filename, '.');
@ -112,50 +116,82 @@ void file_to_mpk(display_context_t disp, u8 *filename)
printText("skip header", 9, -1, disp);
static uint8_t mempak_data_buff[36928];
resp = fatReadFile(&mempak_data_buff, 36928 / 512);
result =
f_read (
&file, /* [IN] File object */
&mempak_data_buff, /* [OUT] Buffer to store read data */
36928, /* [IN] Number of bytes to read */
&bytesread /* [OUT] Number of bytes read */
);
memcpy(&mempak_data, mempak_data_buff + 4160, 32768);
}
else
{
printText("Z64 format", 9, -1, disp);
resp = fatReadFile(&mempak_data, 32768 / 512);
result =
f_read (
&file, /* [IN] File object */
&mempak_data, /* [OUT] Buffer to store read data */
32768, /* [IN] Number of bytes to read */
&bytesread /* [OUT] Number of bytes read */
);
}
result = f_close(&file);
int err = 0;
for (int j = 0; j < 128; j++)
{
err |= write_mempak_sector(0, j, &mempak_data[j * MEMPAK_BLOCK_SIZE]);
}
}
}
void view_mpk_file(display_context_t disp, char *mpk_filename)
{
u8 tmp[32];
u8 buff[64];
u8 ok = 0;
FatRecord rec_tmpf;
ok = fatFindRecord(mpk_filename, &rec_tmpf, 0);
FRESULT result;
FIL file;
UINT bytesread;
result = f_open(&file, mpk_filename, FA_READ);
u8 resp = 0;
resp = fatOpenFileByName(mpk_filename, 0);
if (result == FR_OK)
{
//int fsize = f_size(&file);
u8 *pch;
pch = strrchr(mpk_filename, '.');
sprintf(buff, "%s", (pch + 2));
if (strcmp(buff, "64") == 0)
if (strcmp(buff, "64") == 0) //DEXDRIVE format
{
static uint8_t mempak_data_buff[36928];
resp = fatReadFile(&mempak_data_buff, 36928 / 512);
result =
f_read (
&file, /* [IN] File object */
&mempak_data_buff, /* [OUT] Buffer to store read data */
36928, /* [IN] Number of bytes to read */
&bytesread /* [OUT] Number of bytes read */
);
memcpy(&mempak_data, mempak_data_buff + 4160, 32768);
}
else
else //Z64 format
{
resp = fatReadFile(&mempak_data, 32768 / 512);
result =
f_read (
&file, /* [IN] File object */
&mempak_data, /* [OUT] Buffer to store read data */
32768, /* [IN] Number of bytes to read */
&bytesread /* [OUT] Number of bytes read */
);
}
result = f_close(&file);
printText("File content:", 11, 5, disp);
printText(" ", 11, -1, disp);
@ -271,6 +307,7 @@ void view_mpk_file(display_context_t disp, char *mpk_filename)
{
printText("empty", 11, -1, disp);
}
}
}
void view_mpk(display_context_t disp)