minor cosmetic changes

Author: ValleyBell

CMakeLists.txt

@@ -15,7 +15,7 @@ endif ()
 
 check_include_file("stdint.h" HAVE_STDINT)
 if(HAVE_STDINT)
-	add_definitions("-D HAVE_STDINT")
+	add_definitions("-D HAVE_STDINT_H")
 endif()
 
 if(MSVC)

emu/cores/emu2149.c

@@ -467,8 +467,8 @@ mix_output_stereo(EPSG *psg, int32_t out[2])
     if (! (~psg->stereo_mask[i] & 0x03))
     {
       // mono channel
-      out[0] += APPLY_PANNING(psg->ch_out[i], psg->pan[i][0]);
-      out[1] += APPLY_PANNING(psg->ch_out[i], psg->pan[i][1]);
+      out[0] += APPLY_PANNING_S(psg->ch_out[i], psg->pan[i][0]);
+      out[1] += APPLY_PANNING_S(psg->ch_out[i], psg->pan[i][1]);
     }
     else
     {

emu/cores/emu2413.c

@@ -15,16 +15,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#ifndef INLINE
-#if defined(_MSC_VER)
-#define INLINE __inline
-#elif defined(__GNUC__)
-#define INLINE __inline__
-#else
-#define INLINE inline
-#endif
-#endif
-
 #include "../../stdtype.h"
 #include "emutypes.h"
 #include "../snddef.h"
@@ -34,6 +24,7 @@
 #include "emu2413.h"
 #include "emu2413_private.h"
 #include "../panning.h" // Maxim
+#undef INLINE	// emu2413 uses its own INLINE definition
 
 
 static UINT8 device_start_ym2413_emu(const DEV_GEN_CFG* cfg, DEV_INFO* retDevInf);
@@ -67,6 +58,16 @@ DEV_DEF devDef_YM2413_Emu =
 };
 
 
+#ifndef INLINE
+#if defined(_MSC_VER)
+#define INLINE __inline
+#elif defined(__GNUC__)
+#define INLINE __inline__
+#else
+#define INLINE inline
+#endif
+#endif
+
 #define _PI_ 3.14159265358979323846264338327950288
 
 #define EOPLL_TONE_NUM 3
@@ -187,7 +188,7 @@ static uint16_t fullsin_table[PG_WIDTH] = {
 /* clang-format on */
 
 static uint16_t halfsin_table[PG_WIDTH];
-static uint16_t *wave_table_map[2] = {fullsin_table, halfsin_table};
+static const uint16_t *wave_table_map[2] = {fullsin_table, halfsin_table};
 
 /* pitch modulator */
 /* offset to fnum, rough approximation of 14 cents depth. */
@@ -1078,9 +1079,9 @@ INLINE static void mix_output_stereo(EOPLL *opll) {
   out[0] = out[1] = 0;
   for (i = 0; i < 14; i++) {
     if (opll->pan[i] & 1)
-      out[1] += APPLY_PANNING(opll->ch_out[i], opll->pan_fine[i][1]);
+      out[1] += APPLY_PANNING_S(opll->ch_out[i], opll->pan_fine[i][1]);
     if (opll->pan[i] & 2)
-      out[0] += APPLY_PANNING(opll->ch_out[i], opll->pan_fine[i][0]);
+      out[0] += APPLY_PANNING_S(opll->ch_out[i], opll->pan_fine[i][0]);
   }
   if (opll->conv) {
     EOPLL_RateConv_putData(opll->conv, 0, out[0]);

emu/cores/emu2413_private.h

@@ -33,7 +33,7 @@ typedef struct __EOPLL_SLOT {
   int32_t output[2]; /* output value, latest and previous. */
 
   /* phase generator (pg) */
-  uint16_t *wave_table; /* wave table */
+  const uint16_t *wave_table; /* wave table */
   uint32_t pg_phase;    /* pg phase */
   uint32_t pg_out;      /* pg output, as index of wave table */
   uint8_t pg_keep;      /* if 1, pg_phase is preserved when key-on */

emu/cores/sn76489.c

@@ -254,8 +254,8 @@ static void SN76489_Update(SN76489_Context* chip, UINT32 length, DEV_SMPL **buff
 				if ( ( ( chip->PSGStereo >> i ) & 0x11 ) == 0x11 )
 				{
 					// no GG stereo for this channel
-					buffer[0][j] += APPLY_PANNING( chnOut, chip->panning[i][0] ); // left
-					buffer[1][j] += APPLY_PANNING( chnOut, chip->panning[i][1] ); // right
+					buffer[0][j] += APPLY_PANNING_S( chnOut, chip->panning[i][0] ); // left
+					buffer[1][j] += APPLY_PANNING_S( chnOut, chip->panning[i][1] ); // right
 				}
 				else
 				{

emu/panning.h

@@ -12,7 +12,7 @@ extern "C"
 #define PANNING_NORMAL	(1 << PANNING_BITS)
 
 // apply panning value to x, x should be within +-16384
-#define APPLY_PANNING(x, panval)	((x * panval) >> PANNING_BITS)
+#define APPLY_PANNING_S(x, panval)	((x * panval) >> PANNING_BITS)
 // apply panning value to x, version for larger values
 #define APPLY_PANNING_L(x, panval)	(INT32)(((INT64)x * panval) >> PANNING_BITS)
 

stdtype.h

@@ -1,7 +1,7 @@
 #ifndef __CST_STDTYPE_H__
 #define __CST_STDTYPE_H__
 
-#ifdef HAVE_STDINT
+#ifdef HAVE_STDINT_H
 
 #include <stdint.h>
 
@@ -14,7 +14,7 @@ typedef  int32_t	 INT32;
 typedef uint64_t	UINT64;
 typedef  int64_t	 INT64;
 
-#else	// ! HAVE_STDINT
+#else	// ! HAVE_STDINT_H
 
 // typedefs to use MAME's (U)INTxx types (copied from MAME\src\ods\odscomm.h)
 // 8-bit values