Added YM2610B MSX pi supporting

Author: 110-kenichi

README.md

@@ -1023,4 +1023,7 @@ License: MIT license https://github.com/naudio/NAudio?tab=MIT-1-ov-file#readme
 
 *VST.NET - obiwanjacobi
 https://github.com/obiwanjacobi/vst.net/tree/vstnet1
-License: LGPL-2.1 license
+License: LGPL-2.1 license
+
+*Neo-Geo ADPCM-A sample encoder - AJ Kelly
+https://github.com/freem/adpcma/blob/master/LICENSE

src/VSIF/VGMPlayer/SongBase.cs

@@ -1154,50 +1154,6 @@ protected void deferredWriteOPNB_P1(VsifClient comPortOPNB, int adrs, int dt)
             }
         }
 
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="transferData"></param>
-        /// <param name="saddr"></param>
-        /// <param name="fp"></param>
-        protected void sendAdpcmDataYM2610_SIOS(VsifClient comPortOPNB, byte[] transferData, int saddr, int type, FormProgress fp)
-        {
-            //Transfer
-            int len = transferData.Length;
-            int index = 0;
-            int percentage = 0;
-            int lastPercentage = -1;
-            for (int i = 0; i < len; i++)
-            {
-                deferredWriteOPNA_P1(comPortOPNB, 0x08, transferData[i]);
-
-                //HACK: WAIT
-                switch (comPortOPNB?.SoundModuleType)
-                {
-                    case VsifSoundModuleType.Spfm:
-                    case VsifSoundModuleType.SpfmLight:
-                    case VsifSoundModuleType.Gimic:
-                        comPortOPNB?.FlushDeferredWriteDataAndWait();
-                        break;
-                }
-
-                percentage = (100 * index) / len;
-                if (percentage != lastPercentage)
-                {
-                    FormMain.TopForm.SetStatusText("YM2608: Transferring ADPCM(" + percentage + "%)");
-                    //fp.Percentage = percentage;
-                    comPortOPNB?.FlushDeferredWriteDataAndWait();
-                }
-                lastPercentage = percentage;
-                index++;
-                if (RequestedStat == SoundState.Stopped)
-                    break;
-                else updateStatusForDataTransfer();
-            }
-            FormMain.TopForm.SetStatusText("YM2610: Transferred ADPCM");
-        }
-
         /// <summary>
         /// 
         /// </summary>

src/VSIF/VGMPlayer/VGMSong.cs

@@ -2135,10 +2135,6 @@ private bool connectToOPNB(uint opnb_clock, bool opnb)
 
                     //LFO
                     deferredWriteOPNB_P0(comPortOPNB, 0x22, 0x00);
-                    //channel 3 mode
-                    deferredWriteOPNB_P0(comPortOPNB, 0x27, 0x00);
-                    //Force OPN mode
-                    deferredWriteOPNB_P0(comPortOPNB, 0x29, 0x00);
 
                     for (int i = 0x30; i <= 0x3F; i++)
                         deferredWriteOPNB_P0(comPortOPNB, i, 0);
@@ -4250,7 +4246,7 @@ protected override void StreamSong()
                                                                 byte[] romData = vgmReader.ReadBytes((int)size);
                                                                 if (comPortOPNB != null)
                                                                 {
-                                                                    if(!looped)
+                                                                    if (!looped)
                                                                         transferAdpcmDataForNeotron(size, saddr, romData, 1, "A");
                                                                 }
                                                                 else if (opnbPcm != null)
@@ -5279,7 +5275,11 @@ protected override void StreamSong()
             NotifyFinished();
         }
 
-        private Dictionary<uint, bool> adpcmMemoryErased = new Dictionary<uint, bool>();
+        private Dictionary<uint, bool>[] adpcmMemoryErased =
+            new Dictionary<uint, bool>[]{
+            new Dictionary<uint, bool>(), // ADPCM-A
+            new Dictionary<uint, bool>() // ADPCM-B
+        };
 
         /// <summary>
         /// Transfers ADPCM data to the YM2610 for a specific memory type.
@@ -5324,9 +5324,9 @@ private uint transferAdpcmDataForNeotron(uint size, uint saddr, byte[] romData,
 
                 // ここでchunkを使って処理を行う
                 bool erase = false;
-                if (!adpcmMemoryErased.ContainsKey((saddr >> 16)))
+                if (!adpcmMemoryErased[memoryType - 1].ContainsKey((saddr >> 16)))
                 {
-                    adpcmMemoryErased[(saddr >> 16)] = true;
+                    adpcmMemoryErased[memoryType - 1][(saddr >> 16)] = true;
                     erase = true;
 #if DEBUG
                     Console.WriteLine("YM2610: Erase ADPCM-" + memoryTypeName + "(" +

src/devices/sound/fm.cpp

@@ -2433,7 +2433,6 @@ struct ADPCM_CH
 	int8_t        vol_mul;        /* volume in "0.75dB" steps */
 	uint8_t       vol_shift;      /* volume in "-6dB" steps   */
 	int32_t       *pan;           /* &out_adpcm[OPN_xxxx]     */
-	uint8_t       program_no;     /* prog no mamidimemo */
 
 };
 
@@ -2496,7 +2495,7 @@ struct ym2610_state
 					data = ch->now_data & 0x0f;
 				else
 				{
-					ch->now_data = read_byte(device, (ch->program_no << 24) | ch->now_addr>>1);
+					ch->now_data = read_byte(device, (0 << 24) | ch->now_addr>>1);
 					data = (ch->now_data >> 4) & 0x0f;
 				}
 
@@ -2580,14 +2579,6 @@ struct ym2610_state
 				adpcm[c].adpcm_out = ((adpcm[c].adpcm_acc * adpcm[c].vol_mul) >> adpcm[c].vol_shift) & ~3;  /* multiply, shift and mask out low 2 bits */
 			}
 			break;
-		case 0x02:
-		case 0x03:
-		case 0x04:
-		case 0x05:
-		case 0x06:
-		case 0x07:
-			adpcm[r - 2].program_no = v;
-			break;
 		default:
 			c = r&0x07;
 			if( c >= 0x06 ) return;