1 files changed, 39 insertions, 100 deletions

diff --git a/apps/plugins/rockboy/fastmem.c b/apps/plugins/rockboy/fastmem.c
index d883438ce1..9092f68fed 100644
--- a/apps/plugins/rockboy/fastmem.c
+++ b/apps/plugins/rockboy/fastmem.c
@@ -3,136 +3,75 @@
 #include "rockmacros.h"
 #include "fastmem.h"
 
-
-#define D 0 /* direct */
-#define C 1 /* direct cgb-only */
-#define R 2 /* io register */
-#define S 3 /* sound register */
-#define W 4 /* wave pattern */
-
-#define F 0xFF /* fail */
-
-const byte himask[256];
-
-const byte hi_rmap[256] =
-{
-        0, 0, R, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        S, S, S, S, S, S, S, S, S, S, S, S, S, S, S, S,
-        S, S, S, S, S, S, S, S, S, S, S, S, S, S, S, S,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, C, 0, C,
-        0, C, C, C, C, C, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, C, C, C, C, 0, 0, 0, 0,
-        C, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-};
-
-const byte hi_wmap[256] =
-{
-        R, R, R, R, R, R, R, R, R, R, R, R, R, R, R, R,
-        S, S, S, S, S, S, S, S, S, S, S, S, S, S, S, S,
-        S, S, S, S, S, S, S, S, S, S, S, S, S, S, S, S,
-        S, S, S, S, S, S, S, S, S, S, S, S, S, S, S, S,
-        R, R, R, R, R, R, R, R, R, R, R, R, 0, R, 0, R,
-        0, C, C, C, C, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, R, R, R, R, 0, 0, 0, 0,
-        R, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, R
-};
-
-
 byte readb(int a)
 {
-        byte *p = mbc.rmap[a>>12];
-        if (p) return p[a];
-        else return mem_read(a);
+    byte *p = mbc.rmap[a>>12];
+    if (p) return p[a];
+    else return mem_read(a);
 }
 
 void writeb(int a, byte b)
 {
-        byte *p = mbc.wmap[a>>12];
-        if (p) p[a] = b;
-        else mem_write(a, b);
+    byte *p = mbc.wmap[a>>12];
+    if (p) p[a] = b;
+    else mem_write(a, b);
 }
 
 int readw(int a)
 {
-        if ((a+1) & 0xfff)
-        {
-                byte *p = mbc.rmap[a>>12];
-                if (p)
-                {
+    if ((a+1) & 0xfff)
+    {
+        byte *p = mbc.rmap[a>>12];
+        if (p)
+        {
 #ifdef ROCKBOX_LITTLE_ENDIAN
 #ifndef ALLOW_UNALIGNED_IO
-                        if (a&1) return p[a] | (p[a+1]<<8);
+            if (a&1) return p[a] | (p[a+1]<<8);
 #endif
-                        return *(word *)(p+a);
+            return *(word *)(p+a);
 #else
-                        return p[a] | (p[a+1]<<8);
+            return p[a] | (p[a+1]<<8);
 #endif
-                }
-        }
-        return mem_read(a) | (mem_read(a+1)<<8);
+        }
+    }
+    return mem_read(a) | (mem_read(a+1)<<8);
 }
 
 void writew(int a, int w)
 {
-        if ((a+1) & 0xfff)
-        {
-                byte *p = mbc.wmap[a>>12];
-                if (p)
-                {
+    if ((a+1) & 0xfff)
+    {
+        byte *p = mbc.wmap[a>>12];
+        if (p)
+        {
 #ifdef ROCKBOX_LITTLE_ENDIAN
 #ifndef ALLOW_UNALIGNED_IO
-                        if (a&1)
-                        {
-                                p[a] = w;
-                                p[a+1] = w >> 8;
-                                return;
-                        }
+            if (a&1)
+            {
+                p[a] = w;
+                p[a+1] = w >> 8;
+                return;
+            }
 #endif
-                        *(word *)(p+a) = w;
-                        return;
+            *(word *)(p+a) = w;
+            return;
 #else
-                        p[a] = w;
-                        p[a+1] = w >> 8;
-                        return;
+            p[a] = w;
+            p[a+1] = w >> 8;
+            return;
 #endif
-                }
-        }
-        mem_write(a, w);
-        mem_write(a+1, w>>8);
+        }
+    }
+    mem_write(a, w);
+    mem_write(a+1, w>>8);
 }
 
 byte readhi(int a)
 {
-        return readb(a | 0xff00);
+    return readb(a | 0xff00);
 }
 
 void writehi(int a, byte b)
 {
-        writeb(a | 0xff00, b);
+    writeb(a | 0xff00, b);
 }
-
-#if 0
-byte readhi(int a)
-{
-        byte (*rd)() = hi_read[a];
-        return rd ? rd(a) : (ram.hi[a] | himask[a]);
-}
-
-void writehi(int a, byte b)
-{
-        byte (*wr)() = hi_write[a];
-        if (wr) wr(a, b);
-        else ram.hi[a] = b & ~himask[a];
-}
-#endif
-