renamed project to vsbhda

Baron-von-Riedesel · Baron-von-Riedesel · commit 2967d689cb24 · 2023-04-12T16:35:03.000+02:00
diff --git a/MPXPLAY/AU_CARDS.C b/MPXPLAY/AU_CARDS.C
@@ -18,7 +18,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 
-#include "SBEMUCFG.H"
+#include "CONFIG.H"
 #include "MPXPLAY.H"
 #include "DMAIRQ.H"
 #ifndef SBEMU
diff --git a/MPXPLAY/CV_FREQ.C b/MPXPLAY/CV_FREQ.C
@@ -19,7 +19,7 @@
 #include <stdint.h>
 //#include <assert.h>
 
-#include "SBEMUCFG.H"
+#include "CONFIG.H"
 #include "MPXPLAY.H"
 
 #define MALLOCSTATIC 1
diff --git a/MPXPLAY/DMAIRQ.C b/MPXPLAY/DMAIRQ.C
@@ -19,7 +19,7 @@
 #include <stdint.h>
 #include <string.h>
 
-#include "SBEMUCFG.H"
+#include "CONFIG.H"
 #include "MPXPLAY.H"
 #include "DMAIRQ.H"
 
diff --git a/MPXPLAY/NF_DPMI.C b/MPXPLAY/NF_DPMI.C
@@ -19,8 +19,8 @@
 #include <dpmi.h>
 #include <sys/exceptn.h>
 
+#include "CONFIG.H"
 #include "NEWFUNC.H"
-#include "SBEMUCFG.H"
 
 #define PHYSICAL_MAP_COUNT 64
 
diff --git a/MPXPLAY/SC_E1371.C b/MPXPLAY/SC_E1371.C
@@ -18,7 +18,7 @@
 #include <stdint.h>
 #include <stdio.h>
 
-#include "SBEMUCFG.H"
+#include "CONFIG.H"
 #include "MPXPLAY.H"
 #include "DMAIRQ.H"
 #include "PCIBIOS.H"
diff --git a/MPXPLAY/SC_ICH.C b/MPXPLAY/SC_ICH.C
@@ -19,7 +19,7 @@
 #include <time.h>
 #include <string.h>
 
-#include "SBEMUCFG.H"
+#include "CONFIG.H"
 #include "MPXPLAY.H"
 #include "DMAIRQ.H"
 #include "PCIBIOS.H"
diff --git a/MPXPLAY/SC_INTHD.C b/MPXPLAY/SC_INTHD.C
@@ -19,7 +19,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "SBEMUCFG.H"
+#include "CONFIG.H"
 #include "MPXPLAY.H"
 #include "DMAIRQ.H"
 #include "PCIBIOS.H"
@@ -977,6 +977,8 @@ static void azx_setup_periods(struct intelhd_card_s *card)
  }
 }
 
