v1.7

Author: Baron-von-Riedesel

History.txt

@@ -1,5 +1,5 @@
 
-  v1.7, __._.2025
+  v1.7, 11.8.2025
   - fixed: clear CF in case int 31h hook proc handles the function (ax=0x20x).
   - added soundfont support from VSBHDASF; new cmdline options /SF, /MV, /PS.
   - fixed: array bounds check in vopl3.cpp added (& 0xff).
@@ -14,7 +14,7 @@
   - fixed: ES1371 audio driver.
   - /F cmdline option now accepts 11025 as argument.
   - added support for SiS 7012.
-  - cmdline option /O1 for SBLive enables speaker connector.
+  - cmdline option /O1 for SBLive enables speaker jack.
   - fixed: SB Live/SB Audigy FX8010 initialization.
 
   v1.6, 10.6.2025

MPXPLAY/SC_E1371.C

@@ -14,6 +14,8 @@
 //**************************************************************************
 //function: Ensoniq 1371/1373 low level routines (for SB PCI 16/64/128 cards)
 //based on ALSA (http://www.alsa-project.org)
+//v1.7 fix: 5880 variants weren't enabled, since the "enable" bit was set
+//in ES_REG_SERIAL, but has to be set in ES_REG_STATUS (fix by mkarcher).
 
 #include <stdlib.h>
 #include <stdint.h>
@@ -28,7 +30,7 @@
 #include "PCIBIOS.H"
 #include "AC97MIX.H"
 
-#if 0
+#if 0 /* v1.7: generally use 512 as default period_size */
 #define ES1371_DMABUF_PERIODS  32
 #define ES1371_MAX_CHANNELS     2
 #define ES1371_MAX_BYTES        4
@@ -37,18 +39,21 @@
 #define ES1371_DMABUF_ALIGN 512
 #endif
 
-/* 00-07 interrupt/chip select
+/* v1.7: poll count reduced */
+//#define POLL_COUNT      0x8000
+#define POLL_COUNT      0x1000
+
+/* ports:
+ * 00-07 interrupt/chip select
  * 08-0B UART
- * 0C-0F host interface	- memory page
+ * 0C-0F host interface - memory page
  * 10-13 sample rate converter
  * 14-17 codec
  * 18-1F legacy
  * 20-2F serial interface
  * 30-3F host interface - memory
  */
 
-#define POLL_COUNT      0x1000
-
 #define ES_REG_CONTROL    0x00    /* R/W: Interrupt/Chip select control register */
 #define  ES_1371_GPIO_OUT(o) (((o)&0x0f)<<16)/* GPIO out [3:0] pins - W/R */
 #define  ES_1371_SYNC_RES    (1<<14)       /* Warm AC97 reset */
@@ -187,6 +192,9 @@
 
 #define ENSONIQ_CARD_INFOBIT_AC97RESETHACK 0x01
 
+/* sample rate converter (SRC) mask for status check;
+ * bits 16-18, although used here, are documented as "undefined"!
+ */
 #define SRC_MASK 0x870000UL
 
 struct ensoniq_card_s
@@ -228,7 +236,6 @@ static unsigned int snd_es1371_wait_src_rdy(struct ensoniq_card_s *card)
 }
 
 /* read "sample rate converter" data
- * it's undocumented what purpose bit 16 has ( neither is bit 17/18 explained )
  */
 
 static unsigned short snd_es1371_src_read(struct ensoniq_card_s *card, unsigned short reg)
