X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=dos_auplay;a=blobdiff_plain;f=src%2Fau_sb.c;h=06f862ad8eda500a0581e4522b638cd1ec1e3c58;hp=d733f20b71bc910403ba4d0396adb035e69f1fbe;hb=6e29178202fe1876a0fb0231e71fa0e75a7b6460;hpb=87ef5613bb9baae3903237321c15133066139f7c

diff --git a/src/au_sb.c b/src/au_sb.c
index d733f20..06f862a 100644
--- a/src/au_sb.c
+++ b/src/au_sb.c
@@ -4,11 +4,13 @@
 #include <dos.h>
 #include <conio.h>
 #include "audio.h"
-#include "au_sb.h"
+#include "audrv.h"
 #include "dpmi.h"
 #include "dma.h"
 #include "intr.h"
 
+#define BUFSIZE			16384
+
 #define REG_MIXPORT		(base_port + 0x4)
 #define REG_MIXDATA		(base_port + 0x5)
 #define REG_RESET		(base_port + 0x6)
@@ -68,6 +70,18 @@
 /* delay for about 1us */
 #define iodelay()	outp(0x80, 0)
 
+
+static int reset_dsp(void);
+static void *sb_buffer(int *size);
+static void set_output_rate(int rate);
+static void start(int rate, int bits, int nchan);
+static void pause(void);
+static void cont(void);
+static void stop(void);
+static int isplaying(void);
+static void setvolume(int ctl, int vol);
+static int getvolume(int ctl);
+
 static void INTERRUPT intr_handler();
 static void start_dsp4(int bits, unsigned int mode, int num_samples);
 static void start_dsp(int nchan, int num_samples);
@@ -81,20 +95,32 @@ static int dsp4_detect_dma(void);
 static void print_dsp_info(void);
 static const char *sbname(int ver);
 
+
+static const struct audrv sbdrv = {
+	start,
+	pause,
+	cont,
+	stop,
+	setvolume,
+	getvolume,
+	isplaying
+};
+
+
 static int base_port;
 static int irq, dma_chan, dma16_chan, dsp_ver;
 static int dsp4;
-static void *buffer;
-static int xfer_mode;
 
-static int isplaying;
-static int cur_bits, cur_mode;
-static int curblk;
+static void *buffer[2];
+static volatile int wrbuf;
+
+static volatile int playing;
+static int cur_bits, cur_mode, auto_init;
 
 static void (INTERRUPT *prev_intr_handler)();
 
 
