From 0018638d3d6aba82eb7864dd408abf90681352a6 Mon Sep 17 00:00:00 2001
From: qwertymodo <qwertymodo@qwertymodo.com>
Date: Mon, 14 Nov 2016 11:10:08 -0800
Subject: [PATCH 1/2] Add MSU-1 to libretro build

---
 libretro/Makefile.common                | 1 +
 libretro/libretro-win32.vcxproj         | 2 ++
 libretro/libretro-win32.vcxproj.filters | 6 ++++++
 3 files changed, 9 insertions(+)

diff --git a/libretro/Makefile.common b/libretro/Makefile.common
index 3025492b..f390b798 100644
--- a/libretro/Makefile.common
+++ b/libretro/Makefile.common
@@ -30,6 +30,7 @@ SOURCES_CXX := $(CORE_DIR)/apu/apu.cpp \
 				 $(CORE_DIR)/globals.cpp \
 				 $(CORE_DIR)/logger.cpp \
 				 $(CORE_DIR)/memmap.cpp \
+                 $(CORE_DIR)/msu1.cpp \
 				 $(CORE_DIR)/obc1.cpp \
 				 $(CORE_DIR)/ppu.cpp \
 				 $(CORE_DIR)/stream.cpp \
diff --git a/libretro/libretro-win32.vcxproj b/libretro/libretro-win32.vcxproj
index adbf9f08..cfc8c204 100644
--- a/libretro/libretro-win32.vcxproj
+++ b/libretro/libretro-win32.vcxproj
@@ -222,6 +222,7 @@
     <ClInclude Include="..\messages.h" />
     <ClInclude Include="..\missing.h" />
     <ClInclude Include="..\movie.h" />
+    <ClInclude Include="..\msu1.h" />
     <ClInclude Include="..\netplay.h" />
     <ClInclude Include="..\obc1.h" />
     <ClInclude Include="..\pixform.h" />
@@ -274,6 +275,7 @@
     <ClCompile Include="..\logger.cpp" />
     <ClCompile Include="..\memmap.cpp" />
     <ClCompile Include="..\movie.cpp" />
+    <ClCompile Include="..\msu1.cpp" />
     <ClCompile Include="..\netplay.cpp" />
     <ClCompile Include="..\obc1.cpp" />
     <ClCompile Include="..\ppu.cpp" />
diff --git a/libretro/libretro-win32.vcxproj.filters b/libretro/libretro-win32.vcxproj.filters
index 998c0e74..bb0a5065 100644
--- a/libretro/libretro-win32.vcxproj.filters
+++ b/libretro/libretro-win32.vcxproj.filters
@@ -180,6 +180,9 @@
     <ClInclude Include="libretro.h">
       <Filter>libretro</Filter>
     </ClInclude>
+    <ClInclude Include="..\msu1.h">
+      <Filter>s9x-source</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\bsx.cpp">
@@ -338,5 +341,8 @@
     <ClCompile Include="libretro.cpp">
       <Filter>libretro</Filter>
     </ClCompile>
+    <ClCompile Include="..\msu1.cpp">
+      <Filter>s9x-source</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file

From 8dba3d447ee2947890cb510b38d13fd1db7fcfda Mon Sep 17 00:00:00 2001
From: qwertymodo <qwertymodo@qwertymodo.com>
Date: Mon, 14 Nov 2016 14:58:35 -0800
Subject: [PATCH 2/2] MSU-1: Fix audio error flag

---
 msu1.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/msu1.cpp b/msu1.cpp
index 8c5f0bc7..ec1d0844 100644
--- a/msu1.cpp
+++ b/msu1.cpp
@@ -231,10 +231,12 @@ bool AudioOpen()
 		audioFile.read((char *)&audioLoopPos, 4);
 		audioLoopPos <<= 2;
 		audioLoopPos += 8;
+
+		MSU1.MSU1_STATUS &= ~AudioError;
+		return true;
 	}
 
-	MSU1.MSU1_STATUS &= ~AudioError;
-	return true;
+	return false;
 }
 
 bool DataOpen()