diff options
author | Jesse Talavera-Greenberg <jesse@jesse.tg> | 2023-10-11 11:20:05 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-10-11 17:20:05 +0200 |
commit | d4e51f80601f57399db49f1010c45427bd2bf3c4 (patch) | |
tree | 206985e7bedfc1755941eeba26d6605d4e03fa0a /src/FATIO.h | |
parent | b2fcff97c186cc9db263089acd4810ea7d58517d (diff) |
Refactor DSi_NAND (#1844)
* Refactor diskio's contents
- Change ff_disk_read_cb/write_cb into a std::function instead of a raw pointer
- Add const specifiers as needed
* Refactor DSi_NAND to manage the file system's mounted lifetime with RAII
* Split NANDMount into NANDMount and NANDImage
- NANDImage is used for information about the NAND that doesn't require decryption or filesystem access
- NANDMount is used to actually access the file system
- Both classes manage their respective resources (the NAND file handle and the NAND's mount) with RAII
- Also split the file loading into another function that I will remove in a later PR
* Make NANDMount immovable
* Remove NAND-loading code that I had sectioned off into a function
- Incomplete copypasta
- I must have gotten distracted
* Tidy up NANDImage's initialization
- Don't unmount the disk image if the constructor fails (that's NANDMount's job now)
- Only assign CurFile if the constructor succeeds
* Add some const-correctness
* Move DSi NAND initialization to the frontend
- The NANDImage is now installed via a unique_ptr in DSi
* Remove Platform::DSi_NANDPath
- Not Config::DSiNANDPath; that can still be configured as usual
- The core no longer needs to care
Diffstat (limited to 'src/FATIO.h')
-rw-r--r-- | src/FATIO.h | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/src/FATIO.h b/src/FATIO.h new file mode 100644 index 0000000..b3b63f3 --- /dev/null +++ b/src/FATIO.h @@ -0,0 +1,34 @@ +/* + Copyright 2016-2023 melonDS team + + This file is part of melonDS. + + melonDS is free software: you can redistribute it and/or modify it under + the terms of the GNU General Public License as published by the Free + Software Foundation, either version 3 of the License, or (at your option) + any later version. + + melonDS is distributed in the hope that it will be useful, but WITHOUT ANY + WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with melonDS. If not, see http://www.gnu.org/licenses/. +*/ + + +#ifndef FATIO_H +#define FATIO_H + +#include <functional> +#include "fatfs/ff.h" + +// extra additions for interfacing with melonDS + +using ff_disk_read_cb = std::function<UINT(BYTE*, LBA_t, UINT)>; +using ff_disk_write_cb = std::function<UINT(const BYTE*, LBA_t, UINT)>; + +void ff_disk_open(const ff_disk_read_cb& readcb, const ff_disk_write_cb& writecb, LBA_t seccnt); +void ff_disk_close(); + +#endif // FATIO_H |