WallyHackenslacker/lovedos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Preparations for 8 bit driver and new mixer

Browse Source
This commit is contained in:
rnlf
2017-01-27 21:28:07 +01:00
parent 3d3eed26ab
commit be8c4deb36
2 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/soundblaster.c
View File

@@ -18,7 +18,10 @@
#define BYTE(val, byte) (((val) >> ((byte) * 8)) & 0xFF) #define BYTE(val, byte) (((val) >> ((byte) * 8)) & 0xFF)
#define SOUNDBLASTER_SAMPLES_PER_BUFFER 2048
#define SAMPLE_BUFFER_SIZE (SOUNDBLASTER_SAMPLES_PER_BUFFER * sizeof(uint16_t) * 2) #define SAMPLE_BUFFER_SIZE (SOUNDBLASTER_SAMPLES_PER_BUFFER * sizeof(uint16_t) * 2)
#define SAMPLE_RATE 22050
// SB16 // SB16
#define BLASTER_RESET_PORT 0x6 #define BLASTER_RESET_PORT 0x6
@@ -36,9 +39,10 @@
#define BLASTER_READY_BYTE 0xAA #define BLASTER_READY_BYTE 0xAA
#define BLASTER_SET_OUTPUT_SAMPLING_RATE 0x41 #define BLASTER_SET_OUTPUT_SAMPLING_RATE 0x41
#define BLASTER_PROGRAM_16BIT_IO_CMD 0xB0 #define BLASTER_PROGRAM_16BIT_IO_CMD 0xB0
#define BLASTER_PROGRAM_16BIT_FLAG_FIFO 0x02 #define BLASTER_PROGRAM_FLAG_FIFO 0x02
#define BLASTER_PROGRAM_16BIT_FLAG_AUTO_INIT 0x04 #define BLASTER_PROGRAM_FLAG_AUTO_INIT 0x04
#define BLASTER_PROGRAM_16BIT_FLAG_INPUT 0x08 #define BLASTER_PROGRAM_FLAG_INPUT 0x08
#define BLASTER_PROGRAM_8BIT_IO_CMD 0xC0
#define BLASTER_PROGRAM_STEREO 0x20 #define BLASTER_PROGRAM_STEREO 0x20
#define BLASTER_PROGRAM_SIGNED 0x10 #define BLASTER_PROGRAM_SIGNED 0x10
#define BLASTER_SPEAKER_ON_CMD 0xD1 #define BLASTER_SPEAKER_ON_CMD 0xD1
@@ -313,11 +317,11 @@ static void startDMAOutput(void) {
// SB16 setup // SB16 setup
writeDSP(BLASTER_SET_OUTPUT_SAMPLING_RATE); writeDSP(BLASTER_SET_OUTPUT_SAMPLING_RATE);
writeDSP(BYTE(22050, 1)); writeDSP(BYTE(SAMPLE_RATE, 1));
writeDSP(BYTE(22050, 0)); writeDSP(BYTE(SAMPLE_RATE, 0));
writeDSP(BLASTER_PROGRAM_16BIT_IO_CMD writeDSP(BLASTER_PROGRAM_16BIT_IO_CMD
| BLASTER_PROGRAM_16BIT_FLAG_AUTO_INIT | BLASTER_PROGRAM_FLAG_AUTO_INIT
| BLASTER_PROGRAM_16BIT_FLAG_FIFO); | BLASTER_PROGRAM_FLAG_FIFO);
writeDSP(BLASTER_PROGRAM_SIGNED); writeDSP(BLASTER_PROGRAM_SIGNED);
writeDSP(BYTE(samples/2-1, 0)); writeDSP(BYTE(samples/2-1, 0));
writeDSP(BYTE(samples/2-1, 1)); writeDSP(BYTE(samples/2-1, 1));
@@ -392,3 +396,13 @@ void soundblaster_deinit(void) {
blasterInitialized = false; blasterInitialized = false;
} }
} }
int soundblaster_getSampleRate(void) {
return SAMPLE_RATE;
}
int soundblaster_getSampleBufferSize(void) {
return SOUNDBLASTER_SAMPLES_PER_BUFFER;
}

2
src/soundblaster.h
View File

@@ -23,5 +23,7 @@ typedef int16_t const* (*soundblaster_getSampleProc)(void);
int soundblaster_init(soundblaster_getSampleProc sampleproc); int soundblaster_init(soundblaster_getSampleProc sampleproc);
void soundblaster_deinit(void); void soundblaster_deinit(void);
int soundblaster_getSampleRate(void);
int soundblaster_getSampleBufferSize(void);
#endif #endif