libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-26 19:55:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

TOWNS/PC98: Replaced some tabs with spaces.

Browse Source 
svn-id: r51654
This commit is contained in:
Johannes Schickel 2010-08-02 19:36:49 +00:00
parent 7f2e880f70
commit 7f1f4c8b07
4 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sound/softsynth/fmtowns_pc98/towns_audio.cpp
View File

@ -779,12 +779,12 @@ int TownsAudioInterface::fmKeyOn(int chan, int note, int velo) {
v |= 4; v |= 4;
for (uint8 reg = 0x80 + chan; reg < 0x90; reg += 4) for (uint8 reg = 0x80 + chan; reg < 0x90; reg += 4)
writeReg(part, reg, _fmSaveReg[part][reg] | 0x0f); writeReg(part, reg, _fmSaveReg[part][reg] | 0x0f);
writeReg(0, 0x28, v); writeReg(0, 0x28, v);
for (uint8 reg = 0x80 + chan; reg < 0x90; reg += 4) for (uint8 reg = 0x80 + chan; reg < 0x90; reg += 4)
writeReg(part, reg, _fmSaveReg[part][reg]); writeReg(part, reg, _fmSaveReg[part][reg]);
bufferedWriteReg(0, 0x28, v | 0xf0); bufferedWriteReg(0, 0x28, v | 0xf0);

4
sound/softsynth/fmtowns_pc98/towns_euphony.cpp
View File

@ -109,7 +109,7 @@ void TownsEuphonyDriver::reset() {
if (_tempoControlMode == 1) { if (_tempoControlMode == 1) {
//if (///) //if (///)
// return; // return;
setTempoIntern(_defaultTempo); setTempoIntern(_defaultTempo);
} else { } else {
setTempoIntern(_defaultTempo); setTempoIntern(_defaultTempo);
@ -415,7 +415,7 @@ void TownsEuphonyDriver::updateCheckEot() {
} }
bool TownsEuphonyDriver::parseNext() { bool TownsEuphonyDriver::parseNext() {
#define OPC(x) &TownsEuphonyDriver::evt##x #define OPC(x) &TownsEuphonyDriver::evt##x
static const EuphonyOpcode opcodes[] = { static const EuphonyOpcode opcodes[] = {
OPC(NotImpl), OPC(NotImpl),
OPC(SetupNote), OPC(SetupNote),

42
sound/softsynth/fmtowns_pc98/towns_pc98_driver.cpp
View File

@ -34,13 +34,13 @@ public:
virtual void init(); virtual void init();
typedef enum channelState { typedef enum channelState {
CHS_RECALCFREQ = 0x01, CHS_RECALCFREQ = 0x01,
CHS_KEYOFF = 0x02, CHS_KEYOFF = 0x02,
CHS_SSGOFF = 0x04, CHS_SSGOFF = 0x04,
CHS_VBROFF = 0x08, CHS_VBROFF = 0x08,
CHS_ALLOFF = 0x0f, CHS_ALLOFF = 0x0f,
CHS_PROTECT = 0x40, CHS_PROTECT = 0x40,
CHS_EOT = 0x80 CHS_EOT = 0x80
} ChannelState; } ChannelState;
virtual void loadData(uint8 *data); virtual void loadData(uint8 *data);
@ -197,7 +197,7 @@ TownsPC98_MusicChannel::~TownsPC98_MusicChannel() {
} }
void TownsPC98_MusicChannel::init() { void TownsPC98_MusicChannel::init() {
#define Control(x) &TownsPC98_MusicChannel::control_##x #define Control(x) &TownsPC98_MusicChannel::control_##x
static const ControlEventFunc ctrlEvents[] = { static const ControlEventFunc ctrlEvents[] = {
Control(f0_setPatch), Control(f0_setPatch),
Control(f1_presetOutputLevel), Control(f1_presetOutputLevel),
@ -589,7 +589,7 @@ TownsPC98_MusicChannelSSG::TownsPC98_MusicChannelSSG(TownsPC98_AudioDriver *driv
void TownsPC98_MusicChannelSSG::init() { void TownsPC98_MusicChannelSSG::init() {
_algorithm = 0x80; _algorithm = 0x80;
#define Control(x) &TownsPC98_MusicChannelSSG::control_##x #define Control(x) &TownsPC98_MusicChannelSSG::control_##x
static const ControlEventFunc ctrlEventsSSG[] = { static const ControlEventFunc ctrlEventsSSG[] = {
Control(f0_setPatch), Control(f0_setPatch),
Control(f1_setTotalLevel), Control(f1_setTotalLevel),
@ -936,7 +936,7 @@ TownsPC98_MusicChannelPCM::TownsPC98_MusicChannelPCM(TownsPC98_AudioDriver *driv
void TownsPC98_MusicChannelPCM::init() { void TownsPC98_MusicChannelPCM::init() {
_algorithm = 0x80; _algorithm = 0x80;
#define Control(x) &TownsPC98_MusicChannelPCM::control_##x #define Control(x) &TownsPC98_MusicChannelPCM::control_##x
static const ControlEventFunc ctrlEventsPCM[] = { static const ControlEventFunc ctrlEventsPCM[] = {
Control(dummy), Control(dummy),
Control(f1_prcStart), Control(f1_prcStart),
@ -1328,7 +1328,7 @@ void TownsPC98_AudioDriver::startSoundEffect() {
} }
const uint8 TownsPC98_AudioDriver::_drvTables[] = { const uint8 TownsPC98_AudioDriver::_drvTables[] = {
// channel presets // channel presets
0x00, 0x80, 0x00, 0x00, 0x00, 0x01, 0x00, 0x80, 0x00, 0x00, 0x00, 0x01,
0x01, 0x80, 0x01, 0x01, 0x00, 0x02, 0x01, 0x80, 0x01, 0x01, 0x00, 0x02,
0x02, 0x80, 0x02, 0x02, 0x00, 0x04, 0x02, 0x80, 0x02, 0x02, 0x00, 0x04,
@ -1336,29 +1336,29 @@ const uint8 TownsPC98_AudioDriver::_drvTables[] = {
0x01, 0x80, 0x04, 0x05, 0x01, 0x10, 0x01, 0x80, 0x04, 0x05, 0x01, 0x10,
0x02, 0x80, 0x05, 0x06, 0x01, 0x20, 0x02, 0x80, 0x05, 0x06, 0x01, 0x20,
// control event size // control event size
0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x04, 0x05, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x04, 0x05,
0x02, 0x06, 0x02, 0x00, 0x00, 0x02, 0x00, 0x02, 0x02, 0x06, 0x02, 0x00, 0x00, 0x02, 0x00, 0x02,
// fmt level presets // fmt level presets
0x54, 0x50, 0x4C, 0x48, 0x44, 0x40, 0x3C, 0x38, 0x54, 0x50, 0x4C, 0x48, 0x44, 0x40, 0x3C, 0x38,
0x34, 0x30, 0x2C, 0x28, 0x24, 0x20, 0x1C, 0x18, 0x34, 0x30, 0x2C, 0x28, 0x24, 0x20, 0x1C, 0x18,
0x14, 0x10, 0x0C, 0x08, 0x04, 0x90, 0x90, 0x90, 0x14, 0x10, 0x0C, 0x08, 0x04, 0x90, 0x90, 0x90,
// carriers // carriers
0x08, 0x08, 0x08, 0x08, 0x0C, 0x0E, 0x0E, 0x0F, 0x08, 0x08, 0x08, 0x08, 0x0C, 0x0E, 0x0E, 0x0F,
// pc98 level presets // pc98 level presets
0x40, 0x3B, 0x38, 0x34, 0x30, 0x2A, 0x28, 0x25, 0x40, 0x3B, 0x38, 0x34, 0x30, 0x2A, 0x28, 0x25,
0x22, 0x20, 0x1D, 0x1A, 0x18, 0x15, 0x12, 0x10, 0x22, 0x20, 0x1D, 0x1A, 0x18, 0x15, 0x12, 0x10,
0x0D, 0x0A, 0x08, 0x05, 0x02, 0x90, 0x90, 0x90, 0x0D, 0x0A, 0x08, 0x05, 0x02, 0x90, 0x90, 0x90,
// frequencies // frequencies
0x6A, 0x02, 0x8F, 0x02, 0xB6, 0x02, 0xDF, 0x02, 0x6A, 0x02, 0x8F, 0x02, 0xB6, 0x02, 0xDF, 0x02,
0x0B, 0x03, 0x39, 0x03, 0x6A, 0x03, 0x9E, 0x03, 0x0B, 0x03, 0x39, 0x03, 0x6A, 0x03, 0x9E, 0x03,
0xD5, 0x03, 0x10, 0x04, 0x4E, 0x04, 0x8F, 0x04, 0xD5, 0x03, 0x10, 0x04, 0x4E, 0x04, 0x8F, 0x04,
// ssg frequencies // ssg frequencies
0xE8, 0x0E, 0x12, 0x0E, 0x48, 0x0D, 0x89, 0x0C, 0xE8, 0x0E, 0x12, 0x0E, 0x48, 0x0D, 0x89, 0x0C,
0xD5, 0x0B, 0x2B, 0x0B, 0x8A, 0x0A, 0xF3, 0x09, 0xD5, 0x0B, 0x2B, 0x0B, 0x8A, 0x0A, 0xF3, 0x09,
0x64, 0x09, 0xDD, 0x08, 0x5E, 0x08, 0xE6, 0x07, 0x64, 0x09, 0xDD, 0x08, 0x5E, 0x08, 0xE6, 0x07,

16
sound/softsynth/fmtowns_pc98/towns_pc98_fmsynth.cpp
View File

@ -32,7 +32,7 @@ TownsPC98_FmSynthOperator::TownsPC98_FmSynthOperator(const uint32 timerbase, con
_rateTbl(rateTable), _rshiftTbl(shiftTable), _adTbl(attackDecayTable), _fTbl(frqTable), _rateTbl(rateTable), _rshiftTbl(shiftTable), _adTbl(attackDecayTable), _fTbl(frqTable),
_sinTbl(sineTable), _tLvlTbl(tlevelOut), _detnTbl(detuneTable), _tickLength(timerbase * 2), _sinTbl(sineTable), _tLvlTbl(tlevelOut), _detnTbl(detuneTable), _tickLength(timerbase * 2),
_specifiedAttackRate(0), _specifiedDecayRate(0), _specifiedReleaseRate(0), _specifiedSustainRate(0), _specifiedAttackRate(0), _specifiedDecayRate(0), _specifiedReleaseRate(0), _specifiedSustainRate(0),
_phase(0), _state(kEnvReady),_ playing(false), _timer(0), _keyScale1(0), _phase(0), _state(kEnvReady), _playing(false), _timer(0), _keyScale1(0),
_keyScale2(0), _currentLevel(1023), _ampMod(false), _tickCount(0) { _keyScale2(0), _currentLevel(1023), _ampMod(false), _tickCount(0) {
fs_a.rate = fs_a.shift = fs_d.rate = fs_d.shift = fs_s.rate = fs_s.shift = fs_r.rate = fs_r.shift = 0; fs_a.rate = fs_a.shift = fs_d.rate = fs_d.shift = fs_s.rate = fs_s.shift = fs_r.rate = fs_r.shift = 0;
@ -1261,7 +1261,7 @@ void TownsPC98_FmSynth::nextTick(int32 *buffer, uint32 bufferSize) {
} }
const uint32 TownsPC98_FmSynth::_adtStat[] = { const uint32 TownsPC98_FmSynth::_adtStat[] = {
0x00010001, 0x00010001, 0x00010001, 0x01010001, 0x00010001, 0x00010001, 0x00010001, 0x01010001,
0x00010101, 0x00010101, 0x00010101, 0x01010101, 0x00010101, 0x00010101, 0x00010101, 0x01010101,
0x01010101, 0x01010101, 0x01010102, 0x01010102, 0x01010101, 0x01010101, 0x01010102, 0x01010102,
0x01020102, 0x01020102, 0x01020202, 0x01020202, 0x01020102, 0x01020102, 0x01020202, 0x01020202,
@ -1275,14 +1275,14 @@ const uint32 TownsPC98_FmSynth::_adtStat[] = {
const uint8 TownsPC98_FmSynth::_detSrc[] = { const uint8 TownsPC98_FmSynth::_detSrc[] = {
0x02, 0x02, 0x02, 0x02, 0x02, 0x03, 0x03, 0x03, 0x02, 0x02, 0x02, 0x02, 0x02, 0x03, 0x03, 0x03,
0x04, 0x04, 0x04, 0x05, 0x05, 0x06, 0x06, 0x07, 0x04, 0x04, 0x04, 0x05, 0x05, 0x06, 0x06, 0x07,
0x08, 0x08, 0x08, 0x08, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 0x08, 0x08, 0x01, 0x01, 0x01, 0x01,
0x02, 0x02, 0x02, 0x02, 0x02, 0x03, 0x03, 0x03, 0x02, 0x02, 0x02, 0x02, 0x02, 0x03, 0x03, 0x03,
0x04, 0x04, 0x04, 0x05, 0x05, 0x06, 0x06, 0x07, 0x04, 0x04, 0x04, 0x05, 0x05, 0x06, 0x06, 0x07,
0x08, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x08, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e,
0x10, 0x10, 0x10, 0x10, 0x02, 0x02, 0x02, 0x02, 0x10, 0x10, 0x10, 0x10, 0x02, 0x02, 0x02, 0x02,
0x02, 0x03, 0x03, 0x03, 0x04, 0x04, 0x04, 0x05, 0x02, 0x03, 0x03, 0x03, 0x04, 0x04, 0x04, 0x05,
0x05, 0x06, 0x06, 0x07, 0x08, 0x08, 0x09, 0x0a, 0x05, 0x06, 0x06, 0x07, 0x08, 0x08, 0x09, 0x0a,
0x0b, 0x0c, 0x0d, 0x0e, 0x10, 0x11, 0x13, 0x14, 0x0b, 0x0c, 0x0d, 0x0e, 0x10, 0x11, 0x13, 0x14,
0x16, 0x16, 0x16, 0x16 0x16, 0x16, 0x16, 0x16
}; };