Added libappletReadStorage and libappletPopOutData.

This commit is contained in:
yellows8 2019-02-18 22:27:50 -05:00
parent 821c46539d
commit f392dc0ce2
2 changed files with 46 additions and 0 deletions

View File

@ -34,6 +34,15 @@ void libappletArgsCreate(LibAppletArgs* a, u32 version);
*/
void libappletArgsSetPlayStartupSound(LibAppletArgs* a, bool flag);
/**
* @brief Reads data from offset 0 from the specified storage into the buffer. If the storage-size is smaller than the size param, the storage-size is used instead.
* @param s Storage object.
* @param buffer Output buffer.
* @param size Size to read.
* @param transfer_size Optional output size field for the actual size used for the read.
*/
Result libappletReadStorage(AppletStorage* s, void* buffer, size_t size, size_t *transfer_size);
/**
* @brief Sets the tick field in LibAppletArgs, then creates a storage with it which is pushed to the AppletHolder via \ref appletHolderPushInData.
* @param a LibAppletArgs struct.
@ -49,6 +58,15 @@ Result libappletArgsPush(LibAppletArgs* a, AppletHolder *h);
*/
Result libappletPushInData(AppletHolder *h, const void* buffer, size_t size);
/**
* @brief Pops a storage via \ref appletHolderPopOutData, uses \ref libappletReadStorage, then closes the storage.
* @param h AppletHolder object.
* @param buffer Output buffer.
* @param size Size to read.
* @param transfer_size Optional output size field for the actual size used for the read.
*/
Result libappletPopOutData(AppletHolder *h, void* buffer, size_t size, size_t *transfer_size);
/// Wrapper for \ref appletPushToGeneralChannel, see appletPushToGeneralChannel regarding the requirements for using this.
/// Returns to the main Home Menu, equivalent to pressing the HOME button.
Result libappletRequestHomeMenu(void);

View File

@ -34,6 +34,22 @@ static Result _libappletCreateWriteStorage(AppletStorage* s, const void* buffer,
return rc;
}
Result libappletReadStorage(AppletStorage* s, void* buffer, size_t size, size_t *transfer_size) {
Result rc=0;
s64 tmpsize=0;
rc = appletStorageGetSize(s, &tmpsize);
if (R_SUCCEEDED(rc)) {
if (tmpsize < size) size = tmpsize;
rc = appletStorageRead(s, 0, buffer, size);
}
if (R_SUCCEEDED(rc) && transfer_size) *transfer_size = size;
return rc;
}
static Result _libappletPushInData(AppletHolder *h, const void* buffer, size_t size) {
Result rc=0;
AppletStorage storage;
@ -67,6 +83,18 @@ Result libappletPushInData(AppletHolder *h, const void* buffer, size_t size) {
return _libappletPushInData(h, buffer, size);
}
Result libappletPopOutData(AppletHolder *h, void* buffer, size_t size, size_t *transfer_size) {
Result rc=0;
AppletStorage storage;
rc = appletHolderPopOutData(h, &storage);
if (R_FAILED(rc)) return rc;
rc = libappletReadStorage(&storage, buffer, size, transfer_size);
appletStorageClose(&storage);
return rc;
}
Result libappletRequestHomeMenu(void) {
u8 storagedata[0x10] = {0x53, 0x41, 0x4d, 0x53, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00};//RequestHomeMenu
return _libappletQlaunchRequest(storagedata, sizeof(storagedata));