aesnd: add unsigned PCM support

Author: WinterMute

gc/aesndlib.h

@@ -17,10 +17,14 @@
 #define VOICE_STATE_RUNNING		1
 #define VOICE_STATE_STREAM		2
 
-#define VOICE_MONO8				0x00000000
-#define VOICE_STEREO8			0x00000001
-#define VOICE_MONO16			0x00000002
-#define VOICE_STEREO16			0x00000003
+#define VOICE_MONO8             0x00000000
+#define VOICE_STEREO8           0x00000001
+#define VOICE_MONO16            0x00000002
+#define VOICE_STEREO16          0x00000003
+#define VOICE_MONO8_UNSIGNED    0x00000004
+#define VOICE_STEREO8_UNSIGNED  0x00000005
+#define VOICE_MONO16_UNSIGNED   0x00000006
+#define VOICE_STEREO16_UNSIGNED	0x00000007
 
 #define VOICE_FREQ32KHZ			32000
 #define VOICE_FREQ48KHZ			48000

libaesnd/aesndlib.c

@@ -12,10 +12,11 @@
 #define PB_STRUCT_SIZE			64
 #define DSP_DRAMSIZE			8192
 
-#define VOICE_PAUSE				0x00000004
-#define VOICE_LOOP				0x00000008
-#define VOICE_ONCE				0x00000010
-#define VOICE_STREAM			0x00000020
+
+#define VOICE_PAUSE    0x00000008
+#define VOICE_LOOP     0x00000010
+#define VOICE_ONCE     0x00000020
+#define VOICE_STREAM   0x00000040
 
 #define VOICE_FINISHED			0x00100000
 #define VOICE_STOPPED			0x00200000
@@ -127,16 +128,21 @@ static __inline__ void __aesndcopycommand(AESNDPB *dst,AESNDPB *src)
 	dst->cb = src->cb;
 }
 
+
 static __inline__ void __aesndsetvoiceformat(AESNDPB *pb,u32 format)
 {
-	pb->flags = (pb->flags&~0x03)|(format&0x03);
-	switch((format&0x03)) {
+	pb->flags = (pb->flags&~0x07)|(format&0x07);
+	switch((format&0x07)) {
 		case VOICE_MONO8:
 		case VOICE_STEREO8:
+		case VOICE_MONO8_UNSIGNED:
+		case VOICE_STEREO8_UNSIGNED:
 			pb->shift = 0;
 			break;
 		case VOICE_MONO16:
 		case VOICE_STEREO16:
+		case VOICE_MONO16_UNSIGNED:
+		case VOICE_STEREO16_UNSIGNED:
 			pb->shift = 1;
 			break;
 	}

libaesnd/dspcode/dspmixer.s

@@ -82,9 +82,9 @@ PB_STURCT_SIZE:		equ		64
 NUM_SAMPLES:		equ		96						//process 2ms of sample data
 DEF_FREQ_INT:		equ		0x0001
 
-VOICE_FLAGL_PAUSE:	equ		0x0004
-VOICE_FLAGL_LOOP:	equ		0x0008
-VOICE_FLAGL_ONCE:	equ		0x0010
+VOICE_FLAGL_PAUSE:	equ		0x0008
+VOICE_FLAGL_LOOP:	equ		0x0010
+VOICE_FLAGL_ONCE:	equ		0x0020
 
 VOICE_FLAGH_END:	equ		0x0010
 VOICE_FLAGH_STOP:	equ		0x0020
@@ -299,7 +299,7 @@ no_change_buffer:
 	call	setup_accl
 
 	mrr		$acc1.m,$acc1.l
-	andi	$acc1.m,#0x03
+	andi	$acc1.m,#0x07
 	addi	$acc1.m,#select_mixer
 	mrr		$ar3,$acc1.m
 	ilrr	$acc1.m,@$ar3
@@ -359,34 +359,38 @@ no_delay:
 
 	jmp		no_mix
 
-mono_8bits:
-	bloop	$acx0.l,mono_8bits_end
+mono_unsigned_mix:
+	bloop	$acx0.l,mono_unsigned_mix_end
 	lrs		$acc0.m,@ACDAT			//right channel
-mono_8bits_end:
+mono_unsigned_mix_end:
 	mrr		$acc1.m,$acc0.m			//left channel
+	xori	$acc0.m,#0x8000
+	xori	$acc1.m,#0x8000
 
 	jmp		mix_samples
 
-stereo_8bits:
-	bloop	$acx0.l,stereo_8bits_end
+mono_mix:
+	bloop	$acx0.l,mono_mix_end
 	lrs		$acc0.m,@ACDAT			//right channel
-stereo_8bits_end:
-	lrs		$acc1.m,@ACDAT			//left channel
+mono_mix_end:
+	mrr		$acc1.m,$acc0.m			//left channel
 
 	jmp		mix_samples
 
-mono_16bits:
-	bloop	$acx0.l,mono_16bits_end
+stereo_unsigned_mix:
+	bloop	$acx0.l,stereo_unsigned_mix_end
 	lrs		$acc0.m,@ACDAT			//right channel
-mono_16bits_end:
-	mrr		$acc1.m,$acc0.m			//left channel
+stereo_unsigned_mix_end:
+	lrs		$acc1.m,@ACDAT			//left channel
+	xori	$acc0.m,#0x8000
+	xori	$acc1.m,#0x8000
 
 	jmp		mix_samples
 
-stereo_16bits:
-	bloop	$acx0.l,stereo_16bits_end
+stereo_mix:
+	bloop	$acx0.l,stereo_mix_end
 	lrs		$acc0.m,@ACDAT			//right channel
-stereo_16bits_end:
+stereo_mix_end:
 	lrs		$acc1.m,@ACDAT			//left channel
 
 mix_samples:
@@ -563,14 +567,17 @@ exception7:		// External interrupt (message from CPU)
 	rti
 
 select_mixer:
-	cw		mono_8bits
-	cw		stereo_8bits
-	cw		mono_16bits
-	cw		stereo_16bits
+	cw		mono_mix
+	cw		stereo_mix
+	cw		mono_mix
+	cw		stereo_mix
+	cw		mono_unsigned_mix
+	cw		stereo_unsigned_mix
+	cw		mono_unsigned_mix
+	cw		stereo_unsigned_mix
 
 select_format:
 	cw		ACCL_FMT_8BIT
 	cw		ACCL_GAIN_8BIT
 	cw		ACCL_FMT_16BIT
 	cw		ACCL_GAIN_16BIT
-