+/* called by HDA_setrate() */
+
 static void azx_setup_controller(struct intelhd_card_s *card)
 /////////////////////////////////////////////////////////////
 {
@@ -1012,7 +1014,7 @@ static void azx_setup_controller(struct intelhd_card_s *card)
 	azx_sd_writel(card, SD_BDLPU, 0); // upper 32 bit
 	//azx_sd_writel(card, SD_CTL,azx_sd_readl(card, SD_CTL) | SD_INT_MASK);
 #ifdef SBEMU
-	azx_sd_writel(card, SD_CTL,azx_sd_readl(card, SD_CTL) | SD_INT_COMPLETE);
+	//azx_sd_writel(card, SD_CTL,azx_sd_readl(card, SD_CTL) | SD_INT_COMPLETE);
 #endif
 	pds_delay_10us(100);
 
@@ -1420,12 +1422,13 @@ static void HDA_start(struct mpxplay_audioout_info_s *aui)
 {
 	struct intelhd_card_s *card = aui->card_private_data;
 	unsigned int timeout;
+
 	dbgprintf("HDA_start\n" );
-	//const unsigned int stream_index=0;
+	//const unsigned int stream_index = 0;
 	//azx_writeb(card, INTCTL, azx_readb(card, INTCTL) | (1 << stream_index)); // enable SIE
-	//azx_sd_writeb(card, SD_CTL, azx_sd_readb(card, SD_CTL) | SD_CTL_DMA_START | SD_INT_MASK); // start DMA
 
-	azx_sd_writeb(card, SD_CTL, azx_sd_readb(card, SD_CTL) | SD_CTL_DMA_START); // start DMA
+	azx_sd_writeb(card, SD_CTL, azx_sd_readb(card, SD_CTL) | SD_CTL_DMA_START | SD_INT_MASK); // start DMA
+	//azx_sd_writeb(card, SD_CTL, azx_sd_readb(card, SD_CTL) | SD_CTL_DMA_START); // start DMA
 
 	timeout = 500;
 	while(!(azx_sd_readb(card, SD_CTL) & SD_CTL_DMA_START) && --timeout) // wait for DMA start
@@ -1439,7 +1442,9 @@ static void HDA_stop(struct mpxplay_audioout_info_s *aui)
 {
 	struct intelhd_card_s *card = aui->card_private_data;
 	unsigned int timeout;
-	//const unsigned int stream_index=0;
+
+	dbgprintf("HDA_start\n" );
+
 	azx_sd_writeb(card, SD_CTL, azx_sd_readb(card, SD_CTL) & ~(SD_CTL_DMA_START | SD_INT_MASK)); // stop DMA
 
 	timeout = 200;
@@ -1449,6 +1454,8 @@ static void HDA_stop(struct mpxplay_audioout_info_s *aui)
 	pds_delay_10us(100);
 
 	//azx_sd_writeb( card, SD_STS, SD_INT_MASK); // to be sure
+
+	//const unsigned int stream_index = 0;
 	//azx_writeb( card, INTCTL, azx_readb(card, INTCTL) & ~(1 << stream_index));
 }
 
@@ -1494,7 +1501,7 @@ static int HDA_IRQRoutine(mpxplay_audioout_info_s* aui)
 ///////////////////////////////////////////////////////////
 {
 	struct intelhd_card_s *card=aui->card_private_data;
-	int status = azx_sd_readb(card, SD_STS)&SD_INT_MASK;
+	int status = azx_sd_readb(card, SD_STS) & SD_INT_MASK;
 	if(status)
 		azx_sd_writeb(card, SD_STS, status); //ack all
 
diff --git a/MPXPLAY/SC_INTHD.H b/MPXPLAY/SC_INTHD.H
@@ -513,8 +513,7 @@ enum {
 #define SD_INT_DESC_ERR        0x10    /* descriptor error interrupt */
 #define SD_INT_FIFO_ERR        0x08    /* FIFO error interrupt */
 #define SD_INT_COMPLETE        0x04    /* completion interrupt */
-#define SD_INT_MASK        (SD_INT_DESC_ERR|SD_INT_FIFO_ERR|\
-                 SD_INT_COMPLETE)
+#define SD_INT_MASK            (SD_INT_DESC_ERR | SD_INT_FIFO_ERR | SD_INT_COMPLETE)
 
 #define RIRB_INT_MASK        0x05
 
diff --git a/MPXPLAY/SC_SBL24.C b/MPXPLAY/SC_SBL24.C
@@ -17,7 +17,7 @@
 
 #include <stdint.h>
 
-#include "SBEMUCFG.H"
+#include "CONFIG.H"
 #include "MPXPLAY.H"
 #include "DMAIRQ.H"
 #include "PCIBIOS.H"
diff --git a/MPXPLAY/SC_SBLIV.C b/MPXPLAY/SC_SBLIV.C
@@ -19,7 +19,7 @@
 #include <stdint.h>
 #include <stdio.h>
 
-#include "SBEMUCFG.H"
+#include "CONFIG.H"
 #include "MPXPLAY.H"
 #include "DMAIRQ.H"
 #include "PCIBIOS.H"
diff --git a/MPXPLAY/SC_VIA82.C b/MPXPLAY/SC_VIA82.C
@@ -18,7 +18,7 @@
 #include <stdint.h>
 #include <string.h>
 
-#include "SBEMUCFG.H"
+#include "CONFIG.H"
 #include "MPXPLAY.H"
 #include "DMAIRQ.H"
 #include "PCIBIOS.H"
diff --git a/Makefile b/Makefile
@@ -1,12 +1,14 @@
 
-# create sbemu.exe
+# create vsbhda.exe
 # to create a debug version, enter: make DEBUG=1
 # note that for assembly jwasm v2.17+ is needed ( understands -djgpp option )
 
 ifndef DEBUG
 DEBUG=0
 endif
 
+NAME=vsbhda
+
 ifeq ($(DEBUG),1)
 OUTD=debug
 C_DEBUG_FLAGS=-D_DEBUG
@@ -39,7 +41,7 @@ SRC_DIRS=src mpxplay
 C_OPT_FLAGS=-Os -fno-asynchronous-unwind-tables
 C_EXTRA_FLAGS=-march=i386 -DSBEMU
 LD_FLAGS=$(addprefix -Xlinker ,$(LD_EXTRA_FLAGS))
-LD_EXTRA_FLAGS=-Map $(OUTD)/sbemu.map
+LD_EXTRA_FLAGS=-Map $(OUTD)/$(NAME).map
 
 INCLUDES=$(addprefix -I,$(INCLUDE_DIRS))
 LIBS=$(addprefix -l,stdcxx m)
@@ -60,22 +62,22 @@ $(OUTD)/%.o: src/%.asm
 $(OUTD)/%.o: mpxplay/%.c
 	$(COMPILE.c.o)
 
-all:: $(OUTD) $(OUTD)/sbemu.exe
+all:: $(OUTD) $(OUTD)/$(NAME).exe
 
 $(OUTD):
 	@mkdir $(OUTD)
 
-$(OUTD)/sbemu.exe:: $(OUTD)/sbemu.ar
-	gcc $(C_EXTRA_FLAGS) -o $@ $(OUTD)/main.o $(OUTD)/sbemu.ar $(LD_FLAGS) $(LIBS)
+$(OUTD)/$(NAME).exe:: $(OUTD)/$(NAME).ar
+	gcc $(C_EXTRA_FLAGS) -o $@ $(OUTD)/main.o $(OUTD)/$(NAME).ar $(LD_FLAGS) $(LIBS)
 	strip -s $@
 	exe2coff $@
-	copy /b res\stub.bin + $(OUTD)\sbemu $(OUTD)\sbemu.exe
+	copy /b res\stub.bin + $(OUTD)\$(NAME) $(OUTD)\$(NAME).exe
 
-$(OUTD)/sbemu.ar:: $(OBJFILES)
-	ar --target=coff-go32 r $(OUTD)/sbemu.ar $(OBJFILES)
+$(OUTD)/$(NAME).ar:: $(OBJFILES)
+	ar --target=coff-go32 r $(OUTD)/$(NAME).ar $(OBJFILES)
 
 $(OUTD)/ac97_def.o:: ac97_def.c  ac97_def.h in_file.h mpxplay.h au_cards.h au_mixer.h newfunc.h
-$(OUTD)/au_cards.o:: au_cards.c  in_file.h mpxplay.h au_cards.h au_mixer.h newfunc.h dmairq.h sbemucfg.h
+$(OUTD)/au_cards.o:: au_cards.c  in_file.h mpxplay.h au_cards.h au_mixer.h newfunc.h dmairq.h config.h
 $(OUTD)/cv_bits.o::  cv_bits.c   in_file.h mpxplay.h au_cards.h au_mixer.h newfunc.h
 $(OUTD)/cv_chan.o::  cv_chan.c   in_file.h mpxplay.h au_cards.h au_mixer.h newfunc.h
 $(OUTD)/cv_freq.o::  cv_freq.c   in_file.h mpxplay.h au_cards.h au_mixer.h newfunc.h
@@ -84,30 +86,31 @@ $(OUTD)/dmairq.o::   dmairq.c    in_file.h mpxplay.h au_cards.h au_mixer.h newfu
 $(OUTD)/dpmihlp.o::  dpmihlp.c   dpmihlp.h platform.h
 $(OUTD)/dprintf.o::  dprintf.asm
 $(OUTD)/int31.o::    int31.asm
-$(OUTD)/main.o::     main.c      ptrap.h dpmihlp.h vopl3.h pic.h platform.h sbemucfg.h vsb.h vdma.h virq.h in_file.h mpxplay.h au_cards.h au_mixer.h mix_func.h newfunc.h
+$(OUTD)/main.o::     main.c      ptrap.h dpmihlp.h vopl3.h pic.h platform.h config.h vsb.h vdma.h virq.h in_file.h mpxplay.h au_cards.h au_mixer.h mix_func.h newfunc.h
 $(OUTD)/memory.o::   memory.c    in_file.h mpxplay.h au_cards.h au_mixer.h newfunc.h
 $(OUTD)/nf_dpmi.o::  nf_dpmi.c   newfunc.h
 $(OUTD)/pcibios.o::  pcibios.c   pcibios.h newfunc.h
 $(OUTD)/pic.o::      pic.c       pic.h platform.h ptrap.h
-$(OUTD)/ptrap.o::    ptrap.c     ptrap.h dpmihlp.h platform.h sbemucfg.h ports.h
+$(OUTD)/ptrap.o::    ptrap.c     ptrap.h dpmihlp.h platform.h config.h ports.h
 $(OUTD)/rmwrap.o::   rmwrap.asm
 $(OUTD)/sc_e1371.o:: sc_e1371.c  ac97_def.h in_file.h mpxplay.h au_cards.h dmairq.h pcibios.h au_mixer.h newfunc.h
 $(OUTD)/sc_ich.o::   sc_ich.c    ac97_def.h in_file.h mpxplay.h au_cards.h dmairq.h pcibios.h au_mixer.h newfunc.h
 $(OUTD)/sc_inthd.o:: sc_inthd.c             in_file.h mpxplay.h au_cards.h dmairq.h pcibios.h au_mixer.h newfunc.h sc_inthd.h 
 $(OUTD)/sc_sbl24.o:: sc_sbl24.c  ac97_def.h in_file.h mpxplay.h au_cards.h dmairq.h pcibios.h au_mixer.h newfunc.h sc_sbl24.h emu10k1.h 
 $(OUTD)/sc_sbliv.o:: sc_sbliv.c  ac97_def.h in_file.h mpxplay.h au_cards.h dmairq.h pcibios.h au_mixer.h newfunc.h sc_sbliv.h emu10k1.h 
 $(OUTD)/sc_via82.o:: sc_via82.c  ac97_def.h in_file.h mpxplay.h au_cards.h dmairq.h pcibios.h au_mixer.h newfunc.h
-$(OUTD)/sndisr.o::   sndisr.c    dpmihlp.h vopl3.h pic.h platform.h sbemucfg.h vsb.h vdma.h virq.h in_file.h mpxplay.h au_cards.h au_mixer.h mix_func.h newfunc.h
+$(OUTD)/sndisr.o::   sndisr.c    dpmihlp.h vopl3.h pic.h platform.h config.h vsb.h vdma.h virq.h in_file.h mpxplay.h au_cards.h au_mixer.h mix_func.h newfunc.h
 $(OUTD)/stackio.o::  stackio.asm
 $(OUTD)/stackisr.o:: stackisr.asm
 $(OUTD)/time.o::     time.c      in_file.h mpxplay.h au_cards.h au_mixer.h newfunc.h
-$(OUTD)/vdma.o::     vdma.c      dpmihlp.h platform.h ptrap.h vdma.h sbemucfg.h
+$(OUTD)/vdma.o::     vdma.c      dpmihlp.h platform.h ptrap.h vdma.h config.h
 $(OUTD)/vioout.o::   vioout.asm
-$(OUTD)/virq.o::     virq.c      dpmihlp.h pic.h platform.h ptrap.h virq.h sbemucfg.h
-$(OUTD)/vopl3.o::    vopl3.cpp   dbopl.h vopl3.h sbemucfg.h
-$(OUTD)/vsb.o::      vsb.c       dpmihlp.h platform.h vsb.h sbemucfg.h ctadpcm.h
+$(OUTD)/virq.o::     virq.c      dpmihlp.h pic.h platform.h ptrap.h virq.h config.h
+$(OUTD)/vopl3.o::    vopl3.cpp   dbopl.h vopl3.h config.h
+$(OUTD)/vsb.o::      vsb.c       dpmihlp.h platform.h vsb.h config.h ctadpcm.h
 
 clean::
-	del $(OUTD)\sbemu.exe
-	del $(OUTD)\sbemu.ar
+	del $(OUTD)\$(NAME).exe
+	del $(OUTD)\$(NAME).ar
 	del $(OUTD)\*.o
+
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
-# SBEMU
-Sound blaster emulation for AC97/HDA/SBLive; a fork of crazii's SBEMU: https://github.com/crazii/SBEMU
+# VSBHDA
+Sound blaster emulation for HDA (and AC97/SBLive); a fork of crazii's SBEMU: https://github.com/crazii/SBEMU
 
 Works with unmodified HDPMI32i, making it compatible with HX.
 
@@ -17,6 +17,6 @@ Requirements:
  * HDPMI32i - DPMI host with port trapping; protected-mode
  * JEMMEX 5.84 - V86 monitor with port trapping; v86-mode
  
-SBEMU uses some source codes from:
+VSBHDA uses some source codes from:
  * MPXPlay: https://mpxplay.sourceforge.net/, for sound card drivers
  * DOSBox: https://www.dosbox.com/, for OPL3 FM emulation
diff --git a/src/CONFIG.H b/src/CONFIG.H
@@ -1,10 +1,10 @@
-#ifndef _SBEMUCFG_H_
-#define _SBEMUCFG_H_
+#ifndef _CONFIG_H_
+#define _CONFIG_H_
 
-#define SBEMU_SAMPLERATE    22050
-//#define SBEMU_SAMPLERATE    44100
-#define SBEMU_CHANNELS 2
-#define SBEMU_BITS 16
+#define HW_SAMPLERATE    22050
+//#define HW_SAMPLERATE    44100
+#define HW_CHANNELS 2
+#define HW_BITS 16
 
 #define SB16 1        /* 1=support SB16 */
 #define SBLIVE 1      /* 1=support SBLIVE/AUDIGY */
@@ -37,4 +37,4 @@ int dbgprintf(const char *fmt, ... );
 #define dbgprintf
 #endif
 
-#endif//_SBEMUCFG_H_
+#endif//_CONFIG_H_
diff --git a/src/MAIN.C b/src/MAIN.C
@@ -11,7 +11,7 @@
 #include <go32.h>
 #include <sys/exceptn.h>
 
-#include "SBEMUCFG.H"
+#include "CONFIG.H"
 #include "PLATFORM.H"
 #include "PIC.H"
 #include "DPMIHLP.H"
@@ -47,12 +47,12 @@ static mpxplay_audio_decoder_info_s adi = {
 	NULL, /* private data */
 	0, /* infobits */
 	MPXPLAY_WAVEID_PCM_SLE, /* 16-bit samples */
-	SBEMU_SAMPLERATE, /* 22050 or 44100 */
-	SBEMU_CHANNELS, /* channels in file (not used) */
-	SBEMU_CHANNELS, /* decoded channels */
+	HW_SAMPLERATE, /* 22050 or 44100 */
+	HW_CHANNELS, /* channels in file (not used) */
+	HW_CHANNELS, /* decoded channels */
 	NULL, /* output channel matrix */
-	SBEMU_BITS, /* 16 */
-	SBEMU_BITS/8, /* bytes per sample */
+	HW_BITS, /* 16 */
+	HW_BITS/8, /* bytes per sample */
 	0}; /* bitrate */
 
 static int16_t MAIN_OPLPCM[MAIN_PCM_SAMPLESIZE+256];
@@ -217,9 +217,9 @@ static void ReleaseRes( void )
     return;
 }
 
-/* uninstall SBEMU.
+/* uninstall.
  * uninstall a protected-mode TSR is best done from real-mode.
- * for SBEMU, it's triggered by an OUT 226h, 55h ( see sbemu.c ).
+ * for VSBHDA, it's triggered by an OUT 226h, 55h ( see vsb.c ).
  * note: no printf() possible here, since stdio files are closed.
  */
 void MAIN_Uninstall( void )
@@ -321,7 +321,7 @@ int main(int argc, char* argv[])
     /* if -? or unrecognised option was entered, display help and exit */
     if( bHelp ) {
         bHelp = false;
-        printf("SBEMU: Sound Blaster emulation on AC97. Usage:\n");
+        printf("VSBHDA: Sound Blaster emulation on AC97. Usage:\n");
 
         for( int i = 0; MAIN_Options[i].option; i++ )
             printf( " %-8s: %s\n", MAIN_Options[i].option, MAIN_Options[i].desc );
@@ -366,7 +366,7 @@ int main(int argc, char* argv[])
     DPMI_Init();
 
     if ( IsInstalled() ) {
-        printf("SB found - probably SBEMU already installed.\n" );
+        printf("SB found - probably VSBHDA already installed.\n" );
         return(0);
     }
 
diff --git a/src/PTRAP.C b/src/PTRAP.C
@@ -16,7 +16,7 @@
 #include <sys/ioctl.h>
 #endif
 
-#include "SBEMUCFG.h"
+#include "CONFIG.H"
 #include "PLATFORM.H"
 #include "DPMIHLP.H"
 #include "PTRAP.H"
diff --git a/src/RMWRAP.ASM b/src/RMWRAP.ASM
@@ -17,7 +17,7 @@ RMPICTRAPDYN            equ 0 ; must match #define in ptrap.c
 
 	assume ds:nothing, ss:nothing
 
-_0000 dd 0	; rmcb to sbemu port trap handler
+_0000 dd 0	; rmcb to vsbhda port trap handler
 _0004 db 0 
 _0005 db 0
       dw 0
diff --git a/src/SNDISR.C b/src/SNDISR.C
diff --git a/src/STACKIO.ASM b/src/STACKIO.ASM
diff --git a/src/VDMA.C b/src/VDMA.C
diff --git a/src/VIRQ.C b/src/VIRQ.C
diff --git a/src/VOPL3.CPP b/src/VOPL3.CPP
diff --git a/src/VOPL3.H b/src/VOPL3.H
diff --git a/src/VSB.C b/src/VSB.C
diff --git a/vsbhda.txt b/vsbhda.txt
