usb-redir: Change usbredir_open_chardev into usbredir_create_parser

[qemu.git] / hw / fmopl.c

diff --git a/hw/fmopl.c b/hw/fmopl.c
index 3df1806a912001316f21059598e096988066cf38..f0a023477db5f9074fc822179121ded489ee55ba 100644 (file)
--- a/hw/fmopl.c
+++ b/hw/fmopl.c
@@ -45,6 +45,10 @@
 #define PI 3.14159265358979323846
 #endif
 
+#ifndef ARRAY_SIZE
+#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
+#endif
+
 /* -------------------- for debug --------------------- */
 /* #define OPL_OUTPUT_LOG */
 #ifdef OPL_OUTPUT_LOG
@@ -358,8 +362,8 @@ INLINE UINT32 OPL_CALC_SLOT( OPL_SLOT *SLOT )
        return SLOT->TLL+ENV_CURVE[SLOT->evc>>ENV_BITS]+(SLOT->ams ? ams : 0);
 }
 
-/* set algorythm connection */
-static void set_algorythm( OPL_CH *CH)
+/* set algorithm connection */
+static void set_algorithm( OPL_CH *CH)
 {
        INT32 *carrier = &outd[0];
        CH->connect1 = CH->CON ? carrier : &feedback2;
@@ -494,7 +498,7 @@ INLINE void OPL_CALC_CH( OPL_CH *CH )
        }
 }
 
-/* ---------- calcrate rythm block ---------- */
+/* ---------- calcrate rhythm block ---------- */
 #define WHITE_NOISE_db 6.0
 INLINE void OPL_CALC_RH( OPL_CH *CH )
 {
@@ -595,14 +599,14 @@ static void init_timetables( FM_OPL *OPL , int ARRATE , int DRRATE )
                OPL->AR_TABLE[i] = rate / ARRATE;
                OPL->DR_TABLE[i] = rate / DRRATE;
        }
