Fixing inlines to be either static inline or extern inline as the case may be.

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@72221 e17a0e51-4ae3-4d35-97c3-1a29b211df97

11 files changed, 26 insertions, 35 deletions

diff --git a/plugins/dfsound/adsr.c b/plugins/dfsound/adsr.c
index 4eb3748c..e13b2827 100644
--- a/plugins/dfsound/adsr.c
+++ b/plugins/dfsound/adsr.c
@@ -142,7 +142,7 @@ void InitADSR(void)                                    // INIT ADSR
 

 ////////////////////////////////////////////////////////////////////////

 

-void StartADSR(int ch)                          // MIX ADSR

+extern INLINE void StartADSR(int ch)                          // MIX ADSR

 {

  s_chan[ch].ADSRX.lVolume=1;                           // and init some adsr vars

  s_chan[ch].ADSRX.State=0;

@@ -152,7 +152,7 @@ void StartADSR(int ch)                          // MIX ADSR
 

 ////////////////////////////////////////////////////////////////////////

 

-int MixADSR(int ch)                             // MIX ADSR

+extern INLINE int MixADSR(int ch)                             // MIX ADSR

 {    

  int EnvelopeVol = s_chan[ch].ADSRX.EnvelopeVol;

  int EnvelopeVol_f = s_chan[ch].ADSRX.EnvelopeVol_f;

diff --git a/plugins/dfsound/adsr.h b/plugins/dfsound/adsr.h
index 47f38abd..0251cf11 100644
--- a/plugins/dfsound/adsr.h
+++ b/plugins/dfsound/adsr.h
@@ -15,5 +15,5 @@
  *                                                                         *

  ***************************************************************************/

 

-extern void StartADSR(int ch);

-extern int  MixADSR(int ch);

+extern INLINE void StartADSR(int ch);

+extern INLINE int  MixADSR(int ch);

diff --git a/plugins/dfsound/cfg.h b/plugins/dfsound/cfg.h
index d26c116e..b052b2d9 100644
--- a/plugins/dfsound/cfg.h
+++ b/plugins/dfsound/cfg.h
@@ -20,8 +20,6 @@ void ReadConfig(void);
 #ifdef _WINDOWS

 BOOL CALLBACK AboutDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam);

 BOOL CALLBACK DSoundDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam);

-#elif defined (_MACOSX)

-#include "maccfg.h"

 #else

 void StartCfgTool(char * pCmdLine);

 #endif

diff --git a/plugins/dfsound/reverb.c b/plugins/dfsound/reverb.c
index e0746006..3ec38f24 100644
--- a/plugins/dfsound/reverb.c
+++ b/plugins/dfsound/reverb.c
@@ -63,7 +63,7 @@ void SetREVERB(unsigned short val)
 // START REVERB

 ////////////////////////////////////////////////////////////////////////

 

-void StartREVERB(int ch)

