"preallocated" memory for malloc() changed to 0x20000 (for open cubic player)

Author: Baron-von-Riedesel

History.txt

@@ -1,5 +1,5 @@
 
-  v1.4, 14.4.2024
+  v1.4, 20.4.2024
 
   - added 16-bit protected-mode variant vsbhda16.exe.
   - reworked HDA initialization code

Makefile

@@ -49,7 +49,7 @@ A_DEBUG_FLAGS=-D_DEBUG -Fl$*
 !else
 OUTD=ow
 OUTD16=ow16
-C_DEBUG_FLAGS=-D_LOG
+C_DEBUG_FLAGS=
 A_DEBUG_FLAGS=
 !endif
 

src/MAIN.C

@@ -81,10 +81,6 @@ static int freq = 22050; /* default value for AU_setrate() */
 
 uint8_t bOMode = 1; /* 1=output DOS, 2=direct, 4=debugger */
 
-#ifdef _LOG
-extern uint32_t dwMaxBytes;
-#endif
-
 #if PREMAPDMA
 uint32_t MAIN_MappedBase; /* linear address mapped ISA DMA region (0x000000 - 0xffffff) */
 #endif
@@ -201,9 +197,6 @@ static void ReleaseRes( void )
 	if( gvars.pm ) {
 		PTRAP_Uninstall_PM_PortTraps();
 	}
-#ifdef _LOG
-	printf("max PCM buffer usage: %u\n", dwMaxBytes );
-#endif
 
 	return;
 }
@@ -461,11 +454,12 @@ int main(int argc, char* argv[])
     if ( gvars.vol != VOL_DEFAULT )
         printf("Volume=%u\n", gvars.vol );
 
-    /* temp alloc a 64 kB buffer so it will belong to THIS client. Any dpmi memory allocation
-     * while another client is active will result in problems, since that memory is released when
-     * the client exits. This is best done before SNDISR_InstallISR() is called.
+    /* temp alloc a 64 kB chunk of memory. This will ensure that mallocs done while sound is playing won't
+     * need another DPMI memory allocation. A dpmi memory allocation while another client is active will
+     * result in problems, since that memory is released when that client exits.
+     * This temp alloc is best done before SNDISR_InstallISR() is called.
      */
-    if (p = malloc( 0x10000 ) )
+    if (p = malloc( 0x20000 ) ) /* 64 kB seems not enough for open cube player */
         free( p );
 
     bISR = SNDISR_InstallISR(PIC_IRQ2VEC( AU_getirq( hAU ) ), &SNDISR_Interrupt );

src/SB.H

@@ -52,6 +52,7 @@
 
 #define SB_MIXERREG_INPUTFILTER  0x0C /* SBPro only */
 #define SB_MIXERREG_MODEFILTER   0x0E /* SBPro only - bit 1:Stereo select, bit 5: Filter output */
+#define SB_MIXERREG_MODEFILTER_STEREO 2
 
 /* the following regs are 3 bits for SBPro [1-3, 5-7], 4 bit [0-3, 4-7] for SB16 */
 #define SB_MIXERREG_VOICESTEREO  0x04 /* SBPro+, DAC level, 3/4 bit L & R */

src/SNDISR.C

@@ -50,7 +50,7 @@ static uint32_t ISR_DMA_Size = 0;
  */
 uint32_t ISR_DMA_MappedAddr = 0;
 
-#ifdef _LOG
+#ifdef _LOGBUFFMAX
 uint32_t dwMaxBytes = 0;
 #endif
 
@@ -418,17 +418,23 @@ int SNDISR_Interrupt( struct clientregs _far *clstat )
         /* in case there weren't enough samples copied, fill the rest with silence */
         for( i = pos; i < samples; i++ )
             *(pPCM + i*2+1) = *(pPCM + i*2) = 0;
