etc
/
furnace
mirror of https://github.com/tildearrow/furnace.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'tildearrow:master' into master

This commit is contained in:
Waverider 2022-12-20 13:22:48 -05:00 committed by GitHub
parent f07f4cf692 15afb1da84
commit 256152c12a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 863 additions and 754 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -424,6 +424,8 @@ src/engine/platform/sound/ymfm/ymfm_ssg.cpp
src/engine/platform/sound/lynx/Mikey.cpp
src/engine/platform/sound/pokey/mzpokeysnd.c
src/engine/platform/sound/qsound.c
src/engine/platform/sound/swan.cpp
@ -508,6 +510,7 @@ src/engine/platform/pcspkr.cpp
src/engine/platform/segapcm.cpp
src/engine/platform/qsound.cpp
src/engine/platform/x1_010.cpp
src/engine/platform/pokey.cpp
src/engine/platform/lynx.cpp
src/engine/platform/su.cpp
src/engine/platform/swan.cpp

34
papers/doc/7-systems/pokey.md Normal file
View File

@ -0,0 +1,34 @@
# POKEY
a sound and input chip developed by Atari for their 8-bit computers (Atari 400, 800, XL/XE and so on). 4 channels of signature Atari sounds.
# effects
- 10xx: set waveform.
- 0: harsh noise (poly5+17)
- 1: square buzz (poly5)
- 2: weird noise (poly4+5)
- 3: square buzz (poly5)
- 4: soft noise (poly17)
- 5: square
- 6: bass (poly4)
- 7: buzz (poly4)
- 11xx: set AUDCTL. `xx` is a bitmask.
- bit 7: 9-bit poly mode. shortens noise.
- bit 6: high channel 1 clock (~1.79MHz on NTSC).
- overrides 15KHz mode.
- bit 5: high channel 3 clock (~1.79MHz on NTSC).
- overrides 15KHz mode.
- bit 4: join channels 1 and 2 for a wide period range.
- use with conjunction with bit 6.
- channel 2 becomes inaccessible when this is on.
- bit 3: join channels 3 and 4 for a wide period range.
- use with conjunction with bit 5.
- channel 4 becomes inaccessible when this is on.
- bit 2: high-pass filter (channels 1 and 3).
- filtered output on channel 1 (I suggest you to set channel 3 volume to 0).
- use for PWM effects (not automatic!).
- bit 1: high-pass filter (channels 2 and 4).
- filtered output on channel 2 (I suggest you to set channel 4 volume to 0).
- use for PWM effects (not automatic!).
- bit 0: 15KHz mode.

4
src/engine/dispatchContainer.cpp
View File