@@ -463,8 +470,9 @@ static unsigned int snd_es1371_buffer_init( struct ensoniq_card_s *card, struct
 //////////////////////////////////////////////////////////////////////////////////////////////////////
 {
 	unsigned int bytes_per_sample = 2; // 16 bit
+	/* v1.7: use /PS cmdline option if set */
 	//card->pcmout_bufsize = MDma_get_max_pcmoutbufsize( aui, 0, ES1371_DMABUF_ALIGN, bytes_per_sample, 0);
-    card->pcmout_bufsize = MDma_get_max_pcmoutbufsize( aui, 0, aui->gvars->period_size ? aui->gvars->period_size : ES1371_DMABUF_ALIGN, bytes_per_sample, 0);
+	card->pcmout_bufsize = MDma_get_max_pcmoutbufsize( aui, 0, aui->gvars->period_size ? aui->gvars->period_size : ES1371_DMABUF_ALIGN, bytes_per_sample, 0);
 	card->dm = MDma_alloc_cardmem( card->pcmout_bufsize );
 	if (!card->dm)
 		return 0;
@@ -566,6 +574,7 @@ static void snd_es1371_prepare_playback( struct ensoniq_card_s *card, struct aud
 	/* for DAC1: FRAME=port 30h, SIZE=port 34h, COUNT=port 24h */
 	outl((card->port + ES_REG_DAC_FRAME), (unsigned long) pds_cardmem_physicalptr(card->dm, card->pcmout_buffer));
 	outl((card->port + ES_REG_DAC_SIZE), (aui->card_dmasize >> 2) - 1);
+	/* v1.7: use /PS cmdline option if set */
 	//outl((card->port + ES_REG_DAC_COUNT), (aui->card_dmasize >> 2) - 1);
 	outl((card->port + ES_REG_DAC_COUNT), aui->gvars->period_size ? (aui->gvars->period_size >> 2) - 1 : (512>>2) - 1);
 
@@ -636,6 +645,7 @@ static int ES1371_adetect( struct audioout_info_s *aui )
 		|| ((card->pci_dev->device_id == 0x5880) && ((card->chiprev == CT5880REV_CT5880_C) || (card->chiprev == CT5880REV_CT5880_D) || (card->chiprev == CT5880REV_CT5880_E)))
 	   ) ) {
 		card->infobits |= ENSONIQ_CARD_INFOBIT_AC97RESETHACK;
+		/* v1.7 fix: to enable 5880, bit 29 has to be set IN THE STATUS register */
 		//card->sctrl |= ES_1371_ST_AC97_RST;
 		card->cssr |= ES_1371_ST_AC97_RST;
 		dbgprintf(("ES1371_adetect: INFOBIT_AC97RESETHACK set\n"));
@@ -680,6 +690,7 @@ static void ES1371_setrate( struct audioout_info_s *aui )
 /////////////////////////////////////////////////////////
 {
 	struct ensoniq_card_s *card = aui->card_private_data;
+	/* v1.7: use /PS cmdline option if set */
 	unsigned int pagesize = aui->gvars->period_size ? aui->gvars->period_size : ES1371_DMABUF_ALIGN;
 
 	dbgprintf(("ES1371_setrate\n"));

src/MAIN.C

@@ -160,7 +160,7 @@ static const struct {
     "PS", "Set period size [def 512]", &gvars.period_size,
 #if SOUNDFONT
     "SF:", "Set sound font file name", (int *)&gvars.soundfont,
-    "MV", "Set voice limit [1-256, def 64]", &gvars.voices,
+    "MV", "Set voice limit [0-256, def 64]", &gvars.voices,
 #endif
     "CF", "Set compatibility flags [def 0]", &gvars.compatflags,
     NULL, NULL, 0,

vsbhda.txt

@@ -119,6 +119,7 @@
      This option uses the RDTSC instruction - Although usually no problem, this
      instruction is priviledged if bit TSD (bit 2) is set in register CR4; then
      running this instruction in ring3 will cause a GPF.
+   - /DIVE: the fix can only work for programs running in protected-mode!
    - /PS: "period size" is space (in bytes) for samples rendered during one
      interrupt request. A period size of 512, for example, means that about
      128 samples will be rendered ( since output is always 16-bit, stereo ).
@@ -128,7 +129,7 @@
      synthesizer you'll usually have to also set the MPU port - either via the
      BLASTER variable or the /P cmdline option.
    - /MV: setting a voice limit of 0 will trigger dynamic allocation - this
-     may not work for all applications.
+     is the most flexible setting, but may not work for all applications.
    - /O: for the SB Live card, /O1 enables the "speaker" connector; /O2
      has no meaning for this card.
    - /CF: defines up to 32 bits to fine tune VSBHDA's behavior.