Merge experimental Wii Speak emulation code (credits to degasus/godis…

…government)
mbc07 · Aug 12, 2016 · b67b19e · b67b19e
1 parent 0bd5db3
commit b67b19e
Show file tree

Hide file tree

Showing 6 changed files with 1,370 additions and 0 deletions.
diff --git a/Source/Core/Core/CMakeLists.txt b/Source/Core/Core/CMakeLists.txt
@@ -146,6 +146,7 @@ set(SRCS	ActionReplay.cpp
 			IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.cpp
 			IPC_HLE/WII_IPC_HLE_Device_usb.cpp
 			IPC_HLE/WII_IPC_HLE_Device_usb_kbd.cpp
+			IPC_HLE/WII_IPC_HLE_Device_WiiSpeak.cpp
 			IPC_HLE/WII_IPC_HLE_WiiMote.cpp
 			IPC_HLE/WiiMote_HID_Attr.cpp
 			PowerPC/MMU.cpp

diff --git a/Source/Core/Core/Core.vcxproj b/Source/Core/Core/Core.vcxproj
@@ -187,6 +187,7 @@
     <ClCompile Include="IPC_HLE\WII_IPC_HLE_Device_usb.cpp" />
     <ClCompile Include="IPC_HLE\WII_IPC_HLE_Device_usb_kbd.cpp" />
     <ClCompile Include="IPC_HLE\WII_IPC_HLE_WiiMote.cpp" />
+    <ClCompile Include="IPC_HLE\WII_IPC_HLE_Device_WiiSpeak.cpp" />
     <ClCompile Include="IPC_HLE\WII_Socket.cpp" />
     <ClCompile Include="MemTools.cpp" />
     <ClCompile Include="Movie.cpp" />
@@ -390,6 +391,7 @@
     <ClInclude Include="IPC_HLE\WII_IPC_HLE_Device_usb.h" />
     <ClInclude Include="IPC_HLE\WII_IPC_HLE_Device_usb_kbd.h" />
     <ClInclude Include="IPC_HLE\WII_IPC_HLE_WiiMote.h" />
+    <ClInclude Include="IPC_HLE\WII_IPC_HLE_Device_WiiSpeak.h" />
     <ClInclude Include="IPC_HLE\WII_Socket.h" />
     <ClInclude Include="MachineContext.h" />
     <ClInclude Include="MemTools.h" />

diff --git a/Source/Core/Core/Core.vcxproj.filters b/Source/Core/Core/Core.vcxproj.filters
@@ -724,6 +724,9 @@
       <Filter>PowerPC\Jit64Common</Filter>
     </ClCompile>
     <ClCompile Include="Analytics.cpp" />
+    <ClCompile Include="IPC_HLE\WII_IPC_HLE_Device_WiiSpeak.cpp">
+      <Filter>IPC HLE %28IOS/Starlet%29\USB</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="BootManager.h" />
@@ -1237,6 +1240,9 @@
       <Filter>PowerPC\Jit64Common</Filter>
     </ClInclude>
     <ClInclude Include="Analytics.h" />
+    <ClInclude Include="IPC_HLE\WII_IPC_HLE_Device_WiiSpeak.h">
+      <Filter>IPC HLE %28IOS/Starlet%29\USB</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Text Include="CMakeLists.txt" />

diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE.cpp b/Source/Core/Core/IPC_HLE/WII_IPC_HLE.cpp
@@ -52,6 +52,7 @@ They will also generate a true or false return for UpdateInterrupts() in WII_IPC
 #include "Core/IPC_HLE/WII_IPC_HLE_Device_stm.h"
 #include "Core/IPC_HLE/WII_IPC_HLE_Device_usb.h"
 #include "Core/IPC_HLE/WII_IPC_HLE_Device_usb_kbd.h"
+#include "Core/IPC_HLE/WII_IPC_HLE_Device_WiiSpeak.h"
 
 #if defined(__LIBUSB__) || defined(_WIN32)
 #include "Core/IPC_HLE/WII_IPC_HLE_Device_hid.h"
@@ -127,6 +128,8 @@ void Init()
   num_devices = 0;
 
   // Build hardware devices
+  AddDevice<CWII_IPC_HLE_Device_usb_oh0_46d_a03>("/dev/usb/oh0/46d/a03"); // Logitech Vantage USB Microphone
+  AddDevice<CWII_IPC_HLE_Device_usb_oh0_57e_308>("/dev/usb/oh0/57e/308"); // Wii Speak
   AddDevice<CWII_IPC_HLE_Device_usb_oh1_57e_305>("/dev/usb/oh1/57e/305");
   AddDevice<CWII_IPC_HLE_Device_stm_immediate>("/dev/stm/immediate");
   AddDevice<CWII_IPC_HLE_Device_stm_eventhook>("/dev/stm/eventhook");
@@ -147,6 +150,8 @@ void Init()
   AddDevice<CWII_IPC_HLE_Device_net_ip_top>("/dev/net/ip/top");
   AddDevice<CWII_IPC_HLE_Device_net_ssl>("/dev/net/ssl");
   AddDevice<CWII_IPC_HLE_Device_usb_kbd>("/dev/usb/kbd");
+  AddDevice<CWII_IPC_HLE_Device_usb_oh0>("/dev/usb/oh0");
+  AddDevice<CWII_IPC_HLE_Device_usb_ven>("/dev/usb/ven");
   AddDevice<CWII_IPC_HLE_Device_sdio_slot0>("/dev/sdio/slot0");
   AddDevice<CWII_IPC_HLE_Device_stub>("/dev/sdio/slot1");
 #if defined(__LIBUSB__) || defined(_WIN32)