diff options
| author | Roman Sandu <roma.sandu@gmail.com> | 2026-03-27 04:54:07 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-03-26 18:54:07 -0700 |
| commit | 0fc019dcfa2ed1834825e9754d47e7948e1745f7 (patch) | |
| tree | c3b06bbb412d48cc6586bea3312274dd70f00761 /libs/revolution | |
| parent | f8cf5458482d7b380f52740289745b8241448559 (diff) | |
JAHostIO and friends (#3131)
Diffstat (limited to 'libs/revolution')
| -rw-r--r-- | libs/revolution/include/revolution/dvd.h | 9 | ||||
| -rw-r--r-- | libs/revolution/src/ipc/ipcProfile.c | 1 | ||||
| -rw-r--r-- | libs/revolution/src/pad/Pad.c | 1 | ||||
| -rw-r--r-- | libs/revolution/src/wpad/__wpad.h | 1 |
4 files changed, 8 insertions, 4 deletions
diff --git a/libs/revolution/include/revolution/dvd.h b/libs/revolution/include/revolution/dvd.h index 06b7ecaece..afb0013558 100644 --- a/libs/revolution/include/revolution/dvd.h +++ b/libs/revolution/include/revolution/dvd.h @@ -3,7 +3,6 @@ #include <revolution/types.h> #include <revolution/esp.h> -#include "global.h" #ifdef __cplusplus extern "C" { @@ -188,15 +187,16 @@ typedef struct DVDGameTOC { typedef struct DVDPartitionParams DVDPartitionParams; +#define ROUND_HACK(n, a) (((u32)(n) + (a)-1) & ~((a)-1)) struct DVDPartitionParams { ESTicket ticket; - u8 padding0[ROUND(sizeof(ESTicket), 32) - sizeof(ESTicket)]; + u8 padding0[ROUND_HACK(sizeof(ESTicket), 32) - sizeof(ESTicket)]; ESTicketView ticketView; - u8 padding1[ROUND(sizeof(ESTicketView), 32) - sizeof(ESTicketView)]; + u8 padding1[ROUND_HACK(sizeof(ESTicketView), 32) - sizeof(ESTicketView)]; u32 numTmdBytes; u8 padding2[28]; ESTitleMeta tmd; - u8 padding3[ROUND(sizeof(ESTitleMeta), 32) - sizeof(ESTitleMeta)]; + u8 padding3[ROUND_HACK(sizeof(ESTitleMeta), 32) - sizeof(ESTitleMeta)]; u32 numCertBytes; u8 padding4[28]; u8 certificates[4096]; @@ -204,6 +204,7 @@ struct DVDPartitionParams { u8 padding5[28]; u8 h3Hash[98304]; }; +#undef ROUND_HACK typedef struct diRegVals { u32 ImmRegVal; diff --git a/libs/revolution/src/ipc/ipcProfile.c b/libs/revolution/src/ipc/ipcProfile.c index 735f053757..a778e09b35 100644 --- a/libs/revolution/src/ipc/ipcProfile.c +++ b/libs/revolution/src/ipc/ipcProfile.c @@ -1,4 +1,5 @@ #include <revolution.h> +#include "global.h" #include <cstring> #if SDK_AUG2010 diff --git a/libs/revolution/src/pad/Pad.c b/libs/revolution/src/pad/Pad.c index b20da7bb14..3d934d3d8b 100644 --- a/libs/revolution/src/pad/Pad.c +++ b/libs/revolution/src/pad/Pad.c @@ -1,6 +1,7 @@ #include <revolution.h> #include <revolution/pad.h> #include <revolution/si.h> +#include "global.h" #include <cstring> diff --git a/libs/revolution/src/wpad/__wpad.h b/libs/revolution/src/wpad/__wpad.h index 7203d9f5b0..e6a6c8803e 100644 --- a/libs/revolution/src/wpad/__wpad.h +++ b/libs/revolution/src/wpad/__wpad.h @@ -3,6 +3,7 @@ #include <revolution/os.h> #include <revolution/wpad.h> +#include "global.h" #ifdef __cplusplus extern "C" { |