From 93bdab64fa69d1fc81762163949bc1a2aae82a23 Mon Sep 17 00:00:00 2001 From: Pringo Date: Thu, 3 Nov 2016 17:58:28 -0700 Subject: [PATCH] Change "Wiimote" to "Wii Remote" in Logs --- .../dolphinemu/utils/Java_WiimoteAdapter.java | 6 +++--- Source/Core/Core/HW/SystemTimers.cpp | 4 ++-- Source/Core/Core/HW/WiimoteReal/IOhidapi.cpp | 12 ++++++------ .../Core/Core/HW/WiimoteReal/WiimoteReal.cpp | 2 +- .../IPC_HLE/WII_IPC_HLE_Device_usb_bt_emu.cpp | 18 +++++++++--------- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/Java_WiimoteAdapter.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/Java_WiimoteAdapter.java index bb690387dd..5fdc49b021 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/Java_WiimoteAdapter.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/Java_WiimoteAdapter.java @@ -41,7 +41,7 @@ public class Java_WiimoteAdapter { if (!manager.hasPermission(dev)) { - Log.warning("Requesting permission for Wiimote adapter"); + Log.warning("Requesting permission for Wii Remote adapter"); Intent intent = new Intent(); PendingIntent pend_intent; intent.setClass(NativeLibrary.sEmulationActivity, USBPermService.class); @@ -130,11 +130,11 @@ public class Java_WiimoteAdapter { for (int i = 0; i < MAX_WIIMOTES; ++i) { - // One interface per Wiimote + // One interface per Wii Remote usb_intf[i] = dev.getInterface(i); usb_con.claimInterface(usb_intf[i], true); - // One endpoint per Wiimote. Input only + // One endpoint per Wii Remote. Input only // Output reports go through the control channel. usb_in[i] = usb_intf[i].getEndpoint(0); Log.info("Interface " + i + " endpoint count:" + usb_intf[i].getEndpointCount()); diff --git a/Source/Core/Core/HW/SystemTimers.cpp b/Source/Core/Core/HW/SystemTimers.cpp index fbd886e2d6..a740a2eef1 100644 --- a/Source/Core/Core/HW/SystemTimers.cpp +++ b/Source/Core/Core/HW/SystemTimers.cpp @@ -13,7 +13,7 @@ rather than time, so if a game can't keep up with the normal framerate all anima actions slows down and the game runs to slow. This is different from PC games that are often controlled by time instead and may not have maximum framerates. -However, I'm not sure if the Bluetooth communication for the Wiimote is entirely frame +However, I'm not sure if the Bluetooth communication for the Wii Remote is entirely frame dependent, the timing problems with the ack command in Zelda - TP may be related to time rather than frames? For now the IPC_HLE_PERIOD is frame dependent, but because of different conditions on the way to PluginWiimote::Wiimote_Update() the updates may actually @@ -25,7 +25,7 @@ would mean one update per frame and [GetTicksPerSecond() / 250] would mean four frame. -IPC_HLE_PERIOD: For the Wiimote this is the call schedule: +IPC_HLE_PERIOD: For the Wii Remote this is the call schedule: IPC_HLE_UpdateCallback() // In this file // This function seems to call all devices' Update() function four times per frame diff --git a/Source/Core/Core/HW/WiimoteReal/IOhidapi.cpp b/Source/Core/Core/HW/WiimoteReal/IOhidapi.cpp index 35856fca8d..4fdfc30670 100644 --- a/Source/Core/Core/HW/WiimoteReal/IOhidapi.cpp +++ b/Source/Core/Core/HW/WiimoteReal/IOhidapi.cpp @@ -15,19 +15,19 @@ static bool IsDeviceUsable(const std::string& device_path) hid_device* handle = hid_open_path(device_path.c_str()); if (handle == nullptr) { - ERROR_LOG(WIIMOTE, "Could not connect to Wiimote at \"%s\". " + ERROR_LOG(WIIMOTE, "Could not connect to Wii Remote at \"%s\". " "Do you have permission to access the device?", device_path.c_str()); return false; } - // Some third-party adapters (DolphinBar) always expose all four Wiimotes as HIDs + // Some third-party adapters (DolphinBar) always expose all four Wii Remotes as HIDs // even when they are not connected, which causes an endless error loop when we try to use them. - // Try to write a report to the device to see if this Wiimote is really usable. + // Try to write a report to the device to see if this Wii Remote is really usable. static const u8 report[] = {WM_SET_REPORT | WM_BT_OUTPUT, WM_REQUEST_STATUS, 0}; const int result = hid_write(handle, report, sizeof(report)); - // The DolphinBar uses EPIPE to signal the absence of a Wiimote connected to this HID. + // The DolphinBar uses EPIPE to signal the absence of a Wii Remote connected to this HID. if (result == -1 && errno != EPIPE) - ERROR_LOG(WIIMOTE, "Couldn't write to Wiimote at \"%s\".", device_path.c_str()); + ERROR_LOG(WIIMOTE, "Couldn't write to Wii Remote at \"%s\".", device_path.c_str()); hid_close(handle); return result != -1; @@ -96,7 +96,7 @@ bool WiimoteHidapi::ConnectInternal() m_handle = hid_open_path(m_device_path.c_str()); if (m_handle == nullptr) { - ERROR_LOG(WIIMOTE, "Could not connect to Wiimote at \"%s\". " + ERROR_LOG(WIIMOTE, "Could not connect to Wii Remote at \"%s\". " "Do you have permission to access the device?", m_device_path.c_str()); } diff --git a/Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp b/Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp index 1e780d5c56..5d8e81ab7e 100644 --- a/Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp +++ b/Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp @@ -219,7 +219,7 @@ void Wiimote::Read() } else if (0 == result) { - ERROR_LOG(WIIMOTE, "Wiimote::IORead failed. Disconnecting Wiimote %d.", m_index + 1); + ERROR_LOG(WIIMOTE, "Wiimote::IORead failed. Disconnecting Wii Remote %d.", m_index + 1); DisconnectInternal(); } } diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_emu.cpp b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_emu.cpp index 053fc4c474..bd48e8c102 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_emu.cpp +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb_bt_emu.cpp @@ -76,15 +76,15 @@ CWII_IPC_HLE_Device_usb_oh1_57e_305_emu::CWII_IPC_HLE_Device_usb_oh1_57e_305_emu memcpy(BT_DINF.registered[i].name, wmName, 20); memcpy(BT_DINF.active[i].name, wmName, 20); - DEBUG_LOG(WII_IPC_WIIMOTE, "Wiimote %d BT ID %x,%x,%x,%x,%x,%x", i, tmpBD.b[0], tmpBD.b[1], + DEBUG_LOG(WII_IPC_WIIMOTE, "Wii Remote %d BT ID %x,%x,%x,%x,%x,%x", i, tmpBD.b[0], tmpBD.b[1], tmpBD.b[2], tmpBD.b[3], tmpBD.b[4], tmpBD.b[5]); m_WiiMotes.push_back(CWII_IPC_HLE_WiiMote(this, i, tmpBD, false)); i++; } BT_DINF.num_registered = MAX_BBMOTES; - // save now so that when games load sysconf file it includes the new Wiimotes - // and the correct order for connected Wiimotes + // save now so that when games load sysconf file it includes the new Wii Remotes + // and the correct order for connected Wii Remotes if (!sysconf.SetArrayData("BT.DINF", (u8*)&BT_DINF, sizeof(_conf_pads)) || !sysconf.Save()) PanicAlertT("Failed to write BT.DINF to SYSCONF"); } @@ -203,7 +203,7 @@ IPCCommandResult CWII_IPC_HLE_Device_usb_oh1_57e_305_emu::IOCtlV(u32 _CommandAdd { case USBV0_IOCTL_CTRLMSG: // HCI command is received from the stack { - // This is the HCI datapath from CPU to Wiimote, the USB stuff is little endian.. + // This is the HCI datapath from CPU to Wii Remote, the USB stuff is little endian.. m_CtrlSetup.bRequestType = *(u8*)Memory::GetPointer(CommandBuffer.InBuffer[0].m_Address); m_CtrlSetup.bRequest = *(u8*)Memory::GetPointer(CommandBuffer.InBuffer[1].m_Address); m_CtrlSetup.wValue = *(u16*)Memory::GetPointer(CommandBuffer.InBuffer[2].m_Address); @@ -241,7 +241,7 @@ IPCCommandResult CWII_IPC_HLE_Device_usb_oh1_57e_305_emu::IOCtlV(u32 _CommandAdd { case ACL_DATA_OUT: // ACL data is received from the stack { - // This is the ACL datapath from CPU to Wiimote + // This is the ACL datapath from CPU to Wii Remote // Here we only need to record the command address in case we need to delay the reply m_ACLSetup = CommandBuffer.m_Address; @@ -378,7 +378,7 @@ void CWII_IPC_HLE_Device_usb_oh1_57e_305_emu::SendACLPacket(u16 connection_handl } } -// These messages are sent from the Wiimote to the game, for example RequestConnection() +// These messages are sent from the Wii Remote to the game, for example RequestConnection() // or ConnectionComplete(). // // Our WII_IPC_HLE is so efficient that we could fill the buffer immediately @@ -482,7 +482,7 @@ u32 CWII_IPC_HLE_Device_usb_oh1_57e_305_emu::Update() } } - // The Real Wiimote sends report every ~5ms (200 Hz). + // The Real Wii Remote sends report every ~5ms (200 Hz). const u64 interval = SystemTimers::GetTicksPerSecond() / 200; const u64 now = CoreTiming::GetTicks(); @@ -1639,7 +1639,7 @@ void CWII_IPC_HLE_Device_usb_oh1_57e_305_emu::CommandWritePageTimeOut(const u8* SendEventCommandComplete(HCI_CMD_WRITE_PAGE_TIMEOUT, &reply, sizeof(hci_host_buffer_size_rp)); } -/* This will enable ScanEnable so that Update() can start the Wiimote. */ +/* This will enable ScanEnable so that Update() can start the Wii Remote. */ void CWII_IPC_HLE_Device_usb_oh1_57e_305_emu::CommandWriteScanEnable(const u8* input) { const hci_write_scan_enable_cp* write_scan_enable = @@ -1915,7 +1915,7 @@ void CWII_IPC_HLE_Device_usb_oh1_57e_305_emu::DisplayDisconnectMessage(const int { // TODO: If someone wants to be fancy we could also figure out what the values for pDiscon->reason // mean - // and display things like "Wiimote %i disconnected due to inactivity!" etc. + // and display things like "Wii Remote %i disconnected due to inactivity!" etc. Core::DisplayMessage( StringFromFormat("Wii Remote %i disconnected by emulated software", wiimoteNumber), 3000); }