@ -57,6 +57,7 @@
#include "platform/su.h"
#include "platform/swan.h"
#include "platform/lynx.h"
#include "platform/pokey.h"
#include "platform/zxbeeper.h"
#include "platform/bubsyswsg.h"
#include "platform/n163.h"
@ -338,6 +339,9 @@ void DivDispatchContainer::init(DivSystem sys, DivEngine* eng, int chanCount, do
case DIV_SYSTEM_LYNX:
dispatch=new DivPlatformLynx;
break;
case DIV_SYSTEM_POKEY:
dispatch=new DivPlatformPOKEY;
break;
case DIV_SYSTEM_QSOUND:
dispatch=new DivPlatformQSound;
break;

4
src/engine/platform/arcade.cpp
View File

@ -353,9 +353,9 @@ void DivPlatformArcade::tick(bool sysTick) {
chan[i].freq=chan[i].baseFreq+(chan[i].pitch>>1)-64+chan[i].pitch2;
if (!parent->song.oldArpStrategy) {
if (chan[i].fixedArp) {
chan[i].freq=(chan[i].baseNoteOverride<<7)+(chan[i].pitch>>1)-64+chan[i].pitch2;
chan[i].freq=(chan[i].baseNoteOverride<<6)+(chan[i].pitch>>1)-64+chan[i].pitch2;
} else {
chan[i].freq+=chan[i].arpOff<<7;
chan[i].freq+=chan[i].arpOff<<6;
}
}
if (chan[i].freq<0) chan[i].freq=0;

446
src/engine/platform/pokey.cpp Normal file
View File

@ -0,0 +1,446 @@
/**
* Furnace Tracker - multi-system chiptune tracker
* Copyright (C) 2021-2022 tildearrow and contributors
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "pokey.h"
#include "../engine.h"
#include "../../ta-log.h"
#define rWrite(a,v) if (!skipRegisterWrites) {writes.emplace(a,v); if (dumpWrites) {addWrite(a,v);} }
#define CHIP_DIVIDER 1
const char* regCheatSheetPOKEY[]={
"AUDF1", "0",
"AUDC1", "1",
"AUDF2", "2",
"AUDC2", "3",
"AUDF3", "4",
"AUDC3", "5",
"AUDF4", "6",
"AUDC4", "7",
"AUDCTL", "8",
NULL
};
// LLsLSsLLsSLsLLn
const unsigned char snapPeriodLong[15]={
0, 1, 1, 3, 3, 6, 6, 7, 7, 10, 10, 12, 12, 13, 13
};
const unsigned char snapPeriodShort[15]={
2, 2, 2, 2, 5, 5, 5, 8, 8, 11, 11, 11, 11, 17, 17
};
// LsSLsLLnLLsLSsL
const unsigned char snapPeriodLong16[15]={
0, 0, 3, 3, 3, 5, 6, 6, 8, 9, 9, 11, 11, 14, 14
};
const unsigned char snapPeriodShort16[15]={
1, 1, 1, 4, 4, 4, 4, 4, 10, 10, 10, 10, 13, 13, 13
};
const unsigned char waveMap[8]={
0, 1, 2, 3, 4, 5, 6, 6
};
const char** DivPlatformPOKEY::getRegisterSheet() {
return regCheatSheetPOKEY;
}
void DivPlatformPOKEY::acquire(short* bufL, short* bufR, size_t start, size_t len) {
for (size_t h=start; h<start+len; h++) {
while (!writes.empty()) {
QueuedWrite w=writes.front();
Update_pokey_sound_mz(&pokey,w.addr,w.val,0);
regPool[w.addr&0x0f]=w.val;
writes.pop();
}
mzpokeysnd_process_16(&pokey,&bufL[h],1);
}
}
void DivPlatformPOKEY::tick(bool sysTick) {
for (int i=0; i<4; i++) {
chan[i].std.next();
if (chan[i].std.vol.had) {
chan[i].outVol=VOL_SCALE_LINEAR(chan[i].vol&15,MIN(15,chan[i].std.vol.val),15);
chan[i].ctlChanged=true;
}
if (NEW_ARP_STRAT) {
chan[i].handleArp();
} else if (chan[i].std.arp.had) {
if (!chan[i].inPorta) {
chan[i].baseFreq=NOTE_PERIODIC(parent->calcArp(chan[i].note,chan[i].std.arp.val));
}
chan[i].freqChanged=true;
}
if (chan[i].std.duty.had) {
audctl=chan[i].std.duty.val;
audctlChanged=true;
}
if (chan[i].std.wave.had) {
chan[i].wave=chan[i].std.wave.val;
chan[i].ctlChanged=true;
chan[i].freqChanged=true;
}
if (chan[i].std.pitch.had) {
if (chan[i].std.pitch.mode) {
chan[i].pitch2+=chan[i].std.pitch.val;
CLAMP_VAR(chan[i].pitch2,-32768,32767);
} else {
chan[i].pitch2=chan[i].std.pitch.val;
}
chan[i].freqChanged=true;
}
}
if (audctlChanged) {
audctlChanged=false;
rWrite(8,audctl);
for (int i=0; i<4; i++) {
chan[i].freqChanged=true;
chan[i].ctlChanged=true;
}
}
for (int i=0; i<4; i++) {
if (chan[i].freqChanged || chan[i].keyOn || chan[i].keyOff) {
chan[i].freq=parent->calcFreq(chan[i].baseFreq,chan[i].pitch,chan[i].fixedArp?chan[i].baseNoteOverride:chan[i].arpOff,chan[i].fixedArp,true,0,chan[i].pitch2,chipClock,CHIP_DIVIDER);
if ((i==0 && !(audctl&64)) || (i==2 && !(audctl&32)) || i==1 || i==3) {
chan[i].freq/=7;
switch (chan[i].wave) {
case 6:
chan[i].freq/=5;
chan[i].freq>>=1;
break;
case 7:
if (audctl&1) {
chan[i].freq/=5;
} else {
chan[i].freq/=15;
}
chan[i].freq>>=1;
break;
default:
chan[i].freq>>=2;
break;
}
} else if ((i==0 && audctl&64) || (i==2 && audctl&32)) {
switch (chan[i].wave) {
case 6:
chan[i].freq<<=1;
chan[i].freq/=5;
break;
case 7:
chan[i].freq<<=1;
chan[i].freq/=15;
break;
}
}
if (audctl&1 && !((i==0 && audctl&64) || (i==2 && audctl&32))) {
chan[i].freq>>=2;
}
if (--chan[i].freq<0) chan[i].freq=0;
// snap buzz periods
int minFreq8=255;
if (chan[i].wave==7) {
if ((i==0 && audctl&64) || (i==2 && audctl&32)) {
chan[i].freq=15*(chan[i].freq/15)+snapPeriodLong16[(chan[i].freq%15)]+1;
} else {
if (!(audctl&1)) chan[i].freq=15*(chan[i].freq/15)+snapPeriodLong[(chan[i].freq%15)];
}
} else if (chan[i].wave==6) {
if ((i==0 && audctl&64) || (i==2 && audctl&32)) {
chan[i].freq=15*(chan[i].freq/15)+snapPeriodShort16[(chan[i].freq%15)]+1;
} else {
if (!(audctl&1)) chan[i].freq=15*(chan[i].freq/15)+snapPeriodShort[(chan[i].freq%15)];
}
minFreq8=251;
}
if ((i==0 && audctl&16) || (i==2 && audctl&8)) {
if (chan[i].freq>65535) chan[i].freq=65535;
} else {
if (chan[i].freq>minFreq8) chan[i].freq=minFreq8;
}
// write frequency
if ((i==1 && audctl&16) || (i==3 && audctl&8)) {
// ignore - channel is paired
} else {
rWrite(i<<1,chan[i].freq&0xff);
if ((i==0 && audctl&16) || (i==2 && audctl&8)) {
rWrite((1+i)<<1,chan[i].freq>>8);
}
}
if (chan[i].keyOff) {
chan[i].ctlChanged=true;
}
if (chan[i].keyOn) chan[i].keyOn=false;
if (chan[i].keyOff) chan[i].keyOff=false;
chan[i].freqChanged=false;
}
if (chan[i].ctlChanged) {
unsigned char val=((chan[i].active && !isMuted[i])?(chan[i].outVol&15):0)|(waveMap[chan[i].wave&7]<<5);
chan[i].ctlChanged=false;
if ((i==1 && audctl&16) || (i==3 && audctl&8)) {
// ignore - channel is paired
} else if ((i==0 && audctl&16) || (i==0 && audctl&8)) {
rWrite(1+(i<<1),0);
rWrite(3+(i<<1),val);
} else {
rWrite(1+(i<<1),val);
}
}
}
}
int DivPlatformPOKEY::dispatch(DivCommand c) {
switch (c.cmd) {
case DIV_CMD_NOTE_ON: {
DivInstrument* ins=parent->getIns(chan[c.chan].ins,DIV_INS_POKEY);
if (c.value!=DIV_NOTE_NULL) {
chan[c.chan].baseFreq=NOTE_PERIODIC(c.value);
chan[c.chan].freqChanged=true;
chan[c.chan].note=c.value;
}
chan[c.chan].active=true;
chan[c.chan].keyOn=true;
chan[c.chan].macroInit(ins);
if (!parent->song.brokenOutVol && !chan[c.chan].std.vol.will) {
chan[c.chan].outVol=chan[c.chan].vol;
chan[c.chan].ctlChanged=true;
}
chan[c.chan].insChanged=false;
break;
}
case DIV_CMD_NOTE_OFF:
chan[c.chan].active=false;
chan[c.chan].keyOff=true;
chan[c.chan].macroInit(NULL);
break;
case DIV_CMD_NOTE_OFF_ENV:
case DIV_CMD_ENV_RELEASE:
chan[c.chan].std.release();
break;
case DIV_CMD_INSTRUMENT:
if (chan[c.chan].ins!=c.value || c.value2==1) {
chan[c.chan].ins=c.value;
chan[c.chan].insChanged=true;
}
break;
case DIV_CMD_VOLUME:
if (chan[c.chan].vol!=c.value) {
chan[c.chan].vol=c.value;
if (!chan[c.chan].std.vol.has) {
chan[c.chan].outVol=c.value;
if (chan[c.chan].active) {
chan[c.chan].ctlChanged=true;
}
}
}
break;
case DIV_CMD_GET_VOLUME:
if (chan[c.chan].std.vol.has) {
return chan[c.chan].vol;
}
return chan[c.chan].outVol;
break;
case DIV_CMD_PITCH:
chan[c.chan].pitch=c.value;
chan[c.chan].freqChanged=true;
break;
case DIV_CMD_WAVE:
chan[c.chan].wave=c.value;
chan[c.chan].ctlChanged=true;
break;
case DIV_CMD_STD_NOISE_MODE:
audctl=c.value&0xff;
audctlChanged=true;
break;
case DIV_CMD_NOTE_PORTA: {
int destFreq=NOTE_PERIODIC(c.value2);
bool return2=false;
if (destFreq>chan[c.chan].baseFreq) {
chan[c.chan].baseFreq+=c.value;
if (chan[c.chan].baseFreq>=destFreq) {
chan[c.chan].baseFreq=destFreq;
return2=true;
}
} else {
chan[c.chan].baseFreq-=c.value;
if (chan[c.chan].baseFreq<=destFreq) {
chan[c.chan].baseFreq=destFreq;
return2=true;
}
}
chan[c.chan].freqChanged=true;
if (return2) {
chan[c.chan].inPorta=false;
return 2;
}
break;
}
case DIV_CMD_LEGATO:
chan[c.chan].baseFreq=NOTE_PERIODIC(c.value);
chan[c.chan].freqChanged=true;
chan[c.chan].note=c.value;
break;
case DIV_CMD_PRE_PORTA:
if (chan[c.chan].active && c.value2) {
if (parent->song.resetMacroOnPorta) chan[c.chan].macroInit(parent->getIns(chan[c.chan].ins,DIV_INS_POKEY));
}
if (!chan[c.chan].inPorta && c.value && !parent->song.brokenPortaArp && chan[c.chan].std.arp.will && !NEW_ARP_STRAT) chan[c.chan].baseFreq=NOTE_PERIODIC(chan[c.chan].note);
chan[c.chan].inPorta=c.value;
break;
case DIV_CMD_GET_VOLMAX:
return 15;
break;
case DIV_CMD_MACRO_OFF:
chan[c.chan].std.mask(c.value,true);
break;
case DIV_CMD_MACRO_ON:
chan[c.chan].std.mask(c.value,false);
break;
case DIV_ALWAYS_SET_VOLUME:
return 1;
break;
default:
break;
}
return 1;
}
void DivPlatformPOKEY::muteChannel(int ch, bool mute) {
isMuted[ch]=mute;
chan[ch].ctlChanged=true;
}
void DivPlatformPOKEY::forceIns() {
for (int i=0; i<4; i++) {
chan[i].insChanged=true;
chan[i].ctlChanged=true;
chan[i].freqChanged=true;
}
}
void* DivPlatformPOKEY::getChanState(int ch) {
return &chan[ch];
}
DivMacroInt* DivPlatformPOKEY::getChanMacroInt(int ch) {
return &chan[ch].std;
}
DivDispatchOscBuffer* DivPlatformPOKEY::getOscBuffer(int ch) {
return oscBuf[ch];
}
unsigned char* DivPlatformPOKEY::getRegisterPool() {
return regPool;
}
int DivPlatformPOKEY::getRegisterPoolSize() {
return 9;
}
void DivPlatformPOKEY::reset() {
while (!writes.empty()) writes.pop();
memset(regPool,0,16);
for (int i=0; i<4; i++) {
chan[i]=DivPlatformPOKEY::Channel();
chan[i].std.setEngine(parent);
}
if (dumpWrites) {
addWrite(0xffffffff,0);
}
ResetPokeyState(&pokey);
audctl=0;
audctlChanged=true;
}
bool DivPlatformPOKEY::keyOffAffectsArp(int ch) {
return true;
}
float DivPlatformPOKEY::getPostAmp() {
return 2.0f;
}
void DivPlatformPOKEY::notifyInsDeletion(void* ins) {
for (int i=0; i<4; i++) {
chan[i].std.notifyInsDeletion((DivInstrument*)ins);
}
}
void DivPlatformPOKEY::setFlags(const DivConfig& flags) {
if (flags.getInt("clockSel",0)) {
chipClock=COLOR_PAL*2.0/5.0;
} else {
chipClock=COLOR_NTSC/2.0;
}
CHECK_CUSTOM_CLOCK;
rate=chipClock;
for (int i=0; i<4; i++) {
oscBuf[i]->rate=rate/16;
}
}
void DivPlatformPOKEY::poke(unsigned int addr, unsigned short val) {
rWrite(addr,val);
}
void DivPlatformPOKEY::poke(std::vector<DivRegWrite>& wlist) {
for (DivRegWrite& i: wlist) rWrite(i.addr,i.val);
}
int DivPlatformPOKEY::init(DivEngine* p, int channels, int sugRate, const DivConfig& flags) {
parent=p;
dumpWrites=false;
skipRegisterWrites=false;
for (int i=0; i<4; i++) {
isMuted[i]=false;
oscBuf[i]=new DivDispatchOscBuffer;
}
MZPOKEYSND_Init(&pokey);
setFlags(flags);
reset();
return 6;
}
void DivPlatformPOKEY::quit() {
for (int i=0; i<4; i++) {
delete oscBuf[i];
}
}
DivPlatformPOKEY::~DivPlatformPOKEY() {
}

78
src/engine/platform/pokey.h Normal file
View File

@ -0,0 +1,78 @@
/**
* Furnace Tracker - multi-system chiptune tracker
* Copyright (C) 2021-2022 tildearrow and contributors
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef _POKEY_H
#define _POKEY_H
#include "../dispatch.h"
#include <queue>
extern "C" {
#include "sound/pokey/mzpokeysnd.h"
}
class DivPlatformPOKEY: public DivDispatch {
struct Channel: public SharedChannel<int> {
unsigned char wave;
bool ctlChanged;
Channel():
SharedChannel<int>(15),
wave(5),
ctlChanged(true) {}
};
Channel chan[4];
DivDispatchOscBuffer* oscBuf[4];
bool isMuted[4];
struct QueuedWrite {
unsigned char addr;
unsigned char val;
QueuedWrite(unsigned char a, unsigned char v): addr(a), val(v) {}
};
std::queue<QueuedWrite> writes;
unsigned char audctl;
bool audctlChanged;
PokeyState pokey;
unsigned char regPool[16];
friend void putDispatchChip(void*,int);
friend void putDispatchChan(void*,int,int);
public:
void acquire(short* bufL, short* bufR, size_t start, size_t len);
int dispatch(DivCommand c);
void* getChanState(int chan);
DivMacroInt* getChanMacroInt(int ch);
DivDispatchOscBuffer* getOscBuffer(int chan);
unsigned char* getRegisterPool();
int getRegisterPoolSize();
void reset();
void forceIns();
void tick(bool sysTick=true);
void muteChannel(int ch, bool mute);
bool keyOffAffectsArp(int ch);
float getPostAmp();
void setFlags(const DivConfig& flags);
void notifyInsDeletion(void* ins);
void poke(unsigned int addr, unsigned short val);
void poke(std::vector<DivRegWrite>& wlist);
const char** getRegisterSheet();
int init(DivEngine* parent, int channels, int sugRate, const DivConfig& flags);
void quit();
~DivPlatformPOKEY();
};
#endif

840
src/engine/platform/sound/pokey/mzpokeysnd.c
View File

File diff suppressed because it is too large Load Diff

159
src/engine/platform/sound/pokey/mzpokeysnd.h
View File

@ -3,11 +3,158 @@
#include <stdlib.h>
int MZPOKEYSND_Init(size_t freq17,
int playback_freq,
int flags,
int quality
, int clear_regs
);
struct stPokeyState;
typedef int (*readout_t)(struct stPokeyState* ps);
typedef void (*event_t)(struct stPokeyState* ps, int p5v, int p4v, int p917v);
#ifdef NONLINEAR_MIXING
/* Change queue event value type */
typedef double qev_t;
#else
typedef unsigned char qev_t;
#endif
/* State variables for single Pokey Chip */
typedef struct stPokeyState
{
int curtick;
/* Poly positions */
int poly4pos;
int poly5pos;
int poly17pos;
int poly9pos;
/* Main divider (64khz/15khz) */
int mdivk; /* 28 for 64khz, 114 for 15khz */
/* Main switches */
int selpoly9;
int c0_hf;
int c1_f0;
int c2_hf;
int c3_f2;
/* SKCTL for two-tone mode */
int skctl;
/* Main output state */
qev_t outvol_all;
int forcero; /* Force readout */
/* channel 0 state */
readout_t readout_0;
event_t event_0;
int c0divpos;
int c0divstart; /* AUDF0 recalculated */
int c0divstart_p; /* start value when c1_f0 */
int c0diva; /* AUDF0 register */
int c0t1; /* D - 5bit, Q goes to sw3 */
int c0t2; /* D - out sw2, Q goes to sw4 and t3 */
int c0t3; /* D - out t2, q goes to xor */
int c0sw1; /* in1 - 4bit, in2 - 17bit, out goes to sw2 */
int c0sw2; /* in1 - /Q t2, in2 - out sw1, out goes to t2 */
int c0sw3; /* in1 - +5, in2 - Q t1, out goes to C t2 */
int c0sw4; /* hi-pass sw */
int c0vo; /* volume only */
#ifndef NONLINEAR_MIXING
int c0stop; /* channel counter stopped */
#endif
int vol0;
int outvol_0;
/* channel 1 state */
readout_t readout_1;
event_t event_1;
int c1divpos;
int c1divstart;
int c1diva;
int c1t1;
int c1t2;
int c1t3;
int c1sw1;
int c1sw2;
int c1sw3;
int c1sw4;
int c1vo;
#ifndef NONLINEAR_MIXING
int c1stop; /* channel counter stopped */
#endif
int vol1;
int outvol_1;
/* channel 2 state */
readout_t readout_2;
event_t event_2;
int c2divpos;
int c2divstart;
int c2divstart_p; /* start value when c1_f0 */
int c2diva;
int c2t1;
int c2t2;
int c2sw1;
int c2sw2;
int c2sw3;
int c2vo;
#ifndef NONLINEAR_MIXING
int c2stop; /* channel counter stopped */
#endif
int vol2;
int outvol_2;
/* channel 3 state */
readout_t readout_3;
event_t event_3;
int c3divpos;
int c3divstart;
int c3diva;
int c3t1;
int c3t2;
int c3sw1;
int c3sw2;
int c3sw3;
int c3vo;
#ifndef NONLINEAR_MIXING
int c3stop; /* channel counter stopped */
#endif
int vol3;
int outvol_3;
} PokeyState;
void mzpokeysnd_process_8(PokeyState* ps, void* sndbuffer, int sndn);
void mzpokeysnd_process_16(PokeyState* ps, void* sndbuffer, int sndn);
void Update_pokey_sound_mz(PokeyState* ps, unsigned short addr, unsigned char val, unsigned char gain);
void ResetPokeyState(PokeyState* ps);
int MZPOKEYSND_Init(PokeyState* ps);
#endif /* MZPOKEYSND_H_ */

11
src/engine/platform/sound/pokey/pokey.h
View File

@ -75,15 +75,4 @@
#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_ */

4
src/engine/platform/tx81z.cpp
View File

@ -306,9 +306,9 @@ void DivPlatformTX81Z::tick(bool sysTick) {
chan[i].freq=chan[i].baseFreq+(chan[i].pitch>>1)-64+chan[i].pitch2;
if (!parent->song.oldArpStrategy) {
if (chan[i].fixedArp) {
chan[i].freq=(chan[i].baseNoteOverride<<7)+(chan[i].pitch>>1)-64+chan[i].pitch2;
chan[i].freq=(chan[i].baseNoteOverride<<6)+(chan[i].pitch>>1)-64+chan[i].pitch2;
} else {
chan[i].freq+=chan[i].arpOff<<7;
chan[i].freq+=chan[i].arpOff<<6;
}
}
if (chan[i].freq<0) chan[i].freq=0;

7
src/engine/sysDef.cpp
View File

@ -1124,7 +1124,12 @@ void DivEngine::registerSystems() {
{"Channel 1", "Channel 2", "Channel 3", "Channel 4"},
{"CH1", "CH2", "CH3", "CH4"},
{DIV_CH_WAVE, DIV_CH_WAVE, DIV_CH_WAVE, DIV_CH_WAVE},
{DIV_INS_POKEY, DIV_INS_POKEY, DIV_INS_POKEY, DIV_INS_POKEY}
{DIV_INS_POKEY, DIV_INS_POKEY, DIV_INS_POKEY, DIV_INS_POKEY},
{},
{
{0x10, {DIV_CMD_WAVE, "10xx: Set waveform (0 to 7)"}},
{0x11, {DIV_CMD_STD_NOISE_MODE, "11xx: Set AUDCTL"}},
}
);
sysDefs[DIV_SYSTEM_RF5C68]=new DivSysDef(

2
src/gui/guiConst.cpp
View File

@ -958,6 +958,7 @@ const int availableSystems[]={
DIV_SYSTEM_TIA,
DIV_SYSTEM_SAA1099,
DIV_SYSTEM_AY8930,
DIV_SYSTEM_POKEY,
DIV_SYSTEM_LYNX,
DIV_SYSTEM_QSOUND,
DIV_SYSTEM_X1_010,
@ -1063,6 +1064,7 @@ const int chipsSpecial[]={
DIV_SYSTEM_SOUND_UNIT,
DIV_SYSTEM_TIA,
DIV_SYSTEM_AY8930,
DIV_SYSTEM_POKEY,
DIV_SYSTEM_LYNX,
DIV_SYSTEM_VERA,
DIV_SYSTEM_PET,

12
src/gui/insEdit.cpp
View File

@ -255,6 +255,10 @@ const char* c64SpecialBits[3]={
"sync", "ring", NULL
};
const char* pokeyCtlBits[9]={
"15KHz", "filter 2+4", "filter 1+3", "16-bit 3+4", "16-bit 1+2", "high3", "high1", "poly9", NULL
};
const char* mikeyFeedbackBits[11] = {
"0", "1", "2", "3", "4", "5", "7", "10", "11", "int", NULL
};
@ -4979,6 +4983,10 @@ void FurnaceGUI::drawInsEdit() {
if (ins->type==DIV_INS_AY || ins->type==DIV_INS_AY8930 || ins->type==DIV_INS_FM || ins->type==DIV_INS_OPM) {
dutyLabel="Noise Freq";
}
if (ins->type==DIV_INS_POKEY) {
dutyLabel="AUDCTL";
dutyMax=8;
}
if (ins->type==DIV_INS_MIKEY) {
dutyLabel="Duty/Int";
dutyMax=ins->amiga.useSample?0:10;
@ -5086,7 +5094,7 @@ void FurnaceGUI::drawInsEdit() {
if (ins->type==DIV_INS_K007232) waveMax=0;
if (ins->type==DIV_INS_GA20) waveMax=0;
if (ins->type==DIV_INS_POKEMINI) waveMax=0;
if (ins->type==DIV_INS_SU) waveMax=7;
if (ins->type==DIV_INS_SU || ins->type==DIV_INS_POKEY) waveMax=7;
if (ins->type==DIV_INS_PET) {
waveMax=8;
waveBitMode=true;
@ -5220,6 +5228,8 @@ void FurnaceGUI::drawInsEdit() {
if (dutyMax>0) {
if (ins->type==DIV_INS_MIKEY) {
macroList.push_back(FurnaceGUIMacroDesc(dutyLabel,&ins->std.dutyMacro,0,dutyMax,160,uiColors[GUI_COLOR_MACRO_OTHER],false,NULL,NULL,true,mikeyFeedbackBits));
} else if (ins->type==DIV_INS_POKEY) {
macroList.push_back(FurnaceGUIMacroDesc(dutyLabel,&ins->std.dutyMacro,0,dutyMax,160,uiColors[GUI_COLOR_MACRO_OTHER],false,NULL,NULL,true,pokeyCtlBits));
} else if (ins->type==DIV_INS_MSM5232) {
macroList.push_back(FurnaceGUIMacroDesc(dutyLabel,&ins->std.dutyMacro,0,dutyMax,160,uiColors[GUI_COLOR_MACRO_OTHER],false,NULL,NULL,true,msm5232ControlBits));
} else if (ins->type==DIV_INS_ES5506) {

13
src/gui/presets.cpp
View File

@ -826,6 +826,19 @@ void FurnaceGUI::initSystemPresets() {
CH(DIV_SYSTEM_AY8910, 64, 0, "clockSel=5")
}
);
ENTRY(
"Atari 800", {
CH(DIV_SYSTEM_POKEY, 64, 0, "clockSel=1")
},
"tickRate=50"
);
ENTRY(
"Atari 800 (stereo)", {
CH(DIV_SYSTEM_POKEY, 64, -127, "clockSel=1"),
CH(DIV_SYSTEM_POKEY, 64, 127, "clockSel=1"),
},
"tickRate=50"
);
ENTRY(
"Atari ST", {
CH(DIV_SYSTEM_AY8910, 64, 0,