Type fixes. Fixes from snes9x 1.50. Minor changes and optimizations.

1 files changed, 73 insertions, 439 deletions

diff --git a/source/dsp1.c b/source/dsp1.c
index 42f20c8..5d4d522 100644
--- a/source/dsp1.c
+++ b/source/dsp1.c
@@ -12,21 +12,8 @@
 void (*SetDSP)(uint8_t, uint16_t) = &DSP1SetByte;
 uint8_t(*GetDSP)(uint16_t) = &DSP1GetByte;
 
-void S9xInitDSP1()
-{
-   static bool init = false;
-
-   if (!init)
-   {
-      InitDSP();
-      init = true;
-   }
-}
-
 void S9xResetDSP1()
 {
-   S9xInitDSP1();
-
    DSP1.waiting4command = true;
    DSP1.in_count = 0;
    DSP1.out_count = 0;
@@ -67,136 +54,89 @@ void DSP1SetByte(uint8_t byte, uint16_t address)
          // Mario Kart uses 0x00, 0x02, 0x06, 0x0c, 0x28, 0x0a
          switch (byte)
          {
-         case 0x00:
-            DSP1.in_count = 2;
-            break;
-         case 0x30:
-         case 0x10:
-            DSP1.in_count = 2;
-            break;
-         case 0x20:
-            DSP1.in_count = 2;
-            break;
-         case 0x24:
-         case 0x04:
-            DSP1.in_count = 2;
-            break;
-         case 0x08:
-            DSP1.in_count = 3;
-            break;
-         case 0x18:
-            DSP1.in_count = 4;
-            break;
-         case 0x28:
-            DSP1.in_count = 3;
-            break;
-         case 0x38:
-            DSP1.in_count = 4;
-            break;
-         case 0x2c:
-         case 0x0c:
-            DSP1.in_count = 3;
-            break;
-         case 0x3c:
-         case 0x1c:
-            DSP1.in_count = 6;
-            break;
-         case 0x32:
-         case 0x22:
-         case 0x12:
-         case 0x02:
-            DSP1.in_count = 7;
-            break;
+         case 0x07:
          case 0x0a:
+         case 0x0f:
+         case 0x1f:
+         case 0x27:
+         case 0x2f:
             DSP1.in_count = 1;
             break;
-         case 0x3a:
-         case 0x2a:
-         case 0x1a:
-            DSP1. command = 0x1a;
-            DSP1.in_count = 1;
-            break;
-         case 0x16:
-         case 0x26:
-         case 0x36:
-         case 0x06:
-            DSP1.in_count = 3;
-            break;
+         case 0x00:
+         case 0x04:
+         case 0x0e:
+         case 0x10:
          case 0x1e:
+         case 0x20:
+         case 0x24:
          case 0x2e:
+         case 0x30:
          case 0x3e:
-         case 0x0e:
             DSP1.in_count = 2;
             break;
-         case 0x05:
-         case 0x35:
-         case 0x31:
-         case 0x01:
-            DSP1.in_count = 4;
-            break;
-         case 0x15:
-         case 0x11:
-            DSP1.in_count = 4;
-            break;
-         case 0x25:
-         case 0x21:
-            DSP1.in_count = 4;
-            break;
+         case 0x03:
+         case 0x06:
+         case 0x08:
          case 0x09:
-         case 0x39:
-         case 0x3d:
+         case 0x0b:
+         case 0x0c:
          case 0x0d:
-            DSP1.in_count = 3;
-            break;
+         case 0x13:
+         case 0x16:
          case 0x19:
+         case 0x1b:
          case 0x1d:
-            DSP1.in_count = 3;
-            break;
+         case 0x23:
+         case 0x26:
+         case 0x28:
          case 0x29:
+         case 0x2b:
+         case 0x2c:
          case 0x2d:
-            DSP1.in_count = 3;
-            break;
          case 0x33:
-         case 0x03:
-            DSP1.in_count = 3;
-            break;
-         case 0x13:
-            DSP1.in_count = 3;
-            break;
-         case 0x23:
-            DSP1.in_count = 3;
-            break;
+         case 0x36:
+         case 0x39:
          case 0x3b:
-         case 0x0b:
-            DSP1.in_count = 3;
-            break;
-         case 0x1b:
+         case 0x3d:
             DSP1.in_count = 3;
             break;
-         case 0x2b:
-            DSP1.in_count = 3;
+         case 0x01:
+         case 0x05:
+         case 0x11:
+         case 0x15:
+         case 0x18:
+         case 0x21:
+         case 0x25:
+         case 0x31:
+         case 0x35:
+         case 0x38:
+            DSP1.in_count = 4;
             break;
-         case 0x34:
          case 0x14:
+         case 0x1c:
+         case 0x34:
+         case 0x3c:
             DSP1.in_count = 6;
             break;
-         case 0x07:
-         case 0x0f:
-            DSP1.in_count = 1;
+         case 0x02:
+         case 0x12:
+         case 0x22:
+         case 0x32:
+            DSP1.in_count = 7;
             break;
-         case 0x27:
-         case 0x2F:
+         case 0x3a:
+         case 0x2a:
+         case 0x1a:
+            DSP1.command = 0x1a;
             DSP1.in_count = 1;
             break;
          case 0x17:
          case 0x37:
          case 0x3F:
             DSP1.command = 0x1f;
-         case 0x1f:
             DSP1.in_count = 1;
             break;
          default:
-         case 0x80:
             DSP1.in_count = 0;
             DSP1.waiting4command = true;
             DSP1.first_parameter = true;
@@ -211,17 +151,12 @@ void DSP1SetByte(uint8_t byte, uint16_t address)
          DSP1.in_index++;
       }
 
-      if (DSP1.waiting4command ||
-            (DSP1.first_parameter && byte == 0x80))
+      if (DSP1.waiting4command || (DSP1.first_parameter && byte == 0x80))
       {
          DSP1.waiting4command = true;
          DSP1.first_parameter = false;
       }
-      else if (DSP1.first_parameter && (DSP1.in_count != 0 || (DSP1.in_count == 0
-                                        && DSP1.in_index == 0)))
-      {
-      }
-      else
+      else if (!(DSP1.first_parameter && (DSP1.in_count != 0 || (DSP1.in_count == 0 && DSP1.in_index == 0))))
       {
          if (DSP1.in_count)
          {
@@ -245,7 +180,6 @@ void DSP1SetByte(uint8_t byte, uint16_t address)
                   DSP1.output [0] = Op00Result & 0xFF;
                   DSP1.output [1] = (Op00Result >> 8) & 0xFF;
                   break;
-
                case 0x20:  // Multiple
                   Op20Multiplicand = (int16_t)(DSP1.parameters [0] | (DSP1.parameters[1] << 8));
                   Op20Multiplier = (int16_t)(DSP1.parameters [2] | (DSP1.parameters[3] << 8));
@@ -256,7 +190,6 @@ void DSP1SetByte(uint8_t byte, uint16_t address)
                   DSP1.output [0] = Op20Result & 0xFF;
                   DSP1.output [1] = (Op20Result >> 8) & 0xFF;
                   break;
-
                case 0x30:
                case 0x10:  // Inverse
                   Op10Coefficient = (int16_t)(DSP1.parameters [0] | (DSP1.parameters[1] << 8));
@@ -270,7 +203,6 @@ void DSP1SetByte(uint8_t byte, uint16_t address)
                   DSP1.output [2] = (uint8_t)(((int16_t) Op10ExponentR) & 0xff);
                   DSP1.output [3] = (uint8_t)((((int16_t) Op10ExponentR) >> 8) & 0xff);
                   break;
-
                case 0x24:
                case 0x04:  // Sin and Cos of angle
                   Op04Angle = (int16_t)(DSP1.parameters [0] | (DSP1.parameters[1] << 8));
@@ -284,7 +216,6 @@ void DSP1SetByte(uint8_t byte, uint16_t address)
                   DSP1.output [2] = (uint8_t)(Op04Cos & 0xFF);
                   DSP1.output [3] = (uint8_t)((Op04Cos >> 8) & 0xFF);
                   break;
-
                case 0x08:  // Radius
                   Op08X = (int16_t)(DSP1.parameters [0] | (DSP1.parameters[1] << 8));
                   Op08Y = (int16_t)(DSP1.parameters [2] | (DSP1.parameters[3] << 8));
@@ -298,9 +229,7 @@ void DSP1SetByte(uint8_t byte, uint16_t address)
                   DSP1.output [2] = (uint8_t)(((int16_t) Op08Lh) & 0xFF);
                   DSP1.output [3] = (uint8_t)((((int16_t) Op08Lh) >> 8) & 0xFF);
                   break;
-
                case 0x18:  // Range
-
                   Op18X = (int16_t)(DSP1.parameters [0] | (DSP1.parameters[1] << 8));
                   Op18Y = (int16_t)(DSP1.parameters [2] | (DSP1.parameters[3] << 8));
                   Op18Z = (int16_t)(DSP1.parameters [4] | (DSP1.parameters[5] << 8));
@@ -312,7 +241,6 @@ void DSP1SetByte(uint8_t byte, uint16_t address)
                   DSP1.output [0] = (uint8_t)(Op18D & 0xFF);
                   DSP1.output [1] = (uint8_t)((Op18D >> 8) & 0xFF);
                   break;
-
                case 0x38:  // Range
                   Op38X = (int16_t)(DSP1.parameters [0] | (DSP1.parameters[1] << 8));
                   Op38Y = (int16_t)(DSP1.parameters [2] | (DSP1.parameters[3] << 8));
@@ -325,7 +253,6 @@ void DSP1SetByte(uint8_t byte, uint16_t address)
                   DSP1.output [0] = (uint8_t)(Op38D & 0xFF);
                   DSP1.output [1] = (uint8_t)((Op38D >> 8) & 0xFF);
                   break;
-
                case 0x28:  // Distance (vector length)
                   Op28X = (int16_t)(DSP1.parameters [0] | (DSP1.parameters[1] << 8));
                   Op28Y = (int16_t)(DSP1.parameters [2] | (DSP1.parameters[3] << 8));
@@ -337,7 +264,6 @@ void DSP1SetByte(uint8_t byte, uint16_t address)
                   DSP1.output [0] = (uint8_t)(Op28R & 0xFF);
                   DSP1.output [1] = (uint8_t)((Op28R >> 8) & 0xFF);
                   break;
-
                case 0x2c:
                case 0x0c:  // Rotate (2D rotate)
                   Op0CA = (int16_t)(DSP1.parameters [0] | (DSP1.parameters[1] << 8));
@@ -352,7 +278,6 @@ void DSP1SetByte(uint8_t byte, uint16_t address)
                   DSP1.output [2] = (uint8_t)(Op0CY2 & 0xFF);
                   DSP1.output [3] = (uint8_t)((Op0CY2 >> 8) & 0xFF);
                   break;
-
                case 0x3c:
                case 0x1c:  // Polar (3D rotate)
                   Op1CZ = (DSP1.parameters [0] | (DSP1.parameters[1] << 8));
@@ -373,7 +298,6 @@ void DSP1SetByte(uint8_t byte, uint16_t address)
                   DSP1.output [4] = (uint8_t)(Op1CZAR & 0xFF);
                   DSP1.output [5] = (uint8_t)((Op1CZAR >> 8) & 0xFF);
                   break;
-
                case 0x32:
                case 0x22:
                case 0x12:
@@ -398,7 +322,6 @@ void DSP1SetByte(uint8_t byte, uint16_t address)
                   DSP1.output [6] = (uint8_t)(Op02CY & 0xFF);
                   DSP1.output [7] = (uint8_t)((Op02CY >> 8) & 0xFF);
                   break;
-
                case 0x3a:  //1a Mirror
                case 0x2a:  //1a Mirror
                case 0x1a:  // Raster mode 7 matrix data
@@ -418,7 +341,6 @@ void DSP1SetByte(uint8_t byte, uint16_t address)
                   DSP1.output [7] = (uint8_t)((Op0AD >> 8) & 0xFF);
                   DSP1.in_index = 0;
                   break;
-
                case 0x16:
                case 0x26:
                case 0x36:
@@ -437,7 +359,6 @@ void DSP1SetByte(uint8_t byte, uint16_t address)
                   DSP1.output [4] = (uint8_t)(Op06S & 0xFF);
                   DSP1.output [5] = (uint8_t)((Op06S >> 8) & 0xFF);
                   break;
-
                case 0x1e:
                case 0x2e:
                case 0x3e:
@@ -453,7 +374,6 @@ void DSP1SetByte(uint8_t byte, uint16_t address)
                   DSP1.output [2] = (uint8_t)(Op0EY & 0xFF);
                   DSP1.output [3] = (uint8_t)((Op0EY >> 8) & 0xFF);
                   break;
-
                // Extra commands used by Pilot Wings
                case 0x05:
                case 0x35:
@@ -466,7 +386,6 @@ void DSP1SetByte(uint8_t byte, uint16_t address)
 
                   DSPOp01();
                   break;
-
                case 0x15:
                case 0x11:  // Set attitude matrix B
                   Op11m = (int16_t)(DSP1.parameters [0] | (DSP1.parameters[1] << 8));
@@ -476,7 +395,6 @@ void DSP1SetByte(uint8_t byte, uint16_t address)
 
                   DSPOp11();
                   break;
-
                case 0x25:
                case 0x21:  // Set attitude matrix C
                   Op21m = (int16_t)(DSP1.parameters [0] | (DSP1.parameters[1] << 8));
@@ -486,7 +404,6 @@ void DSP1SetByte(uint8_t byte, uint16_t address)
 
                   DSPOp21();
                   break;
-
                case 0x09:
                case 0x39:
                case 0x3d:
@@ -505,7 +422,6 @@ void DSP1SetByte(uint8_t byte, uint16_t address)
                   DSP1.output [4] = (uint8_t)(Op0DU & 0xFF);
                   DSP1.output [5] = (uint8_t)((Op0DU >> 8) & 0xFF);
                   break;
-
                case 0x19:
                case 0x1d:  // Objective matrix B
                   Op1DX = (int16_t)(DSP1.parameters [0] | (DSP1.parameters[1] << 8));
@@ -522,7 +438,6 @@ void DSP1SetByte(uint8_t byte, uint16_t address)
                   DSP1.output [4] = (uint8_t)(Op1DU & 0xFF);
                   DSP1.output [5] = (uint8_t)((Op1DU >> 8) & 0xFF);
                   break;
-
                case 0x29:
                case 0x2d:  // Objective matrix C
                   Op2DX = (int16_t)(DSP1.parameters [0] | (DSP1.parameters[1] << 8));
@@ -539,7 +454,6 @@ void DSP1SetByte(uint8_t byte, uint16_t address)
                   DSP1.output [4] = (uint8_t)(Op2DU & 0xFF);
                   DSP1.output [5] = (uint8_t)((Op2DU >> 8) & 0xFF);
                   break;
-
                case 0x33:
                case 0x03:  // Subjective matrix A
                   Op03F = (int16_t)(DSP1.parameters [0] | (DSP1.parameters[1] << 8));
@@ -556,7 +470,6 @@ void DSP1SetByte(uint8_t byte, uint16_t address)
                   DSP1.output [4] = (uint8_t)(Op03Z & 0xFF);
                   DSP1.output [5] = (uint8_t)((Op03Z >> 8) & 0xFF);
                   break;
-
                case 0x13:  // Subjective matrix B
                   Op13F = (int16_t)(DSP1.parameters [0] | (DSP1.parameters[1] << 8));
                   Op13L = (int16_t)(DSP1.parameters [2] | (DSP1.parameters[3] << 8));
@@ -572,7 +485,6 @@ void DSP1SetByte(uint8_t byte, uint16_t address)
                   DSP1.output [4] = (uint8_t)(Op13Z & 0xFF);
                   DSP1.output [5] = (uint8_t)((Op13Z >> 8) & 0xFF);
                   break;
-
                case 0x23:  // Subjective matrix C
                   Op23F = (int16_t)(DSP1.parameters [0] | (DSP1.parameters[1] << 8));
                   Op23L = (int16_t)(DSP1.parameters [2] | (DSP1.parameters[3] << 8));
@@ -588,7 +500,6 @@ void DSP1SetByte(uint8_t byte, uint16_t address)
                   DSP1.output [4] = (uint8_t)(Op23Z & 0xFF);
                   DSP1.output [5] = (uint8_t)((Op23Z >> 8) & 0xFF);
                   break;
-
                case 0x3b:
                case 0x0b:
                   Op0BX = (int16_t)(DSP1.parameters [0] | (DSP1.parameters[1] << 8));
@@ -601,7 +512,6 @@ void DSP1SetByte(uint8_t byte, uint16_t address)
                   DSP1.output [0] = (uint8_t)(Op0BS & 0xFF);
                   DSP1.output [1] = (uint8_t)((Op0BS >> 8) & 0xFF);
                   break;
-
                case 0x1b:
                   Op1BX = (int16_t)(DSP1.parameters [0] | (DSP1.parameters[1] << 8));
                   Op1BY = (int16_t)(DSP1.parameters [2] | (DSP1.parameters[3] << 8));
@@ -613,7 +523,6 @@ void DSP1SetByte(uint8_t byte, uint16_t address)
                   DSP1.output [0] = (uint8_t)(Op1BS & 0xFF);
                   DSP1.output [1] = (uint8_t)((Op1BS >> 8) & 0xFF);
                   break;
-
                case 0x2b:
                   Op2BX = (int16_t)(DSP1.parameters [0] | (DSP1.parameters[1] << 8));
                   Op2BY = (int16_t)(DSP1.parameters [2] | (DSP1.parameters[3] << 8));
@@ -625,7 +534,6 @@ void DSP1SetByte(uint8_t byte, uint16_t address)
                   DSP1.output [0] = (uint8_t)(Op2BS & 0xFF);
                   DSP1.output [1] = (uint8_t)((Op2BS >> 8) & 0xFF);
                   break;
-
                case 0x34:
                case 0x14:
                   Op14Zr = (int16_t)(DSP1.parameters [0] | (DSP1.parameters[1] << 8));
@@ -645,7 +553,6 @@ void DSP1SetByte(uint8_t byte, uint16_t address)
                   DSP1.output [4] = (uint8_t)(Op14Yrr & 0xFF);
                   DSP1.output [5] = (uint8_t)((Op14Yrr >> 8) & 0xFF);
                   break;
-
                case 0x27:
                case 0x2F:
                   Op2FUnknown = (int16_t)(DSP1.parameters [0] | (DSP1.parameters[1] << 8));
@@ -656,8 +563,6 @@ void DSP1SetByte(uint8_t byte, uint16_t address)
                   DSP1.output [0] = (uint8_t)(Op2FSize & 0xFF);
                   DSP1.output [1] = (uint8_t)((Op2FSize >> 8) & 0xFF);
                   break;
-
-
                case 0x07:
                case 0x0F:
                   Op0FRamsize = (int16_t)(DSP1.parameters [0] | (DSP1.parameters[1] << 8));
@@ -668,7 +573,6 @@ void DSP1SetByte(uint8_t byte, uint16_t address)
                   DSP1.output [0] = (uint8_t)(Op0FPass & 0xFF);
                   DSP1.output [1] = (uint8_t)((Op0FPass >> 8) & 0xFF);
                   break;
-
                default:
                   break;
                }
@@ -681,8 +585,7 @@ void DSP1SetByte(uint8_t byte, uint16_t address)
 uint8_t DSP1GetByte(uint16_t address)
 {
    uint8_t t;
-   if ((address & 0xf000) == 0x6000 ||
-         (address & 0x7fff) < 0x4000)
+   if ((address & 0xf000) == 0x6000 || (address & 0x7fff) < 0x4000)
    {
       if (DSP1.out_count)
       {
@@ -715,11 +618,10 @@ uint8_t DSP1GetByte(uint16_t address)
          DSP1.waiting4command = true;
       }
       else
-      {
          t = 0xff;
-      }
    }
-   else t = 0x80;
+   else
+      t = 0x80;
    return t;
 }
 
@@ -735,28 +637,22 @@ void DSP2SetByte(uint8_t byte, uint16_t address)
          DSP1.waiting4command = false;
          switch (byte)
          {
-         case 0x01:
-            DSP1.in_count = 32;
+         default:
+            DSP1.in_count = 0;
             break;
          case 0x03:
-            DSP1.in_count = 1;
-            break;
          case 0x05:
-            DSP1.in_count = 1;
-            break;
-         case 0x09:
-            DSP1.in_count = 4;
-            break;
          case 0x06:
             DSP1.in_count = 1;
             break;
-         case 0x0D:
+         case 0x0d:
             DSP1.in_count = 2;
             break;
-         default:
-            printf("Op%02X\n", byte);
-         case 0x0f:
-            DSP1.in_count = 0;
+         case 0x09:
+            DSP1.in_count = 4;
+            break;
+         case 0x01:
+            DSP1.in_count = 32;
             break;
          }
       }
@@ -863,8 +759,7 @@ void DSP2SetByte(uint8_t byte, uint16_t address)
 uint8_t DSP2GetByte(uint16_t address)
 {
    uint8_t t;
-   if ((address & 0xf000) == 0x6000 ||
-         (address >= 0x8000 && address < 0xc000))
+   if ((address & 0xf000) == 0x6000 || (address >= 0x8000 && address < 0xc000))
    {
       if (DSP1.out_count)
       {
@@ -876,253 +771,11 @@ uint8_t DSP2GetByte(uint16_t address)
       else
          t = 0xff;
    }
-   else t = 0x80;
-   return t;
-}
-
-//Disable non-working chips?
-#ifdef DSP_DUMMY_LOOPS
-uint16_t Dsp3Rom[1024] =
-{
-   0x0000,  0x0000,  0x0000,  0x0000,  0x0000,  0x0000,  0x0000,  0x0000,
-   0x0000,  0x0000,  0x0000,  0x0000,  0x0000,  0x0000,  0x0000,  0x0000,
-   0x0000,  0x0000,  0x0000,  0x0000,  0x0000,  0x0000,  0x0000,  0x0000,
-   0x0000,  0x0000,  0x0000,  0x0000,  0x0000,  0x0000,  0x0000,  0x0000,
-   0x0000,  0x0000,  0x0001,  0x0002,  0x0004,  0x0008,  0x0010,  0x0020,
-   0x0040,  0x0080,  0x0100,  0x0200,  0x0400,  0x0800,  0x1000,  0x2000,
-   0x4000,  0x7fff,  0x4000,  0x2000,  0x1000,  0x0800,  0x0400,  0x0200,
-   0x0100,  0x0080,  0x0040,  0x0020,  0x0001,  0x0008,  0x0004,  0x0002,
-   0x0001,  0x0000,  0x0000,  0x0000,  0x0000,  0x0000,  0x0000,  0x0000,
-   0x0000,  0x0000,  0x0000,  0x0000,  0x0000,  0x0000,  0x0000,  0x0000,
-   0x0000,  0x0000,  0x0000,  0x0000,  0x0000,  0x0000,  0x0000,  0x0000,
-   0x0000,  0x0000,  0x0000,  0x0000,  0x0000,  0x0000,  0x0000,  0x0000,
-   0x0000,  0x0000,  0x8000,  0xffe5,  0x0100,  0x7fff,  0x7f02,  0x7e08,
-   0x7d12,  0x7c1f,  0x7b30,  0x7a45,  0x795d,  0x7878,  0x7797,  0x76ba,
-   0x75df,  0x7507,  0x7433,  0x7361,  0x7293,  0x71c7,  0x70fe,  0x7038,
-   0x6f75,  0x6eb4,  0x6df6,  0x6d3a,  0x6c81,  0x6bca,  0x6b16,  0x6a64,
-   0x69b4,  0x6907,  0x685b,  0x67b2,  0x670b,  0x6666,  0x65c4,  0x6523,
-   0x6484,  0x63e7,  0x634c,  0x62b3,  0x621c,  0x6186,  0x60f2,  0x6060,
-   0x5fd0,  0x5f41,  0x5eb5,  0x5e29,  0x5d9f,  0x5d17,  0x5c91,  0x5c0c,
-   0x5b88,  0x5b06,  0x5a85,  0x5a06,  0x5988,  0x590b,  0x5890,  0x5816,
-   0x579d,  0x5726,  0x56b0,  0x563b,  0x55c8,  0x5555,  0x54e4,  0x5474,
-   0x5405,  0x5398,  0x532b,  0x52bf,  0x5255,  0x51ec,  0x5183,  0x511c,
-   0x50b6,  0x5050,  0x4fec,  0x4f89,  0x4f26,  0x4ec5,  0x4e64,  0x4e05,
-   0x4da6,  0x4d48,  0x4cec,  0x4c90,  0x4c34,  0x4bda,  0x4b81,  0x4b28,
-   0x4ad0,  0x4a79,  0x4a23,  0x49cd,  0x4979,  0x4925,  0x48d1,  0x487f,
-   0x482d,  0x47dc,  0x478c,  0x473c,  0x46ed,  0x469f,  0x4651,  0x4604,
-   0x45b8,  0x456c,  0x4521,  0x44d7,  0x448d,  0x4444,  0x43fc,  0x43b4,
-   0x436d,  0x4326,  0x42e0,  0x429a,  0x4255,  0x4211,  0x41cd,  0x4189,
-   0x4146,  0x4104,  0x40c2,  0x4081,  0x4040,  0x3fff,  0x41f7,  0x43e1,
-   0x45bd,  0x478d,  0x4951,  0x4b0b,  0x4cbb,  0x4e61,  0x4fff,  0x5194,
-   0x5322,  0x54a9,  0x5628,  0x57a2,  0x5914,  0x5a81,  0x5be9,  0x5d4a,
-   0x5ea7,  0x5fff,  0x6152,  0x62a0,  0x63ea,  0x6530,  0x6672,  0x67b0,
-   0x68ea,  0x6a20,  0x6b53,  0x6c83,  0x6daf,  0x6ed9,  0x6fff,  0x7122,
-   0x7242,  0x735f,  0x747a,  0x7592,  0x76a7,  0x77ba,  0x78cb,  0x79d9,
-   0x7ae5,  0x7bee,  0x7cf5,  0x7dfa,  0x7efe,  0x7fff,  0x0000,  0x0324,
-   0x0647,  0x096a,  0x0c8b,  0x0fab,  0x12c8,  0x15e2,  0x18f8,  0x1c0b,
-   0x1f19,  0x2223,  0x2528,  0x2826,  0x2b1f,  0x2e11,  0x30fb,  0x33de,
-   0x36ba,  0x398c,  0x3c56,  0x3f17,  0x41ce,  0x447a,  0x471c,  0x49b4,
-   0x4c3f,  0x4ebf,  0x5133,  0x539b,  0x55f5,  0x5842,  0x5a82,  0x5cb4,
-   0x5ed7,  0x60ec,  0x62f2,  0x64e8,  0x66cf,  0x68a6,  0x6a6d,  0x6c24,
-   0x6dca,  0x6f5f,  0x70e2,  0x7255,  0x73b5,  0x7504,  0x7641,  0x776c,
-   0x7884,  0x798a,  0x7a7d,  0x7b5d,  0x7c29,  0x7ce3,  0x7d8a,  0x7e1d,
-   0x7e9d,  0x7f09,  0x7f62,  0x7fa7,  0x7fd8,  0x7ff6,  0x7fff,  0x7ff6,
-   0x7fd8,  0x7fa7,  0x7f62,  0x7f09,  0x7e9d,  0x7e1d,  0x7d8a,  0x7ce3,
-   0x7c29,  0x7b5d,  0x7a7d,  0x798a,  0x7884,  0x776c,  0x7641,  0x7504,
-   0x73b5,  0x7255,  0x70e2,  0x6f5f,  0x6dca,  0x6c24,  0x6a6d,  0x68a6,
-   0x66cf,  0x64e8,  0x62f2,  0x60ec,  0x5ed7,  0x5cb4,  0x5a82,  0x5842,
-   0x55f5,  0x539b,  0x5133,  0x4ebf,  0x4c3f,  0x49b4,  0x471c,  0x447a,
-   0x41ce,  0x3f17,  0x3c56,  0x398c,  0x36ba,  0x33de,  0x30fb,  0x2e11,
-   0x2b1f,  0x2826,  0x2528,  0x2223,  0x1f19,  0x1c0b,  0x18f8,  0x15e2,
-   0x12c8,  0x0fab,  0x0c8b,  0x096a,  0x0647,  0x0324,  0x7fff,  0x7ff6,
-   0x7fd8,  0x7fa7,  0x7f62,  0x7f09,  0x7e9d,  0x7e1d,  0x7d8a,  0x7ce3,
-   0x7c29,  0x7b5d,  0x7a7d,  0x798a,  0x7884,  0x776c,  0x7641,  0x7504,
-   0x73b5,  0x7255,  0x70e2,  0x6f5f,  0x6dca,  0x6c24,  0x6a6d,  0x68a6,
-   0x66cf,  0x64e8,  0x62f2,  0x60ec,  0x5ed7,  0x5cb4,  0x5a82,  0x5842,
-   0x55f5,  0x539b,  0x5133,  0x4ebf,  0x4c3f,  0x49b4,  0x471c,  0x447a,
-   0x41ce,  0x3f17,  0x3c56,  0x398c,  0x36ba,  0x33de,  0x30fb,  0x2e11,
-   0x2b1f,  0x2826,  0x2528,  0x2223,  0x1f19,  0x1c0b,  0x18f8,  0x15e2,
-   0x12c8,  0x0fab,  0x0c8b,  0x096a,  0x0647,  0x0324,  0x0000,  0xfcdc,
-   0xf9b9,  0xf696,  0xf375,  0xf055,  0xed38,  0xea1e,  0xe708,  0xe3f5,
-   0xe0e7,  0xdddd,  0xdad8,  0xd7da,  0xd4e1,  0xd1ef,  0xcf05,  0xcc22,
-   0xc946,  0xc674,  0xc3aa,  0xc0e9,  0xbe32,  0xbb86,  0xb8e4,  0xb64c,
-   0xb3c1,  0xb141,  0xaecd,  0xac65,  0xaa0b,  0xa7be,  0xa57e,  0xa34c,
-   0xa129,  0x9f14,  0x9d0e,  0x9b18,  0x9931,  0x975a,  0x9593,  0x93dc,
-   0x9236,  0x90a1,  0x8f1e,  0x8dab,  0x8c4b,  0x8afc,  0x89bf,  0x8894,
-   0x877c,  0x8676,  0x8583,  0x84a3,  0x83d7,  0x831d,  0x8276,  0x81e3,
-   0x8163,  0x80f7,  0x809e,  0x8059,  0x8028,  0x800a,  0x6488,  0x0080,
-   0x03ff,  0x0116,  0x0002,  0x0080,  0x4000,  0x3fd7,  0x3faf,  0x3f86,
-   0x3f5d,  0x3f34,  0x3f0c,  0x3ee3,  0x3eba,  0x3e91,  0x3e68,  0x3e40,
-   0x3e17,  0x3dee,  0x3dc5,  0x3d9c,  0x3d74,  0x3d4b,  0x3d22,  0x3cf9,
-   0x3cd0,  0x3ca7,  0x3c7f,  0x3c56,  0x3c2d,  0x3c04,  0x3bdb,  0x3bb2,
-   0x3b89,  0x3b60,  0x3b37,  0x3b0e,  0x3ae5,  0x3abc,  0x3a93,  0x3a69,
-   0x3a40,  0x3a17,  0x39ee,  0x39c5,  0x399c,  0x3972,  0x3949,  0x3920,
-   0x38f6,  0x38cd,  0x38a4,  0x387a,  0x3851,  0x3827,  0x37fe,  0x37d4,
-   0x37aa,  0x3781,  0x3757,  0x372d,  0x3704,  0x36da,  0x36b0,  0x3686,
-   0x365c,  0x3632,  0x3609,  0x35df,  0x35b4,  0x358a,  0x3560,  0x3536,
-   0x350c,  0x34e1,  0x34b7,  0x348d,  0x3462,  0x3438,  0x340d,  0x33e3,
-   0x33b8,  0x338d,  0x3363,  0x3338,  0x330d,  0x32e2,  0x32b7,  0x328c,
-   0x3261,  0x3236,  0x320b,  0x31df,  0x31b4,  0x3188,  0x315d,  0x3131,
-   0x3106,  0x30da,  0x30ae,  0x3083,  0x3057,  0x302b,  0x2fff,  0x2fd2,
-   0x2fa6,  0x2f7a,  0x2f4d,  0x2f21,  0x2ef4,  0x2ec8,  0x2e9b,  0x2e6e,
-   0x2e41,  0x2e14,  0x2de7,  0x2dba,  0x2d8d,  0x2d60,  0x2d32,  0x2d05,
-   0x2cd7,  0x2ca9,  0x2c7b,  0x2c4d,  0x2c1f,  0x2bf1,  0x2bc3,  0x2b94,
-   0x2b66,  0x2b37,  0x2b09,  0x2ada,  0x2aab,  0x2a7c,  0x2a4c,  0x2a1d,
-   0x29ed,  0x29be,  0x298e,  0x295e,  0x292e,  0x28fe,  0x28ce,  0x289d,
-   0x286d,  0x283c,  0x280b,  0x27da,  0x27a9,  0x2777,  0x2746,  0x2714,
-   0x26e2,  0x26b0,  0x267e,  0x264c,  0x2619,  0x25e7,  0x25b4,  0x2581,
-   0x254d,  0x251a,  0x24e6,  0x24b2,  0x247e,  0x244a,  0x2415,  0x23e1,
-   0x23ac,  0x2376,  0x2341,  0x230b,  0x22d6,  0x229f,  0x2269,  0x2232,
-   0x21fc,  0x21c4,  0x218d,  0x2155,  0x211d,  0x20e5,  0x20ad,  0x2074,
-   0x203b,  0x2001,  0x1fc7,  0x1f8d,  0x1f53,  0x1f18,  0x1edd,  0x1ea1,
-   0x1e66,  0x1e29,  0x1ded,  0x1db0,  0x1d72,  0x1d35,  0x1cf6,  0x1cb8,
-   0x1c79,  0x1c39,  0x1bf9,  0x1bb8,  0x1b77,  0x1b36,  0x1af4,  0x1ab1,
-   0x1a6e,  0x1a2a,  0x19e6,  0x19a1,  0x195c,  0x1915,  0x18ce,  0x1887,
-   0x183f,  0x17f5,  0x17ac,  0x1761,  0x1715,  0x16c9,  0x167c,  0x162e,
-   0x15df,  0x158e,  0x153d,  0x14eb,  0x1497,  0x1442,  0x13ec,  0x1395,
-   0x133c,  0x12e2,  0x1286,  0x1228,  0x11c9,  0x1167,  0x1104,  0x109e,
-   0x1036,  0x0fcc,  0x0f5f,  0x0eef,  0x0e7b,  0x0e04,  0x0d89,  0x0d0a,
-   0x0c86,  0x0bfd,  0x0b6d,  0x0ad6,  0x0a36,  0x098d,  0x08d7,  0x0811,
-   0x0736,  0x063e,  0x0519,  0x039a,  0x0000,  0x7fff,  0x0100,  0x0080,
-   0x021d,  0x00c8,  0x00ce,  0x0048,  0x0a26,  0x277a,  0x00ce,  0x6488,
-   0x14ac,  0x0001,  0x00f9,  0x00fc,  0x00ff,  0x00fc,  0x00f9,  0xffff,
-   0xffff,  0xffff,  0xffff,  0xffff,  0xffff,  0xffff,  0xffff,  0xffff,
-   0xffff,  0xffff,  0xffff,  0xffff,  0xffff,  0xffff,  0xffff,  0xffff,
-   0xffff,  0xffff,  0xffff,  0xffff,  0xffff,  0xffff,  0xffff,  0xffff,
-   0xffff,  0xffff,  0xffff,  0xffff,  0xffff,  0xffff,  0xffff,  0xffff,
-   0xffff,  0xffff,  0xffff,  0xffff,  0xffff,  0xffff,  0xffff,  0xffff,
-   0xffff,  0xffff,  0xffff,  0xffff,  0xffff,  0xffff,  0xffff,  0xffff,
-   0xffff,  0xffff,  0xffff,  0xffff,  0xffff,  0xffff,  0xffff,  0xffff,
-   0xffff,  0xffff,  0xffff,  0xffff,  0xffff,  0xffff,  0xffff,  0xffff,
-   0xffff,  0xffff,  0xffff,  0xffff,  0xffff,  0xffff,  0xffff,  0xffff,
-   0xffff,  0xffff,  0xffff,  0xffff,  0xffff,  0xffff,  0xffff,  0xffff,
-   0xffff,  0xffff,  0xffff,  0xffff,  0xffff,  0xffff,  0xffff,  0xffff,
-   0xffff,  0xffff,  0xffff,  0xffff,  0xffff,  0xffff,  0xffff,  0xffff,
-   0xffff,  0xffff,  0xffff,  0xffff,  0xffff,  0xffff,  0xffff,  0xffff,
-   0xffff,  0xffff,  0xffff,  0xffff,  0xffff,  0xffff,  0xffff,  0xffff,
-   0xffff,  0xffff,  0xffff,  0xffff,  0xffff,  0xffff,  0xffff,  0xffff,
-   0xffff,  0xffff,  0xffff,  0xffff,  0xffff,  0xffff,  0xffff,  0xffff,
-   0xffff,  0xffff,  0xffff,  0xffff,  0xffff,  0xffff,  0xffff,  0xffff,
-   0xffff,  0xffff,  0xffff,  0xffff,  0xffff,  0xffff,  0xffff,  0xffff,
-   0xffff,  0xffff,  0xffff,  0xffff,  0xffff,  0xffff,  0xffff,  0xffff,
-   0xffff,  0xffff,  0xffff,  0xffff,  0xffff,  0xffff,  0xffff,  0xffff,
-   0xffff,  0xffff,  0xffff,  0xffff,  0xffff,  0xffff,  0xffff,  0xffff,
-   0xffff,  0xffff,  0xffff,  0xffff,  0xffff,  0xffff,  0xffff,  0xffff,
-   0xffff,  0xffff,  0xffff,  0xffff,  0xffff,  0xffff,  0xffff,  0xffff,
-   0xffff,  0xffff,  0xffff,  0xffff,  0xffff,  0xffff,  0xffff,  0xffff,
-   0xffff,  0xffff,  0xffff,  0xffff,  0xffff,  0xffff,  0xffff,  0xffff,
-   0xffff,  0xffff,  0xffff,  0xffff,  0xffff,  0xffff,  0xffff,  0xffff
-
-};
-
-void DSP3SetByte(uint8_t byte, uint16_t address)
-{
-   if ((address & 0xf000) == 0x6000 ||
-         (address >= 0x8000 && address < 0xc000))
-   {
-      if (DSP1.waiting4command)
-      {
-         DSP1.command = byte;
-         DSP1.in_index = 0;
-         DSP1.waiting4command = false;
-         switch (byte)
-         {
-         case 0x2F:
-            DSP1.in_count = 2;
-            break;
-         case 0x1F:
-            DSP1.in_count = 2;
-            break;
-         case 0x0F:
-            DSP1.in_count = 2;
-            break;
-         case 0x38:
-            DSP1.in_count = 4;
-            break;
-         default:
-            break;
-         }
-      }
-      else
-      {
-         DSP1.parameters [DSP1.in_index] = byte;
-         DSP1.in_index++;
-      }
-
-      if (DSP1.in_count == DSP1.in_index)
-      {
-         // Actually execute the command
-         DSP1.waiting4command = true;
-         DSP1.out_index = 0;
-         switch (DSP1.command)
-         {
-         case 0x2F:
-            DSP1.out_count = 2;
-            break;
-         case 0x1F:
-            DSP1.out_count = 2048;
-            break;
-         case 0x0F:
-            DSP1.out_count = 2;
-            DSP1.output[0] = 0;
-            DSP1.output[1] = 0;
-            break;
-         case 0x38:
-         {
-            DSP1.out_count = 2;
-            // 176B
-            DSP1.output[0] = 0;
-            DSP1.output[1] = 0x80;
-
-            break;
-         }
-         default:
-            break;
-         }
-      }
-   }
-}
-
-uint8_t DSP3GetByte(uint16_t address)
-{
-   uint8_t t;
-   if ((address & 0xf000) == 0x6000 ||
-         (address >= 0x8000 && address < 0xc000))
-   {
-      if (DSP1.command == 0x38 && DSP1.out_index == 1)
-         t = 4;
-
-      if (DSP1.out_count)
-      {
-         if (DSP1.command == 0x1f)
-         {
-            if ((DSP1.out_index % 2) != 0)
-               t = (uint8_t)Dsp3Rom[DSP1.out_index >> 1];
-            else
-               t = Dsp3Rom[DSP1.out_index >> 1] >> 8;
-            DSP1.out_index++;
-         }
-         else
-         {
-            t = (uint8_t) DSP1.output [DSP1.out_index];
-            DSP1.out_index++;
-            DSP1.out_index %= 512;
-            if (DSP1.out_count == DSP1.out_index)
-               DSP1.out_count = 0;
-         }
-      }
-      else
-         t = 0xff;
-   }
    else
-   {
       t = 0x80;
-   }
    return t;
 }
 
-#endif
-
 typedef struct
 {
    bool     waiting4command;
@@ -1151,8 +804,7 @@ void DSP4SetByte(uint8_t byte, uint16_t address)
       DSP4_init = true;
    }
 
-   if ((address & 0xf000) == 0x6000 ||
-         (address >= 0x8000 && address < 0xc000))
+   if ((address & 0xf000) == 0x6000 || (address >= 0x8000 && address < 0xc000))
    {
       if (DSP4.out_index < DSP4.out_count)
       {
@@ -1167,7 +819,7 @@ void DSP4SetByte(uint8_t byte, uint16_t address)
             DSP4.command |= (byte << 8);
             DSP4.in_index = 0;
             DSP4.waiting4command = false;
-            DSP4.half_command = 0;
+            DSP4.half_command = false;
             DSP4.out_count = 0;
             DSP4.out_index = 0;
             DSP4_Logic = 0;
@@ -1181,11 +833,7 @@ void DSP4SetByte(uint8_t byte, uint16_t address)
                DSP4.in_count = 36;
                break;
             case 0x0003:
-               DSP4.in_count = 0;
-               break;
             case 0x0005:
-               DSP4.in_count = 0;
-               break;
             case 0x0006:
                DSP4.in_count = 0;
                break;
@@ -1199,8 +847,6 @@ void DSP4SetByte(uint8_t byte, uint16_t address)
                DSP4.in_count = 14;
                break;
             case 0x000A:
-               DSP4.in_count = 6;
-               break;
             case 0x000B:
                DSP4.in_count = 6;
                break;
@@ -1221,7 +867,7 @@ void DSP4SetByte(uint8_t byte, uint16_t address)
          else
          {
             DSP4.command = byte;
-            DSP4.half_command = 1;
+            DSP4.half_command = true;
          }
       }
       else
@@ -1252,9 +898,8 @@ void DSP4SetByte(uint8_t byte, uint16_t address)
             DSP4.out_count = 4;
             DSP4_WRITE_WORD(0, product);
             DSP4_WRITE_WORD(2, product >> 16);
+            break;
          }
-         break;
-
          // unknown: horizontal mapping command
          case 0x0011:
          {
@@ -1271,40 +916,33 @@ void DSP4SetByte(uint8_t byte, uint16_t address)
             DSP4_WRITE_WORD(0, m);
             break;
          }
-
          // track projection
          case 0x0001:
             DSP4_Op01();
             break;
-
          // track projection (pass 2)
          case 0x0007:
             DSP4_Op07();
             break;
-
          // zone projections (fuel/repair/lap/teleport/...)
          case 0x0008:
             DSP4_Op08();
             break;
-
          // sprite transformation
          case 0x0009:
             DSP4_Op09();
             break;
-
          // fast track projection
          case 0x000D:
             DSP4_Op0D();
             break;
-
          // internal memory management (01)
          case 0x0003:
          {
             // reset op09 data
-            op09_mode = 0;
+            op09_mode = false;
             break;
          }
-
          // internal memory management (06)
          case 0x0005:
          {
@@ -1316,15 +954,13 @@ void DSP4SetByte(uint8_t byte, uint16_t address)
                op06_OAM[lcv] = 0;
             break;
          }
-
          // internal memory management (0D)
          case 0x000E:
          {
             // reset op09 data
-            op09_mode = 1;
+            op09_mode = true;
             break;
          }
-
          // sprite OAM post-table data
          case 0x0006:
          {
@@ -1334,7 +970,6 @@ void DSP4SetByte(uint8_t byte, uint16_t address)
                DSP4.output[lcv] = op06_OAM[lcv];
          }
          break;
-
          // unknown
          case 0x000A:
          {
@@ -1372,7 +1007,7 @@ void DSP4SetByte(uint8_t byte, uint16_t address)
                DSP4_WRITE_WORD(4, oam);
 
                // OAM: size,msb data
-               DSP4_Op06(0, 0);
+               DSP4_Op06(false, false);
             }
             // 4p mode
             else
@@ -1381,9 +1016,8 @@ void DSP4SetByte(uint8_t byte, uint16_t address)
                DSP4.out_count = 0;
                DSP4_WRITE_WORD(0, 0);
             }
+            break;
          }
-         break;
-
          default:
             break;
          }