diff options
| -rw-r--r-- | include/gba/macro.h | 12 | ||||
| -rw-r--r-- | src/m4a_2.c | 5 |
2 files changed, 7 insertions, 10 deletions
diff --git a/include/gba/macro.h b/include/gba/macro.h index 7c56943b7..1a778ef84 100644 --- a/include/gba/macro.h +++ b/include/gba/macro.h @@ -2,12 +2,12 @@ #define GUARD_GBA_MACRO_H #define CPU_FILL(dest, value, size, bit) \ -do { \ +{ \ vu##bit tmp = (vu##bit)(value); \ CpuSet((void *)&tmp, \ dest, \ CPU_SET_##bit##BIT | CPU_SET_SRC_FIXED | ((size)/(bit/8) & 0x1FFFFF)); \ -} while (0) +} #define CpuFill16(dest, value, size) CPU_FILL(dest, value, size, 16) #define CpuFill32(dest, value, size) CPU_FILL(dest, value, size, 32) @@ -18,23 +18,23 @@ do { #define CpuCopy32(src, dest, size) CPU_COPY(src, dest, size, 32) #define DmaSet(dmaNum, src, dest, control) \ -do { \ +{ \ vu32 *dmaRegs = (vu32 *)REG_ADDR_DMA##dmaNum; \ dmaRegs[0] = (vu32)(src); \ dmaRegs[1] = (vu32)(dest); \ dmaRegs[2] = (vu32)(control); \ dmaRegs[2]; \ -} while (0) +} #define DMA_FILL(dmaNum, dest, value, size, bit) \ -do { \ +{ \ vu##bit tmp = (vu##bit)(value); \ DmaSet(dmaNum, \ &tmp, \ dest, \ (DMA_ENABLE | DMA_START_NOW | DMA_##bit##BIT | DMA_SRC_FIXED | DMA_DEST_INC) << 16 \ | ((size)/(bit/8))); \ -} while (0) +} #define DmaFill16(dmaNum, dest, value, size) DMA_FILL(dmaNum, dest, value, size, 16) #define DmaFill32(dmaNum, dest, value, size) DMA_FILL(dmaNum, dest, value, size, 32) diff --git a/src/m4a_2.c b/src/m4a_2.c index 29f9bf910..56487808c 100644 --- a/src/m4a_2.c +++ b/src/m4a_2.c @@ -251,7 +251,6 @@ void MPlayExtender(struct CgbChannel *cgbChans) { struct SoundInfo *soundInfo; u32 ident; - register u32 maxLines asm("r0"); REG_SOUNDCNT_X = SOUND_MASTER_ENABLE | SOUND_4_ON @@ -291,9 +290,7 @@ void MPlayExtender(struct CgbChannel *cgbChans) soundInfo->CgbSound = CgbSound; soundInfo->CgbOscOff = CgbOscOff; soundInfo->MidiKeyToCgbFreq = MidiKeyToCgbFreq; - - maxLines = MAX_LINES; - soundInfo->maxLines = maxLines; + soundInfo->maxLines = MAX_LINES; CpuFill32(cgbChans, 0, sizeof(struct CgbChannel) * 4); |