mika/libnx
1
0
Fork 0
mirror of https://github.com/switchbrew/libnx.git synced 2025-06-21 12:32:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fun not allowed under constexpr

Browse Source
This commit is contained in:
fincs 2023-05-07 02:33:50 +02:00
parent f73cecc31b
commit d9a874181d
No known key found for this signature in database
GPG Key ID: 62C7609ADA219C60
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nx/include/switch/sf/cmif.h
View File

@ -91,13 +91,13 @@ typedef struct CmifResponse {
Handle* move_handles; Handle* move_handles;
} CmifResponse; } CmifResponse;
NX_CONSTEXPR void* cmifGetAlignedDataStart(u32* data_words, void* base) NX_INLINE void* cmifGetAlignedDataStart(u32* data_words, void* base)
{ {
intptr_t data_start = ((u8*)data_words - (u8*)base + 15) &~ 15; intptr_t data_start = ((u8*)data_words - (u8*)base + 15) &~ 15;
return (u8*)base + data_start; return (u8*)base + data_start;
} }
NX_CONSTEXPR CmifRequest cmifMakeRequest(void* base, CmifRequestFormat fmt) NX_INLINE CmifRequest cmifMakeRequest(void* base, CmifRequestFormat fmt)
{ {
// First of all, we need to figure out what size we need. // First of all, we need to figure out what size we need.
u32 actual_size = 16; u32 actual_size = 16;
@ -156,7 +156,7 @@ NX_CONSTEXPR CmifRequest cmifMakeRequest(void* base, CmifRequestFormat fmt)
return req; return req;
} }
NX_CONSTEXPR void* cmifMakeControlRequest(void* base, u32 request_id, u32 size) NX_INLINE void* cmifMakeControlRequest(void* base, u32 request_id, u32 size)
{ {
u32 actual_size = 16 + sizeof(CmifInHeader) + size; u32 actual_size = 16 + sizeof(CmifInHeader) + size;
HipcRequest hipc = hipcMakeRequestInline(base, HipcRequest hipc = hipcMakeRequestInline(base,
@ -173,7 +173,7 @@ NX_CONSTEXPR void* cmifMakeControlRequest(void* base, u32 request_id, u32 size)
return hdr+1; return hdr+1;
} }
NX_CONSTEXPR void cmifMakeCloseRequest(void* base, u32 object_id) NX_INLINE void cmifMakeCloseRequest(void* base, u32 object_id)
{ {
if (object_id) { if (object_id) {
HipcRequest hipc = hipcMakeRequestInline(base, HipcRequest hipc = hipcMakeRequestInline(base,
@ -257,7 +257,7 @@ NX_CONSTEXPR void cmifRequestHandle(CmifRequest* req, Handle handle)
*req->hipc.copy_handles++ = handle; *req->hipc.copy_handles++ = handle;
} }
NX_CONSTEXPR Result cmifParseResponse(CmifResponse* res, void* base, bool is_domain, u32 size) NX_INLINE Result cmifParseResponse(CmifResponse* res, void* base, bool is_domain, u32 size)
{ {
HipcResponse hipc = hipcParseResponse(base); HipcResponse hipc = hipcParseResponse(base);
void* start = cmifGetAlignedDataStart(hipc.data_words, base); void* start = cmifGetAlignedDataStart(hipc.data_words, base);