piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 22:29:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

More minor consistency changes

Browse Source
This commit is contained in:
Stevoisiak
2015-01-12 22:28:12 -05:00
parent cb86db7b68
commit f31b688cf5
32 changed files with 109 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp
View File

@ -81,8 +81,8 @@ CWII_IPC_HLE_Device_usb_oh1_57e_305::CWII_IPC_HLE_Device_usb_oh1_57e_305(u32 _De
i++;
}
// 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 Wiimotes
// and the correct order for connected Wiimotes
if (!SConfig::GetInstance().m_SYSCONF->SetArrayData("BT.DINF", (u8*)&BT_DINF, sizeof(_conf_pads)) || !SConfig::GetInstance().m_SYSCONF->Save())
PanicAlertT("Failed to write BT.DINF to SYSCONF");
}
@ -441,7 +441,7 @@ u32 CWII_IPC_HLE_Device_usb_oh1_57e_305::Update()
packet_transferred = true;
}
// We wait for ScanEnable to be sent from the bt stack through HCI_CMD_WRITE_SCAN_ENABLE
// We wait for ScanEnable to be sent from the Bluetooth stack through HCI_CMD_WRITE_SCAN_ENABLE
// before we initiate the connection.
//
// FiRES: TODO find a better way to do this
@ -1857,8 +1857,8 @@ CWII_IPC_HLE_WiiMote* CWII_IPC_HLE_Device_usb_oh1_57e_305::AccessWiiMote(u16 _Co
return &wiimote;
}
ERROR_LOG(WII_IPC_WIIMOTE, "Can't find WiiMote by connection handle %02x", _ConnectionHandle);
PanicAlertT("Can't find WiiMote by connection handle %02x", _ConnectionHandle);
ERROR_LOG(WII_IPC_WIIMOTE, "Can't find Wiimote by connection handle %02x", _ConnectionHandle);
PanicAlertT("Can't find Wiimote by connection handle %02x", _ConnectionHandle);
return nullptr;
}

6
Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.h
View File

@ -42,7 +42,7 @@ struct SQueuedEvent
// Important to remember that this class is for /dev/usb/oh1/57e/305 ONLY
// /dev/usb/oh1 -> internal usb bus
// 57e/305 -> VendorID/ProductID of device on usb bus
// This device is ONLY the internal bluetooth module (based on BCM2045 chip)
// This device is ONLY the internal Bluetooth module (based on BCM2045 chip)
class CWII_IPC_HLE_Device_usb_oh1_57e_305 : public IWII_IPC_HLE_Device
{
public:
@ -60,12 +60,12 @@ public:
static void EnqueueReply(u32 CommandAddress);
// Send ACL data back to bt stack
// Send ACL data back to Bluetooth stack
void SendACLPacket(u16 _ConnectionHandle, u8* _pData, u32 _Size);
bool RemoteDisconnect(u16 _connectionHandle);
// hack for wiimote plugin
// hack for Wiimote plugin
public:
std::vector<CWII_IPC_HLE_WiiMote> m_WiiMotes;
CWII_IPC_HLE_WiiMote* AccessWiiMote(const bdaddr_t& _rAddr);

4
Source/Core/Core/IPC_HLE/WII_IPC_HLE_WiiMote.cpp
View File

@ -546,7 +546,7 @@ void CWII_IPC_HLE_WiiMote::ReceiveDisconnectionReq(u8 _Ident, u8* _pData, u32 _S
//
//
// We assume WiiMote is always connected
// We assume Wiimote is always connected
void CWII_IPC_HLE_WiiMote::SendConnectionRequest(u16 scid, u16 psm)
{
// create the channel
@ -604,7 +604,7 @@ void CWII_IPC_HLE_WiiMote::SendConfigurationRequest(u16 scid, u16 MTU, u16 Flush
// (shuffle2) currently we end up not appending options. this is because we don't
// negotiate after trying to set MTU = 0 fails (stack will respond with
// "configuration failed" msg...). This is still fine, we'll just use whatever the
// bt stack defaults to.
// Bluetooth stack defaults to.
if (MTU || rChannel.MTU)
{
if (MTU == 0)

2
Source/Core/Core/IPC_HLE/WII_IPC_HLE_WiiMote.h
View File

@ -54,7 +54,7 @@ public:
void ResetChannels();
void Activate(bool ready);
void ExecuteL2capCmd(u8* _pData, u32 _Size); // From CPU
void ReceiveL2capData(u16 scid, const void* _pData, u32 _Size); // From wiimote
void ReceiveL2capData(u16 scid, const void* _pData, u32 _Size); // From Wiimote
int NetPlay_GetWiimoteNum(int _number);

2
Source/Core/Core/IPC_HLE/hci.h
View File

@ -2,7 +2,7 @@
// Added some info from bluetooth.h
// All packet headers have had the packet type field removed. This is because
// IOS adds the packet type to the header, and strips it before returning the
// packet to the overlying bt stack.
// packet to the overlying Bluetooth stack.
/* $NetBSD: hci.h,v 1.33 2009/09/11 18:35:50 plunky Exp $ */