Merge branch 'master' into feature/zip-support

1 files changed, 14 insertions, 14 deletions

diff --git a/src/DSi_NWifi.h b/src/DSi_NWifi.h
index 7efd40c..72780d1 100644
--- a/src/DSi_NWifi.h
+++ b/src/DSi_NWifi.h
@@ -84,40 +84,40 @@ private:
 
     u16 MB_Read16(int n)
     {
-        u16 ret = Mailbox[n]->Read();
-        ret |= (Mailbox[n]->Read() << 8);
+        u16 ret = Mailbox[n].Read();
+        ret |= (Mailbox[n].Read() << 8);
         return ret;
     }
 
     void MB_Write16(int n, u16 val)
     {
-        Mailbox[n]->Write(val & 0xFF); val >>= 8;
-        Mailbox[n]->Write(val & 0xFF);
+        Mailbox[n].Write(val & 0xFF); val >>= 8;
+        Mailbox[n].Write(val & 0xFF);
     }
 
     u32 MB_Read32(int n)
     {
-        u32 ret = Mailbox[n]->Read();
-        ret |= (Mailbox[n]->Read() << 8);
-        ret |= (Mailbox[n]->Read() << 16);
-        ret |= (Mailbox[n]->Read() << 24);
+        u32 ret = Mailbox[n].Read();
+        ret |= (Mailbox[n].Read() << 8);
+        ret |= (Mailbox[n].Read() << 16);
+        ret |= (Mailbox[n].Read() << 24);
         return ret;
     }
 
     void MB_Write32(int n, u32 val)
     {
-        Mailbox[n]->Write(val & 0xFF); val >>= 8;
-        Mailbox[n]->Write(val & 0xFF); val >>= 8;
-        Mailbox[n]->Write(val & 0xFF); val >>= 8;
-        Mailbox[n]->Write(val & 0xFF);
+        Mailbox[n].Write(val & 0xFF); val >>= 8;
+        Mailbox[n].Write(val & 0xFF); val >>= 8;
+        Mailbox[n].Write(val & 0xFF); val >>= 8;
+        Mailbox[n].Write(val & 0xFF);
     }
 
     void MB_Drain(int n)
     {
-        while (!Mailbox[n]->IsEmpty()) Mailbox[n]->Read();
+        while (!Mailbox[n].IsEmpty()) Mailbox[n].Read();
     }
 
-    FIFO<u8>* Mailbox[9];
+    DynamicFIFO<u8> Mailbox[9];
 
     u8 F0_IRQEnable;
     u8 F0_IRQStatus;