Retro/pcem
Watch
1
0
Fork
You've already forked pcem
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improvements to PC speaker - fixes sound on Beyond Castle Wolfenstein and probably other games as well.

Browse source
This commit is contained in:
TomW 2014-07-16 20:44:29 +01:00
commit 67cb9e3781
8 changed files with 35 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/keyboard_amstrad.c
View file

@ -4,6 +4,7 @@
#include "pic.h"
#include "pit.h"
#include "sound.h"
#include "sound_speaker.h"
#include "timer.h"
#include "keyboard.h"
@ -75,9 +76,10 @@ void keyboard_amstrad_write(uint16_t port, uint8_t val, void *priv)
keyboard_amstrad.pb = val;
ppi.pb = val;
gated = ((val & 3) == 3);
if (gated)
wasgated = 1;
speaker_gated = val & 1;
speaker_enable = val & 2;
if (speaker_enable)
was_speaker_enable = 1;
pit_set_gate(2, val & 1);
if (val & 0x80)

8
src/keyboard_at.c
View file

@ -4,6 +4,7 @@
#include "pic.h"
#include "pit.h"
#include "sound.h"
#include "sound_speaker.h"
#include "timer.h"
#include "keyboard.h"
@ -271,9 +272,10 @@ void keyboard_at_write(uint16_t port, uint8_t val, void *priv)
case 0x61:
ppi.pb = val;
gated = ((val & 3) == 3);
if (gated)
wasgated = 1;
speaker_gated = val & 1;
speaker_enable = val & 2;
if (speaker_enable)
was_speaker_enable = 1;
pit_set_gate(2, val & 1);
break;

8
src/keyboard_olim24.c
View file

@ -4,6 +4,7 @@
#include "mouse.h"
#include "pic.h"
#include "sound.h"
#include "sound_speaker.h"
#include "timer.h"
#include "keyboard.h"
@ -143,9 +144,10 @@ void keyboard_olim24_write(uint16_t port, uint8_t val, void *priv)
case 0x61:
ppi.pb = val;
gated = ((val & 3) == 3);
if (gated)
wasgated = 1;
speaker_gated = val & 1;
speaker_enable = val & 2;
if (speaker_enable)
was_speaker_enable = 1;
pit_set_gate(2, val & 1);
break;
}

7
src/keyboard_pcjr.c
View file

@ -124,9 +124,10 @@ void keyboard_pcjr_write(uint16_t port, uint8_t val, void *priv)
case 0x61:
keyboard_pcjr.pb = val;
gated = ((val & 3) == 3);
if (gated)
wasgated = 1;
speaker_gated = val & 1;
speaker_enable = val & 2;
if (speaker_enable)
was_speaker_enable = 1;
pit_set_gate(2, val & 1);
sn76489_mute = speaker_mute = 1;
switch (val & 0x60)

8
src/keyboard_xt.c
View file

@ -3,6 +3,7 @@
#include "mem.h"
#include "pic.h"
#include "sound.h"
#include "sound_speaker.h"
#include "timer.h"
#include "keyboard.h"
@ -75,9 +76,10 @@ void keyboard_xt_write(uint16_t port, uint8_t val, void *priv)
keyboard_xt.pb = val;
ppi.pb = val;
gated = ((val & 3) == 3);
if (gated)
wasgated = 1;
speaker_gated = val & 1;
speaker_enable = val & 2;
if (speaker_enable)
was_speaker_enable = 1;
pit_set_gate(2, val & 1);
if (val & 0x80)

1
src/sound.h
View file

@ -1,6 +1,5 @@
void sound_add_handler(void (*poll)(void *p), void (*get_buffer)(int16_t *buffer, int len, void *p), void *p);
extern int wasgated;
extern int sbtype;
extern int sound_card_current;

14
src/sound_speaker.c
View file

@ -8,24 +8,26 @@ static int16_t speaker_buffer[SOUNDBUFLEN];
static int speaker_pos = 0;
int wasgated = 0;
int speaker_gated = 0;
int speaker_enable = 0, was_speaker_enable = 0;
static void speaker_poll(void *p)
{
if (speaker_pos >= SOUNDBUFLEN) return;
// printf("SPeaker - %i %i %i %02X\n",speakval,gated,speakon,pit.m[2]);
if (gated)
if (speaker_gated && was_speaker_enable)
{
if (!pit.m[2] || pit.m[2]==4)
speaker_buffer[speaker_pos] = speakval;
speaker_buffer[speaker_pos] = speakval;
else
speaker_buffer[speaker_pos] = speakon ? 0x1400 : 0;
speaker_buffer[speaker_pos] = speakon ? 0x1400 : 0;
}
else
speaker_buffer[speaker_pos] = wasgated ? 0x1400 : 0;
speaker_buffer[speaker_pos] = was_speaker_enable ? 0x1400 : 0;
speaker_pos++;
wasgated = 0;
if (!speaker_enable)
was_speaker_enable = 0;
}
static void speaker_get_buffer(int16_t *buffer, int len, void *p)

3
src/sound_speaker.h
View file

@ -1,3 +1,6 @@
void speaker_init();
extern int speaker_mute;
extern int speaker_gated;
extern int speaker_enable, was_speaker_enable;