mirror/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-03-29 10:20:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix annoying debug break in win32. some cleanup

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2639 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Shawn Hoffman 2009-03-10 05:43:18 +00:00
parent 79e14b4077
commit 19921c057a
3 changed files with 142 additions and 155 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/Common/Src/CPUDetect.cpp
View File

@ -92,8 +92,8 @@ void CPUInfo::Detect()
#ifdef _WIN32 #ifdef _WIN32
#ifdef _M_IX86 #ifdef _M_IX86
bool f64 = false; BOOL f64 = false;
OS64bit = IsWow64Process(GetCurrentProcess(), (PBOOL)(&f64)) && f64; OS64bit = IsWow64Process(GetCurrentProcess(), &f64);
#endif #endif
#endif #endif

21
Source/Core/Core/Src/HW/GBAPipe.cpp
View File

@ -1,4 +1,4 @@
// Copyright (C) 2003-2008 Dolphin Project. // Copyright (C) 2003-2009 Dolphin Project.
// This program is free software: you can redistribute it and/or modify // This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by // it under the terms of the GNU General Public License as published by
@ -14,20 +14,14 @@
// Official SVN repository and contact information can be found at // Official SVN repository and contact information can be found at
// http://code.google.com/p/dolphin-emu/ // http://code.google.com/p/dolphin-emu/
#ifdef _WIN32 #ifdef _WIN32
#include <windows.h> #include <windows.h>
#endif #endif
#include "Common.h"
#include "../Core.h"
#include "GBAPipe.h" #include "GBAPipe.h"
#include "../PowerPC/PowerPC.h"
#include "CommandProcessor.h"
#include "../Host.h"
#ifdef _WIN32 #ifdef _WIN32
namespace GBAPipe namespace GBAPipe
@ -36,16 +30,10 @@ namespace GBAPipe
HANDLE m_hPipe; HANDLE m_hPipe;
bool m_bIsServer; bool m_bIsServer;
bool m_bEnabled; bool m_bEnabled;
u32 m_BlockStart;
#define PIPENAME "\\\\.\\pipe\\gbapipe" #define PIPENAME "\\\\.\\pipe\\gbapipe"
void SetBlockStart(u32 addr)
{
m_BlockStart = addr;
}
void StartServer() void StartServer()
{ {
if (m_bEnabled) if (m_bEnabled)
@ -158,8 +146,8 @@ namespace GBAPipe
return m_bIsServer; return m_bIsServer;
} }
} // namespace GBAPipe
}
#else #else
namespace GBAPipe namespace GBAPipe
@ -171,7 +159,6 @@ namespace GBAPipe
void Write(u8 data) { } void Write(u8 data) { }
bool IsEnabled() { return false; } bool IsEnabled() { return false; }
bool IsServer() { return false; } bool IsServer() { return false; }
} } // namespace GBAPipe
// #error Provide a GBAPipe implementation or dummy it out, please
#endif #endif

6
Source/Core/Core/Src/HW/GBAPipe.h
View File

@ -1,4 +1,4 @@
// Copyright (C) 2003-2008 Dolphin Project. // Copyright (C) 2003-2009 Dolphin Project.
// This program is free software: you can redistribute it and/or modify // This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by // it under the terms of the GNU General Public License as published by
@ -26,6 +26,7 @@
namespace GBAPipe namespace GBAPipe
{ {
// start the server // start the server
void StartServer(); void StartServer();
@ -45,7 +46,6 @@ namespace GBAPipe
// IsServer // IsServer
bool IsServer(); bool IsServer();
void SetBlockStart(u32 addr); } // namespace GBAPipe
}
#endif #endif