Mirrors/Awoo-Installer
2
0
Fork 0
mirror of https://github.com/Huntereb/Awoo-Installer synced 2025-02-16 11:48:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update to libnx 3.1.0 (#66)

Browse source
This commit is contained in:
masagrator 2020-04-19 20:24:58 +02:00 • committed by GitHub
parent 4370eb9f1e
commit eb499cad0b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
include/nx/ipc/ns_ext.h
View file

@ -39,15 +39,11 @@ typedef struct {
Result nsextInitialize(void);
void nsextExit(void);
Result nsCalculateApplicationOccupiedSize(u64 titleID, void *out_buf);
Result nsPushApplicationRecord(u64 title_id, u8 last_modified_event, ContentStorageRecord *content_records_buf, size_t buf_size);
Result nsListApplicationRecordContentMeta(u64 offset, u64 titleID, void *out_buf, size_t out_buf_size, u32 *entries_read_out);
Result nsDeleteApplicationRecord(u64 titleID);
Result nsTouchApplication(u64 titleID);
Result nsLaunchApplication(u64 titleID);
Result nsPushLaunchVersion(u64 titleID, u32 version);
Result nsCountApplicationContentMeta(u64 titleId, u32* countOut);
Result nsCheckApplicationLaunchVersion(u64 titleID);
Result nsDisableApplicationAutoUpdate(u64 titleID);
Result nsGetContentMetaStorage(const NcmContentMetaKey *record, u8 *out);
Result nsBeginInstallApplication(u64 tid, u32 unk, u8 storageId);
@ -55,4 +51,3 @@ Result nsInvalidateAllApplicationControlCache(void);
Result nsInvalidateApplicationControlCache(u64 tid);
Result nsCheckApplicationLaunchRights(u64 tid);
Result nsGetApplicationContentPath(u64 titleId, u8 type, char *outBuf, size_t bufSize);
Result nsWithdrawApplicationUpdateRequest(u64 titleId);

4
source/install/install.cpp
View file

@ -72,7 +72,7 @@ namespace tin::install
Result rc = 0;
std::vector<ContentStorageRecord> storageRecords;
u64 baseTitleId = tin::util::GetBaseTitleId(this->GetTitleId(i), this->GetContentMetaType(i));
u32 contentMetaCount = 0;
s32 contentMetaCount = 0;
LOG_DEBUG("Base title Id: 0x%lx", baseTitleId);
@ -96,7 +96,7 @@ namespace tin::install
ASSERT_OK(nsListApplicationRecordContentMeta(0, baseTitleId, contentStorageBuf.get(), contentStorageBufSize, &entriesRead), "Failed to list application record content meta");
if (entriesRead != contentMetaCount)
if ((s32)entriesRead != contentMetaCount)
{
THROW_FORMAT("Mismatch between entries read and content meta count");
}

61
source/nx/ipc/ns_ext.c
View file

@ -76,23 +76,6 @@ Result nsPushApplicationRecord(u64 title_id, u8 last_modified_event, ContentStor
.buffers = { { content_records_buf, buf_size } });
}
Result nsCalculateApplicationOccupiedSize(u64 titleID, void *out_buf) {
struct {
u64 titleID;
} in = { titleID };
struct {
u8 out[0x80];
} out;
Result rc = serviceDispatchInOut(&g_nsAppManSrv, 11, in, out);
if (R_SUCCEEDED(rc) && out_buf) memcpy(out_buf, out.out, 0x80);
return rc;
}
Result nsListApplicationRecordContentMeta(u64 offset, u64 titleID, void *out_buf, size_t out_buf_size, u32 *entries_read_out) {
struct {
@ -113,14 +96,6 @@ Result nsListApplicationRecordContentMeta(u64 offset, u64 titleID, void *out_buf
return rc;
}
Result nsTouchApplication(u64 titleID) {
struct {
u64 titleID;
} in = { titleID };
return serviceDispatchIn(&g_nsAppManSrv, 904, in);
}
Result nsDeleteApplicationRecord(u64 titleID) {
struct {
u64 titleID;
@ -147,31 +122,6 @@ Result nsPushLaunchVersion(u64 titleID, u32 version) {
return serviceDispatchIn(&g_nsAppManSrv, 36, in);
}
Result nsCheckApplicationLaunchVersion(u64 titleID) {
struct {
u64 titleID;
} in = { titleID };
return serviceDispatchIn(&g_nsAppManSrv, 38, in);
}
Result nsCountApplicationContentMeta(u64 titleId, u32* countOut) {
struct {
u64 titleId;
} in = { titleId };
struct {
u32 count;
} out;
Result rc = serviceDispatchInOut(&g_nsAppManSrv, 600, in, out);
if (R_SUCCEEDED(rc) && countOut) *countOut = out.count;
return rc;
}
Result nsGetContentMetaStorage(const NcmContentMetaKey *record, u8 *storageOut) {
struct {
@ -244,13 +194,4 @@ Result nsDisableApplicationAutoUpdate(u64 titleID) {
} in = { titleID };
return serviceDispatchIn(&g_nsAppManSrv, 903, in);
}
Result nsWithdrawApplicationUpdateRequest(u64 titleId) {
struct {
u64 title_id;
} in = { titleId };
return serviceDispatchIn(&g_nsAppManSrv, 907, in);
}
}

4
source/util/usb_comms_awoo.c
View file

@ -442,7 +442,7 @@ static Result _usbCommsRead(usbCommsInterface *interface, void* buffer, size_t s
if (R_FAILED(rc))
{
usbDsEndpoint_Cancel(interface->endpoint_out);
eventWait(&interface->endpoint_out->CompletionEvent, U64_MAX);
eventWait(&interface->endpoint_out->CompletionEvent, UINT64_MAX);
eventClear(&interface->endpoint_out->CompletionEvent);
return rc;
}
@ -512,7 +512,7 @@ static Result _usbCommsWrite(usbCommsInterface *interface, const void* buffer, s
if (R_FAILED(rc))
{
usbDsEndpoint_Cancel(interface->endpoint_in);
eventWait(&interface->endpoint_in->CompletionEvent, U64_MAX);
eventWait(&interface->endpoint_in->CompletionEvent, UINT64_MAX);
eventClear(&interface->endpoint_in->CompletionEvent);
return rc;
}