Merge branch 'tildearrow:master' into master

src/engine/platform/sound/pokey/mzpokeysnd.c

@@ -25,17 +25,10 @@
 // additional modifications for Furnace by tildearrow
 
 #define _USE_MATH_DEFINES
-#include "config.h"
 #include <stdlib.h>
 #include <math.h>
 
-#include "asap_internal.h"
-#include "atari.h"
 #include "mzpokeysnd.h"
-#include "pokeysnd.h"
-#include "remez.h"
-#include "antic.h"
-#include "gtia.h"
 
 #define CONSOLE_VOL 8
 #ifdef NONLINEAR_MIXING
@@ -1221,9 +1214,9 @@ found:
   return size;
 }
 
-static void mzpokeysnd_process_8(void* sndbuffer, int sndn);
+void mzpokeysnd_process_8(void* sndbuffer, int sndn);
-static void mzpokeysnd_process_16(void* sndbuffer, int sndn);
+void mzpokeysnd_process_16(void* sndbuffer, int sndn);
-static void Update_pokey_sound_mz(UWORD addr, UBYTE val, UBYTE gain);
+void Update_pokey_sound_mz(UWORD addr, UBYTE val, UBYTE gain);
 #ifdef VOL_ONLY_SOUND
 static void Update_vol_only_sound_mz( void );
 #endif
@@ -1857,7 +1850,7 @@ static void Update_c3stop(PokeyState* ps)
 /* Outputs: Adjusts local globals - no return value                          */
 /*                                                                           */
 /*****************************************************************************/
-static void Update_pokey_sound_mz(UWORD addr, UBYTE val, UBYTE gain)
+void Update_pokey_sound_mz(UWORD addr, UBYTE val, UBYTE gain)
 {
     PokeyState* ps = pokey_states;
 
@@ -2162,7 +2155,7 @@ static void Update_pokey_sound_mz(UWORD addr, UBYTE val, UBYTE gain)
 
 #define MAX_SAMPLE 152
 
-static void mzpokeysnd_process_8(void* sndbuffer, int sndn)
+void mzpokeysnd_process_8(void* sndbuffer, int sndn)
 {
     int i;
     int nsam = sndn;
@@ -2203,7 +2196,7 @@ static void mzpokeysnd_process_8(void* sndbuffer, int sndn)
     }
 }
 
