diff options
| author | SatoMew <SatoMew@users.noreply.github.com> | 2019-08-04 20:35:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-04 20:35:38 +0100 |
| commit | 667f0837e2c0fecb03e4198a182cf04624a47fbd (patch) | |
| tree | 4f11ff910478fdb34a4c40c465b30be2ac1a22da /src/multiboot.c | |
| parent | 89da828794d036e33ef313ab95868c8be6bb039f (diff) | |
| parent | ce941e6f56803b389c20a52c0a5b89f5ade12b7a (diff) | |
Merge branch 'master' into master
Diffstat (limited to 'src/multiboot.c')
| -rw-r--r-- | src/multiboot.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/multiboot.c b/src/multiboot.c index da90a55c0..c7e14392e 100644 --- a/src/multiboot.c +++ b/src/multiboot.c @@ -1,7 +1,7 @@ #include "gba/gba.h" #include "multiboot.h" -IWRAM_DATA static u16 MultiBoot_required_data[MULTIBOOT_NCHILD]; +static u16 MultiBoot_required_data[MULTIBOOT_NCHILD]; static int MultiBootSend(struct MultiBootParam *mp, u16 data); static int MultiBootHandShake(struct MultiBootParam *mp); @@ -435,7 +435,7 @@ static int MultiBootHandShake(struct MultiBootParam *mp) #undef must_data } -static void MultiBootWaitCycles(u32 cycles) +static NOINLINE void MultiBootWaitCycles(u32 cycles) { asm("mov r2, pc"); asm("lsr r2, #24"); |