From 06ad38fc65056e533ebe474ee8cf9c4abc25aa8f Mon Sep 17 00:00:00 2001
From: Tronix <tronix286@rambler.ru>
Date: Wed, 10 Mar 2021 15:06:35 +0300
Subject: [PATCH] Added note priority

---
 .gitignore |   5 +-
 CMS.C      |  61 +++++++++---
 CMS.H      |   2 +-
 CMS.LST    | 273 +++++++++++++++++++++++++----------------------------
 DOSMID.CFG |   1 +
 DOSMID.EXE | Bin 40994 -> 41138 bytes
 6 files changed, 179 insertions(+), 163 deletions(-)

diff --git a/.gitignore b/.gitignore
index f30211c..4a1019b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
 *.obj
 *.mid
-*.map
\ No newline at end of file
+*.map
+*.lst
+*.log
+*.lst
diff --git a/CMS.C b/CMS.C
index 27fc84f..447d872 100644
--- a/CMS.C
+++ b/CMS.C
@@ -1,5 +1,7 @@
 #ifdef CMS
 
+//#define CMS_DEBUG 1
+
 #ifdef CMS_DEBUG
 #include <stdio.h>
 #include <stdarg.h>
@@ -52,6 +54,10 @@ unsigned char CmsOctaveStore[12];
 
 unsigned char ChanEnableReg[2] = {0,0};
 
