mirror of https://github.com/PCSX2/pcsx2.git
Port a few of the Windows cleanups to the Linux version, and correct a few warnings while I'm at it.
git-svn-id: http://pcsx2-playground.googlecode.com/svn/trunk@307 a6443dda-0b58-4228-96e9-037be469359c
This commit is contained in:
arcum42
Gregory Hainaut
parent
56004a1e8b
commit
22fa366df2
|
|
@ -18,6 +18,56 @@
|
|||
|
||||
#include "ConfigDlg.h"
|
||||
|
||||
static void ConfPlugin(PluginConf confs, char* plugin, const char* name)
|
||||
{
|
||||
void *drv;
|
||||
void (*conf)();
|
||||
char file[g_MaxPath];
|
||||
|
||||
GetComboText(confs.Combo, confs.plist, plugin);
|
||||
strcpy(file, Config.PluginsDir);
|
||||
strcat(file, plugin);
|
||||
|
||||
drv = SysLoadLibrary(file);
|
||||
getcwd(file, ARRAYSIZE(file)); /* store current dir */
|
||||
chdir(Config.PluginsDir); /* change dirs so that plugins can find their config file*/
|
||||
if (drv == NULL) return;
|
||||
|
||||
conf = (void (*)()) SysLoadSym(drv, name);
|
||||
if (SysLibError() == NULL) conf();
|
||||
chdir(file); /* change back*/
|
||||
SysCloseLibrary(drv);
|
||||
}
|
||||
|
||||
|
||||
static void TestPlugin(PluginConf confs, char* plugin, const char* name)
|
||||
{
|
||||
void *drv;
|
||||
s32 (* (*conf)())();
|
||||
char file[g_MaxPath];
|
||||
int ret = 0;
|
||||
|
||||
GetComboText(confs.Combo, confs.plist, plugin);
|
||||
strcpy(file, Config.PluginsDir);
|
||||
strcat(file, plugin);
|
||||
|
||||
drv = SysLoadLibrary(file);
|
||||
getcwd(file, ARRAYSIZE(file)); /* store current dir */
|
||||
chdir(Config.PluginsDir); /* change dirs so that plugins can find their config file*/
|
||||
if (drv == NULL) return;
|
||||
|
||||
conf = (s32 (* (*)())()) SysLoadSym(drv, name);
|
||||
if (SysLibError() == NULL)
|
||||
ret = (s32) conf();
|
||||
chdir(file); /* change back*/
|
||||
SysCloseLibrary(drv);
|
||||
|
||||
if (ret == 0)
|
||||
SysMessage(_("This plugin reports that should work correctly"));
|
||||
else
|
||||
SysMessage(_("This plugin reports that should not work correctly"));
|
||||
}
|
||||
|
||||
void OnConf_Gs(GtkMenuItem *menuitem, gpointer user_data)
|
||||
{
|
||||
char file[255];
|
||||
|
|
@ -161,99 +211,99 @@ void OnConfConf_Cancel(GtkButton *button, gpointer user_data) {
|
|||
}
|
||||
|
||||
void OnConfConf_GsConf(GtkButton *button, gpointer user_data) {
|
||||
ConfPlugin(_GSconfigure, GSConfS, Config.GS, "GSconfigure");
|
||||
ConfPlugin(GSConfS, Config.GS, "GSconfigure");
|
||||
}
|
||||
|
||||
void OnConfConf_GsTest(GtkButton *button, gpointer user_data) {
|
||||
TestPlugin(_GStest, GSConfS, Config.GS, "GStest");
|
||||
TestPlugin(GSConfS, Config.GS, "GStest");
|
||||
}
|
||||
|
||||
void OnConfConf_GsAbout(GtkButton *button, gpointer user_data) {
|
||||
ConfPlugin(_GSabout, GSConfS, Config.GS, "GSabout");
|
||||
ConfPlugin(GSConfS, Config.GS, "GSabout");
|
||||
}
|
||||
|
||||
void OnConfConf_Pad1Conf(GtkButton *button, gpointer user_data) {
|
||||
ConfPlugin(_PADconfigure, PAD1ConfS, Config.PAD1, "PADconfigure");
|
||||
ConfPlugin(PAD1ConfS, Config.PAD1, "PADconfigure");
|
||||
}
|
||||
|
||||
void OnConfConf_Pad1Test(GtkButton *button, gpointer user_data) {
|
||||
TestPlugin(_PADtest, PAD1ConfS, Config.PAD1, "PADtest");
|
||||
TestPlugin(PAD1ConfS, Config.PAD1, "PADtest");
|
||||
}
|
||||
|
||||
void OnConfConf_Pad1About(GtkButton *button, gpointer user_data) {
|
||||
ConfPlugin(_PADabout, PAD1ConfS, Config.PAD1, "PADabout");
|
||||
ConfPlugin(PAD1ConfS, Config.PAD1, "PADabout");
|
||||
}
|
||||
|
||||
void OnConfConf_Pad2Conf(GtkButton *button, gpointer user_data) {
|
||||
ConfPlugin(_PADconfigure, PAD2ConfS, Config.PAD2, "PADconfigure");
|
||||
ConfPlugin(PAD2ConfS, Config.PAD2, "PADconfigure");
|
||||
}
|
||||
|
||||
void OnConfConf_Pad2Test(GtkButton *button, gpointer user_data) {
|
||||
TestPlugin(_PADtest, PAD2ConfS, Config.PAD2, "PADtest");
|
||||
TestPlugin(PAD2ConfS, Config.PAD2, "PADtest");
|
||||
}
|
||||
|
||||
void OnConfConf_Pad2About(GtkButton *button, gpointer user_data) {
|
||||
ConfPlugin(_PADabout, PAD2ConfS, Config.PAD2, "PADabout");
|
||||
ConfPlugin(PAD2ConfS, Config.PAD2, "PADabout");
|
||||
}
|
||||
|
||||
void OnConfConf_Spu2Conf(GtkButton *button, gpointer user_data) {
|
||||
ConfPlugin(_SPU2configure, SPU2ConfS, Config.SPU2, "SPU2configure");
|
||||
ConfPlugin(SPU2ConfS, Config.SPU2, "SPU2configure");
|
||||
}
|
||||
|
||||
void OnConfConf_Spu2Test(GtkButton *button, gpointer user_data) {
|
||||
TestPlugin(_SPU2test, SPU2ConfS, Config.SPU2, "SPU2test");
|
||||
TestPlugin(SPU2ConfS, Config.SPU2, "SPU2test");
|
||||
}
|
||||
|
||||
void OnConfConf_Spu2About(GtkButton *button, gpointer user_data) {
|
||||
ConfPlugin(_SPU2about, SPU2ConfS, Config.SPU2, "SPU2about");
|
||||
ConfPlugin(SPU2ConfS, Config.SPU2, "SPU2about");
|
||||
}
|
||||
|
||||
void OnConfConf_CdvdConf(GtkButton *button, gpointer user_data) {
|
||||
ConfPlugin(_CDVDconfigure, CDVDConfS, Config.CDVD, "CDVDconfigure");
|
||||
ConfPlugin(CDVDConfS, Config.CDVD, "CDVDconfigure");
|
||||
}
|
||||
|
||||
void OnConfConf_CdvdTest(GtkButton *button, gpointer user_data) {
|
||||
TestPlugin(_CDVDtest, CDVDConfS, Config.CDVD, "CDVDtest");
|
||||
TestPlugin(CDVDConfS, Config.CDVD, "CDVDtest");
|
||||
}
|
||||
|
||||
void OnConfConf_CdvdAbout(GtkButton *button, gpointer user_data) {
|
||||
ConfPlugin(_CDVDabout, CDVDConfS, Config.CDVD, "CDVDabout");
|
||||
ConfPlugin(CDVDConfS, Config.CDVD, "CDVDabout");
|
||||
}
|
||||
|
||||
void OnConfConf_Dev9Conf(GtkButton *button, gpointer user_data) {
|
||||
ConfPlugin(_DEV9configure, DEV9ConfS, Config.DEV9, "DEV9configure");
|
||||
ConfPlugin( DEV9ConfS, Config.DEV9, "DEV9configure");
|
||||
}
|
||||
|
||||
void OnConfConf_Dev9Test(GtkButton *button, gpointer user_data) {
|
||||
TestPlugin(_DEV9test, DEV9ConfS, Config.DEV9, "DEV9test");
|
||||
TestPlugin(DEV9ConfS, Config.DEV9, "DEV9test");
|
||||
}
|
||||
|
||||
void OnConfConf_Dev9About(GtkButton *button, gpointer user_data) {
|
||||
ConfPlugin(_DEV9about, DEV9ConfS, Config.DEV9, "DEV9about");
|
||||
ConfPlugin( DEV9ConfS, Config.DEV9, "DEV9about");
|
||||
}
|
||||
|
||||
void OnConfConf_UsbConf(GtkButton *button, gpointer user_data) {
|
||||
ConfPlugin(_USBconfigure, USBConfS, Config.USB, "USBconfigure");
|
||||
ConfPlugin(USBConfS, Config.USB, "USBconfigure");
|
||||
}
|
||||
|
||||
void OnConfConf_UsbTest(GtkButton *button, gpointer user_data) {
|
||||
TestPlugin(_USBtest, USBConfS, Config.USB, "USBtest");
|
||||
TestPlugin(USBConfS, Config.USB, "USBtest");
|
||||
}
|
||||
|
||||
void OnConfConf_UsbAbout(GtkButton *button, gpointer user_data) {
|
||||
ConfPlugin(_USBabout, USBConfS, Config.USB, "USBabout");
|
||||
ConfPlugin(USBConfS, Config.USB, "USBabout");
|
||||
}
|
||||
|
||||
void OnConfConf_FWConf(GtkButton *button, gpointer user_data) {
|
||||
ConfPlugin(_FWconfigure, FWConfS, Config.FW, "FWconfigure");
|
||||
ConfPlugin( FWConfS, Config.FW, "FWconfigure");
|
||||
}
|
||||
|
||||
void OnConfConf_FWTest(GtkButton *button, gpointer user_data) {
|
||||
TestPlugin(_FWtest, FWConfS, Config.FW, "FWtest");
|
||||
TestPlugin(FWConfS, Config.FW, "FWtest");
|
||||
}
|
||||
|
||||
void OnConfConf_FWAbout(GtkButton *button, gpointer user_data) {
|
||||
ConfPlugin(_FWabout, FWConfS, Config.FW, "FWabout");
|
||||
ConfPlugin( FWConfS, Config.FW, "FWabout");
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -357,7 +407,7 @@ void FindPlugins() {
|
|||
DIR *dir;
|
||||
struct dirent *ent;
|
||||
void *Handle;
|
||||
char plugin[256],name[256];
|
||||
char plugin[g_MaxPath],name[g_MaxPath];
|
||||
|
||||
GSConfS.plugins = 0; CDVDConfS.plugins = 0; DEV9ConfS.plugins = 0;
|
||||
PAD1ConfS.plugins = 0; PAD2ConfS.plugins = 0; SPU2ConfS.plugins = 0;
|
||||
|
|
|
|||
|
|
@ -35,71 +35,6 @@ extern "C" {
|
|||
}
|
||||
#endif
|
||||
|
||||
// Evil Macros - Destroy when possible
|
||||
#define FindComboText(combo,plist, list, conf) \
|
||||
if (strlen(conf) > 0) { \
|
||||
SetActiveComboItem(GTK_COMBO_BOX(combo), plist, list, conf); \
|
||||
}
|
||||
|
||||
#define GetComboText(combo,list,conf) \
|
||||
{ \
|
||||
int i; \
|
||||
char *tmp = (char*)gtk_combo_box_get_active_text(GTK_COMBO_BOX(combo)); \
|
||||
for (i=2;i<255;i+=2) { \
|
||||
if (!strcmp(tmp, list[i-1])) { \
|
||||
strcpy(conf, list[i-2]); \
|
||||
break; \
|
||||
} \
|
||||
} \
|
||||
}
|
||||
|
||||
#define ConfPlugin(src, confs, plugin, name) \
|
||||
void *drv; \
|
||||
src conf; \
|
||||
char file[256]; \
|
||||
GetComboText(confs.Combo, confs.plist, plugin); \
|
||||
strcpy(file, Config.PluginsDir); \
|
||||
strcat(file, plugin); \
|
||||
drv = SysLoadLibrary(file); \
|
||||
getcwd(file, ARRAYSIZE(file)); /* store current dir */ \
|
||||
chdir(Config.PluginsDir); /* change dirs so that plugins can find their config file*/ \
|
||||
if (drv == NULL) return; \
|
||||
conf = (src) SysLoadSym(drv, (char*)name); \
|
||||
if (SysLibError() == NULL) conf(); \
|
||||
chdir(file); /* change back*/ \
|
||||
SysCloseLibrary(drv);
|
||||
|
||||
#define TestPlugin(src, confs, plugin, name) \
|
||||
void *drv; \
|
||||
src conf; \
|
||||
int ret = 0; \
|
||||
char file[256]; \
|
||||
GetComboText(confs.Combo, confs.plist, plugin); \
|
||||
strcpy(file, Config.PluginsDir); \
|
||||
strcat(file, plugin); \
|
||||
drv = SysLoadLibrary(file); \
|
||||
if (drv == NULL) return; \
|
||||
conf = (src) SysLoadSym(drv, (char*)name); \
|
||||
if (SysLibError() == NULL) { \
|
||||
ret = conf(); \
|
||||
if (ret == 0) \
|
||||
SysMessage(_("This plugin reports that should work correctly")); \
|
||||
else SysMessage(_("This plugin reports that should not work correctly")); \
|
||||
} \
|
||||
SysCloseLibrary(drv);
|
||||
|
||||
#define ConfCreatePConf(name, type) \
|
||||
type##ConfS.Combo = lookup_widget(ConfDlg, "GtkCombo_" name); \
|
||||
SetComboToGList(GTK_COMBO_BOX(type##ConfS.Combo), type##ConfS.PluginNameList); \
|
||||
FindComboText(type##ConfS.Combo, type##ConfS.plist, type##ConfS.PluginNameList, Config.type);
|
||||
|
||||
#define ComboAddPlugin(type) { \
|
||||
sprintf (name, "%s %ld.%ld.%ld", PS2EgetLibName(), (version>>8)&0xff ,version&0xff, (version>>24)&0xff); \
|
||||
type##ConfS.plugins+=2; \
|
||||
strcpy(type##ConfS.plist[type##ConfS.plugins-1], name); \
|
||||
strcpy(type##ConfS.plist[type##ConfS.plugins-2], ent->d_name); \
|
||||
type##ConfS.PluginNameList = g_list_append(type##ConfS.PluginNameList, type##ConfS.plist[type##ConfS.plugins-1]); \
|
||||
}
|
||||
|
||||
// Helper Functions
|
||||
void FindPlugins();
|
||||
|
|
@ -130,4 +65,39 @@ _PS2EgetLibType PS2EgetLibType = NULL;
|
|||
_PS2EgetLibVersion2 PS2EgetLibVersion2 = NULL;
|
||||
_PS2EgetLibName PS2EgetLibName = NULL;
|
||||
|
||||
// Evil Macros - Destroy when possible
|
||||
#define FindComboText(combo,plist, list, conf) \
|
||||
if (strlen(conf) > 0) { \
|
||||
SetActiveComboItem(GTK_COMBO_BOX(combo), plist, list, conf); \
|
||||
}
|
||||
|
||||
#define GetComboText(combo,list,conf) \
|
||||
{ \
|
||||
int i; \
|
||||
char *tmp = (char*)gtk_combo_box_get_active_text(GTK_COMBO_BOX(combo)); \
|
||||
for (i=2;i<255;i+=2) { \
|
||||
if (!strcmp(tmp, list[i-1])) { \
|
||||
strcpy(conf, list[i-2]); \
|
||||
break; \
|
||||
} \
|
||||
} \
|
||||
}
|
||||
|
||||
|
||||
static void ConfPlugin(PluginConf confs, char* plugin, const char* name);
|
||||
static void TestPlugin(PluginConf confs, char* plugin, const char* name);
|
||||
|
||||
#define ConfCreatePConf(name, type) \
|
||||
type##ConfS.Combo = lookup_widget(ConfDlg, "GtkCombo_" name); \
|
||||
SetComboToGList(GTK_COMBO_BOX(type##ConfS.Combo), type##ConfS.PluginNameList); \
|
||||
FindComboText(type##ConfS.Combo, type##ConfS.plist, type##ConfS.PluginNameList, Config.type);
|
||||
|
||||
#define ComboAddPlugin(type) { \
|
||||
sprintf (name, "%s %ld.%ld.%ld", PS2EgetLibName(), (version>>8)&0xff ,version&0xff, (version>>24)&0xff); \
|
||||
type##ConfS.plugins+=2; \
|
||||
strcpy(type##ConfS.plist[type##ConfS.plugins-1], name); \
|
||||
strcpy(type##ConfS.plist[type##ConfS.plugins-2], ent->d_name); \
|
||||
type##ConfS.PluginNameList = g_list_append(type##ConfS.PluginNameList, type##ConfS.plist[type##ConfS.plugins-1]); \
|
||||
}
|
||||
|
||||
#endif // __CONFIGDLG_H__
|
||||
|
|
@ -46,11 +46,11 @@ GtkWidget *MemWriteDlg, *MemEntry, *DataEntry;
|
|||
GtkAdjustment *DebugAdj;
|
||||
|
||||
extern int efile;
|
||||
extern char elfname[256];
|
||||
extern char elfname[g_MaxPath];
|
||||
|
||||
int DebugMode; // 0 - EE | 1 - IOP
|
||||
static u32 dPC, dBPA = -1, dBPC = -1;
|
||||
static char nullAddr[256];
|
||||
static char nullAddr[g_MaxPath];
|
||||
|
||||
GtkWidget *DebugWnd;
|
||||
|
||||
|
|
|
|||
|
|
@ -188,7 +188,7 @@ void OnFile_Exit(GtkMenuItem *menuitem, gpointer user_data) {
|
|||
DIR *dir;
|
||||
struct dirent *ent;
|
||||
void *Handle;
|
||||
char plugin[256];
|
||||
char plugin[g_MaxPath];
|
||||
|
||||
// with this the problem with plugins that are linked with the pthread
|
||||
// library is solved
|
||||
|
|
@ -237,7 +237,7 @@ void OnEmu_Reset(GtkMenuItem *menuitem, gpointer user_data)
|
|||
|
||||
void ResetMenuSlots(GtkMenuItem *menuitem, gpointer user_data) {
|
||||
GtkWidget *Item;
|
||||
char str[256];
|
||||
char str[g_MaxPath];
|
||||
int i;
|
||||
|
||||
for (i=0; i<5; i++) {
|
||||
|
|
@ -251,7 +251,7 @@ void OnEmu_Reset(GtkMenuItem *menuitem, gpointer user_data)
|
|||
}
|
||||
|
||||
void UpdateMenuSlots(GtkMenuItem *menuitem, gpointer user_data) {
|
||||
char str[256];
|
||||
char str[g_MaxPath];
|
||||
int i = 0;
|
||||
|
||||
for (i=0; i<5; i++) {
|
||||
|
|
@ -261,7 +261,7 @@ void UpdateMenuSlots(GtkMenuItem *menuitem, gpointer user_data) {
|
|||
}
|
||||
|
||||
void States_Load(int num) {
|
||||
char Text[256];
|
||||
char Text[g_MaxPath];
|
||||
int ret;
|
||||
|
||||
efile = 2;
|
||||
|
|
@ -274,7 +274,7 @@ void States_Load(int num) {
|
|||
}
|
||||
|
||||
void States_Save(int num) {
|
||||
char Text[256];
|
||||
char Text[g_MaxPath];
|
||||
int ret;
|
||||
|
||||
sprintf (Text, SSTATES_DIR "/%8.8X.%3.3d", ElfCRC, num);
|
||||
|
|
@ -295,7 +295,7 @@ void OnStates_Load5(GtkMenuItem *menuitem, gpointer user_data) { States_Load(4);
|
|||
|
||||
void OnLoadOther_Ok(GtkButton* button, gpointer user_data) {
|
||||
gchar *File;
|
||||
char str[256];
|
||||
char str[g_MaxPath];
|
||||
int ret;
|
||||
|
||||
File = (gchar*)gtk_file_selection_get_filename(GTK_FILE_SELECTION(FileSel));
|
||||
|
|
@ -340,7 +340,7 @@ void OnStates_Save5(GtkMenuItem *menuitem, gpointer user_data) { States_Save(4);
|
|||
|
||||
void OnSaveOther_Ok(GtkButton* button, gpointer user_data) {
|
||||
gchar *File;
|
||||
char str[256];
|
||||
char str[g_MaxPath];
|
||||
int ret;
|
||||
|
||||
File = (gchar*)gtk_file_selection_get_filename(GTK_FILE_SELECTION(FileSel));
|
||||
|
|
@ -380,7 +380,7 @@ void OnArguments_Ok(GtkButton *button, gpointer user_data) {
|
|||
char *str;
|
||||
|
||||
str = (char*)gtk_entry_get_text(GTK_ENTRY(widgetCmdLine));
|
||||
memcpy(args, str, 256);
|
||||
memcpy(args, str, g_MaxPath);
|
||||
|
||||
gtk_widget_destroy(CmdLine);
|
||||
gtk_widget_set_sensitive(MainWindow, TRUE);
|
||||
|
|
@ -587,7 +587,7 @@ void OnHelpAbout_Ok(GtkButton *button, gpointer user_data) {
|
|||
}
|
||||
|
||||
void OnHelp_About(GtkMenuItem *menuitem, gpointer user_data) {
|
||||
char str[256];
|
||||
char str[g_MaxPath];
|
||||
GtkWidget *Label;
|
||||
|
||||
AboutDlg = create_AboutDlg();
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ bool needReset = TRUE;
|
|||
bool RunExe = FALSE;
|
||||
|
||||
int efile = 0;
|
||||
char elfname[256];
|
||||
char elfname[g_MaxPath];
|
||||
int Slots[5] = { -1, -1, -1, -1, -1 };
|
||||
|
||||
GtkWidget *CpuDlg;
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@
|
|||
extern "C" {
|
||||
#endif
|
||||
|
||||
#include "../Paths.h"
|
||||
#include "Paths.h"
|
||||
#include "Common.h"
|
||||
|
||||
/* Misc.c */
|
||||
|
|
@ -86,7 +86,7 @@ extern void init_widgets();
|
|||
|
||||
|
||||
typedef struct {
|
||||
char lang[256];
|
||||
char lang[g_MaxPath];
|
||||
} _langs;
|
||||
|
||||
typedef enum
|
||||
|
|
@ -114,7 +114,7 @@ GtkWidget *radio_normal_limit, *radio_limit_limit, *radio_fs_limit, *radio_vuski
|
|||
_langs *langs;
|
||||
unsigned int langsMax;
|
||||
|
||||
char cfgfile[256];
|
||||
char cfgfile[g_MaxPath];
|
||||
|
||||
/* Hacks */
|
||||
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ GtkWidget *MsgDlg;
|
|||
|
||||
int main(int argc, char *argv[]) {
|
||||
char *file = NULL;
|
||||
char elfname[256];
|
||||
char elfname[g_MaxPath];
|
||||
int efile = 0;
|
||||
int i = 1;
|
||||
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@ __forceinline static void _rcntSet( int i, int bitwise )
|
|||
// thanks to being forceinline'd, this conditional will always be optimized
|
||||
// to a constant by VC (confirmed via disassembler):
|
||||
|
||||
u64 overflowCap = (bitwise==32) ? 0x100000000 : 0x10000;
|
||||
u64 overflowCap = (bitwise==32) ? 0x100000000ULL : 0x10000;
|
||||
u64 c;
|
||||
|
||||
#ifdef _DEBUG
|
||||
|
|
@ -184,7 +184,7 @@ void psxCheckEndGate16(int i)
|
|||
psxCounters[i].count += (u16)psxRcntRcount16(i); //Only counts when signal is on
|
||||
break;
|
||||
case 0x1: //GATE_ON_ClearStart
|
||||
if(psxCounters[i].mode & 0x10000000)psxRcntUpd16(i);
|
||||
if(psxCounters[i].mode & 0x10000000) psxRcntUpd16(i);
|
||||
psxCounters[i].mode &= ~0x10000000;
|
||||
break;
|
||||
case 0x2: //GATE_ON_Clear_OFF_Start
|
||||
|
|
@ -318,10 +318,10 @@ void _testRcnt16target(int i) {
|
|||
psxCounters[i].count -= psxCounters[i].target;
|
||||
if((psxCounters[i].mode & 0x40) == 0){
|
||||
SysPrintf("Counter %x repeat intr not set on zero ret, ignoring target\n", i);
|
||||
psxCounters[i].target += 0x1000000000;
|
||||
psxCounters[i].target += 0x1000000000ULL;
|
||||
}
|
||||
|
||||
} else psxCounters[i].target += 0x1000000000;
|
||||
} else psxCounters[i].target += 0x1000000000ULL;
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -379,10 +379,10 @@ void _testRcnt32target(int i) {
|
|||
psxCounters[i].count -= psxCounters[i].target;
|
||||
if((psxCounters[i].mode & 0x40) == 0){
|
||||
SysPrintf("Counter %x repeat intr not set on zero ret, ignoring target\n", i);
|
||||
psxCounters[i].target += 0x1000000000;
|
||||
psxCounters[i].target += 0x1000000000ULL;
|
||||
}
|
||||
|
||||
} else psxCounters[i].target += 0x1000000000;
|
||||
} else psxCounters[i].target += 0x1000000000ULL;
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -400,7 +400,7 @@ void _testRcnt32overflow(int i) {
|
|||
psxCounters[i].mode&= ~0x0400; // Interrupt flag
|
||||
}
|
||||
}
|
||||
psxCounters[i].count -= 0x100000000;
|
||||
psxCounters[i].count -= 0x100000000ULL;
|
||||
if(psxCounters[i].target > 0xffffffff) {
|
||||
//SysPrintf("IOP 32 Correcting target on overflow\n");
|
||||
if((psxCounters[i].mode & 0x50) <= 0x40 && (psxCounters[i].mode & 0x50) != 0) SysPrintf("Counter %x overflowing, no repeat interrupt mode = %x\n", i, psxCounters[i].mode);
|
||||
|
|
@ -762,7 +762,7 @@ void psxRcntWtarget16(int index, u32 value) {
|
|||
psxCounters[index].target = value & 0xffff;
|
||||
if(psxCounters[index].target <= psxRcntCycles(index)/* && psxCounters[index].target != 0*/) {
|
||||
//SysPrintf("IOP 16 Saving %x target from early trigger target = %x, count = %I64x\n", index, psxCounters[index].target, psxRcntCycles(index));
|
||||
psxCounters[index].target += 0x1000000000;
|
||||
psxCounters[index].target += 0x1000000000ULL;
|
||||
}
|
||||
|
||||
_rcntSet( index, 16 );
|
||||
|
|
@ -777,7 +777,7 @@ void psxRcntWtarget32(int index, u32 value) {
|
|||
psxCounters[index].target = value;
|
||||
if(psxCounters[index].target <= psxRcntCycles(index)/* && psxCounters[index].target != 0*/) {
|
||||
//SysPrintf("IOP 32 Saving %x target from early trigger target = %x, count = %I64x\n", index, psxCounters[index].target, psxRcntCycles(index));
|
||||
psxCounters[index].target += 0x1000000000;
|
||||
psxCounters[index].target += 0x1000000000ULL;
|
||||
}
|
||||
|
||||
_rcntSet( index, 32 );
|
||||
|
|
|
|||
Loading…
Reference in New Issue