-int sb_detect(void)
+int sb_detect(struct audrv *drv)
 {
 	int i;
 	char *env;
@@ -102,10 +128,11 @@ int sb_detect(void)
 	if((env = getenv("BLASTER"))) {
 		dma16_chan = -1;
 		if(sscanf(env, "A%x I%d D%d H%d", &base_port, &irq, &dma_chan, &dma16_chan) >= 3) {
-			if(sb_reset_dsp() == 0) {
+			if(reset_dsp() == 0) {
 				dsp_ver = get_dsp_version();
 				dsp4 = VER_MAJOR(dsp_ver) >= 4 ? 1 : 0;
 				print_dsp_info();
+				*drv = sbdrv;
 				return 1;
 			}
 		} else {
@@ -115,7 +142,7 @@ int sb_detect(void)
 
 	for(i=0; i<6; i++) {
 		base_port = 0x200 + ((i + 1) << 4);
-		if(sb_reset_dsp() == 0) {
+		if(reset_dsp() == 0) {
 			dsp_ver = get_dsp_version();
 			dsp4 = VER_MAJOR(dsp_ver) >= 4 ? 1 : 0;
 
@@ -138,6 +165,7 @@ int sb_detect(void)
 				printf("sb_detect: old sound blaster dsp. assuming: irq 5, dma 1\n");
 			}
 			print_dsp_info();
+			*drv = sbdrv;
 
 			return 1;
 		}
@@ -146,7 +174,7 @@ int sb_detect(void)
 	return 0;
 }
 
-int sb_reset_dsp(void)
+static int reset_dsp(void)
 {
 	int i;
 
@@ -165,7 +193,7 @@ int sb_reset_dsp(void)
 	return -1;
 }
 
-void sb_set_output_rate(int rate)
+static void set_output_rate(int rate)
 {
 	if(dsp4) {
 		write_dsp(DSP4_OUT_RATE);
@@ -178,69 +206,77 @@ void sb_set_output_rate(int rate)
 	}
 }
 
-void *sb_buffer(int *size)
-{
-	*size = 32768;
-	return (char*)buffer + curblk * 32768;
-}
-
-void sb_start(int rate, int bits, int nchan)
+static void start(int rate, int bits, int nchan)
 {
 	uint16_t seg, pmsel;
-	uint32_t addr;
-	int size;
+	uint32_t addr, next64k;
+	int size, num_samples;
 
-	if(!buffer) {
-		/* allocate a 64k-aligned 64k buffer in low memory */
-		if(!(seg = dpmi_alloc(65536 * 2 / 16, &pmsel))) {
-			fprintf(stderr, "sb_start: failed to allocate DMA buffer\n");
+	if(!buffer[1]) {
+		/* allocate a buffer in low memory that doesn't cross 64k boundaries */
+		if(!(seg = dpmi_alloc(BUFSIZE * 2 / 16, &pmsel))) {
+			fprintf(stderr, "SB start: failed to allocate DMA buffer\n");
 			return;
 		}
 
 		printf("DBG allocated seg: %x, addr: %lx\n", (unsigned int)seg,
 				(unsigned long)seg << 4);
 
-		addr = ((uint32_t)(seg << 4) + 0xffff) & 0xffff0000;
-		printf("DBG aligned: %lx\n", (unsigned long)addr);
-		buffer = (void*)addr;
-	} else {
-		addr = (uint32_t)buffer;
+		addr = (uint32_t)seg << 4;
+		next64k = (addr + 0x10000) & 0xffff0000;
+		if(next64k - addr < BUFSIZE) {
+			addr = next64k;
+		}
+
+		printf("DBG aligned: %lx (mid: %lx)\n", (unsigned long)addr, (unsigned long)(addr + BUFSIZE / 2));
+		buffer[0] = (void*)addr;
+		buffer[1] = (void*)(addr + BUFSIZE / 2);
+		wrbuf = 0;
 	}
 
-	if(!(size = audio_callback(buffer, 32768))) {
+	/* Auto-init playback mode:
+	 * fill the whole buffer with data, program the DMA for BUFSIZE transfer,
+	 * and program the DSP for BUFSIZE/2 transfer. We'll get an interrupt in the
+	 * middle, while the DSP uses the upper half, and we'll refill the bottom half.
+	 * Then continue ping-ponging the two halves of the buffer until we run out of
+	 * data.
+	 */
+	auto_init = 1;
+
+	/* TODO: if size <= BUFSIZE, do a single transfer instead */
+	wrbuf = 0;
+	if(!(size = audio_callback(buffer[wrbuf], BUFSIZE))) {
 		return;
 	}
-	curblk = 1;
+	addr = (uint32_t)buffer[wrbuf];
+	num_samples = bits == 8 ? size : size / 2;
 
 	_disable();
 	if(!prev_intr_handler) {
 		prev_intr_handler = _dos_getvect(IRQ_TO_INTR(irq));
 	}
-	printf("setting interrupt vector: %d\n", IRQ_TO_INTR(irq));
 	_dos_setvect(IRQ_TO_INTR(irq), intr_handler);
 	_enable();
 
 	unmask_irq(irq);
 
 	cur_bits = bits;
-	cur_mode = 0;	/* TODO */
+	cur_mode = bits == 8 ? 0 : DSP4_MODE_SIGNED;
 	if(nchan > 1) {
 		cur_mode |= DSP4_MODE_STEREO;
 	}
 
 	write_dsp(DSP_ENABLE_OUTPUT);
-	dma_out(dma_chan, addr, size, DMA_SINGLE);
-	sb_set_output_rate(rate);
-	start_dsp4(cur_bits, cur_mode, size);
-	isplaying = 1;
+	dma_out(cur_bits == 8 ? dma_chan : dma16_chan, addr, BUFSIZE, DMA_SINGLE | DMA_AUTO);
+	set_output_rate(rate);
+	start_dsp4(cur_bits, cur_mode, num_samples / 2);
+	playing = 1;
 }
 
 static void start_dsp4(int bits, unsigned int mode, int num_samples)
 {
 	unsigned char cmd = bits == 8 ? DSP4_START_DMA8 : DSP4_START_DMA16;
-	assert(bits == 8 || bits == 16);
-
-	/*cmd |= DSP4_AUTO | DSP4_FIFO;*/
+	cmd |= DSP4_AUTO | DSP4_FIFO;
 
 	/* program the DSP to start the DMA transfer */
 	write_dsp(cmd);
@@ -256,17 +292,17 @@ static void start_dsp(int nchan, int num_samples)
 	/* TODO */
 }
 
-void sb_pause(void)
+static void pause(void)
 {
 	write_dsp(cur_bits == 8 ? DSP_PAUSE_DMA8 : DSP_PAUSE_DMA16);
 }
 
-void sb_continue(void)
+static void cont(void)
 {
 	write_dsp(cur_bits == 8 ? DSP_CONT_DMA8 : DSP_CONT_DMA16);
 }
 
-void sb_stop(void)
+static void stop(void)
 {
 	write_dsp(DSP_DISABLE_OUTPUT);
 
@@ -276,40 +312,128 @@ void sb_stop(void)
 	_dos_setvect(IRQ_TO_INTR(irq), prev_intr_handler);
 	_enable();
 
-	/* no need to stop anything if we're in single-cycle mode */
-	if(cur_mode & DSP4_AUTO) {
-		write_dsp(cur_bits == 8 ? DSP_END_DMA8 : DSP_END_DMA16);
-	}
-	isplaying = 0;
+	write_dsp(cur_bits == 8 ? DSP_END_DMA8 : DSP_END_DMA16);
+	playing = 0;
 }
 
-int sb_isplaying(void)
+static int isplaying(void)
 {
-	return isplaying;
+	return playing;
 }
 
-void sb_volume(int vol)
+static void setvolume(int ctl, int vol)
 {
-	/* TODO */
+	unsigned char val;
+
+	if(VER_MAJOR(dsp_ver) >= 4) {
+		/* DSP 4.x - SB16 */
+		val = vol & 0xf8;
+		if(ctl == AUDIO_PCM) {
+			write_mix(MIX_SB16_VOICE_L, vol);
+			write_mix(MIX_SB16_VOICE_R, vol);
+		} else {
+			write_mix(MIX_SB16_MASTER_L, vol);
+			write_mix(MIX_SB16_MASTER_R, vol);
+		}
+
+	} else if(VER_MAJOR(dsp_ver) >= 3) {
+		/* DSP 3.x - SBPro */
+		val = vol & 0xe0;
+		val |= val >> 4;
+
+		if(ctl == AUDIO_PCM) {
+			write_mix(MIX_SBPRO_VOICE, val);
+		} else {
+			write_mix(MIX_SBPRO_MASTER, val);
+		}
+
+	} else {
+		/* DSP 2.x - SB 2.0 */
+		if(ctl == AUDIO_PCM) {
+			val = (vol >> 5) & 6;
+			write_mix(MIX_VOICE, val);
+		} else {
+			val = (vol >> 4) & 0xe;
+			write_mix(MIX_MASTER, val);
+		}
+	}
+}
+
+static int getvolume(int ctl)
+{
+	int left, right;
+	unsigned char val;
+
+	if(VER_MAJOR(dsp_ver) >= 4) {
+		/* DSP 4.x - SB16 */
+		int lreg, rreg;
+		if(ctl == AUDIO_PCM) {
+			lreg = MIX_SB16_VOICE_L;
+			rreg = MIX_SB16_VOICE_R;
+		} else {	/* MASTER or DEFAULT */
+			lreg = MIX_SB16_MASTER_L;
+			rreg = MIX_SB16_MASTER_R;
+		}
+
+		val = read_mix(lreg);
+		left = (val & 0xf8) | ((val >> 3) & 7);	/* duplicate last 3 bits */
+		val = read_mix(rreg);
+		right = (val & 0xf8) | ((val >> 3) & 7);
+
+	} else if(VER_MAJOR(dsp_ver) >= 3) {
+		/* DSP 3.x - SBPro */
+		val = read_mix(ctl == AUDIO_PCM ? MIX_SBPRO_VOICE : MIX_SBPRO_MASTER);
+
+		/* left is top 3 bits, duplicate twice(-ish) */
+		left = (val & 0xe0) | ((val >> 3) & 0x1c) | (val >> 6);
+		/* right is top 3 bits of the lower nibble */
+		right = (val << 4) | ((val << 1) & 0x1c) | ((val >> 2) & 3);
+
+	} else {
+		int volume;
+
+		/* DSP 2.x - SB 2.0 */
+		if(ctl == AUDIO_PCM) {
+			/* voice is in bits 1 and 2 */
+			val = read_mix(MIX_VOICE);
+			volume = (val << 5) | ((val << 3) & 0x30) | ((val << 1) & 0xc) | ((val >> 1) & 3);
+		} else {
+			/* master is in the 3 top bits of the lower nibble */
+			val = read_mix(MIX_MASTER);
+			volume = (val << 4) | ((val << 1) & 0x1c) | ((val >> 2) & 3);
+		}
+		return volume;
+	}
+
+	return (left + right) >> 1;
 }
 
 static void INTERRUPT intr_handler()
 {
 	int size;
-	void *bptr = (unsigned char*)buffer + curblk * 32768;
+	void *bptr = buffer[wrbuf];
+	uint32_t addr = (uint32_t)bptr;
 
-	curblk = (curblk + 1) & 1;
+	wrbuf ^= 1;
 
 	/* ask for more data */
-	if(!(size = audio_callback(bptr, 32768))) {
-		sb_stop();
-	} else {
-		dma_out(dma_chan, (uint32_t)bptr, size, DMA_SINGLE);
-		start_dsp4(cur_bits, cur_mode, size);
+	if(!(size = audio_callback(bptr, BUFSIZE / 2))) {
+		stop();
 	}
 
 	/* acknowledge the interrupt */
-	inp(REG_INTACK);
+	if(cur_bits == 8) {
+		inp(REG_INTACK);
+	} else {
+		/*
+		unsigned char istat;
+		outp(REG_MIXPORT, 0x82);
+		istat = inp(REG_MIXDATA);
+		if(istat & 2) {
+		*/
+			inp(REG_INT16ACK);
+		//}
+	}
 
 	if(irq > 7) {
 		outp(PIC2_CMD, OCW2_EOI);
@@ -426,9 +550,6 @@ static int dsp4_detect_dma(void)
 
 static void print_dsp_info(void)
 {
-	int master[2], voice[2];
-	int val;
-
 	printf("sb_detect: %s (DSP v%d.%02d) port %xh, irq %d", sbname(dsp_ver),
 			VER_MAJOR(dsp_ver), VER_MINOR(dsp_ver), base_port, irq);
 	if(VER_MAJOR(dsp_ver) >= 4) {
@@ -436,27 +557,6 @@ static void print_dsp_info(void)
 	} else {
 		printf(" dma %d\n", dma_chan);
 	}
-
-	if(VER_MAJOR(dsp_ver) >= 4) {
-		master[0] = 100 * (int)(read_mix(MIX_SB16_MASTER_L) >> 3) / 31;
-		master[1] = 100 * (int)(read_mix(MIX_SB16_MASTER_R) >> 3) / 31;
-		voice[0] = 100 * (int)(read_mix(MIX_SB16_VOICE_L) >> 3) / 31;
-		voice[1] = 100 * (int)(read_mix(MIX_SB16_VOICE_R) >> 3) / 31;
-	} else if(VER_MAJOR(dsp_ver) >= 3) {
-		val = read_mix(MIX_SBPRO_MASTER);
-		master[0] = 100 * (val >> 5) / 7;
-		master[1] = 100 * ((val >> 1) & 7) / 7;
-		val = read_mix(MIX_SBPRO_VOICE);
-		voice[0] = 100 * (val >> 5) / 7;
-		voice[1] = 100 * ((val >> 1) & 7) / 7;
-	} else {
-		val = read_mix(MIX_MASTER);
-		master[0] = master[1] = 100 * ((val >> 1) & 7) / 7;
-		val = read_mix(MIX_VOICE);
-		voice[0] = voice[1] = 100 * ((val >> 1) & 3) / 3;
-	}
-	printf("  mixer: master(%d|%d) voice(%d|%d)\n", master[0], master[1],
-			voice[0], voice[1]);
 }
 
 #define V(maj, min)	(((maj) << 8) | (min))