+
 	} else if ( i = VSB_GetDirectCount( &pDirect ) ) {
+
 		int count = i;
 		uint32_t freq = AU_getfreq( hAU );
-		//uint32_t SB_Rate = VSB_GetSampleRate();
-		uint32_t SB_Rate = count * freq / 128; /* just a "guess" */
 
-		dbgprintf(("isr, direct samples: cnt=%d, samples=%d \n", count, samples ));
+		/* calc the src frequency by formula:
+		 * x / dst-freq = src-smpls / dst-smpls
+		 * x = src-smpl * dst-freq / dst-smpls
+		 */
+		uint32_t SB_Rate = count * freq / samples;
+
+		//dbgprintf(("isr, direct samples: cnt=%d, samples=%d, rate%u\n", count, samples, SB_Rate ));
 		memcpy( pPCM, pDirect, count );
-		cv_bits_8_to_16( pPCM, count ); /* converts unsigned 8-bit to signed 16-bit */
+		cv_bits_8_to_16( pPCM, count );
 		count = cv_rate( pPCM, count, 1, SB_Rate, freq );
-		cv_channels_1_to_2( pPCM, count);
+		cv_channels_1_to_2( pPCM, count );
 		for( i = count; i < samples; i++ )
 			*(pPCM + i*2+1) = *(pPCM + i*2) = 0;
 		VSB_ResetDirectCount();
@@ -463,7 +469,7 @@ int SNDISR_Interrupt( struct clientregs _far *clstat )
             /* in assembly it's probably easier to handle signed/unsigned shifts */
             SNDISR_Mixer( pPCM, pPCMOPL, samples * 2, voicevol, midivol );
 #endif
-#ifdef _LOG
+#ifdef _LOGBUFFMAX
             if ( (( pPCMOPL + samples * 2 ) - pPCM ) * sizeof(int16_t) > dwMaxBytes )
                 dwMaxBytes = (( pPCMOPL + samples * 2 ) - pPCM ) * sizeof(int16_t);
 #endif
@@ -474,7 +480,7 @@ int SNDISR_Interrupt( struct clientregs _far *clstat )
         if( digital ) {
             for( i = 0, pPCMOPL = pPCM; i < samples * 2; i++, pPCMOPL++ ) *pPCMOPL = ( *pPCMOPL * voicevol ) >> 8;
             //dbgprintf(("+"));
-#ifdef _LOG
+#ifdef _LOGBUFFMAX
             if ( (( pPCMOPL + samples * 2 ) - pPCM ) * sizeof(int16_t) > dwMaxBytes )
                 dwMaxBytes = (( pPCMOPL + samples * 2 ) - pPCM ) * sizeof(int16_t);
 #endif
@@ -514,6 +520,9 @@ bool SNDISR_UninstallISR( void )
 ////////////////////////////////
 {
     /* first uninstall int 31h, then ISR! */
+#ifdef _LOGBUFFMAX
+    printf("max PCM buffer usage: %u\n", dwMaxBytes );
+#endif
     _hdpmi_UninstallInt31();
     return ( _hdpmi_UninstallISR() );
 }

src/VSB.C

@@ -49,7 +49,7 @@ static int VSB_HDMA = 5;
 #endif
 static int VSB_DACSpeaker = 1;
 static unsigned int VSB_Bits = 8;
-static int VSB_SampleRate = 22050;
+static int VSB_SampleRate;
 static unsigned int VSB_Samples = 0;  /* the length argument after a play command (samples - 1) */
 static int VSB_Auto = false; /* auto-initialize mode active */
 static int VSB_HighSpeed = 0;
@@ -220,12 +220,13 @@ static void DSP_Reset( uint8_t value )
 #else
         VSB_MixerRegs[SB_MIXERREG_DMA_SETUP] = (1 << VSB_DMA) & 0xB;
 #endif
-        VSB_MixerRegs[SB_MIXERREG_MODEFILTER] = 0xFD; //mask out stereo
+        VSB_MixerRegs[SB_MIXERREG_MODEFILTER] = 0x11; //SB Pro: mono, no filter
         VSB_MixerRegIndex = 0;
         VSB_DSPCMD = -1;
         VSB_DSPCMD_Subindex = 0;
         DSPDataBytes = 0;
         VSB_Started = 0;
+        VSB_SampleRate = 0;
         VSB_Samples = 0;
         VSB_Auto = false;
         VSB_Signed = false;
@@ -261,6 +262,24 @@ static void DSP_Reset( uint8_t value )
     }
 }
 
+int VSB_CalcSampleRate( uint8_t value )
+///////////////////////////////////////
+{
+	int rc = 0;
+	int i;
+	for( i = 0; i < 3; ++i ) {
+		if(value >= VSB_TimeConstantMapMono[i][0] - 3 && value <= VSB_TimeConstantMapMono[i][0] + 3 ) {
+			rc  = VSB_TimeConstantMapMono[i][1] / VSB_GetChannels();
+			break;
+		}
+	}
+	if(!rc) {
+		//rc = 1000000 / ( 256 - value ) / VSB_GetChannels();
+		rc = 256000000/( 65536 - (value << 8) ) / VSB_GetChannels();
+	}
+	return rc;
+}
+
 /* write port 2xC */
 
 static void DSP_Write( uint8_t value )
@@ -330,7 +349,7 @@ static void DSP_Write( uint8_t value )
             ISR_adpcm_state.useRef = true;
             ISR_adpcm_state.step = 0;
             VSB_Bits = (value == SB_DSP_2BIT_OUT_AUTO) ? 2 : (value == SB_DSP_3BIT_OUT_AUTO) ? 3 : 4;
-            VSB_MixerRegs[SB_MIXERREG_MODEFILTER] &= ~0x2;
+            VSB_MixerRegs[SB_MIXERREG_MODEFILTER] &= ~SB_MIXERREG_MODEFILTER_STEREO;
             VSB_Silent = false;
             VSB_Started = true; //start transfer here
             VSB_Pos = 0;
@@ -405,8 +424,10 @@ static void DSP_Write( uint8_t value )
             /* bit 4 of value: 1=signed */
             VSB_Signed = ( ( value & 0x10 ) ? true : false );
             /* bit 5 of value: 1=stereo */
