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

implemented a very crude hack for the lockup in the soundblaster shutdown

Browse Source
This commit is contained in:
Ilu
2023-04-28 15:08:59 +02:00
parent e781aa5a1a
commit 49af8d6c03
1 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/soundblaster.c
View File

@@ -75,7 +75,7 @@ static const struct {
{0xC0, 0xC2, 0xD4, 0xD6, 0xD8, 0x8F}, {0xC4, 0xC6, 0xD4, 0xD6, 0xD8, 0x8B}, {0xC0, 0xC2, 0xD4, 0xD6, 0xD8, 0x8F}, {0xC4, 0xC6, 0xD4, 0xD6, 0xD8, 0x8B},
{0xC8, 0xCA, 0xD4, 0xD6, 0xD8, 0x89}, {0xCC, 0xCE, 0xD4, 0xD6, 0xD8, 0x8A}}; {0xC8, 0xCA, 0xD4, 0xD6, 0xD8, 0x89}, {0xCC, 0xCE, 0xD4, 0xD6, 0xD8, 0x8A}};
static volatile int stopDma = 0; static volatile bool isrRunning = false;
static uint16_t *sampleBuffer; static uint16_t *sampleBuffer;
static int sampleBufferSelector; static int sampleBufferSelector;
static uint16_t baseAddress; static uint16_t baseAddress;
@@ -134,29 +134,26 @@ static int resetBlaster(void) {
} }
static void soundblasterISR(void) { static void soundblasterISR(void) {
isrRunning = true;
outportb(baseAddress + BLASTER_MIXER_OUT_PORT, outportb(baseAddress + BLASTER_MIXER_OUT_PORT,
BLASTER_MIXER_INTERRUPT_STATUS); BLASTER_MIXER_INTERRUPT_STATUS);
uint8_t status = inportb(baseAddress + BLASTER_MIXER_IN_PORT); uint8_t status = inportb(baseAddress + BLASTER_MIXER_IN_PORT);
if (status & BLASTER_16BIT_INTERRUPT) { if (status & BLASTER_16BIT_INTERRUPT) {
if (stopDma == 1) { uint8_t *dst =
writeDSP(BLASTER_EXIT_AUTO_DMA); (uint8_t *)(sampleBuffer) + writePage * SAMPLE_BUFFER_SIZE / 2;
stopDma = 2;
} else {
uint8_t *dst =
(uint8_t *)(sampleBuffer) + writePage * SAMPLE_BUFFER_SIZE / 2;
memcpy(dst, getSamples(), SAMPLE_BUFFER_SIZE / 2); memcpy(dst, getSamples(), SAMPLE_BUFFER_SIZE / 2);
writePage = 1 - writePage; writePage = 1 - writePage;
inportb(baseAddress + BLASTER_INTERRUPT_ACKNOWLEDGE_16BIT); inportb(baseAddress + BLASTER_INTERRUPT_ACKNOWLEDGE_16BIT);
}
} }
if (irq >= 8) { if (irq >= 8) {
outportb(PIC2_COMMAND, PIC_EOI); outportb(PIC2_COMMAND, PIC_EOI);
} }
outportb(PIC1_COMMAND, PIC_EOI); outportb(PIC1_COMMAND, PIC_EOI);
isrRunning = false;
} }
static void setBlasterISR(void) { static void setBlasterISR(void) {
@@ -349,8 +346,8 @@ static void resetBlasterISR(void) {
} }
static void stopDMAOutput(void) { static void stopDMAOutput(void) {
stopDma = 1; writeDSP(BLASTER_EXIT_AUTO_DMA);
while (stopDma == 1) { while (isrRunning == 1) {
} }
} }