+extern INLINE void StartREVERB(int ch)

 {

  if(s_chan[ch].bReverb && (spuCtrl&0x80))              // reverb possible?

   {

@@ -84,7 +84,7 @@ void StartREVERB(int ch)
 // HELPER FOR NEILL'S REVERB: re-inits our reverb mixing buf

 ////////////////////////////////////////////////////////////////////////

 

-void InitREVERB(void)

+static INLINE void InitREVERB(void)

 {

  if(iUseReverb==2)

   {memset(sRVBStart,0,NSSIZE*2*4);}

@@ -94,7 +94,7 @@ void InitREVERB(void)
 // STORE REVERB

 ////////////////////////////////////////////////////////////////////////

 

-void StoreREVERB_CD(int left, int right,int ns)

+static INLINE void StoreREVERB_CD(int left, int right,int ns)

 {

  if(iUseReverb==0) return;

  else

@@ -112,7 +112,7 @@ void StoreREVERB_CD(int left, int right,int ns)
 }

  

 

-void StoreREVERB(int ch,int ns)

+extern INLINE void StoreREVERB(int ch,int ns)

 {

  if(iUseReverb==0) return;

  else

@@ -184,7 +184,7 @@ static INLINE void s_buffer1(int iOff,int iVal)                // set_buffer (+1
 

 ////////////////////////////////////////////////////////////////////////

 

-int MixREVERBLeft(int ns)

+static INLINE int MixREVERBLeft(int ns)

 {

  if(iUseReverb==0) return 0;

  else

@@ -291,7 +291,7 @@ int MixREVERBLeft(int ns)
 

 ////////////////////////////////////////////////////////////////////////

 

-int MixREVERBRight(void)

+static INLINE int MixREVERBRight(void)

 {

  if(iUseReverb==0) return 0;

  else

diff --git a/plugins/dfsound/reverb.h b/plugins/dfsound/reverb.h
index 3a5cb9b3..c3a5826b 100644
--- a/plugins/dfsound/reverb.h
+++ b/plugins/dfsound/reverb.h
@@ -15,10 +15,7 @@
  *                                                                         *

  ***************************************************************************/

 

-extern void SetREVERB(unsigned short val);

-extern void InitREVERB(void);

-extern void StartREVERB(int ch);

-extern void StoreREVERB(int ch,int ns);

-extern void StoreREVERB_CD(int left, int right,int ns);

-extern int  MixREVERBLeft(int ns);

-extern int  MixREVERBRight(void);

+void SetREVERB(unsigned short val);

+extern INLINE void StartREVERB(int ch);

+extern INLINE void StoreREVERB(int ch,int ns);

+

diff --git a/plugins/dfsound/xa.c b/plugins/dfsound/xa.c
index 4f78eb00..6dd689be 100644
--- a/plugins/dfsound/xa.c
+++ b/plugins/dfsound/xa.c
@@ -45,7 +45,6 @@ uint32_t * CDDAEnd   = NULL;
 int             iLeftXAVol  = 0x8000;

 int             iRightXAVol = 0x8000;

 

-#if 0

 static int gauss_ptr = 0;

 static int gauss_window[8] = {0, 0, 0, 0, 0, 0, 0, 0};

 

@@ -53,7 +52,6 @@ static int gauss_window[8] = {0, 0, 0, 0, 0, 0, 0, 0};
 #define gvall(x) gauss_window[(gauss_ptr+x)&3]

 #define gvalr0 gauss_window[4+gauss_ptr]

 #define gvalr(x) gauss_window[4+((gauss_ptr+x)&3)]

-#endif

 

 long cdxa_dbuf_ptr;

 

@@ -64,7 +62,7 @@ long cdxa_dbuf_ptr;
 static int lastxa_lc, lastxa_rc;

 static int lastcd_lc, lastcd_rc;

 

-void MixXA(void)

+extern INLINE void MixXA(void)

 {

  int ns;

  int lc,rc;

@@ -262,7 +260,7 @@ unsigned long timeGetTime_spu()
 // FEED XA 

 ////////////////////////////////////////////////////////////////////////

 

-void FeedXA(xa_decode_t *xap)

+extern INLINE void FeedXA(xa_decode_t *xap)

 {

  int sinc,spos,i,iSize,iPlace;

 

@@ -453,7 +451,7 @@ void FeedXA(xa_decode_t *xap)
 

 unsigned int cdda_ptr;

 

-void FeedCDDA(unsigned char *pcm, int nBytes)

+extern INLINE void FeedCDDA(unsigned char *pcm, int nBytes)

 {

  while(nBytes>0)

   {

diff --git a/plugins/dfsound/xa.h b/plugins/dfsound/xa.h
index 06ff990c..b28e6f7a 100644
--- a/plugins/dfsound/xa.h
+++ b/plugins/dfsound/xa.h
@@ -15,6 +15,6 @@
  *                                                                         *

  ***************************************************************************/

 

-extern void MixXA(void);

-extern void FeedXA(xa_decode_t *xap);

-extern void FeedCDDA(unsigned char *pcm, int nBytes);

+extern INLINE void MixXA(void);

+extern INLINE void FeedXA(xa_decode_t *xap);

+extern INLINE void FeedCDDA(unsigned char *pcm, int nBytes);

diff --git a/plugins/dfxvideo/prim.c b/plugins/dfxvideo/prim.c
index 0372cb4a..b77b36ec 100644
--- a/plugins/dfxvideo/prim.c
+++ b/plugins/dfxvideo/prim.c
@@ -50,7 +50,7 @@ BOOL           bDoVSyncUpdate=FALSE;
 #ifdef USE_NASM

 

 #define BGR24to16 i386_BGR24to16

-static __inline unsigned short BGR24to16 (uint32_t BGR);

+extern __inline unsigned short BGR24to16 (uint32_t BGR);

 

 #else

 

diff --git a/plugins/dfxvideo/soft.c b/plugins/dfxvideo/soft.c
index fda9eb43..e7647b2d 100644
--- a/plugins/dfxvideo/soft.c
+++ b/plugins/dfxvideo/soft.c
@@ -1205,7 +1205,7 @@ static int left_B, delta_left_B, right_B, delta_right_B;
 // NASM version (external):

 #define shl10idiv i386_shl10idiv

 

-static __inline int shl10idiv(int x, int y);

+extern __inline int shl10idiv(int x, int y);

 

 #else

 

diff --git a/plugins/dfxvideo/zn.c b/plugins/dfxvideo/zn.c
index 05ef3c8f..38b906ba 100644
--- a/plugins/dfxvideo/zn.c
+++ b/plugins/dfxvideo/zn.c
@@ -71,10 +71,10 @@ int           iTileCheat=0;
 

 typedef struct GPUOTAG

  {

-  uint32_t       Version;        // Version of structure - currently 1

-  unsigned long  hWnd;           // Window handle

-  uint32_t       ScreenRotation; // 0 = 0CW, 1 = 90CW, 2 = 180CW, 3 = 270CW = 90CCW

-  uint32_t       GPUVersion;     // 0 = a, 1 = b, 2 = c

+  uint32_t  Version;        // Version of structure - currently 1

+  long           hWnd;           // Window handle

+  uint32_t  ScreenRotation; // 0 = 0CW, 1 = 90CW, 2 = 180CW, 3 = 270CW = 90CCW

+  uint32_t  GPUVersion;     // 0 = a, 1 = b, 2 = c

   const char*    GameName;       // NULL terminated string

   const char*    CfgFile;        // NULL terminated string

  } GPUConfiguration_t;

diff --git a/plugins/peopsxgl/draw.h b/plugins/peopsxgl/draw.h
index e05fddfe..82f920db 100644
--- a/plugins/peopsxgl/draw.h
+++ b/plugins/peopsxgl/draw.h
@@ -51,8 +51,6 @@ void ReadConfig(void);
 void WriteConfig(void);

 void SetExtGLFuncs(void);

 

-void CreateScanLines(void);

-

 ///////////////////////////////////////////////////////////////////////

 

 #endif // _GL_DRAW_H_