This commit is contained in:
StackZ
2020-04-24 03:19:21 +02:00
parent b16296af60
commit ce4c6bd6d4
2 changed files with 5 additions and 7 deletions
-2
View File
@@ -90,7 +90,6 @@ Result Init::Initialize() {
gfxInitDefault(); gfxInitDefault();
romfsInit(); romfsInit();
amInit(); amInit();
sdmcInit();
Gui::init(); Gui::init();
cfguInit(); cfguInit();
acInit(); acInit();
@@ -206,6 +205,5 @@ Result Init::Exit() {
acExit(); acExit();
amExit(); amExit();
romfsExit(); romfsExit();
sdmcExit();
return 0; return 0;
} }
+5 -5
View File
@@ -2284,9 +2284,9 @@ list_transfer(ftp_session_t *session)
/* the sdmc directory entry already has the type and size, so no need to do a slow stat */ /* the sdmc directory entry already has the type and size, so no need to do a slow stat */
u32 magic = *(u32*)session->dp->dirData->dirStruct; u32 magic = *(u32*)session->dp->dirData->dirStruct;
if(magic == SDMC_DIRITER_MAGIC) if(magic == ARCHIVE_DIRITER_MAGIC)
{ {
sdmc_dir_t *dir = (sdmc_dir_t*)session->dp->dirData->dirStruct; archive_dir_t *dir = (archive_dir_t*)session->dp->dirData->dirStruct;
FS_DirectoryEntry *entry = &dir->entry_data[dir->index]; FS_DirectoryEntry *entry = &dir->entry_data[dir->index];
if(entry->attributes & FS_ATTRIBUTE_DIRECTORY) if(entry->attributes & FS_ATTRIBUTE_DIRECTORY)
@@ -2315,8 +2315,8 @@ list_transfer(ftp_session_t *session)
else if(getmtime) else if(getmtime)
{ {
uint64_t mtime = 0; uint64_t mtime = 0;
if((rc = sdmc_getmtime(session->buffer, &mtime)) != 0) if((rc = archive_getmtime(session->buffer, &mtime)) != 0)
console_print(RED "sdmc_getmtime '%s': 0x%x\n" RESET, session->buffer, rc); console_print(RED "archive_getmtime '%s': 0x%x\n" RESET, session->buffer, rc);
else else
st.st_mtime = mtime; st.st_mtime = mtime;
} }
@@ -3061,7 +3061,7 @@ FTP_DECLARE(MDTM)
} }
#ifdef _3DS #ifdef _3DS
rc = sdmc_getmtime(session->buffer, &mtime); rc = archive_getmtime(session->buffer, &mtime);
if(rc != 0) if(rc != 0)
{ {
ftp_send_response(session, 550, "Error getting mtime\r\n"); ftp_send_response(session, 550, "Error getting mtime\r\n");