C140: add bank types

CMakeLists.txt

@@ -585,6 +585,7 @@ src/engine/filter.cpp
 src/engine/instrument.cpp
 src/engine/macroInt.cpp
 src/engine/pattern.cpp
+src/engine/pitchTable.cpp
 src/engine/playback.cpp
 src/engine/sample.cpp
 src/engine/song.cpp

src/engine/engine.cpp

@@ -3212,10 +3212,11 @@ void DivEngine::setOrder(unsigned char order) {
   BUSY_END;
 }
 
-void DivEngine::updateSysFlags(int system, bool restart) {
+void DivEngine::updateSysFlags(int system, bool restart, bool render) {
   BUSY_BEGIN_SOFT;
   disCont[system].dispatch->setFlags(song.systemFlags[system]);
   disCont[system].setRates(got.rate);
+  if (render) renderSamples();
 
   // patchbay
   if (song.patchbayAuto) {

src/engine/engine.h

@@ -996,7 +996,7 @@ class DivEngine {
     void setOrder(unsigned char order);
 
     // update system flags
-    void updateSysFlags(int system, bool restart);
+    void updateSysFlags(int system, bool restart, bool render);
 
     // set Hz
     void setSongRate(float hz);

src/engine/pitchTable.cpp

@@ -0,0 +1,23 @@
+/**
+ * Furnace Tracker - multi-system chiptune tracker
+ * Copyright (C) 2021-2023 tildearrow and contributors
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+ #include "dispatch.h"
+
+
+

src/engine/platform/c140.cpp

@@ -271,6 +271,14 @@ void DivPlatformC140::tick(bool sysTick) {
             }
           }
         } else {
+          switch (bankType) {
+            case 0:
+              bank=((bank&8)<<2)|(bank&7);
+              break;
+            case 1:
+              bank=((bank&0x18)<<1)|(bank&7);
+              break;
+          }
           rWrite(0x04+(i<<4),bank);
         }
         rWrite(0x06+(i<<4),(start>>8)&0xff);
@@ -548,7 +556,15 @@ const void* DivPlatformC140::getSampleMem(int index) {
 }
 
 size_t DivPlatformC140::getSampleMemCapacity(int index) {
-  return index == 0 ? (is219?524288:16777216) : 0;
+  if (index!=0) return 0;
+  if (is219) return 524288;
+  switch (bankType) {
+    case 0:
+      return 2097152;
+    case 1:
+      return 4194304;
+  }
+  return 16777216;
 }
 
 size_t DivPlatformC140::getSampleMemUsage(int index) {
@@ -562,7 +578,7 @@ bool DivPlatformC140::isSampleLoaded(int index, int sample) {
 }
 
 void DivPlatformC140::renderSamples(int sysID) {
-  memset(sampleMem,0,getSampleMemCapacity());
+  memset(sampleMem,0,is219?524288:16777216);
   memset(sampleOff,0,256*sizeof(unsigned int));
   memset(sampleLoaded,0,256*sizeof(bool));
 
@@ -701,6 +717,10 @@ void DivPlatformC140::setFlags(const DivConfig& flags) {
     CHECK_CUSTOM_CLOCK;
     rate=chipClock/192;
   }
+  bankType=flags.getInt("bankType",0);
+  if (!is219) {
+    c140_bank_type(&c140,bankType);
+  }
   for (int i=0; i<totalChans; i++) {
     oscBuf[i]->rate=rate;
   }
@@ -710,12 +730,13 @@ int DivPlatformC140::init(DivEngine* p, int channels, int sugRate, const DivConf
   parent=p;
   dumpWrites=false;
   skipRegisterWrites=false;
+  bankType=2;
 
   for (int i=0; i<totalChans; i++) {
     isMuted[i]=false;
     oscBuf[i]=new DivDispatchOscBuffer;
   }
-  sampleMem=new unsigned char[getSampleMemCapacity()];
+  sampleMem=new unsigned char[is219?524288:16777216];
   sampleMemLen=0;
   if (is219) {
     c219_init(&c219);

src/engine/platform/c140.h

@@ -60,6 +60,7 @@ class DivPlatformC140: public DivDispatch {
   bool is219;
   int totalChans;
   unsigned char groupBank[4];
+  unsigned char bankType;
 
   unsigned char* sampleMem;
   size_t sampleMemLen;

src/engine/platform/sound/c140_c219.c

@@ -333,6 +333,11 @@ void c219_reset(struct c219_t *c219)
 	}
 }
 
+// TILDEARROW
+void c140_bank_type(struct c140_t *c140, unsigned char type) {
+  c140->bank_type = type;
+}
+
 void c140_write(struct c140_t *c140, const unsigned short addr, const unsigned char data)
 {
 	// voice register
@@ -345,7 +350,16 @@ void c140_write(struct c140_t *c140, const unsigned short addr, const unsigned c
 			case 0x1: voice->lvol = data; break;
 			case 0x2: voice->freq = (voice->freq & ~0xff00) | (unsigned int)(data << 8); break;
 			case 0x3: voice->freq = (voice->freq & ~0x00ff) | data; break;
-			case 0x4: voice->bank = data; break;
+			case 0x4: { // TILDEARROW
+        if (c140->bank_type == 0) {
+          voice->bank = ((data&0x20)>>2)|data&7;
+        } else if (c140->bank_type == 1) {
+          voice->bank = ((data&0x30)>>1)|data&7;
+        } else {
+          voice->bank = data;
+        }
+        break;
+      }
 			case 0x5:
 				voice->compressed = c140_bit(data, 3);
 				voice->loop = c140_bit(data, 4);

src/engine/platform/sound/c140_c219.h

@@ -5,7 +5,7 @@
 MODIFIED Namco C140/C219 sound emulator - MODIFIED VERSION
 by cam900
 
-MODIFICATION by tildearrow - adds muting function
+MODIFICATION by tildearrow - adds muting function AND VGM banking
 THIS IS NOT THE ORIGINAL VERSION - you can find the original one in
 commit 72d04777c013988ed8cf6da27c62a9d784a59dff
 
@@ -78,6 +78,7 @@ struct c140_t
    signed int lout, rout;
    signed short mulaw[256];
    signed short *sample_mem;
+   unsigned char bank_type;
 };
 
 struct c219_t
@@ -106,6 +107,8 @@ void c140_write(struct c140_t *c140, const unsigned short addr, const unsigned c
 
 void c219_write(struct c219_t *c219, const unsigned short addr, const unsigned char data);
 
+void c140_bank_type(struct c140_t *c140, unsigned char type);
+
 void c140_init(struct c140_t *c140);
 
 void c219_init(struct c219_t *c219);

src/engine/vgmOps.cpp

@@ -1834,6 +1834,7 @@ SafeWriter* DivEngine::saveVGM(bool* sysToExport, bool loop, int version, bool p
           CHIP_VOL(40,1.0);
           willExport[i]=true;
           writeC140[0]=disCont[i].dispatch;
+          c140Type=(song.systemFlags[i].getInt("bankType",0)==1)?1:0;
         } else if (!(hasC140&0x40000000)) {
           isSecond[i]=true;
           CHIP_VOL_SECOND(40,1.0);

src/gui/sysConf.cpp

@@ -24,6 +24,7 @@
 
 bool FurnaceGUI::drawSysConf(int chan, int sysPos, DivSystem type, DivConfig& flags, bool modifyOnChange, bool fromMenu) {
   bool altered=false;
+  bool mustRender=false;
   bool restart=modifyOnChange;
   bool supportsCustomRate=true;
 
@@ -896,18 +897,22 @@ bool FurnaceGUI::drawSysConf(int chan, int sysPos, DivSystem type, DivConfig& fl
       if (ImGui::RadioButton("2MB (ECS/AGA max)",chipMem==21)) {
         chipMem=21;
         altered=true;
+        mustRender=true;
       }
       if (ImGui::RadioButton("1MB",chipMem==20)) {
         chipMem=20;
         altered=true;
+        mustRender=true;
       }
       if (ImGui::RadioButton("512KB (OCS max)",chipMem==19)) {
         chipMem=19;
         altered=true;
+        mustRender=true;
       }
       if (ImGui::RadioButton("256KB",chipMem==18)) {
         chipMem=18;
         altered=true;
+        mustRender=true;
       }
       ImGui::Unindent();
 
@@ -2181,14 +2186,42 @@ bool FurnaceGUI::drawSysConf(int chan, int sysPos, DivSystem type, DivConfig& fl
       }
       break;
     }
+    case DIV_SYSTEM_C140: {
+      int bankType=flags.getInt("bankType",0);
+
+      ImGui::Text("Banking style:");
+      ImGui::Indent();
+      if (ImGui::RadioButton("Namco System 2 (2MB)",bankType==0)) {
+        bankType=0;
+        altered=true;
+        mustRender=true;
+      }
+      if (ImGui::RadioButton("Namco System 21 (4MB)",bankType==1)) {
+        bankType=1;
+        altered=true;
+        mustRender=true;
+      }
+      if (ImGui::RadioButton("Raw (16MB; no VGM export!)",bankType==2)) {
+        bankType=2;
+        altered=true;
+        mustRender=true;
+      }
+      ImGui::Unindent();
+
+      if (altered) {
+        e->lockSave([&]() {
+          flags.set("bankType",bankType);
+        });
+      }
+      break;
+    }
     case DIV_SYSTEM_SWAN:
     case DIV_SYSTEM_BUBSYS_WSG:
     case DIV_SYSTEM_PET:
     case DIV_SYSTEM_VBOY:
     case DIV_SYSTEM_GA20:
     case DIV_SYSTEM_PV1000:
     case DIV_SYSTEM_VERA:
-    case DIV_SYSTEM_C140:
     case DIV_SYSTEM_C219:
       break;
     case DIV_SYSTEM_YMU759:
@@ -2241,7 +2274,7 @@ bool FurnaceGUI::drawSysConf(int chan, int sysPos, DivSystem type, DivConfig& fl
 
   if (altered) {
     if (chan>=0) {
-      e->updateSysFlags(chan,restart);
+      e->updateSysFlags(chan,restart,mustRender);
       if (e->song.autoSystem) {
         autoDetectSystem();
       }