Merge bffc26da27 into 80ea68b13c

ProcessorInterface: sync GPU just before PI_FIFO_RESET

Source/Core/Core/HW/ProcessorInterface.cpp

@@ -98,6 +98,10 @@ void ProcessorInterfaceManager::RegisterMMIO(MMIO::Mapping* mmio, u32 base)
                    {
                      system.GetGPFifo().ResetGatherPipe();
 
+                     // Assume that all bytes that made it into the GPU fifo did in fact execute
+                     // before this MMIO write takes effect.
+                     system.GetFifo().SyncGPUForRegisterAccess();
+
                      // Call Fifo::ResetVideoBuffer() from the video thread. Since that function
                      // resets various pointers used by the video thread, we can't call it directly
                      // from the CPU thread, so queue a task to do it instead. In single-core mode,

Source/Core/DolphinQt/Config/GamecubeControllersWidget.cpp

@@ -34,7 +34,8 @@ using SIDeviceName = std::pair<SerialInterface::SIDevices, const char*>;
 static constexpr std::array s_gc_types = {
     SIDeviceName{SerialInterface::SIDEVICE_NONE, _trans("None")},
     SIDeviceName{SerialInterface::SIDEVICE_GC_CONTROLLER, _trans("Standard Controller")},
-    SIDeviceName{SerialInterface::SIDEVICE_WIIU_ADAPTER, _trans("GameCube Adapter for Wii U")},
+    SIDeviceName{SerialInterface::SIDEVICE_WIIU_ADAPTER,
+                 _trans("GameCube Controller Adapter (USB)")},
     SIDeviceName{SerialInterface::SIDEVICE_GC_STEERING, _trans("Steering Wheel")},
     SIDeviceName{SerialInterface::SIDEVICE_DANCEMAT, _trans("Dance Mat")},
     SIDeviceName{SerialInterface::SIDEVICE_GC_TARUKONGA, _trans("DK Bongos")},

Source/Core/DolphinQt/Config/Mapping/GCPadWiiUConfigDialog.cpp

@@ -32,7 +32,7 @@ GCPadWiiUConfigDialog::~GCPadWiiUConfigDialog()
 
 void GCPadWiiUConfigDialog::CreateLayout()
 {
-  setWindowTitle(tr("GameCube Adapter for Wii U at Port %1").arg(m_port + 1));
+  setWindowTitle(tr("GameCube Controller Adapter at Port %1").arg(m_port + 1));
 
   m_layout = new QVBoxLayout();
   m_status_label = new QLabel();