X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2Fsound%2Fym2612.h;h=20147ff3f5946536ae1e85dd59c2ba1f9759061f;hb=03e4f2a349247334666c87abe3a908df72d23051;hp=033ba26e5c466d3a3fad3a36c6ef5051d81dff45;hpb=4f265db77684ec33f9533e7c76734498df03bba4;p=picodrive.git

diff --git a/Pico/sound/ym2612.h b/Pico/sound/ym2612.h
index 033ba26..20147ff 100644
--- a/Pico/sound/ym2612.h
+++ b/Pico/sound/ym2612.h
@@ -162,7 +162,7 @@ void *YM2612GetRegs(void);
 #define YM2612PicoStateLoad YM2612PicoStateLoad_
 #else
 /* GP2X specific */
-#include "../../platform/gp2x/940ctl_ym2612.h"
+#include "../../platform/gp2x/940ctl.h"
 extern int PicoOpt;
 #define YM2612Init(baseclock,rate) { \
 	if (PicoOpt&0x200) YM2612Init_940(baseclock, rate); \
@@ -172,10 +172,9 @@ extern int PicoOpt;
 	if (PicoOpt&0x200) YM2612ResetChip_940(); \
 	else               YM2612ResetChip_(); \
 }
-#define YM2612UpdateOne(buffer,length,stereo,is_buf_empty) { \
-	if (PicoOpt&0x200) YM2612UpdateOne_940(buffer, length, stereo, is_buf_empty); \
-	else               YM2612UpdateOne_(buffer, length, stereo, is_buf_empty); \
-}
+#define YM2612UpdateOne(buffer,length,stereo,is_buf_empty) \
+	(PicoOpt&0x200) ? YM2612UpdateOne_940(buffer, length, stereo, is_buf_empty) : \
+				YM2612UpdateOne_(buffer, length, stereo, is_buf_empty);
 #define YM2612Write(a,v) \
 	(PicoOpt&0x200) ?  YM2612Write_940(a, v) : YM2612Write_(a, v)
 #define YM2612Read() \