From 4422bbf9815ec42402d0235845a8fd33afd792b2 Mon Sep 17 00:00:00 2001 From: Simon Howard Date: Wed, 4 Mar 2009 21:18:18 +0000 Subject: Fix up fmopl code to remove ScummVM dependencies and compile as C. Add to build. Subversion-branch: /branches/opl-branch Subversion-revision: 1446 --- Makefile.am | 2 +- configure.in | 1 + opl/Makefile.am | 8 +++++ opl/fmopl.c | 106 +++++++++++++++++++------------------------------------- opl/fmopl.h | 70 +++++++++++++++++-------------------- 5 files changed, 77 insertions(+), 110 deletions(-) create mode 100644 opl/Makefile.am diff --git a/Makefile.am b/Makefile.am index 40de5828..4f678149 100644 --- a/Makefile.am +++ b/Makefile.am @@ -44,7 +44,7 @@ EXTRA_DIST= \ MAINTAINERCLEANFILES = $(AUX_DIST_GEN) docdir=$(prefix)/share/doc/@PACKAGE@ -SUBDIRS=textscreen pcsound src man setup +SUBDIRS=textscreen opl pcsound src man setup if HAVE_PYTHON diff --git a/configure.in b/configure.in index 15ef200a..24f0bc97 100644 --- a/configure.in +++ b/configure.in @@ -91,6 +91,7 @@ textscreen/examples/Makefile setup/Makefile man/Makefile src/Makefile +opl/Makefile pcsound/Makefile src/resource.rc src/doom-screensaver.desktop diff --git a/opl/Makefile.am b/opl/Makefile.am new file mode 100644 index 00000000..8fd2303e --- /dev/null +++ b/opl/Makefile.am @@ -0,0 +1,8 @@ + +AM_CFLAGS=@SDLMIXER_CFLAGS@ + +noinst_LIBRARIES=libopl.a + +libopl_a_SOURCES = \ + fmopl.c + diff --git a/opl/fmopl.c b/opl/fmopl.c index 5fda6e44..6713ecc1 100644 --- a/opl/fmopl.c +++ b/opl/fmopl.c @@ -1,4 +1,4 @@ -/* ScummVM - Graphic Adventure Engine +/* This file is derived from fmopl.cpp from ScummVM. * * ScummVM is the legal property of its developers, whose names * are too numerous to list here. Please refer to the COPYRIGHT @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL: http://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk/sound/fmopl.cpp $ - * $Id: fmopl.cpp 38211 2009-02-15 10:07:50Z sev $ - * * LGPL licensed version of MAMEs fmopl (V0.37a modified) by * Tatsuyuki Satoh. Included from LGPL'ed AdPlug. */ @@ -31,11 +28,13 @@ #include #include -#include "sound/fmopl.h" +#include "fmopl.h" + +#define PI 3.1415926539 -#if defined (_WIN32_WCE) || defined (__SYMBIAN32__) || defined(PALMOS_MODE) || defined(__GP32__) || defined(GP2X) || defined (__MAEMO__) || defined(__DS__) || defined (__MINT__) -#include "common/config-manager.h" -#endif +#define CLIP(value, min, max) \ + ( (value) < (min) ? (min) : \ + (value) > (max) ? (max) : (value) ) /* -------------------- preliminary define section --------------------- */ /* attack/decay rate time rate */ @@ -57,12 +56,7 @@ /* sinwave entries */ /* used static memory = SIN_ENT * 4 (byte) */ -#ifdef __DS__ -#include "dsmain.h" -#define SIN_ENT_SHIFT 8 -#else #define SIN_ENT_SHIFT 11 -#endif #define SIN_ENT (1<status |= flag; if(!(OPL->status & 0x80)) { @@ -261,7 +256,7 @@ inline void OPL_STATUS_SET(FM_OPL *OPL, int flag) { } /* status reset and IRQ handling */ -inline void OPL_STATUS_RESET(FM_OPL *OPL, int flag) { +static inline void OPL_STATUS_RESET(FM_OPL *OPL, int flag) { /* reset status flag */ OPL->status &= ~flag; if((OPL->status & 0x80)) { @@ -274,7 +269,7 @@ inline void OPL_STATUS_RESET(FM_OPL *OPL, int flag) { } /* IRQ mask set */ -inline void OPL_STATUSMASK_SET(FM_OPL *OPL, int flag) { +static inline void OPL_STATUSMASK_SET(FM_OPL *OPL, int flag) { OPL->statusmask = flag; /* IRQ handling check */ OPL_STATUS_SET(OPL,0); @@ -282,7 +277,7 @@ inline void OPL_STATUSMASK_SET(FM_OPL *OPL, int flag) { } /* ----- key on ----- */ -inline void OPL_KEYON(OPL_SLOT *SLOT) { +static inline void OPL_KEYON(OPL_SLOT *SLOT) { /* sin wave restart */ SLOT->Cnt = 0; /* set attack */ @@ -293,7 +288,7 @@ inline void OPL_KEYON(OPL_SLOT *SLOT) { } /* ----- key off ----- */ -inline void OPL_KEYOFF(OPL_SLOT *SLOT) { +static inline void OPL_KEYOFF(OPL_SLOT *SLOT) { if( SLOT->evm > ENV_MOD_RR) { /* set envelope counter from envleope output */ @@ -337,7 +332,7 @@ inline void OPL_KEYOFF(OPL_SLOT *SLOT) { /* ---------- calcrate Envelope Generator & Phase Generator ---------- */ /* return : envelope output */ -inline uint OPL_CALC_SLOT(OPL_SLOT *SLOT) { +static inline uint OPL_CALC_SLOT(OPL_SLOT *SLOT) { /* calcrate envelope generator */ if((SLOT->evc += SLOT->evs) >= SLOT->eve) { switch( SLOT->evm ) { @@ -377,7 +372,7 @@ static void set_algorythm(OPL_CH *CH) { } /* ---------- frequency counter for operater update ---------- */ -inline void CALC_FCSLOT(OPL_CH *CH, OPL_SLOT *SLOT) { +static inline void CALC_FCSLOT(OPL_CH *CH, OPL_SLOT *SLOT) { int ksr; /* frequency step counter */ @@ -395,7 +390,7 @@ inline void CALC_FCSLOT(OPL_CH *CH, OPL_SLOT *SLOT) { } /* set multi,am,vib,EG-TYP,KSR,mul */ -inline void set_mul(FM_OPL *OPL, int slot, int v) { +static inline void set_mul(FM_OPL *OPL, int slot, int v) { OPL_CH *CH = &OPL->P_CH[slot>>1]; OPL_SLOT *SLOT = &CH->SLOT[slot & 1]; @@ -408,7 +403,7 @@ inline void set_mul(FM_OPL *OPL, int slot, int v) { } /* set ksl & tl */ -inline void set_ksl_tl(FM_OPL *OPL, int slot, int v) { +static inline void set_ksl_tl(FM_OPL *OPL, int slot, int v) { OPL_CH *CH = &OPL->P_CH[slot>>1]; OPL_SLOT *SLOT = &CH->SLOT[slot & 1]; int ksl = v >> 6; /* 0 / 1.5 / 3 / 6 db/OCT */ @@ -422,7 +417,7 @@ inline void set_ksl_tl(FM_OPL *OPL, int slot, int v) { } /* set attack rate & decay rate */ -inline void set_ar_dr(FM_OPL *OPL, int slot, int v) { +static inline void set_ar_dr(FM_OPL *OPL, int slot, int v) { OPL_CH *CH = &OPL->P_CH[slot>>1]; OPL_SLOT *SLOT = &CH->SLOT[slot & 1]; int ar = v >> 4; @@ -440,7 +435,7 @@ inline void set_ar_dr(FM_OPL *OPL, int slot, int v) { } /* set sustain level & release rate */ -inline void set_sl_rr(FM_OPL *OPL, int slot, int v) { +static inline void set_sl_rr(FM_OPL *OPL, int slot, int v) { OPL_CH *CH = &OPL->P_CH[slot>>1]; OPL_SLOT *SLOT = &CH->SLOT[slot & 1]; int sl = v >> 4; @@ -459,7 +454,7 @@ inline void set_sl_rr(FM_OPL *OPL, int slot, int v) { #define OP_OUT(slot,env,con) slot->wavetable[((slot->Cnt + con)>>(24-SIN_ENT_SHIFT)) & (SIN_ENT-1)][env] /* ---------- calcrate one of channel ---------- */ -inline void OPL_CALC_CH(OPL_CH *CH) { +static inline void OPL_CALC_CH(OPL_CH *CH) { uint env_out; OPL_SLOT *SLOT; @@ -501,13 +496,13 @@ inline void OPL_CALC_CH(OPL_CH *CH) { /* ---------- calcrate rythm block ---------- */ #define WHITE_NOISE_db 6.0 -inline void OPL_CALC_RH(FM_OPL *OPL, OPL_CH *CH) { +static inline void OPL_CALC_RH(FM_OPL *OPL, OPL_CH *CH) { uint env_tam, env_sd, env_top, env_hh; // This code used to do int(OPL->rnd.getRandomBit() * (WHITE_NOISE_db / EG_STEP)), // but EG_STEP = 96.0/EG_ENT, and WHITE_NOISE_db=6.0. So, that's equivalent to // int(OPL->rnd.getRandomBit() * EG_ENT/16). We know that EG_ENT is 4096, or 1024, // or 128, so we can safely avoid any FP ops. - int whitenoise = OPL->rnd.getRandomBit() * (EG_ENT>>4); + int whitenoise = (rand() & 1) * (EG_ENT>>4); int tone8; @@ -625,13 +620,6 @@ static int OPLOpenTable(void) { int i,j; double pom; -#ifdef __DS__ - DS::fastRamReset(); - - TL_TABLE = (int *) DS::fastRamAlloc(TL_MAX * 2 * sizeof(int *)); - SIN_TABLE = (int **) DS::fastRamAlloc(SIN_ENT * 4 * sizeof(int *)); -#else - /* allocate dynamic tables */ if((TL_TABLE = (int *)malloc(TL_MAX * 2 * sizeof(int))) == NULL) return 0; @@ -640,7 +628,6 @@ static int OPLOpenTable(void) { free(TL_TABLE); return 0; } -#endif if((AMS_TABLE = (int *)malloc(AMS_ENT * 2 * sizeof(int))) == NULL) { free(TL_TABLE); @@ -671,7 +658,7 @@ static int OPLOpenTable(void) { for (s = 1;s <= SIN_ENT / 4; s++) { pom = sin(2 * PI * s / SIN_ENT); /* sin */ pom = 20 * log10(1 / pom); /* decibel */ - j = int(pom / EG_STEP); /* TL_TABLE steps */ + j = (int) (pom / EG_STEP); /* TL_TABLE steps */ /* degree 0 - 90 , degree 180 - 90 : plus section */ SIN_TABLE[ s] = SIN_TABLE[SIN_ENT / 2 - s] = &TL_TABLE[j]; @@ -723,7 +710,7 @@ static void OPLCloseTable(void) { } /* CSM Key Controll */ -inline void CSMKeyControll(OPL_CH *CH) { +static inline void CSMKeyControll(OPL_CH *CH) { OPL_SLOT *slot1 = &CH->SLOT[SLOT1]; OPL_SLOT *slot2 = &CH->SLOT[SLOT2]; /* all key off */ @@ -790,8 +777,8 @@ void OPLWriteReg(FM_OPL *OPL, int r, int v) { if(v & 0x80) { /* IRQ flag clear */ OPL_STATUS_RESET(OPL, 0x7f); } else { /* set IRQ mask ,timer enable*/ - uint8 st1 = v & 1; - uint8 st2 = (v >> 1) & 1; + uint8_t st1 = v & 1; + uint8_t st2 = (v >> 1) & 1; /* IRQRST,T1MSK,t2MSK,EOSMSK,BRMSK,x,ST2,ST1 */ OPL_STATUS_RESET(OPL, v & 0x78); OPL_STATUSMASK_SET(OPL,((~v) & 0x78) | 0x01); @@ -840,7 +827,7 @@ void OPLWriteReg(FM_OPL *OPL, int r, int v) { case 0xbd: /* amsep,vibdep,r,bd,sd,tom,tc,hh */ { - uint8 rkey = OPL->rythm ^ v; + uint8_t rkey = OPL->rythm ^ v; OPL->ams_table = &AMS_TABLE[v & 0x80 ? AMS_ENT : 0]; OPL->vib_table = &VIB_TABLE[v & 0x40 ? VIB_ENT : 0]; OPL->rythm = v & 0x3f; @@ -978,13 +965,13 @@ static void OPL_UnLockTable(void) { /*******************************************************************************/ /* ---------- update one of chip ----------- */ -void YM3812UpdateOne(FM_OPL *OPL, int16 *buffer, int length, int interleave) { +void YM3812UpdateOne(FM_OPL *OPL, int16_t *buffer, int length, int interleave) { int i; int data; - int16 *buf = buffer; + int16_t *buf = buffer; uint amsCnt = OPL->amsCnt; uint vibCnt = OPL->vibCnt; - uint8 rythm = OPL->rythm & 0x20; + uint8_t rythm = OPL->rythm & 0x20; OPL_CH *CH, *R_CH; @@ -1133,19 +1120,7 @@ unsigned char OPLRead(FM_OPL *OPL,int a) { if(!(a & 1)) { /* status port */ return OPL->status & (OPL->statusmask | 0x80); } - /* data port */ - switch(OPL->address) { - case 0x05: /* KeyBoard IN */ - warning("OPL:read unmapped KEYBOARD port\n"); - return 0; - case 0x19: /* I/O DATA */ - warning("OPL:read unmapped I/O port\n"); - return 0; - case 0x1a: /* PCM-DATA */ - return 0; - default: - break; - } + return 0; } @@ -1173,19 +1148,8 @@ FM_OPL *makeAdlibOPL(int rate) { // We need to emulate one YM3812 chip int env_bits = FMOPL_ENV_BITS_HQ; int eg_ent = FMOPL_EG_ENT_HQ; -#if defined (_WIN32_WCE) || defined(__SYMBIAN32__) || defined(PALMOS_MODE) || defined(__GP32__) || defined (GP2X) || defined(__MAEMO__) || defined(__DS__) || defined (__MINT__) - if (ConfMan.hasKey("FM_high_quality") && ConfMan.getBool("FM_high_quality")) { - env_bits = FMOPL_ENV_BITS_HQ; - eg_ent = FMOPL_EG_ENT_HQ; - } else if (ConfMan.hasKey("FM_medium_quality") && ConfMan.getBool("FM_medium_quality")) { - env_bits = FMOPL_ENV_BITS_MQ; - eg_ent = FMOPL_EG_ENT_MQ; - } else { - env_bits = FMOPL_ENV_BITS_LQ; - eg_ent = FMOPL_EG_ENT_LQ; - } -#endif OPLBuildTables(env_bits, eg_ent); return OPLCreate(OPL_TYPE_YM3812, 3579545, rate); } + diff --git a/opl/fmopl.h b/opl/fmopl.h index 1c5e5e9f..2bbe8363 100644 --- a/opl/fmopl.h +++ b/opl/fmopl.h @@ -1,4 +1,4 @@ -/* ScummVM - Graphic Adventure Engine +/* This file is derived from fmopl.h from ScummVM. * * ScummVM is the legal property of its developers, whose names * are too numerous to list here. Please refer to the COPYRIGHT @@ -18,19 +18,15 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL: http://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk/sound/fmopl.h $ - * $Id: fmopl.h 38211 2009-02-15 10:07:50Z sev $ - * * LGPL licensed version of MAMEs fmopl (V0.37a modified) by * Tatsuyuki Satoh. Included from LGPL'ed AdPlug. */ -#ifndef SOUND_FMOPL_H -#define SOUND_FMOPL_H +#ifndef OPL_FMOPL_H +#define OPL_FMOPL_H -#include "common/scummsys.h" -#include "common/util.h" +#include "inttypes.h" enum { FMOPL_ENV_BITS_HQ = 16, @@ -41,7 +37,6 @@ enum { FMOPL_EG_ENT_LQ = 128 }; - typedef void (*OPL_TIMERHANDLER)(int channel,double interval_Sec); typedef void (*OPL_IRQHANDLER)(int param,int irq); typedef void (*OPL_UPDATEHANDLER)(int param,int min_interval_us); @@ -53,20 +48,20 @@ typedef void (*OPL_UPDATEHANDLER)(int param,int min_interval_us); typedef struct fm_opl_slot { int TL; /* total level :TL << 8 */ int TLL; /* adjusted now TL */ - uint8 KSR; /* key scale rate :(shift down bit) */ + uint8_t KSR; /* key scale rate :(shift down bit) */ int *AR; /* attack rate :&AR_TABLE[AR<<2] */ int *DR; /* decay rate :&DR_TABLE[DR<<2] */ int SL; /* sustain level :SL_TABLE[SL] */ int *RR; /* release rate :&DR_TABLE[RR<<2] */ - uint8 ksl; /* keyscale level :(shift down bits) */ - uint8 ksr; /* key scale rate :kcode>>KSR */ - uint mul; /* multiple :ML_TABLE[ML] */ - uint Cnt; /* frequency count */ - uint Incr; /* frequency step */ + uint8_t ksl; /* keyscale level :(shift down bits) */ + uint8_t ksr; /* key scale rate :kcode>>KSR */ + unsigned int mul; /* multiple :ML_TABLE[ML] */ + unsigned int Cnt; /* frequency count */ + unsigned int Incr; /* frequency step */ /* envelope generator state */ - uint8 eg_typ;/* envelope type flag */ - uint8 evm; /* envelope phase */ + uint8_t eg_typ;/* envelope type flag */ + uint8_t evm; /* envelope phase */ int evc; /* envelope counter */ int eve; /* envelope counter end point */ int evs; /* envelope counter step */ @@ -75,8 +70,8 @@ typedef struct fm_opl_slot { int evsr; /* envelope step for RR :RR[ksr] */ /* LFO */ - uint8 ams; /* ams flag */ - uint8 vib; /* vibrate flag */ + uint8_t ams; /* ams flag */ + uint8_t vib; /* vibrate flag */ /* wave selector */ int **wavetable; } OPL_SLOT; @@ -84,47 +79,47 @@ typedef struct fm_opl_slot { /* ---------- OPL one of channel ---------- */ typedef struct fm_opl_channel { OPL_SLOT SLOT[2]; - uint8 CON; /* connection type */ - uint8 FB; /* feed back :(shift down bit)*/ + uint8_t CON; /* connection type */ + uint8_t FB; /* feed back :(shift down bit)*/ int *connect1; /* slot1 output pointer */ int *connect2; /* slot2 output pointer */ int op1_out[2]; /* slot1 output for selfeedback */ /* phase generator state */ - uint block_fnum; /* block+fnum */ - uint8 kcode; /* key code : KeyScaleCode */ - uint fc; /* Freq. Increment base */ - uint ksl_base; /* KeyScaleLevel Base step */ - uint8 keyon; /* key on/off flag */ + unsigned int block_fnum; /* block+fnum */ + uint8_t kcode; /* key code : KeyScaleCode */ + unsigned int fc; /* Freq. Increment base */ + unsigned int ksl_base; /* KeyScaleLevel Base step */ + uint8_t keyon; /* key on/off flag */ } OPL_CH; /* OPL state */ typedef struct fm_opl_f { - uint8 type; /* chip type */ + uint8_t type; /* chip type */ int clock; /* master clock (Hz) */ int rate; /* sampling rate (Hz) */ double freqbase; /* frequency base */ double TimerBase; /* Timer base time (==sampling time) */ - uint8 address; /* address register */ - uint8 status; /* status flag */ - uint8 statusmask; /* status mask */ - uint mode; /* Reg.08 : CSM , notesel,etc. */ + uint8_t address; /* address register */ + uint8_t status; /* status flag */ + uint8_t statusmask; /* status mask */ + unsigned int mode; /* Reg.08 : CSM , notesel,etc. */ /* Timer */ int T[2]; /* timer counter */ - uint8 st[2]; /* timer enable */ + uint8_t st[2]; /* timer enable */ /* FM channel slots */ OPL_CH *P_CH; /* pointer of CH */ int max_ch; /* maximum channel */ /* Rythm sention */ - uint8 rythm; /* Rythm mode , key flag */ + uint8_t rythm; /* Rythm mode , key flag */ /* time tables */ int AR_TABLE[76]; /* atttack rate tables */ int DR_TABLE[76]; /* decay rate tables */ - uint FN_TABLE[1024];/* fnumber -> increment counter */ + unsigned int FN_TABLE[1024];/* fnumber -> increment counter */ /* LFO */ int *ams_table; @@ -135,7 +130,7 @@ typedef struct fm_opl_f { int vibIncr; /* wave selector enable flag */ - uint8 wavesel; + uint8_t wavesel; /* external event callback handler */ OPL_TIMERHANDLER TimerHandler; /* TIMER handler */ @@ -144,8 +139,6 @@ typedef struct fm_opl_f { int IRQParam; /* IRQ parameter */ OPL_UPDATEHANDLER UpdateHandler; /* stream update handler */ int UpdateParam; /* stream update parameter */ - - Common::RandomSource rnd; } FM_OPL; /* ---------- Generic interface section ---------- */ @@ -165,9 +158,10 @@ int OPLWrite(FM_OPL *OPL, int a, int v); unsigned char OPLRead(FM_OPL *OPL, int a); int OPLTimerOver(FM_OPL *OPL, int c); void OPLWriteReg(FM_OPL *OPL, int r, int v); -void YM3812UpdateOne(FM_OPL *OPL, int16 *buffer, int length, int interleave = 0); +void YM3812UpdateOne(FM_OPL *OPL, int16_t *buffer, int length, int interleave); // Factory method FM_OPL *makeAdlibOPL(int rate); #endif + -- cgit v1.2.3