TAG174 2022/05/20

Driver 初回のタイマー割り込みを予め行っておくよう修正
kuma4649 · May 19, 2022 · eb39881 · eb39881
1 parent 4d08ab4
commit eb39881
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 18 deletions.
diff --git a/CHANGE.txt b/CHANGE.txt
@@ -1,4 +1,8 @@
 �X�V����
+TAG174 2022/05/20
+  Driver
+    ����̃^�C�}�[���荞�݂�\�ߍs���Ă����悤�C��
+
 TAG173 2022/05/19
   Driver
     AllMute�̏����̕s����C��

diff --git a/mucomDotNETConsole/Properties/launchSettings.json b/mucomDotNETConsole/Properties/launchSettings.json
@@ -2,7 +2,7 @@
   "profiles": {
     "Console": {
       "commandName": "Project",
-      "commandLineArgs": "-LOGLEVEL=TRACE \"D:\\bootcamp\\FM音源\\data\\MUC\\test\\test.muc\""
+      "commandLineArgs": "-LOGLEVEL=TRACE \"D:\\bootcamp\\FM音源\\data\\自作\\test\\test.muc\""
     }
   }
 }
diff --git a/mucomDotNETDriver/music2.cs b/mucomDotNETDriver/music2.cs
@@ -60,15 +60,31 @@ public void MSTART(int musicNumber)
                 CHK();//added
                 INT57();
                 ENBL();
+
                 for (int c = 0; c < 5; c++)
                 {
                     work.soundWork.currentChip = c;
+                    work.currentTimer = c;
                     TO_NML();
                 }
                 work.soundWork.currentChip = 0;
 
                 work.resetPlaySync = true;
                 work.Status = 1;
+                work.currentTimer = 0;
+
+                //一度だけタイマ割り込みをさせる(初めの発音が不安定になる現象対策)
+                while ((work.timerOPNA1.StatReg & 3) == 0)
+                {
+                    lock (work.SystemInterrupt)
+                    {
+                        work.timerOPNA1.timer();
+                        work.timerOPNA2.timer();
+                        work.timerOPNB1.timer();
+                        work.timerOPNB2.timer();
+                        work.timerOPM.timer();
+                    }
+                }
             }
         }
 
@@ -838,21 +854,13 @@ private void STTMB(byte e)
 
         public void PL_SND()
         {
-            ChipDatum dat;
-            if (work.currentTimer != 4)
-            {
-                dat = new ChipDatum(0, 0x27, work.soundWork.PLSET1_VAL[work.currentTimer]);//  TIMER-OFF DATA
-                WriteRegister(work.currentTimer, dat);
-                dat = new ChipDatum(0, 0x27, work.soundWork.PLSET2_VAL[work.currentTimer]);//  TIMER-ON DATA
-                WriteRegister(work.currentTimer, dat);
-            }
-            else
-            {
-                dat = new ChipDatum(0, 0x14, work.soundWork.PLSET1_VAL[work.currentTimer]);//  TIMER-OFF DATA
-                WriteRegister(work.currentTimer, dat);
-                dat = new ChipDatum(0, 0x14, work.soundWork.PLSET2_VAL[work.currentTimer]);//  TIMER-ON DATA
-                WriteRegister(work.currentTimer, dat);
-            }
+            updateTimer();
+
+            //if (work.dummyCount > 0)
+            //{
+            //    work.dummyCount--;
+            //    return;
+            //}
 
             DRIVE();
             //FDOUT();
@@ -876,6 +884,25 @@ public void PL_SND()
                 work.Status = 0;
         }
 
+        private void updateTimer()
+        {
+            ChipDatum dat;
+            if (work.currentTimer != 4)
+            {
+                dat = new ChipDatum(0, 0x27, work.soundWork.PLSET1_VAL[work.currentTimer]);//  TIMER-OFF DATA
+                WriteRegister(work.currentTimer, dat);
+                dat = new ChipDatum(0, 0x27, work.soundWork.PLSET2_VAL[work.currentTimer]);//  TIMER-ON DATA
+                WriteRegister(work.currentTimer, dat);
+            }
+            else
+            {
+                dat = new ChipDatum(0, 0x14, work.soundWork.PLSET1_VAL[work.currentTimer]);//  TIMER-OFF DATA
+                WriteRegister(work.currentTimer, dat);
+                dat = new ChipDatum(0, 0x14, work.soundWork.PLSET2_VAL[work.currentTimer]);//  TIMER-ON DATA
+                WriteRegister(work.currentTimer, dat);
+            }
+        }
+
         // **	CALL FM		**
 
         private Tuple<string, int, int, int, int, Action>[] aryDRIVE;

diff --git a/mucomDotNETPlayer/Program.cs b/mucomDotNETPlayer/Program.cs
@@ -716,7 +716,7 @@ private static void OPMWrite(int chipId, ChipDatum dat)
 
             if (dat.address == -1) return;
 
-            Log.WriteLine(LogLevel.TRACE, string.Format("Out ChipOPM:{0} Port:{1} Adr:[{2:x02}] val[{3:x02}]", chipId, dat.port, (int)dat.address, (int)dat.data));
+            //Log.WriteLine(LogLevel.TRACE, string.Format("Out ChipOPM:{0} Port:{1} Adr:[{2:x02}] val[{3:x02}]", chipId, dat.port, (int)dat.address, (int)dat.data));
             switch (device)
             {
                 case 0:

diff --git a/mucomDotNETPlayer/Properties/launchSettings.json b/mucomDotNETPlayer/Properties/launchSettings.json
@@ -2,7 +2,7 @@
   "profiles": {
     "Player": {
       "commandName": "Project",
-      "commandLineArgs": "\"D:\\bootcamp\\FM音源\\data\\MUC\\test\\test.mub\""
+      "commandLineArgs": "\"D:\\bootcamp\\FM音源\\data\\自作\\test\\test.mub\""
     }
   }
 }