From 17b09f3708c4060bf677f51bc5bdd0989d366ae4 Mon Sep 17 00:00:00 2001
From: meepingsnesroms <guicrith@gmail.com>
Date: Tue, 6 Nov 2018 19:26:01 -0800
Subject: [PATCH] Add a few more C89 fixes

---
 src/hardwareRegistersAccessors.c.h | 12 ++++++++----
 src/memoryAccess.c                 |  6 ++++++
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/hardwareRegistersAccessors.c.h b/src/hardwareRegistersAccessors.c.h
index 539040c..d4eb67d 100644
--- a/src/hardwareRegistersAccessors.c.h
+++ b/src/hardwareRegistersAccessors.c.h
@@ -87,8 +87,9 @@ int32_t pwm1FifoRunSample(int32_t now, int32_t clockOffset){
    int32_t audioNow = now + clockOffset;
    int32_t audioSampleDuration = (pwmc1 & 0x8000)/*usingClk32*/ ? audioGetFramePercentIncrementFromClk32s(period * prescaler * clockDivider) : audioGetFramePercentIncrementFromSysclks(period * prescaler * clockDivider);
    float dutyCycle = dMin((float)sample / period, 1.00);
+   uint8_t index;
 
-   for(uint8_t index = 0; index < repeat; index++){
+   for(index = 0; index < repeat; index++){
       inductorPwmDutyCycle(audioNow, audioSampleDuration, dutyCycle);
       audioNow += audioSampleDuration;
    }
@@ -321,9 +322,10 @@ static void setSpiCont1(uint16_t value){
       while(spi1TxFifoEntrys() > 0){
          uint16_t currentTxFifoEntry = spi1TxFifoRead();
          uint16_t newRxFifoEntry = 0;
+         uint8_t bits;
 
-         for(uint8_t bits = 0; bits < bitCount; bits++){
-            newRxFifoEntry |= sdCardExchangeBit(currentTxFifoEntry & startBit);
+         for(bits = 0; bits < bitCount; bits++){
+            newRxFifoEntry |= sdCardExchangeBit(!!(currentTxFifoEntry & startBit));
             newRxFifoEntry <<= 1;
             currentTxFifoEntry <<= 1;
          }
@@ -362,8 +364,10 @@ static void setSpiCont2(uint16_t value){
 
       //the input data is shifted into the unused bits if the transfer is less than 16 bits
       if(spiClk2Enabled){
+         uint8_t bits;
+
          //shift in valid data
-         for(uint8_t bits = 0; bits < bitCount; bits++){
+         for(bits = 0; bits < bitCount; bits++){
             bool newBit = ads7846ExchangeBit(!!(spi2Data & startBit));
             spi2Data <<= 1;
             spi2Data |= newBit;
diff --git a/src/memoryAccess.c b/src/memoryAccess.c
index 5bd28eb..51842de 100644
--- a/src/memoryAccess.c
+++ b/src/memoryAccess.c
@@ -28,24 +28,30 @@ static uint32_t romRead32(uint32_t address){return BUFFER_READ_32(palmRom, addre
 
 //SED1376 accesses
 static uint8_t sed1376Read8(uint32_t address){
+#if !defined(EMU_NO_SAFETY)
    if(sed1376PowerSaveEnabled())
       return 0x00;
+#endif
    if(address & SED1376_MR_BIT)
       return BUFFER_READ_8_BIG_ENDIAN(sed1376Framebuffer, address, chips[CHIP_B0_SED].mask);
    else
       return sed1376GetRegister(address & chips[CHIP_B0_SED].mask);
 }
 static uint16_t sed1376Read16(uint32_t address){
+#if !defined(EMU_NO_SAFETY)
    if(sed1376PowerSaveEnabled())
       return 0x0000;
+#endif
    if(address & SED1376_MR_BIT)
       return BUFFER_READ_16_BIG_ENDIAN(sed1376Framebuffer, address, chips[CHIP_B0_SED].mask);
    else
       return sed1376GetRegister(address & chips[CHIP_B0_SED].mask);
 }
 static uint32_t sed1376Read32(uint32_t address){
+#if !defined(EMU_NO_SAFETY)
    if(sed1376PowerSaveEnabled())
       return 0x00000000;
+#endif
    if(address & SED1376_MR_BIT)
       return BUFFER_READ_32_BIG_ENDIAN(sed1376Framebuffer, address, chips[CHIP_B0_SED].mask);
    else