Leahnaya/gcmm
1
0
Fork 0
mirror of https://github.com/suloku/gcmm.git synced 2026-09-13 22:05:27 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add folder code for Raw restore

Browse Source
This commit is contained in:
suloku
2017-04-05 20:37:55 +02:00
parent 7133bf399d
commit bf825559fb
3 changed files with 85 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

102
source/main.c
View File

@@ -595,7 +595,7 @@ void SD_RestoreMode ()
usleep(300000);
continue;
}
else
else //Selection is a file
{
ShowAction ("Reading from FAT device");
if (SDLoadMCImage ((char*)filelist[selected]))
@@ -666,6 +666,7 @@ void SD_RawRestoreMode ()
char msg[64];
s32 writen = 0;
int i;
int inProgress = 1;
clearRightPane();
DrawText(380,130,"R A W R e s t o r e");
@@ -674,6 +675,9 @@ void SD_RawRestoreMode ()
writeStatusBar("Reading files... ", "");
//Curr Folder to default
sprintf((char*)currFolder, "MCBACKUP");
files = SDGetFileList (0);
setfontsize (14);
@@ -684,35 +688,89 @@ void SD_RawRestoreMode ()
WaitPrompt ("No raw backups in FAT device to restore !");
}else
{
selected = ShowSelector (0);
while(inProgress == 1)
{
setfontsize (14);
writeStatusBar("Pick a file using UP or DOWN", "Press A to restore to Memory Card ") ;
//It will wait here until user selected a file
selected = ShowSelector (0);
if (cancel)
{
WaitPrompt ("Restore action cancelled !");
return;
}
else
{
#ifdef FLASHIDCHECK
//Now imageserial and sramex.flash_id[MEM_CARD] variables should hold the proper information
for (i=0;i<12;i++){
if (imageserial[i] != sramex->flash_id[MEM_CARD][i]){
WaitPrompt ("Card and image flash ID don't match !");
if (cancel)
{
if (strcmp((char*)currFolder, "MCBACKUP") == 0)
{
WaitPrompt ("Restore action cancelled !");
return;
}
else
{
//Go back one folder
char* pos = strrchr( (char*)currFolder, '/' );
currFolder[(pos-(char*)currFolder)] = 0;
files = SDGetFileList (0);
cancel = 0;
offsetchanged = true;
usleep(300000);
continue;
}
}
#endif
ShowAction ("Reading from FAT device...");
if (RestoreRawImage(MEM_CARD, (char*)filelist[selected], &writen) == 1)
else
{
sprintf(msg, "Restore complete! Wrote %d bytes to card",writen);
WaitPrompt(msg);
}else
{
WaitPrompt("Restore failed!");
//Check if selection is folder
char folder[1024];
sprintf (folder, "fat:/%s/%s", currFolder, (char*)filelist[selected]);
if(isdir_sd(folder) == 1)
{
//Enter folder
sprintf((char*)currFolder, "%s/%s", currFolder, (char*)filelist[selected]);
files = SDGetFileList (0);
if (!files)
{
WaitPrompt("Folder is empty!");
//Go back again
char* pos = strrchr( (char*)currFolder, '/' );
currFolder[(pos-(char*)currFolder)] = 0;
files = SDGetFileList (0);
}
offsetchanged = true;
usleep(300000);
continue;
}
else //Selection is a file
{
#ifdef FLASHIDCHECK
//Now imageserial and sramex.flash_id[MEM_CARD] variables should hold the proper information
for (i=0;i<12;i++){
if (imageserial[i] != sramex->flash_id[MEM_CARD][i]){
WaitPrompt ("Card and image flash ID don't match !");
return;
}
}
#endif
ShowAction ("Reading from FAT device...");
if (RestoreRawImage(MEM_CARD, (char*)filelist[selected], &writen) == 1)
{
sprintf(msg, "Restore complete! Wrote %d bytes to card",writen);
WaitPrompt(msg);
}else
{
WaitPrompt("Restore failed!");
}
}
}
}
}
return;
}
/****************************************************************************

5
source/raw.c
View File

@@ -30,6 +30,9 @@ s8 write_data = 0;
s8 erase_data = 0;
Header cardheader;
extern u8 currFolder[260];
extern int folderCount;
extern syssram* __SYS_LockSram();
extern syssramex* __SYS_LockSramEx();
extern u32 __SYS_UnlockSram(u32 write);
@@ -389,7 +392,7 @@ s8 RestoreRawImage( s32 slot, char *sdfilename, s32 *bytes_writen )
/*** Make fullpath filename ***/
sprintf (filename, "fat:/%s/%s", MCSAVES, sdfilename);
sprintf (filename, "fat:/%s/%s", currFolder, sdfilename);
/*** Open the SD Card file ***/
dumpFd = fopen ( filename , "rb" );

2
source/sdsupp.c
View File

@@ -609,7 +609,7 @@ int SDGetFileList(int mode)
int filecount = 0;
DIR *dir;
struct dirent *dit;
static char namefile[256*4]; // reserva espacio suficiente para UTF-8
static char namefile[256*4]; // enough room for UTF-8 encoding
int dirtype;
//static struct stat filestat;