-            VSB_MixerRegs[SB_MIXERREG_MODEFILTER] &= ~2;
-            VSB_MixerRegs[SB_MIXERREG_MODEFILTER] |= ( ( value & 0x20 ) ? 2 : 0 );
+            if ( value & 0x20 )
+                VSB_MixerRegs[SB_MIXERREG_MODEFILTER] |= SB_MIXERREG_MODEFILTER_STEREO;
+            else
+                VSB_MixerRegs[SB_MIXERREG_MODEFILTER] &= ~SB_MIXERREG_MODEFILTER_STEREO;
             VSB_DSPCMD_Subindex++;
             break;
         case 1:
@@ -425,21 +446,14 @@ static void DSP_Write( uint8_t value )
         int i;
         switch( VSB_DSPCMD ) {
         case SB_DSP_SET_TIMECONST: /* 40 */
-            VSB_SampleRate = 0;
 #if !LATERATE
-            for( i = 0; i < 3; ++i ) {
-                if(value >= VSB_TimeConstantMapMono[i][0]-3 && value <= VSB_TimeConstantMapMono[i][0]+3) {
-                    VSB_SampleRate = VSB_TimeConstantMapMono[i][1] / VSB_GetChannels();
-                    break;
-                }
-            }
-            if(VSB_SampleRate == 0)
-                VSB_SampleRate = 256000000/( 65536 - (value << 8) ) / VSB_GetChannels();
-                //VSB_SampleRate = 1000000 / ( 256 - value ) / VSB_GetChannels();
+            VSB_SampleRate = VSB_CalcSampleRate( value );
+            dbgprintf(("DSP_Write: time constant=%X, rate=%u\n", value, VSB_SampleRate ));
 #else
+            VSB_SampleRate = 0;
             bTimeConst = value;
-#endif
             dbgprintf(("DSP_Write: time constant=%X\n", value ));
+#endif
             VSB_DSPCMD_Subindex = 2; //only 1byte
             break;
         case SB_DSP_8BIT_DIRECT: /* 10 */
@@ -480,8 +494,8 @@ static void DSP_Write( uint8_t value )
                 ISR_adpcm_state.useRef = (VSB_DSPCMD & 1 );
                 ISR_adpcm_state.step = 0;
                 VSB_Bits = (VSB_DSPCMD <= SB_DSP_2BIT_OUT_1) ? 2 : (VSB_DSPCMD >= SB_DSP_3BIT_OUT_1_NREF) ? 3 : 4;
-                VSB_MixerRegs[SB_MIXERREG_MODEFILTER] &= ~0x2; /* reset stereo */
-                VSB_Started = true; //start transfer here
+                VSB_MixerRegs[SB_MIXERREG_MODEFILTER] &= ~SB_MIXERREG_MODEFILTER_STEREO; /* reset stereo */
+                VSB_Started = true;
                 VSB_Silent = false;
                 VSB_Signed = false;
                 VSB_Pos = 0;
@@ -505,7 +519,7 @@ static void DSP_Write( uint8_t value )
                 VSB_Samples = value;
             else {
                 VSB_Samples |= value << 8; /* the value is #samples-1! */
-                VSB_MixerRegs[SB_MIXERREG_MODEFILTER] &= ~0x2; /* reset stereo */
+                VSB_MixerRegs[SB_MIXERREG_MODEFILTER] &= ~SB_MIXERREG_MODEFILTER_STEREO; /* reset stereo */
                 VSB_Signed = false;
                 VSB_Bits = 8;
                 VSB_Pos = 0;
@@ -717,24 +731,16 @@ int VSB_IsSigned()
 int VSB_GetChannels()
 /////////////////////
 {
-    return (VSB_MixerRegs[SB_MIXERREG_MODEFILTER] & 0x2) ? 2 : 1;
+    /* MIXERREG_MODEFILTER is for SB Pro only, but in vsbhda also set for sb16 */
+    return (VSB_MixerRegs[SB_MIXERREG_MODEFILTER] & SB_MIXERREG_MODEFILTER_STEREO) ? 2 : 1;
 }
 
 int VSB_GetSampleRate()
 ///////////////////////
 {
 #if LATERATE
-	if ( !VSB_SampleRate ) {
-		for(int i = 0; i < 3; ++i) {
-			if( bTimeConst >= VSB_TimeConstantMapMono[i][0]-3 && bTimeConst <= VSB_TimeConstantMapMono[i][0]+3) {
-				VSB_SampleRate = VSB_TimeConstantMapMono[i][1] / VSB_GetChannels();
-				break;
-			}
-		}
-		if( VSB_SampleRate == 0 )
-			VSB_SampleRate = 256000000/( 65536 - ( bTimeConst << 8) ) / VSB_GetChannels();
-		//VSB_SampleRate = 1000000 / ( 256 - bTimeConst ) / VSB_GetChannels();
-	}
+    if ( !VSB_SampleRate )
+        VSB_SampleRate = VSB_CalcSampleRate( bTimeConst );
 #endif
     return VSB_SampleRate;
 }

startup/SBRK.ASM

@@ -1,6 +1,7 @@
 
 ;--- simple __brk()
 ;--- assemble with -zcw
+;--- DPMI memory allocation must be done while program is current client!
 
 	.386
 	.model ?MODEL