-static void mzpokeysnd_process_16(void* sndbuffer, int sndn)
+void mzpokeysnd_process_16(void* sndbuffer, int sndn)
 {
     int i;
     int nsam = sndn;

src/engine/platform/sound/pokey/mzpokeysnd.h

@@ -1,6 +1,8 @@
 #ifndef MZPOKEYSND_H_
 #define MZPOKEYSND_H_
 
+#include <stdlib.h>
+
 int MZPOKEYSND_Init(size_t freq17,
                         int playback_freq,
                         int flags,

src/engine/platform/sound/pokey/pokey.h

@@ -0,0 +1,89 @@
+#ifndef POKEY_H_
+#define POKEY_H_
+
+#define POKEY_OFFSET_AUDF1 0x00
+#define POKEY_OFFSET_AUDC1 0x01
+#define POKEY_OFFSET_AUDF2 0x02
+#define POKEY_OFFSET_AUDC2 0x03
+#define POKEY_OFFSET_AUDF3 0x04
+#define POKEY_OFFSET_AUDC3 0x05
+#define POKEY_OFFSET_AUDF4 0x06
+#define POKEY_OFFSET_AUDC4 0x07
+#define POKEY_OFFSET_AUDCTL 0x08
+#define POKEY_OFFSET_STIMER 0x09
+#define POKEY_OFFSET_SKRES 0x0a
+#define POKEY_OFFSET_POTGO 0x0b
+#define POKEY_OFFSET_SEROUT 0x0d
+#define POKEY_OFFSET_IRQEN 0x0e
+#define POKEY_OFFSET_SKCTL 0x0f
+
+#define POKEY_OFFSET_POT0 0x00
+#define POKEY_OFFSET_POT1 0x01
+#define POKEY_OFFSET_POT2 0x02
+#define POKEY_OFFSET_POT3 0x03
+#define POKEY_OFFSET_POT4 0x04
+#define POKEY_OFFSET_POT5 0x05
+#define POKEY_OFFSET_POT6 0x06
+#define POKEY_OFFSET_POT7 0x07
+#define POKEY_OFFSET_ALLPOT 0x08
+#define POKEY_OFFSET_KBCODE 0x09
+#define POKEY_OFFSET_RANDOM 0x0a
+#define POKEY_OFFSET_SERIN 0x0d
+#define POKEY_OFFSET_IRQST 0x0e
+#define POKEY_OFFSET_SKSTAT 0x0f
+
+/* CONSTANT DEFINITIONS */
+
+/* definitions for AUDCx (D201, D203, D205, D207) */
+#define POKEY_NOTPOLY5    0x80		/* selects POLY5 or direct CLOCK */
+#define POKEY_POLY4       0x40		/* selects POLY4 or POLY17 */
+#define POKEY_PURETONE    0x20		/* selects POLY4/17 or PURE tone */
+#define POKEY_VOL_ONLY    0x10		/* selects VOLUME OUTPUT ONLY */
+#define POKEY_VOLUME_MASK 0x0f		/* volume mask */
+
+/* definitions for AUDCTL (D208) */
+#define POKEY_POLY9       0x80		/* selects POLY9 or POLY17 */
+#define POKEY_CH1_179     0x40		/* selects 1.78979 MHz for Ch 1 */
+#define POKEY_CH3_179     0x20		/* selects 1.78979 MHz for Ch 3 */
+#define POKEY_CH1_CH2     0x10		/* clocks channel 1 w/channel 2 */
+#define POKEY_CH3_CH4     0x08		/* clocks channel 3 w/channel 4 */
+#define POKEY_CH1_FILTER  0x04		/* selects channel 1 high pass filter */
+#define POKEY_CH2_FILTER  0x02		/* selects channel 2 high pass filter */
+#define POKEY_CLOCK_15    0x01		/* selects 15.6999kHz or 63.9210kHz */
+
+/* for accuracy, the 64kHz and 15kHz clocks are exact divisions of
+   the 1.79MHz clock */
+#define POKEY_DIV_64      28			/* divisor for 1.79MHz clock to 64 kHz */
+#define POKEY_DIV_15      114			/* divisor for 1.79MHz clock to 15 kHz */
+
+/* the size (in entries) of the 4 polynomial tables */
+#define POKEY_POLY4_SIZE  0x000f
+#define POKEY_POLY5_SIZE  0x001f
+#define POKEY_POLY9_SIZE  0x01ff
+#define POKEY_POLY17_SIZE 0x0001ffff
+
+#define POKEY_MAXPOKEYS         2		/* max number of emulated chips */
+
+/* channel/chip definitions */
+#define POKEY_CHAN1       0
+#define POKEY_CHAN2       1
+#define POKEY_CHAN3       2
+#define POKEY_CHAN4       3
+#define POKEY_CHIP1       0
+#define POKEY_CHIP2       4
+#define POKEY_CHIP3       8
+#define POKEY_CHIP4      12
+#define POKEY_SAMPLE    127
+
+/* structures to hold the 9 pokey control bytes */
+extern UBYTE POKEY_AUDF[4 * POKEY_MAXPOKEYS];	/* AUDFx (D200, D202, D204, D206) */
+extern UBYTE POKEY_AUDC[4 * POKEY_MAXPOKEYS];	/* AUDCx (D201, D203, D205, D207) */
+extern UBYTE POKEY_AUDCTL[POKEY_MAXPOKEYS];		/* AUDCTL (D208) */
+
+extern int POKEY_DivNIRQ[4], POKEY_DivNMax[4];
+extern int POKEY_Base_mult[POKEY_MAXPOKEYS];	/* selects either 64Khz or 15Khz clock mult */
+
+extern UBYTE POKEY_poly9_lookup[POKEY_POLY9_SIZE];
+extern UBYTE POKEY_poly17_lookup[16385];
+
+#endif /* POKEY_H_ */