More minor consistency changes

Ben754 · Jan 13, 2015 · f31b688 · f31b688
1 parent cb86db7
commit f31b688
Show file tree

Hide file tree

Showing 32 changed files with 109 additions and 109 deletions.
diff --git a/Source/Core/Core/Core.cpp b/Source/Core/Core/Core.cpp
@@ -366,7 +366,7 @@ void EmuThread()
 	{
 		Wiimote::Initialize(s_window_handle, !s_state_filename.empty());
 
-		// Activate wiimotes which don't have source set to "None"
+		// Activate Wiimotes which don't have source set to "None"
 		for (unsigned int i = 0; i != MAX_BBMOTES; ++i)
 			if (g_wiimote_sources[i])
 				GetUsbPointer()->AccessWiiMote(i | 0x100)->Activate(true);
@@ -432,7 +432,7 @@ void EmuThread()
 		// The EmuThread is thus an idle thread, which sleeps while
 		// waiting for the program to terminate. Without this extra
 		// thread, the video backend window hangs in single core mode
-		// because noone is pumping messages.
+		// because no one is pumping messages.
 		Common::SetCurrentThreadName("Emuthread - Idle");
 
 		// Spawn the CPU+GPU thread

diff --git a/Source/Core/Core/DSP/DSPAccelerator.cpp b/Source/Core/Core/DSP/DSPAccelerator.cpp
@@ -87,7 +87,7 @@ void dsp_write_aram_d3(u16 value)
 	// Zelda ucode writes a bunch of zeros to ARAM through d3 during
 	// initialization.  Don't know if it ever does it later, too.
 	// Pikmin 2 Wii writes non-stop to 0x10008000-0x1000801f (non-zero values too)
-	// Zelda TP WII writes non-stop to 0x10000000-0x1000001f (non-zero values too)
+	// Zelda TP Wii writes non-stop to 0x10000000-0x1000001f (non-zero values too)
 	u32 Address = (g_dsp.ifx_regs[DSP_ACCAH] << 16) | g_dsp.ifx_regs[DSP_ACCAL];
 
 	switch (g_dsp.ifx_regs[DSP_FORMAT])

diff --git a/Source/Core/Core/DSP/DSPIntExtOps.cpp b/Source/Core/Core/DSP/DSPIntExtOps.cpp
@@ -34,7 +34,7 @@ namespace Ext
 
 inline bool IsSameMemArea(u16 a, u16 b)
 {
-	//LM: tested on WII
+	// LM: tested on Wii
 	if ((a>>10)==(b>>10))
 		return true;
 	else

diff --git a/Source/Core/Core/DSP/Jit/DSPJitUtil.cpp b/Source/Core/Core/DSP/Jit/DSPJitUtil.cpp
@@ -509,7 +509,7 @@ void DSPEmitter::decrease_addr_reg(int reg)
 
 
 // EAX - destination address
-// ECX - Base of dram
+// ECX - Base of DRAM
 void DSPEmitter::dmem_write(X64Reg value)
 {
 	//	if (saddr == 0)

diff --git a/Source/Core/Core/HW/DSP.cpp b/Source/Core/Core/HW/DSP.cpp
@@ -646,7 +646,7 @@ static void Do_ARAM_DMA()
 
 // (shuffle2) I still don't believe that this hack is actually needed... :(
 // Maybe the Wii Sports ucode is processed incorrectly?
-// (LM) It just means that DSP reads via '0xffdd' on WII can end up in EXRAM or main RAM
+// (LM) It just means that DSP reads via '0xffdd' on Wii can end up in EXRAM or main RAM
 u8 ReadARAM(u32 _iAddress)
 {
 	//NOTICE_LOG(DSPINTERFACE, "ReadARAM 0x%08x", _iAddress);
@@ -666,7 +666,7 @@ u8 ReadARAM(u32 _iAddress)
 void WriteARAM(u8 value, u32 _uAddress)
 {
 	// NOTICE_LOG(DSPINTERFACE, "WriteARAM 0x%08x", _uAddress);
-	// TODO: verify this on WII
+	// TODO: verify this on Wii
 	g_ARAM.ptr[_uAddress & g_ARAM.mask] = value;
 }
 

diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/GBA.cpp b/Source/Core/Core/HW/DSPHLE/UCodes/GBA.cpp
@@ -60,7 +60,7 @@ void GBAUCode::HandleMail(u32 mail)
 			u32 pad[3];
 		} sec_params;
 
-		// 32 bytes from mram addr to dram @ 0
+		// 32 bytes from mram addr to DRAM @ 0
 		for (int i = 0; i < 8; i++, mramaddr += 4)
 			((u32*)&sec_params)[i] = HLEMemory_Read_U32(mramaddr);
 

diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp b/Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp
@@ -66,11 +66,11 @@ UCodeInterface* UCodeFactory(u32 crc, DSPHLE* dsphle, bool wii)
 		INFO_LOG(DSPHLE, "CRC %08x: Zelda ucode chosen", crc);
 		return new ZeldaUCode(dsphle, crc);
 
-	// WII CRCs
+	// Wii CRCs
 	case 0xb7eb9a9c: // Wii Pikmin - PAL
 	case 0xeaeb38cc: // Wii Pikmin 2 - PAL
 	case 0x6c3f6f94: // Zelda TP - PAL
-	case 0xd643001f: // Mario Galaxy - PAL / WII DK Jungle Beat - PAL
+	case 0xd643001f: // Mario Galaxy - PAL / Wii DK Jungle Beat - PAL
 		INFO_LOG(DSPHLE, "CRC %08x: Zelda Wii ucode chosen\n", crc);
 		return new ZeldaUCode(dsphle, crc);
 
@@ -166,12 +166,12 @@ void UCodeInterface::PrepareBootUCode(u32 mail)
 		if (m_next_ucode.mram_size)
 		{
 			WARN_LOG(DSPHLE,
-				"Trying to boot new ucode with dram download - not implemented");
+				"Trying to boot new ucode with DRAM download - not implemented");
 		}
 		if (m_next_ucode.dram_size)
 		{
 			WARN_LOG(DSPHLE,
-				"Trying to boot new ucode with dram upload - not implemented");
+				"Trying to boot new ucode with DRAM upload - not implemented");
 		}
 
 		m_dsphle->SwapUCode(ector_crc);

diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/Zelda.cpp b/Source/Core/Core/HW/DSPHLE/UCodes/Zelda.cpp
@@ -353,7 +353,7 @@ void ZeldaUCode::HandleMail_NormalVersion(u32 mail)
 		case 0x0003: // Do nothing - continue normally
 			return;
 
-		case 0x0001: // accepts params to either dma to iram and/or dram (used for hotbooting a new ucode)
+		case 0x0001: // accepts params to either DMA to iram and/or DRAM (used for hotbooting a new ucode)
 			// TODO find a better way to protect from HLEMixer?
 			m_upload_setup_in_progress = true;
 			return;

diff --git a/Source/Core/Core/HW/EXI_DeviceIPL.cpp b/Source/Core/Core/HW/EXI_DeviceIPL.cpp
@@ -296,7 +296,7 @@ void CEXIIPL::TransferByte(u8& _uByte)
 		case REGION_WRTC0:
 		case REGION_WRTC1:
 		case REGION_WRTC2:
-			// WII only RTC flags... afaik just the Wii menu initialize it
+			// Wii only RTC flags... afaik just the Wii Menu initialize it
 		default:
 			if ((m_uAddress >> 6) < ROM_SIZE)
 			{

diff --git a/Source/Core/Core/HW/Wiimote.cpp b/Source/Core/Core/HW/Wiimote.cpp
@@ -39,7 +39,7 @@ void Shutdown()
 // if plugin isn't initialized, init and load config
 void Initialize(void* const hwnd, bool wait)
 {
-	// add 4 wiimotes
+	// add 4 Wiimotes
 	for (unsigned int i = WIIMOTE_CHAN_0; i<MAX_BBMOTES; ++i)
 		s_config.controllers.push_back(new WiimoteEmu::Wiimote(i));
 

diff --git a/Source/Core/Core/HW/WiimoteEmu/EmuSubroutines.cpp b/Source/Core/Core/HW/WiimoteEmu/EmuSubroutines.cpp
@@ -70,7 +70,7 @@ void Wiimote::HidOutputReport(const wm_report* const sr, const bool send_ack)
 {
 	INFO_LOG(WIIMOTE, "HidOutputReport (page: %i, cid: 0x%02x, wm: 0x%02x)", m_index, m_reporting_channel, sr->wm);
 
-	// wiibrew:
+	// WiiBrew:
 	// In every single Output Report, bit 0 (0x01) of the first byte controls the Rumble feature.
 	m_rumble_on = sr->rumble;
 
@@ -221,7 +221,7 @@ void Wiimote::RequestStatus(const wm_request_status* const rs)
 	// status values
 	*(wm_status_report*)(data + 2) = m_status;
 
-	// hybrid wiimote stuff
+	// hybrid Wiimote stuff
 	if (WIIMOTE_SRC_REAL & g_wiimote_sources[m_index] && (m_extension->switch_extension <= 0))
 	{
 		using namespace WiimoteReal;
@@ -380,13 +380,13 @@ void Wiimote::ReadData(const wm_read_data* const rd)
 	// ignore the 0x010000 bit
 	address &= 0xFEFFFF;
 
-	// hybrid wiimote stuff
-	// relay the read data request to real-wiimote
+	// hybrid Wiimote stuff
+	// relay the read data request to real-Wiimote
 	if (WIIMOTE_SRC_REAL & g_wiimote_sources[m_index] && ((0xA4 != (address >> 16)) || (m_extension->switch_extension <= 0)))
 	{
 		WiimoteReal::InterruptChannel(m_index, m_reporting_channel, ((u8*)rd) - 2, sizeof(wm_read_data) + 2); // hacky
 
-		// don't want emu-wiimote to send reply
+		// don't want emu-Wiimote to send reply
 		return;
 	}
 

diff --git a/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp b/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp
@@ -338,17 +338,17 @@ bool Wiimote::Step()
 			m_read_requests.pop();
 		}
 
-		// dont send any other reports
+		// don't send any other reports
 		return true;
 	}
 
 	// check if a status report needs to be sent
-	// this happens on wiimote sync and when extensions are switched
+	// this happens on Wiimote sync and when extensions are switched
 	if (m_extension->active_extension != m_extension->switch_extension)
 	{
 		RequestStatus();
 
-		// Wiibrew: Following a connection or disconnection event on the Extension Port,
+		// WiiBrew: Following a connection or disconnection event on the Extension Port,
 		// data reporting is disabled and the Data Reporting Mode must be reset before new data can arrive.
 		// after a game receives an unrequested status report,
 		// it expects data reports to stop until it sets the reporting mode again
@@ -655,7 +655,7 @@ void Wiimote::Update()
 		if (rptf.ext)
 			GetExtData(data + rptf.ext);
 
-		// hybrid wiimote stuff (for now, it's not supported while recording)
+		// hybrid Wiimote stuff (for now, it's not supported while recording)
 		if (WIIMOTE_SRC_HYBRID == g_wiimote_sources[m_index] && !Movie::IsRecordingInput())
 		{
 			using namespace WiimoteReal;
@@ -675,7 +675,7 @@ void Wiimote::Update()
 						{
 							const ReportFeatures& real_rptf = reporting_mode_features[real_data[1] - WM_REPORT_CORE];
 
-							// force same report type from real-wiimote
+							// force same report type from real-Wiimote
 							if (&real_rptf != &rptf)
 								rptf_size = 0;
 
@@ -723,7 +723,7 @@ void Wiimote::Update()
 
 					}
 
-					// copy over report from real-wiimote
+					// copy over report from real-Wiimote
 					if (-1 == rptf_size)
 					{
 						std::copy(rpt.begin(), rpt.end(), data);
@@ -760,7 +760,7 @@ void Wiimote::ControlChannel(const u16 _channelID, const void* _pData, u32 _Size
 	// Check for custom communication
 	if (99 == _channelID)
 	{
-		// wiimote disconnected
+		// Wiimote disconnected
 		//PanicAlert( "Wiimote Disconnected" );
 
 		// reset eeprom/register/reporting mode

diff --git a/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.h b/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.h
@@ -169,10 +169,10 @@ friend class WiimoteReal::Wiimote;
 	Extension*     m_extension;
 	ControlGroup*  m_options;
 
-	// WiiMote accel data
+	// Wiimote accel data
 	AccelData      m_accel;
 
-	// wiimote index, 0-3
+	// Wiimote index, 0-3
 	const u8       m_index;
 
 	double ir_sin, ir_cos; //for the low pass filter

diff --git a/Source/Core/Core/HW/WiimoteReal/IONix.cpp b/Source/Core/Core/HW/WiimoteReal/IONix.cpp
@@ -40,7 +40,7 @@ WiimoteScanner::WiimoteScanner()
 	, device_id(-1)
 	, device_sock(-1)
 {
-	// Get the id of the first bluetooth device.
+	// Get the id of the first Bluetooth device.
 	device_id = hci_get_route(nullptr);
 	if (device_id < 0)
 	{
@@ -52,7 +52,7 @@ WiimoteScanner::WiimoteScanner()
 	device_sock = hci_open_dev(device_id);
 	if (device_sock < 0)
 	{
-		ERROR_LOG(WIIMOTE, "Unable to open bluetooth.");
+		ERROR_LOG(WIIMOTE, "Unable to open Bluetooth.");
 		return;
 	}
 }
@@ -81,15 +81,15 @@ void WiimoteScanner::FindWiimotes(std::vector<Wiimote*> & found_wiimotes, Wiimot
 	auto* scan_infos_ptr = scan_infos;
 	found_board = nullptr;
 
-	// Scan for bluetooth devices
+	// Scan for Bluetooth devices
 	int const found_devices = hci_inquiry(device_id, wait_len, max_infos, nullptr, &scan_infos_ptr, IREQ_CACHE_FLUSH);
 	if (found_devices < 0)
 	{
-		ERROR_LOG(WIIMOTE, "Error searching for bluetooth devices.");
+		ERROR_LOG(WIIMOTE, "Error searching for Bluetooth devices.");
 		return;
 	}
 
-	DEBUG_LOG(WIIMOTE, "Found %i bluetooth device(s).", found_devices);
+	DEBUG_LOG(WIIMOTE, "Found %i Bluetooth device(s).", found_devices);
 
 	// Display discovered devices
 	for (int i = 0; i < found_devices; ++i)
@@ -111,7 +111,7 @@ void WiimoteScanner::FindWiimotes(std::vector<Wiimote*> & found_wiimotes, Wiimot
 
 			// TODO: do this
 
-			// Determine if this wiimote has already been found.
+			// Determine if this Wiimote has already been found.
 			//for (int j = 0; j < MAX_WIIMOTES && new_wiimote; ++j)
 			//{
 			//	if (wm[j] && bacmp(&scan_infos[i].bdaddr,&wm[j]->bdaddr) == 0)
@@ -133,7 +133,7 @@ void WiimoteScanner::FindWiimotes(std::vector<Wiimote*> & found_wiimotes, Wiimot
 				else
 				{
 					found_wiimotes.push_back(wm);
-					NOTICE_LOG(WIIMOTE, "Found wiimote (%s).", bdaddr_str);
+					NOTICE_LOG(WIIMOTE, "Found Wiimote (%s).", bdaddr_str);
 				}
 			}
 		}
@@ -163,7 +163,7 @@ WiimoteLinux::~WiimoteLinux()
 	close(m_wakeup_pipe_r);
 }
 
-// Connect to a wiimote with a known address.
+// Connect to a Wiimote with a known address.
 bool WiimoteLinux::ConnectInternal()
 {
 	sockaddr_l2 addr = {};
@@ -176,7 +176,7 @@ bool WiimoteLinux::ConnectInternal()
 	if ((m_cmd_sock = socket(AF_BLUETOOTH, SOCK_SEQPACKET, BTPROTO_L2CAP)) == -1 ||
 	                  connect(m_cmd_sock, (sockaddr*)&addr, sizeof(addr)) < 0)
 	{
-		WARN_LOG(WIIMOTE, "Unable to open output socket to wiimote: %s", strerror(errno));
+		WARN_LOG(WIIMOTE, "Unable to open output socket to Wiimote: %s", strerror(errno));
 		close(m_cmd_sock);
 		m_cmd_sock = -1;
 		return false;
@@ -187,7 +187,7 @@ bool WiimoteLinux::ConnectInternal()
 	if ((m_int_sock = socket(AF_BLUETOOTH, SOCK_SEQPACKET, BTPROTO_L2CAP)) == -1 ||
 	                  connect(m_int_sock, (sockaddr*)&addr, sizeof(addr)) < 0)
 	{
-		WARN_LOG(WIIMOTE, "Unable to open input socket from wiimote: %s", strerror(errno));
+		WARN_LOG(WIIMOTE, "Unable to open input socket from Wiimote: %s", strerror(errno));
 		close(m_int_sock);
 		close(m_cmd_sock);
 		m_int_sock = m_cmd_sock = -1;
@@ -234,7 +234,7 @@ int WiimoteLinux::IORead(u8* buf)
 
 	if (select(m_int_sock + 1, &fds, nullptr, nullptr, nullptr) == -1)
 	{
-		ERROR_LOG(WIIMOTE, "Unable to select wiimote %i input socket.", m_index + 1);
+		ERROR_LOG(WIIMOTE, "Unable to select Wiimote %i input socket.", m_index + 1);
 		return -1;
 	}
 
@@ -256,11 +256,11 @@ int WiimoteLinux::IORead(u8* buf)
 	if (r == -1)
 	{
 		// Error reading data
-		ERROR_LOG(WIIMOTE, "Receiving data from wiimote %i.", m_index + 1);
+		ERROR_LOG(WIIMOTE, "Receiving data from Wiimote %i.", m_index + 1);
 
 		if (errno == ENOTCONN)
 		{
-			// This can happen if the bluetooth dongle is disconnected
+			// This can happen if the Bluetooth dongle is disconnected
 			ERROR_LOG(WIIMOTE, "Bluetooth appears to be disconnected.  "
 					"Wiimote %i will be disconnected.", m_index + 1);
 		}