Fix Linux compilation (and I suspect a crash). Fix up some of the null plugins so that they actually load in Linux.

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2369 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
arcum42 2009-12-20 13:45:26 +00:00
parent bc3b419272
commit d36ba78392
9 changed files with 27 additions and 5979 deletions

View File

@ -244,7 +244,7 @@ void __evt_fastcall Panels::PluginSelectorPanel::OnCorePluginStatusChanged( void
wxComboBox& box( panel.m_ComponentBoxes->Get(pi->id) );
panel.m_ComponentBoxes->GetConfigButton(pi->id).Enable(
(panel.m_FileList==NULL || panel.m_FileList->Count() == 0) ? false :
g_Conf->FullpathMatchTest( pi->id, panel.m_FileList->at((int)box.GetClientData(box.GetSelection())) )
g_Conf->FullpathMatchTest( pi->id,(*panel.m_FileList)[((int)box.GetClientData(box.GetSelection()))] )
);
} while( ++pi, pi->shortname != NULL );

View File

@ -16,6 +16,11 @@
#pragma once
#ifdef newVif
// newVif_HashBucket.h uses this typedef, so it has to be decared first.
typedef u32 (__fastcall *nVifCall)(void*, void*);
typedef void (__fastcall *nVifrecCall)(uptr dest, uptr src);
#include "newVif_BlockBuffer.h"
#include "newVif_HashBucket.h"
#include "x86emitter/x86emitter.h"
@ -26,9 +31,6 @@ extern void _nVifUnpack (int idx, u8 *data, u32 size);
extern void dVifUnpack (int idx, u8 *data, u32 size);
extern void dVifInit (int idx);
typedef u32 (__fastcall *nVifCall)(void*, void*);
typedef void (__fastcall *nVifrecCall)(uptr dest, uptr src);
static __pagealigned u8 nVifUpkExec[__pagesize*4];
static __aligned16 nVifCall nVifUpk[(2*2*16) *4]; // ([USN][Masking][Unpack Type]) [curCycle]
static __aligned16 u32 nVifMask[3][4][4] = {0}; // [MaskNumber][CycleNumber][Vector]

View File

@ -272,7 +272,7 @@ void writeBackRow(nVifStruct& v) {
// ToDo: Do we need to write back to vifregs.rX too!? :/
}
static __pagealigned u8 nVifMemCmp[__pagesize];
__pagealigned u8 nVifMemCmp[__pagesize];
void emitCustomCompare() {
HostSys::MemProtectStatic(nVifMemCmp, Protect_ReadWrite, false);

View File

@ -22,6 +22,7 @@
#include <string>
using namespace std;
#include "FW.h"
const u8 version = PS2E_FW_VERSION;
@ -33,6 +34,7 @@ static char *libraryName = "FWnull Driver";
s8 *fwregs;
FILE *fwLog;
Config conf;
string s_strIniPath="inis/";
void (*FWirq)();
@ -141,6 +143,11 @@ EXPORT_C_(void) FWirqCallback(void (*callback)())
FWirq = callback;
}
EXPORT_C_(void) FWsetSettingsDir(const char* dir)
{
s_strIniPath = (dir==NULL) ? "inis/" : dir;
}
EXPORT_C_(s32) FWfreeze(int mode, freezeData *data)
{
return 0;

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -23,6 +23,7 @@
using namespace std;
#include "USB.h"
string s_strIniPath="inis/";
const unsigned char version = PS2E_USB_VERSION;
const unsigned char revision = 0;
@ -146,6 +147,11 @@ EXPORT_C_(void) USBsetRAM(void *mem)
USB_LOG("*Setting ram.\n");
}
EXPORT_C_(void) USBsetSettingsDir(const char* dir)
{
s_strIniPath = (dir==NULL) ? "inis/" : dir;
}
// extended funcs
EXPORT_C_(s32) USBfreeze(int mode, freezeData *data)

View File

@ -30,6 +30,7 @@ const char *libraryName = "DEV9null Driver";
void (*DEV9irq)(int);
FILE *dev9Log;
Config conf;
string s_strIniPath="inis/";
EXPORT_C_(u32) PS2EgetLibType()
{
@ -143,6 +144,11 @@ EXPORT_C_(DEV9handler) DEV9irqHandler(void)
return NULL;
}
EXPORT_C_(void) DEV9setSettingsDir(const char* dir)
{
s_strIniPath = (dir==NULL) ? "inis/" : dir;
}
// extended funcs
EXPORT_C_(s32) DEV9test()

File diff suppressed because it is too large Load Diff