diff --git a/pcsx2/CDVD/CDVD.h b/pcsx2/CDVD/CDVD.h
index 04d18242da..864868131d 100644
--- a/pcsx2/CDVD/CDVD.h
+++ b/pcsx2/CDVD/CDVD.h
@@ -16,6 +16,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
+
#pragma once
@@ -27,7 +28,7 @@
#define btoi(b) ((b)/16*10 + (b)%16) /* BCD to u_char */
#define itob(i) ((i)/10*16 + (i)%10) /* u_char to BCD */
-static __forceinline s32 msf_to_lsn(u8 *Time)
+static __forceinline s32 msf_to_lsn(u8 *Time)
{
u32 lsn;
@@ -46,7 +47,7 @@ static __forceinline s32 msf_to_lba(u8 m, u8 s, u8 f)
return lsn;
}
-static __forceinline void lsn_to_msf(u8 *Time, s32 lsn)
+static __forceinline void lsn_to_msf(u8 *Time, s32 lsn)
{
lsn += 150;
Time[2] = lsn / 4500; // minuten
@@ -136,10 +137,10 @@ struct cdvdStruct {
struct CDVD_API
{
void (CALLBACK *close)();
-
+
// Don't need init or shutdown. iso/nodisc have no init/shutdown and plugin's
// is handled by the PluginManager.
-
+
// Don't need plugin specific things like freeze, test, or other stuff here.
// Those are handled by the plugin manager specifically.
@@ -175,23 +176,6 @@ extern void cdvdNewDiskCB();
extern u8 cdvdRead(u8 key);
extern void cdvdWrite(u8 key, u8 rt);
-// ----------------------------------------------------------------------------
-// Multiple interface system for CDVD
-// used to provide internal CDVDiso and NoDisc, and external plugin interfaces.
-// ---------------------------------------------------------------------------
-
-// ----------------------------------------------------------------------------
-// Multiple interface system for CDVD
-// used to provide internal CDVDiso and NoDisc, and external plugin interfaces.
-// ---------------------------------------------------------------------------
-
-enum CDVD_SourceType
-{
- CDVDsrc_Iso = 0, // use built in ISO api
- CDVDsrc_Plugin, // use external plugin
- CDVDsrc_NoDisc, // use built in CDVDnull
-};
-
extern void CDVDsys_ChangeSource( CDVD_SourceType type );
extern CDVD_API* CDVD; // currently active CDVD access mode api (either Iso, NoDisc, or Plugin)
diff --git a/pcsx2/CDVD/CDVDaccess.h b/pcsx2/CDVD/CDVDaccess.h
index 36bb633ec3..7591e33c63 100644
--- a/pcsx2/CDVD/CDVDaccess.h
+++ b/pcsx2/CDVD/CDVDaccess.h
@@ -23,7 +23,7 @@ extern void DoCDVDclose();
extern s32 DoCDVDreadSector(u8* buffer, u32 lsn, int mode);
extern s32 DoCDVDreadTrack(u32 lsn, int mode);
extern s32 DoCDVDgetBuffer(u8* buffer);
-extern s32 DoCDVDreadSubQ(u32 lsn, cdvdSubQ* subq);
+//extern s32 DoCDVDreadSubQ(u32 lsn, cdvdSubQ* subq);
extern void DoCDVDnewDiskCB(void (*callback)());
extern s32 DoCDVDdetectDiskType();
extern void DoCDVDresetDiskTypeCache();
diff --git a/pcsx2/Linux/pcsx2.cbp b/pcsx2/Linux/pcsx2.cbp
index 34740d4bb9..1abd66c325 100644
--- a/pcsx2/Linux/pcsx2.cbp
+++ b/pcsx2/Linux/pcsx2.cbp
@@ -117,11 +117,8 @@
-
-
-
@@ -216,7 +213,7 @@
-
+
@@ -235,7 +232,6 @@
-
@@ -302,6 +298,7 @@
+
@@ -312,6 +309,7 @@
+
diff --git a/pcsx2/System.cpp b/pcsx2/System.cpp
index 11f5cedf55..b519623ada 100644
--- a/pcsx2/System.cpp
+++ b/pcsx2/System.cpp
@@ -70,7 +70,7 @@ void SysDetect()
L"\tx86Flags = %8.8x %8.8x\n"
L"\tx86EFlags = %8.8x\n",
wxString::FromAscii( x86caps.VendorName ).c_str(), x86caps.StepID,
- wxString::FromAscii( x86caps.FamilyName ).Trim().Trim(false).c_str(),
+ wxString::FromAscii( x86caps.FamilyName ).Trim().Trim(false).c_str(),
x86caps.Speed / 1000, x86caps.Speed%1000,
x86caps.PhysicalCores, x86caps.LogicalCores,
wxString::FromAscii( x86caps.TypeName ).c_str(),
@@ -134,7 +134,7 @@ bool SysAllocateMem()
// Failures on the core initialization of memory is bad, since it means the emulator is
// completely non-functional.
-
+
//Msgbox::Alert( "Failed to allocate memory needed to run pcsx2.\n\nError: %s", params ex.cMessage() );
SysShutdownMem();
return false;
@@ -166,7 +166,7 @@ void SysAllocateDynarecs()
{
// TODO : Fix this message. It should respond according to the user's
// currently configured recompiler.interpreter options, for example.
-
+
/*Msgbox::Alert(
"The EE/IOP recompiler failed to initialize with the following error:\n\n"
"%s"
@@ -215,7 +215,7 @@ void SysAllocateDynarecs()
Msgbox::Alert(
"The VU1 recompiler failed to initialize with the following error:\n\n"
"%s"
- "\n\nThe VU1 interpreter will be used for this session (will slow down most games).", params
+ "\n\nThe VU1 interpreter will be used for this session (will slow down most games).", params
ex.cMessage()
);
*/
diff --git a/pcsx2/System.h b/pcsx2/System.h
index 8daf4a2ee4..c778acc454 100644
--- a/pcsx2/System.h
+++ b/pcsx2/System.h
@@ -23,8 +23,18 @@
#include "Utilities/Threading.h" // to use threading stuff, include the Threading namespace in your file.
#include "Misc.h"
+// ----------------------------------------------------------------------------
+// Multiple interface system for CDVD
+// used to provide internal CDVDiso and NoDisc, and external plugin interfaces.
+// ---------------------------------------------------------------------------
+enum CDVD_SourceType
+{
+ CDVDsrc_Iso = 0, // use built in ISO api
+ CDVDsrc_Plugin, // use external plugin
+ CDVDsrc_NoDisc, // use built in CDVDnull
+};
+
class CoreEmuThread;
-enum CDVD_SourceType;
extern bool SysInit();
extern void SysDetect(); // Detects cpu type and fills cpuInfo structs.
diff --git a/pcsx2/ps2/CoreEmuThread.cpp b/pcsx2/ps2/CoreEmuThread.cpp
index f166632cd8..2fd341a318 100644
--- a/pcsx2/ps2/CoreEmuThread.cpp
+++ b/pcsx2/ps2/CoreEmuThread.cpp
@@ -75,6 +75,8 @@ void CoreEmuThread::CpuInitializeMess()
// of SEH, and so these functions can be inlined.
#ifdef _WIN32
# define __unique_stackframe __noinline
+#else
+# define __unique_stackframe
#endif
// On Win32 this function invokes SEH, which requires it be in a function all by itself