+// Note priority
+unsigned char NotePriority;
+
+
 void __declspec( naked ) cmsWrite(void)
 {
 /*
@@ -115,9 +121,9 @@ void cmsReset(unsigned short port)
         for (i=0;i<MAX_CMS_CHANNELS;i++)
         {
                 cms_synth[i].note=0;
-                cms_synth[i].volume=0;
+                cms_synth[i].priority=0;
         }
-
+	NotePriority = 0;
 }
 
 void cmsDisableVoice(unsigned char voice)
@@ -293,8 +299,17 @@ void cmsNoteOff(unsigned char channel, unsigned char note)
     	return;
     }
 
+    // decrease priority for all notes greater than current
+    for (i=0; i<MAX_CMS_CHANNELS; i++)
+	if (cms_synth[i].priority > cms_synth[voice].priority )
+		cms_synth[i].priority = cms_synth[i].priority - 1;
+
+    
+    if (NotePriority != 0) NotePriority--;
+
     cmsDisableVoice(voice);
     cms_synth[voice].note = 0;
+    cms_synth[voice].priority = 0;
 }
 
 void cmsNoteOn(unsigned char channel, unsigned char note, unsigned char velocity)
@@ -312,6 +327,8 @@ void cmsNoteOn(unsigned char channel, unsigned char note, unsigned char velocity
 	octave = (note_cms / 12) - 1; //Some fancy math to get the correct octave
   	noteVal = note_cms - ((octave + 1) * 12); //More fancy math to get the correct note
 
+	NotePriority++;
+
         voice = MAX_CMS_CHANNELS;
     	for(i=0; i<MAX_CMS_CHANNELS; i++)
     	{
@@ -323,19 +340,35 @@ void cmsNoteOn(unsigned char channel, unsigned char note, unsigned char velocity
     	}
 
 
-  	// We run out of voices, ignore note on command
+  	// We run out of voices, find low priority voice
   	if(voice==MAX_CMS_CHANNELS)
   	{
-#ifdef CMS_DEBUG
-		debug_log("no space for note Ch=%u,note=%u,vel=%u\n",channel & 0xFF,note & 0xFF,velocity & 0xFF);
-#endif
-    		return;
+		unsigned char min_prior = cms_synth[0].priority;
+
+		// find note with min prioryty
+		voice = 0;
+    		for (i=1; i<MAX_CMS_CHANNELS; i++)
+		  if (cms_synth[i].priority < min_prior) 
+		  {
+			voice = i;
+                        min_prior = cms_synth[i].priority;
+                  }
+
+		// decrease all notes priority by one
+    		for (i=0; i<MAX_CMS_CHANNELS; i++)
+		  if (cms_synth[i].priority != 0)
+			cms_synth[i].priority = cms_synth[i].priority - 1;
+
+		// decrease current priority
+		if (NotePriority != 0) NotePriority--;
+
   	}
 
 	cmsSound(voice,noteAdr[noteVal],octave,atten[velocity],atten[velocity]); 
 
 	cms_synth[voice].note = note;
-	cms_synth[voice].volume = velocity;
+	cms_synth[voice].priority = NotePriority;
+
   } 
   else
         cmsNoteOff(channel,note);
@@ -370,16 +403,16 @@ void cmsTick(void)
 void cmsController(unsigned char channel, unsigned char id, unsigned char val)
 {
   unsigned char i;
-
-	if (id == 0x07) // set main volume
-        {
+    if ((id==121) || (id==123)) // All Sound/Notes Off
+    {
   		for (i=0;i<MAX_CMS_CHANNELS;i++) 
     		  if (cms_synth[i].note != 0)
 		 	{
-				cmsSetVolume(i,atten[val],atten[val]);
-				cms_synth[i].volume = val;
+    				cmsDisableVoice(i);
+				cms_synth[i].note = 0;
+				cms_synth[i].priority = 0;
 		 	}
-        }
+    }
 }
 
 #endif
diff --git a/CMS.H b/CMS.H
index 50398c5..946c2f2 100644
--- a/CMS.H
+++ b/CMS.H
@@ -5,7 +5,7 @@
 
 typedef struct {
         unsigned char note;
-        unsigned char volume;
+        unsigned char priority;
 } mid_channel;
 
 void cmsReset(unsigned short port);
diff --git a/CMS.LST b/CMS.LST
index e443013..abc4cd1 100644
--- a/CMS.LST
+++ b/CMS.LST
@@ -1,41 +1,23 @@
 .387
-		PUBLIC	debug_log_
+.386p
 		PUBLIC	cmsWrite_
 		PUBLIC	cmsNull_
 		PUBLIC	cmsReset_
 		PUBLIC	cmsDisableVoice_
 		PUBLIC	cmsSetVolume_
 		PUBLIC	cmsSound_
-		PUBLIC	cmsNoteOn_
 		PUBLIC	cmsNoteOff_
+		PUBLIC	cmsTick_
+		PUBLIC	cmsNoteOn_
+		PUBLIC	cmsController_
 		PUBLIC	_ChanEnableReg
 		PUBLIC	_cms_synth
 		PUBLIC	_CmsOctaveStore
 		PUBLIC	_cmsPort
-		EXTRN	fopen_:BYTE
-		EXTRN	fprintf_:BYTE
-		EXTRN	fclose_:BYTE
 		EXTRN	_small_code_:BYTE
 DGROUP		GROUP	CONST,CONST2,_DATA,_BSS
 _TEXT		SEGMENT	BYTE PUBLIC USE16 'CODE'
 		ASSUME CS:_TEXT, DS:DGROUP, SS:DGROUP
-debug_log_:
-    push        dx 
-    push        bp 
-    mov         bp,sp 
-    mov         dx,offset DGROUP:L$19 
-    mov         ax,offset DGROUP:L$20 
-    call        near ptr fopen_ 
-    mov         dx,ax 
-    push        word ptr 6[bp] 
-    push        ax 
-    call        near ptr fprintf_ 
-    add         sp,4 
-    mov         ax,dx 
-    call        near ptr fclose_ 
-    pop         bp 
-    pop         dx 
-    ret         
 cmsWrite_:
     inc         dx 
     xchg        al,ah 
@@ -70,20 +52,23 @@ cmsReset_:
     call        near ptr cmsNull_ 
     xor         al,al 
 L$2:
+    xor         bx,bx 
     mov         bl,al 
-    xor         bh,bh 
-    mov         byte ptr _CmsOctaveStore[bx],bh 
+    xor         ah,ah 
+    mov         byte ptr _CmsOctaveStore[bx],ah 
     inc         al 
     cmp         al,0bH 
     jb          L$2 
+    mov         byte ptr _ChanEnableReg,ah 
+    mov         byte ptr _ChanEnableReg+1,ah 
     xor         al,al 
-    mov         byte ptr _ChanEnableReg,bh 
-    mov         byte ptr _ChanEnableReg+1,bh 
 L$3:
+    xor         bx,bx 
     mov         bl,al 
-    xor         bh,bh 
-    shl         bx,1 
-    mov         word ptr _cms_synth[bx],0 
+    add         bx,bx 
+    xor         cl,cl 
+    mov         byte ptr _cms_synth[bx],cl 
+    mov         byte ptr _cms_synth+1[bx],cl 
     inc         al 
     cmp         al,0cH 
     jb          L$3 
@@ -157,6 +142,7 @@ L$6:
     mov         sp,bp 
     pop         bp 
     pop         di 
+L$7:
     pop         si 
     pop         cx 
     ret         
@@ -183,21 +169,21 @@ cmsSound_:
     sub         di,10H 
     mov         cl,byte ptr -6[bp] 
     cmp         cl,6 
-    jl          L$7 
+    jl          L$8 
     add         di,3 
-L$7:
+L$8:
     mov         ah,al 
     mov         al,byte ptr _CmsOctaveStore[di] 
     mov         bh,byte ptr -2[bp] 
     test        bl,1 
-    jne         L$8 
+    jne         L$9 
     and         al,0f0H 
-    jmp         near ptr L$9 
-L$8:
+    jmp         near ptr L$10 
+L$9:
     and         al,0fH 
     mov         cl,4 
     shl         bh,cl 
-L$9:
+L$10:
     or          al,bh 
     mov         byte ptr _CmsOctaveStore[di],al 
     call        near ptr cmsWrite_ 
@@ -218,9 +204,9 @@ L$9:
     xor         di,di 
     mov         cl,byte ptr -6[bp] 
     cmp         cl,6 
-    jl          L$10 
+    jl          L$11 
     inc         di 
-L$10:
+L$11:
     mov         al,byte ptr _ChanEnableReg[di] 
     mov         ah,1 
     mov         cl,bl 
@@ -233,140 +219,133 @@ L$10:
     pop         di 
     pop         si 
     ret         2 
+cmsNoteOff_:
+    push        bx 
+    mov         ah,0cH 
+    xor         al,al 
+    jmp         L$13 
+L$12:
+    inc         al 
+    cmp         al,0cH 
+    jae         L$14 
+L$13:
+    xor         bx,bx 
+    mov         bl,al 
+    add         bx,bx 
+    cmp         dl,byte ptr _cms_synth[bx] 
+    jne         L$12 
+    mov         ah,al 
+L$14:
+    cmp         ah,0cH 
+    je          L$15 
+    xor         bx,bx 
+    mov         bl,ah 
+    mov         ax,bx 
+    call        near ptr cmsDisableVoice_ 
+    add         bx,bx 
+    mov         byte ptr _cms_synth[bx],0 
+L$15:
+    pop         bx 
+cmsTick_:
+    ret         
 cmsNoteOn_:
     push        cx 
     push        si 
     push        di 
     push        bp 
     mov         bp,sp 
-    sub         sp,4 
-    mov         cl,al 
+    sub         sp,6 
     mov         byte ptr -2[bp],dl 
     mov         byte ptr -4[bp],bl 
-    mov         ch,dl 
-    inc         ch 
-    mov         al,ch 
-    xor         ah,ah 
-    mov         bx,0cH 
+    test        bl,bl 
+    je          L$19 
+    mov         bl,dl 
+    inc         bl 
+    xor         ax,ax 
+    mov         al,bl 
+    mov         cx,0cH 
     cwd         
-    idiv        bx 
+    idiv        cx 
     dec         ax 
     mov         dl,al 
     inc         al 
     mov         ah,0cH 
     mul         ah 
-    mov         dh,ch 
-    sub         dh,al 
-    mov         bh,0cH 
-    xor         bl,bl 
-    jmp         L$12 
-L$11:
-    inc         bl 
-    cmp         bl,0cH 
-    jae         L$13 
-L$12:
-    mov         al,bl 
-    xor         ah,ah 
-    mov         si,ax 
-    shl         si,1 
-    cmp         byte ptr _cms_synth[si],0 
-    jne         L$11 
-    mov         bh,bl 
-L$13:
-    cmp         bh,0cH 
-    jne         L$14 
-    mov         al,byte ptr -4[bp] 
-    xor         ah,ah 
-    push        ax 
-    mov         al,byte ptr -2[bp] 
-    push        ax 
-    mov         al,cl 
-    push        ax 
-    mov         ax,offset DGROUP:L$21 
-    push        ax 
-    call        near ptr debug_log_ 
-    add         sp,8 
-    jmp         near ptr L$6 
-L$14:
-    mov         al,byte ptr -4[bp] 
-    xor         ah,ah 
-    mov         si,ax 
-    mov         cl,byte ptr _atten[si] 
-    xor         ch,ch 
-    push        cx 
-    mov         al,dl 
-    mov         di,ax 
-    mov         al,dh 
-    mov         si,ax 
-    mov         al,byte ptr _noteAdr[si] 
-    mov         dx,ax 
-    mov         al,bh 
-    mov         si,ax 
-    mov         bx,di 
-    call        near ptr cmsSound_ 
-    shl         si,1 
-    mov         al,byte ptr -2[bp] 
-    mov         byte ptr _cms_synth[si],al 
-    mov         al,byte ptr -4[bp] 
-    mov         byte ptr _cms_synth+1[si],al 
-    jmp         near ptr L$6 
-cmsNoteOff_:
-    push        bx 
-    push        cx 
-    mov         ah,dl 
-    mov         cl,0cH 
+    sub         bl,al 
+    mov         byte ptr -6[bp],bl 
+    mov         ah,0cH 
     xor         al,al 
-    jmp         L$16 
-L$15:
+    jmp         L$17 
+L$16:
     inc         al 
     cmp         al,0cH 
-    jae         L$17 
-L$16:
-    mov         dl,al 
-    xor         dh,dh 
-    mov         bx,dx 
-    shl         bx,1 
-    cmp         ah,byte ptr _cms_synth[bx] 
-    jne         L$15 
-    mov         cl,al 
+    jae         L$18 
 L$17:
-    cmp         cl,0cH 
-    jne         L$18 
-    mov         ax,offset DGROUP:L$22 
-    push        ax 
-    call        near ptr debug_log_ 
-    add         sp,2 
-    pop         cx 
-    pop         bx 
-    ret         
+    xor         bx,bx 
+    mov         bl,al 
+    add         bx,bx 
+    cmp         byte ptr _cms_synth[bx],0 
+    jne         L$16 
+    mov         ah,al 
 L$18:
-    mov         dl,cl 
+    cmp         ah,0cH 
+    je          L$6 
+    xor         bx,bx 
+    mov         bl,byte ptr -4[bp] 
+    xor         cx,cx 
+    mov         cl,byte ptr _atten[bx] 
+    push        cx 
     xor         dh,dh 
-    mov         ax,dx 
-    call        near ptr cmsDisableVoice_ 
+    xor         bx,bx 
+    mov         bl,byte ptr -6[bp] 
+    movzx       di,byte ptr _noteAdr[bx] 
+    movzx       si,ah 
     mov         bx,dx 
-    shl         bx,1 
-    mov         byte ptr _cms_synth[bx],dh 
-    pop         cx 
-    pop         bx 
-    ret         
-_TEXT		ENDS
-CONST		SEGMENT	WORD PUBLIC USE16 'DATA'
+    mov         dx,di 
+    mov         ax,si 
+    call        near ptr cmsSound_ 
+    mov         bx,si 
+    add         bx,si 
+    mov         al,byte ptr -2[bp] 
+    mov         byte ptr _cms_synth[bx],al 
+    mov         al,byte ptr -4[bp] 
+    mov         byte ptr _cms_synth+1[bx],al 
+    jmp         near ptr L$6 
 L$19:
-    DB	61H, 0
+    xor         dx,dx 
+    mov         dl,byte ptr -2[bp] 
+    xor         ah,ah 
+    call        near ptr cmsNoteOff_ 
+    jmp         near ptr L$6 
+cmsController_:
+    push        cx 
+    push        si 
+    mov         ch,bl 
+    cmp         dl,7 
+    jne         L$7 
+    xor         cl,cl 
+    jmp         L$21 
 L$20:
-    DB	63H, 6dH, 73H, 6cH, 6fH, 67H, 2eH, 6cH
-    DB	6fH, 67H, 0
+    inc         cl 
+    cmp         cl,0cH 
+    jae         L$7 
 L$21:
-    DB	6eH, 6fH, 20H, 73H, 70H, 61H, 63H, 65H
-    DB	20H, 66H, 6fH, 72H, 20H, 6eH, 6fH, 74H
-    DB	65H, 20H, 43H, 68H, 3dH, 25H, 75H, 2cH
-    DB	6eH, 6fH, 74H, 65H, 3dH, 25H, 75H, 2cH
-    DB	76H, 65H, 6cH, 3dH, 25H, 75H, 0aH, 0
-L$22:
-    DB	6eH, 6fH, 74H, 20H, 66H, 6fH, 75H, 6eH
-    DB	64H, 0aH, 0
-
+    xor         ax,ax 
+    mov         al,cl 
+    mov         si,ax 
+    add         si,ax 
+    cmp         byte ptr _cms_synth[si],0 
+    je          L$20 
+    xor         bx,bx 
+    mov         bl,ch 
+    xor         dx,dx 
+    mov         dl,byte ptr _atten[bx] 
+    mov         bx,dx 
+    call        near ptr cmsSetVolume_ 
+    mov         byte ptr _cms_synth+1[si],ch 
+    jmp         L$20 
+_TEXT		ENDS
+CONST		SEGMENT	WORD PUBLIC USE16 'DATA'
 CONST		ENDS
 CONST2		SEGMENT	WORD PUBLIC USE16 'DATA'
 CONST2		ENDS
diff --git a/DOSMID.CFG b/DOSMID.CFG
index 716f93b..348a39e 100644
--- a/DOSMID.CFG
+++ b/DOSMID.CFG
@@ -1,3 +1,4 @@
 # This is a configuration file for DOSMID. You can write here any DOSMID
 # parameters that you wish to use as defaults. Each parameter must be written
 # on a single line. Lines starting with '#' and empty lines are ignored.
+/cms
\ No newline at end of file
diff --git a/DOSMID.EXE b/DOSMID.EXE
index 6588ee85d90178b1d36d911929a318230b0ade2a..31fb3984cb271992ffecc96ca1a6cf77451df2a5 100644
GIT binary patch
delta 5612
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
JcCDwV{{X?)(T4y4

delta 5493
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