-       for (i = 60;i < 76;i++)
+       for (i = 60; i < ARRAY_SIZE(OPL->AR_TABLE); i++)
        {
                OPL->AR_TABLE[i] = EG_AED-1;
                OPL->DR_TABLE[i] = OPL->DR_TABLE[60];
        }
 #if 0
        for (i = 0;i < 64 ;i++){        /* make for overflow area */
-               LOG(LOG_WAR,("rate %2d , ar %f ms , dr %f ms \n",i,
+               LOG(LOG_WAR, ("rate %2d , ar %f ms , dr %f ms\n", i,
                        ((double)(EG_ENT<<ENV_BITS) / OPL->AR_TABLE[i]) * (1000.0 / OPL->rate),
                        ((double)(EG_ENT<<ENV_BITS) / OPL->DR_TABLE[i]) * (1000.0 / OPL->rate) ));
        }
@@ -711,7 +715,7 @@ static void OPLCloseTable( void )
        free(VIB_TABLE);
 }
 
-/* CSM Key Controll */
+/* CSM Key Control */
 INLINE void CSMKeyControll(OPL_CH *CH)
 {
        OPL_SLOT *slot1 = &CH->SLOT[SLOT1];
@@ -729,7 +733,7 @@ INLINE void CSMKeyControll(OPL_CH *CH)
 }
 
 /* ---------- opl initialize ---------- */
-static void OPL_initalize(FM_OPL *OPL)
+static void OPL_initialize(FM_OPL *OPL)
 {
        int fn;
 
@@ -758,7 +762,7 @@ static void OPLWriteReg(FM_OPL *OPL, int r, int v)
 
        switch(r&0xe0)
        {
-       case 0x00: /* 00-1f:controll */
+       case 0x00: /* 00-1f:control */
                switch(r&0x1f)
                {
                case 0x01:
@@ -822,7 +826,7 @@ static void OPLWriteReg(FM_OPL *OPL, int r, int v)
                                        LOG(LOG_WAR,("OPL:write unmapped KEYBOARD port\n"));
                        }
                        return;
-               case 0x07:      /* DELTA-T controll : START,REC,MEMDATA,REPT,SPOFF,x,x,RST */
+               case 0x07:      /* DELTA-T control : START,REC,MEMDATA,REPT,SPOFF,x,x,RST */
                        if(OPL->type&OPL_TYPE_ADPCM)
                                YM_DELTAT_ADPCM_Write(OPL->deltat,r-0x07,v);
                        return;
@@ -891,14 +895,14 @@ static 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 rkey = OPL->rhythm^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;
-                       if(OPL->rythm&0x20)
+                       OPL->rhythm  = v&0x3f;
+                       if(OPL->rhythm&0x20)
                        {
 #if 0
-                               usrintf_showmessage("OPL Rythm mode select");
+                               usrintf_showmessage("OPL Rhythm mode select");
 #endif
                                /* BD key on/off */
                                if(rkey&0x10)
@@ -991,7 +995,7 @@ static void OPLWriteReg(FM_OPL *OPL, int r, int v)
                int feedback = (v>>1)&7;
                CH->FB   = feedback ? (8+1) - feedback : 0;
                CH->CON = v&1;
-               set_algorythm(CH);
+               set_algorithm(CH);
                }
                return;
        case 0xe0: /* wave type */
@@ -1045,7 +1049,7 @@ void YM3812UpdateOne(FM_OPL *OPL, INT16 *buffer, int length)
        OPLSAMPLE *buf = buffer;
        UINT32 amsCnt  = OPL->amsCnt;
        UINT32 vibCnt  = OPL->vibCnt;
-       UINT8 rythm = OPL->rythm&0x20;
+       UINT8 rhythm = OPL->rhythm&0x20;
        OPL_CH *CH,*R_CH;
 
        if( (void *)OPL != cur_chip ){
@@ -1053,7 +1057,7 @@ void YM3812UpdateOne(FM_OPL *OPL, INT16 *buffer, int length)
                /* channel pointers */
                S_CH = OPL->P_CH;
                E_CH = &S_CH[9];
-               /* rythm slot */
+               /* rhythm slot */
                SLOT7_1 = &S_CH[7].SLOT[SLOT1];
                SLOT7_2 = &S_CH[7].SLOT[SLOT2];
                SLOT8_1 = &S_CH[8].SLOT[SLOT1];
@@ -1064,7 +1068,7 @@ void YM3812UpdateOne(FM_OPL *OPL, INT16 *buffer, int length)
                ams_table = OPL->ams_table;
                vib_table = OPL->vib_table;
        }
-       R_CH = rythm ? &S_CH[6] : E_CH;
+       R_CH = rhythm ? &S_CH[6] : E_CH;
     for( i=0; i < length ; i++ )
        {
                /*            channel A         channel B         channel C      */
@@ -1076,7 +1080,7 @@ void YM3812UpdateOne(FM_OPL *OPL, INT16 *buffer, int length)
                for(CH=S_CH ; CH < R_CH ; CH++)
                        OPL_CALC_CH(CH);
                /* Rythn part */
-               if(rythm)
+               if(rhythm)
                        OPL_CALC_RH(S_CH);
                /* limit check */
                data = Limit( outd[0] , OPL_MAXOUT, OPL_MINOUT );
@@ -1106,7 +1110,7 @@ void Y8950UpdateOne(FM_OPL *OPL, INT16 *buffer, int length)
        OPLSAMPLE *buf = buffer;
        UINT32 amsCnt  = OPL->amsCnt;
        UINT32 vibCnt  = OPL->vibCnt;
-       UINT8 rythm = OPL->rythm&0x20;
+       UINT8 rhythm = OPL->rhythm&0x20;
        OPL_CH *CH,*R_CH;
        YM_DELTAT *DELTAT = OPL->deltat;
 
@@ -1118,7 +1122,7 @@ void Y8950UpdateOne(FM_OPL *OPL, INT16 *buffer, int length)
                /* channel pointers */
                S_CH = OPL->P_CH;
                E_CH = &S_CH[9];
-               /* rythm slot */
+               /* rhythm slot */
                SLOT7_1 = &S_CH[7].SLOT[SLOT1];
                SLOT7_2 = &S_CH[7].SLOT[SLOT2];
                SLOT8_1 = &S_CH[8].SLOT[SLOT1];
@@ -1129,7 +1133,7 @@ void Y8950UpdateOne(FM_OPL *OPL, INT16 *buffer, int length)
                ams_table = OPL->ams_table;
                vib_table = OPL->vib_table;
        }
-       R_CH = rythm ? &S_CH[6] : E_CH;
+       R_CH = rhythm ? &S_CH[6] : E_CH;
     for( i=0; i < length ; i++ )
        {
                /*            channel A         channel B         channel C      */
@@ -1144,7 +1148,7 @@ void Y8950UpdateOne(FM_OPL *OPL, INT16 *buffer, int length)
                for(CH=S_CH ; CH < R_CH ; CH++)
                        OPL_CALC_CH(CH);
                /* Rythn part */
-               if(rythm)
+               if(rhythm)
                        OPL_CALC_RH(S_CH);
                /* limit check */
                data = Limit( outd[0] , OPL_MAXOUT, OPL_MINOUT );
@@ -1235,7 +1239,7 @@ FM_OPL *OPLCreate(int type, int clock, int rate)
        OPL->rate  = rate;
        OPL->max_ch = max_ch;
        /* init grobal tables */
-       OPL_initalize(OPL);
+       OPL_initialize(OPL);
        /* reset chip */
        OPLResetChip(OPL);
 #ifdef OPL_OUTPUT_LOG
@@ -1376,7 +1380,7 @@ int OPLTimerOver(FM_OPL *OPL,int c)
        else
        {       /* Timer A */
                OPL_STATUS_SET(OPL,0x40);
-               /* CSM mode key,TL controll */
+               /* CSM mode key,TL control */
                if( OPL->mode & 0x80 )
                {       /* CSM mode total level latch and auto key on */
                        int ch;