diff --git a/pcsx2/Linux/LnxMain.cpp b/pcsx2/Linux/LnxMain.cpp
index 4f764cfac7..251d9f13d1 100644
--- a/pcsx2/Linux/LnxMain.cpp
+++ b/pcsx2/Linux/LnxMain.cpp
@@ -216,6 +216,11 @@ void On_Dialog_Cancelled(GtkButton* button, gpointer user_data)
gtk_main_quit();
}
+void On_Dialog_Close(GtkDialog* dialog, gpointer user_data)
+{
+ gtk_widget_set_sensitive(MainWindow, TRUE);
+}
+
void RefreshMenuSlots()
{
GtkWidget *Item;
diff --git a/pcsx2/Linux/callbacks.h b/pcsx2/Linux/callbacks.h
index 771418a3ca..7e20155d17 100644
--- a/pcsx2/Linux/callbacks.h
+++ b/pcsx2/Linux/callbacks.h
@@ -257,3 +257,7 @@ OnLogging_Ok (GtkButton *button,
void
OnMemcards_Ok (GtkButton *button,
gpointer user_data);
+
+void
+On_Dialog_Close (GtkDialog *dialog,
+ gpointer user_data);
diff --git a/pcsx2/Linux/interface.c b/pcsx2/Linux/interface.c
index df94254c7e..5c1fcf9ed7 100644
--- a/pcsx2/Linux/interface.c
+++ b/pcsx2/Linux/interface.c
@@ -523,6 +523,9 @@ create_AdvDlg (void)
gtk_dialog_add_action_widget (GTK_DIALOG (AdvDlg), button80, GTK_RESPONSE_CANCEL);
GTK_WIDGET_SET_FLAGS (button80, GTK_CAN_DEFAULT);
+ g_signal_connect ((gpointer) AdvDlg, "close",
+ G_CALLBACK (On_Dialog_Close),
+ NULL);
g_signal_connect ((gpointer) AdvDefaultBtn, "clicked",
G_CALLBACK (on_Advanced_Defaults),
NULL);
@@ -831,6 +834,9 @@ create_SpeedHacksDlg (void)
gtk_dialog_add_action_widget (GTK_DIALOG (SpeedHacksDlg), button98, GTK_RESPONSE_CANCEL);
GTK_WIDGET_SET_FLAGS (button98, GTK_CAN_DEFAULT);
+ g_signal_connect ((gpointer) SpeedHacksDlg, "close",
+ G_CALLBACK (On_Dialog_Close),
+ NULL);
g_signal_connect ((gpointer) EECycleHackScale, "value_changed",
G_CALLBACK (on_ee_slider_changed),
NULL);
@@ -969,6 +975,9 @@ create_GameFixDlg (void)
gtk_dialog_add_action_widget (GTK_DIALOG (GameFixDlg), button83, GTK_RESPONSE_CANCEL);
GTK_WIDGET_SET_FLAGS (button83, GTK_CAN_DEFAULT);
+ g_signal_connect ((gpointer) GameFixDlg, "close",
+ G_CALLBACK (On_Dialog_Close),
+ NULL);
g_signal_connect ((gpointer) cancelbutton1, "clicked",
G_CALLBACK (on_Game_Fix_OK),
NULL);
@@ -4156,6 +4165,9 @@ create_CpuDlg (void)
gtk_dialog_add_action_widget (GTK_DIALOG (CpuDlg), button97, 0);
GTK_WIDGET_SET_FLAGS (button97, GTK_CAN_DEFAULT);
+ g_signal_connect ((gpointer) CpuDlg, "close",
+ G_CALLBACK (On_Dialog_Close),
+ NULL);
g_signal_connect ((gpointer) button96, "clicked",
G_CALLBACK (OnCpu_Ok),
NULL);
@@ -4521,6 +4533,9 @@ create_Logging (void)
gtk_dialog_add_action_widget (GTK_DIALOG (Logging), Logging2Cancel, GTK_RESPONSE_CANCEL);
GTK_WIDGET_SET_FLAGS (Logging2Cancel, GTK_CAN_DEFAULT);
+ g_signal_connect ((gpointer) Logging, "close",
+ G_CALLBACK (On_Dialog_Close),
+ NULL);
g_signal_connect ((gpointer) Logging_Ok, "clicked",
G_CALLBACK (OnLogging_Ok),
NULL);
@@ -4747,6 +4762,9 @@ create_MemDlg (void)
gtk_dialog_add_action_widget (GTK_DIALOG (MemDlg), okbutton1, GTK_RESPONSE_CANCEL);
GTK_WIDGET_SET_FLAGS (okbutton1, GTK_CAN_DEFAULT);
+ g_signal_connect ((gpointer) MemDlg, "close",
+ G_CALLBACK (On_Dialog_Close),
+ NULL);
g_signal_connect ((gpointer) memcardcancelbutton, "clicked",
G_CALLBACK (OnMemcards_Ok),
NULL);
diff --git a/pcsx2/Linux/pcsx2.glade b/pcsx2/Linux/pcsx2.glade
index a53cc57b60..397d21bb1b 100644
--- a/pcsx2/Linux/pcsx2.glade
+++ b/pcsx2/Linux/pcsx2.glade
@@ -19,6 +19,7 @@
True
False
True
+
@@ -1188,6 +1189,7 @@ Denormals are Zero - Your CPU makes Floating Point Denormals become Zero, so it
True
False
True
+
@@ -1777,6 +1779,7 @@ If you have problems, Disable all of these and try again.
True
False
True
+
@@ -6418,6 +6421,7 @@ Version x.x
True
False
True
+
@@ -7295,6 +7299,7 @@ Version x.x
True
False
True
+
@@ -8102,6 +8107,7 @@ Version x.x
True
False
True
+
diff --git a/plugins/USBnull/Makefile.am b/plugins/USBnull/Makefile.am
index 838ab78919..b341b28e91 100644
--- a/plugins/USBnull/Makefile.am
+++ b/plugins/USBnull/Makefile.am
@@ -29,6 +29,5 @@ libUSBnull_a_SOURCES += \
Linux/interface.h Linux/support.c \
Linux/interface.c Linux/support.h \
Linux/callbacks.h
-#Linux/callbacks.c
#SUBDIRS = Linux
\ No newline at end of file
diff --git a/plugins/USBnull/USB.cpp b/plugins/USBnull/USB.cpp
index ba540e73a1..3afa17d50f 100644
--- a/plugins/USBnull/USB.cpp
+++ b/plugins/USBnull/USB.cpp
@@ -95,35 +95,35 @@ EXPORT_C_(void) USBclose()
EXPORT_C_(u8 ) USBread8(u32 addr)
{
- USB_LOG("*UnKnown 8bit read at address %lx ", addr);
+ USB_LOG("*Unknown 8bit read at address %lx ", addr);
return 0;
}
EXPORT_C_(u16) USBread16(u32 addr)
{
- USB_LOG("*UnKnown 16bit read at address %lx", addr);
+ USB_LOG("*Unknown 16bit read at address %lx", addr);
return 0;
}
EXPORT_C_(u32) USBread32(u32 addr)
{
- USB_LOG("*UnKnown 32bit read at address %lx", addr);
+ USB_LOG("*Unknown 32bit read at address %lx", addr);
return 0;
}
EXPORT_C_(void) USBwrite8(u32 addr, u8 value)
{
- USB_LOG("*UnKnown 8bit write at address %lx value %x\n", addr, value);
+ USB_LOG("*Unknown 8bit write at address %lx value %x\n", addr, value);
}
EXPORT_C_(void) USBwrite16(u32 addr, u16 value)
{
- USB_LOG("*UnKnown 16bit write at address %lx value %x\n", addr, value);
+ USB_LOG("*Unknown 16bit write at address %lx value %x\n", addr, value);
}
EXPORT_C_(void) USBwrite32(u32 addr, u32 value)
{
- USB_LOG("*UnKnown 32bit write at address %lx value %lx\n", addr, value);
+ USB_LOG("*Unknown 32bit write at address %lx value %lx\n", addr, value);
}
EXPORT_C_(void) USBirqCallback(USBcallback callback)
@@ -143,6 +143,7 @@ EXPORT_C_(USBhandler) USBirqHandler(void)
EXPORT_C_(void) USBsetRAM(void *mem)
{
+ USB_LOG("*Setting ram.\n");
}
// extended funcs
diff --git a/plugins/USBnull/USB.h b/plugins/USBnull/USB.h
index b10424e5d1..699ba1a432 100644
--- a/plugins/USBnull/USB.h
+++ b/plugins/USBnull/USB.h
@@ -1,5 +1,5 @@
-/* USBlinuz
- * Copyright (C) 2002-2004 USBlinuz Team
+/* USBnull
+ * Copyright (C) 2002-2009 pcsx2 Team
*
* 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
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-
#ifndef __USB_H__
#define __USB_H__
diff --git a/plugins/dev9null/DEV9.cpp b/plugins/dev9null/DEV9.cpp
index 7f050a4723..7e8ce7ecb9 100644
--- a/plugins/dev9null/DEV9.cpp
+++ b/plugins/dev9null/DEV9.cpp
@@ -16,11 +16,12 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include
-#include
-#include
+#include
#include
-#include "PS2Etypes.h"
+#include
+#include
+using namespace std;
+
#include "DEV9.h"
const unsigned char version = PS2E_DEV9_VERSION;
@@ -28,9 +29,11 @@ const unsigned char revision = 0;
const unsigned char build = 4; // increase that with each version
const char *libraryName = "DEV9null Driver";
+string s_strIniPath="inis/DEV9null.ini";
-void (*DEV9irq)();
+void (*DEV9irq)(int);
FILE *dev9Log;
+Config conf;
EXPORT_C_(u32) PS2EgetLibType()
{
@@ -47,10 +50,12 @@ EXPORT_C_(u32) PS2EgetLibVersion2(u32 type)
return (version<<16) | (revision<<8) | build;
}
-void __Log(char *fmt, ...)
+void __Log(char *fmt, ...)
{
va_list list;
+ if (!conf.Log || dev9Log == NULL) return;
+
va_start(list, fmt);
vfprintf(dev9Log, fmt, list);
va_end(list);
@@ -58,11 +63,23 @@ void __Log(char *fmt, ...)
EXPORT_C_(s32) DEV9init()
{
+ LoadConfig();
+
+#ifdef DEV9_LOG
+ dev9Log = fopen("logs/dev9Log.txt", "w");
+ if (dev9Log) setvbuf(dev9Log, NULL, _IONBF, 0);
+ DEV9_LOG("dev9null plugin version %d,%d\n", revision, build);
+ DEV9_LOG("DEV9init\n");
+#endif
+
return 0;
}
EXPORT_C_(void) DEV9shutdown()
{
+#ifdef DEV9_LOG
+ if (dev9Log) fclose(dev9Log);
+#endif
}
EXPORT_C_(s32) DEV9open(void *pDsp)
@@ -77,42 +94,50 @@ EXPORT_C_(void) DEV9close()
EXPORT_C_(u8) DEV9read8(u32 addr)
{
+ DEV9_LOG("*Unknown 8bit read at address %lx ", addr);
return 0;
}
EXPORT_C_(u16 ) DEV9read16(u32 addr)
{
+ DEV9_LOG("*Unknown 16bit read at address %lx ", addr);
return 0;
}
EXPORT_C_(u32 ) DEV9read32(u32 addr)
{
+ DEV9_LOG("*Unknown 32bit read at address %lx ", addr);
return 0;
}
EXPORT_C_(void) DEV9write8(u32 addr, u8 value)
{
+ DEV9_LOG("*Unknown 8bit write at address %lx value %x\n", addr, value);
}
EXPORT_C_(void) DEV9write16(u32 addr, u16 value)
{
+ DEV9_LOG("*Unknown 16bit write at address %lx value %x\n", addr, value);
}
EXPORT_C_(void) DEV9write32(u32 addr, u32 value)
{
+ DEV9_LOG("*Unknown 32bit write at address %lx value %x\n", addr, value);
}
EXPORT_C_(void) DEV9readDMA8Mem(u32 *pMem, int size)
{
+ DEV9_LOG("Reading DMA8 Mem.");
}
EXPORT_C_(void) DEV9writeDMA8Mem(u32* pMem, int size)
{
+ DEV9_LOG("Writing DMA8 Mem.");
}
EXPORT_C_(void) DEV9irqCallback(DEV9callback callback)
{
-
+ DEV9irq = callback;
}
EXPORT_C_(DEV9handler) DEV9irqHandler(void)
@@ -127,6 +152,7 @@ EXPORT_C_(s32) DEV9test()
return 0;
}
+#ifdef _WIN32
EXPORT_C_(void) DEV9configure()
{
SysMessage("Nothing to Configure");
@@ -136,8 +162,6 @@ EXPORT_C_(void) DEV9about()
{
}
-#ifdef _WIN32
-
HINSTANCE hInst;
void SysMessage(const char *fmt, ...)
diff --git a/plugins/dev9null/DEV9.h b/plugins/dev9null/DEV9.h
index a827a0e019..a20dd450db 100644
--- a/plugins/dev9null/DEV9.h
+++ b/plugins/dev9null/DEV9.h
@@ -1,3 +1,21 @@
+/* dev9null
+ * Copyright (C) 2002-2009 pcsx2 Team
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
#ifndef __DEV9_H__
#define __DEV9_H__
@@ -17,6 +35,13 @@ extern "C"
#include "PS2Edefs.h"
}
+typedef struct {
+ int Log;
+} Config;
+
+extern Config conf;
+#define DEV9_LOG __Log
+
/*#ifdef _MSC_VER
#define EXPORT_C_(type) extern "C" __declspec(dllexport) type CALLBACK
#else
@@ -35,7 +60,10 @@ extern const unsigned char build;
extern const unsigned int minor;
extern const char *libraryName;
-extern void (*DEV9irq)();
+void SaveConfig();
+void LoadConfig();
+
+extern void (*DEV9irq)(int);
extern void SysMessage(const char *fmt, ...);
extern FILE *dev9Log;
diff --git a/plugins/dev9null/Linux/Config.cpp b/plugins/dev9null/Linux/Config.cpp
index 89b686d779..fb99c4381d 100644
--- a/plugins/dev9null/Linux/Config.cpp
+++ b/plugins/dev9null/Linux/Config.cpp
@@ -16,15 +16,35 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+ #include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+using namespace std;
+
+#include "Config.h"
#include "DEV9.h"
+ #ifdef __cplusplus
+
+extern "C"
+{
+#endif
-#include
-#include
-#include
-#include
+#include "support.h"
+#include "callbacks.h"
+#include "interface.h"
-GtkWidget *MsgDlg;
+#ifdef __cplusplus
+}
+#endif
+
+GtkWidget *MsgDlg, *About, *Conf;
+extern string s_strIniPath;
void OnMsg_Ok()
{
@@ -74,6 +94,76 @@ void SysMessage(const char *fmt, ...)
gtk_main();
}
-void LoadConfig()
+void OnAbout_Ok(GtkButton *button, gpointer user_data)
{
+ gtk_widget_destroy(About);
+ gtk_main_quit();
}
+
+EXPORT_C_(void) DEV9about()
+{
+ About = create_About();
+ gtk_widget_show_all(About);
+ gtk_main();
+}
+
+void OnConf_Ok(GtkButton *button, gpointer user_data)
+{
+ conf.Log = is_checked(Conf, "check_logging");
+ SaveConfig();
+
+ gtk_widget_destroy(Conf);
+ gtk_main_quit();
+}
+
+void OnConf_Cancel(GtkButton *button, gpointer user_data)
+{
+ gtk_widget_destroy(Conf);
+ gtk_main_quit();
+}
+
+EXPORT_C_(void) DEV9configure()
+{
+ LoadConfig();
+ Conf = create_Config();
+
+ set_checked(Conf, "check_logging", conf.Log);
+ gtk_widget_show_all(Conf);
+ gtk_main();
+}
+
+void LoadConfig()
+{
+ FILE *f;
+ char cfg[255];
+
+ strcpy(cfg, s_strIniPath.c_str());
+ f = fopen(cfg, "r");
+ if (f == NULL)
+ {
+ printf("failed to open %s\n", s_strIniPath.c_str());
+ SaveConfig();//save and return
+ return;
+ }
+ fscanf(f, "logging = %hhx\n", &conf.Log);
+ //fscanf(f, "options = %hhx\n", &confOptions);
+ fclose(f);
+}
+
+void SaveConfig()
+{
+ FILE *f;
+ char cfg[255];
+
+ strcpy(cfg, s_strIniPath.c_str());
+ f = fopen(cfg,"w");
+ if (f == NULL)
+ {
+ printf("failed to open '%s'\n", s_strIniPath.c_str());
+ return;
+ }
+ fprintf(f, "logging = %hhx\n", conf.Log);
+ //fprintf(f, "options = %hhx\n", confOptions);
+ fclose(f);
+}
+
diff --git a/plugins/dev9null/Linux/dev9.glade b/plugins/dev9null/Linux/dev9.glade
index 10b8a7f4d1..204ecc3db2 100644
--- a/plugins/dev9null/Linux/dev9.glade
+++ b/plugins/dev9null/Linux/dev9.glade
@@ -295,6 +295,71 @@
+
+
+ True
+ 0
+ 0.5
+ GTK_SHADOW_NONE
+
+
+
+ True
+ 0.5
+ 0.5
+ 1
+ 1
+ 0
+ 0
+ 12
+ 0
+
+
+
+ True
+ True
+ Enable Logging
+ True
+ GTK_RELIEF_NORMAL
+ True
+ False
+ False
+ True
+
+
+
+
+
+
+
+ True
+ <b>Logging</b>
+ False
+ True
+ GTK_JUSTIFY_LEFT
+ False
+ False
+ 0.5
+ 0.5
+ 0
+ 0
+ PANGO_ELLIPSIZE_NONE
+ -1
+ False
+ 0
+
+
+ label_item
+
+
+
+
+ 0
+ True
+ True
+
+
+
True
diff --git a/plugins/dev9null/Linux/interface.c b/plugins/dev9null/Linux/interface.c
index eef82eaf94..9625f99b79 100644
--- a/plugins/dev9null/Linux/interface.c
+++ b/plugins/dev9null/Linux/interface.c
@@ -45,6 +45,10 @@ create_Config (void)
GList *GtkCombo_Hdd_items = NULL;
GtkWidget *entry1;
GtkWidget *label15;
+ GtkWidget *frame4;
+ GtkWidget *alignment1;
+ GtkWidget *check_logging;
+ GtkWidget *label16;
GtkWidget *hbuttonbox1;
GtkWidget *button1;
GtkWidget *button2;
@@ -132,6 +136,29 @@ create_Config (void)
gtk_widget_show (label15);
gtk_frame_set_label_widget (GTK_FRAME (frame3), label15);
+ frame4 = gtk_frame_new (NULL);
+ gtk_widget_set_name (frame4, "frame4");
+ gtk_widget_show (frame4);
+ gtk_box_pack_start (GTK_BOX (vbox1), frame4, TRUE, TRUE, 0);
+ gtk_frame_set_shadow_type (GTK_FRAME (frame4), GTK_SHADOW_NONE);
+
+ alignment1 = gtk_alignment_new (0.5, 0.5, 1, 1);
+ gtk_widget_set_name (alignment1, "alignment1");
+ gtk_widget_show (alignment1);
+ gtk_container_add (GTK_CONTAINER (frame4), alignment1);
+ gtk_alignment_set_padding (GTK_ALIGNMENT (alignment1), 0, 0, 12, 0);
+
+ check_logging = gtk_check_button_new_with_mnemonic (_("Enable Logging"));
+ gtk_widget_set_name (check_logging, "check_logging");
+ gtk_widget_show (check_logging);
+ gtk_container_add (GTK_CONTAINER (alignment1), check_logging);
+
+ label16 = gtk_label_new (_("Logging"));
+ gtk_widget_set_name (label16, "label16");
+ gtk_widget_show (label16);
+ gtk_frame_set_label_widget (GTK_FRAME (frame4), label16);
+ gtk_label_set_use_markup (GTK_LABEL (label16), TRUE);
+
hbuttonbox1 = gtk_hbutton_box_new ();
gtk_widget_set_name (hbuttonbox1, "hbuttonbox1");
gtk_widget_show (hbuttonbox1);
@@ -172,6 +199,10 @@ create_Config (void)
GLADE_HOOKUP_OBJECT (Config, GtkCombo_Hdd, "GtkCombo_Hdd");
GLADE_HOOKUP_OBJECT (Config, entry1, "entry1");
GLADE_HOOKUP_OBJECT (Config, label15, "label15");
+ GLADE_HOOKUP_OBJECT (Config, frame4, "frame4");
+ GLADE_HOOKUP_OBJECT (Config, alignment1, "alignment1");
+ GLADE_HOOKUP_OBJECT (Config, check_logging, "check_logging");
+ GLADE_HOOKUP_OBJECT (Config, label16, "label16");
GLADE_HOOKUP_OBJECT (Config, hbuttonbox1, "hbuttonbox1");
GLADE_HOOKUP_OBJECT (Config, button1, "button1");
GLADE_HOOKUP_OBJECT (Config, button2, "button2");
diff --git a/plugins/dev9null/Makefile.am b/plugins/dev9null/Makefile.am
index 708b882df6..d8137623c7 100644
--- a/plugins/dev9null/Makefile.am
+++ b/plugins/dev9null/Makefile.am
@@ -22,6 +22,10 @@ libDEV9null_LDFLAGS= @SHARED_LDFLAGS@
libDEV9null_LDFLAGS+=-Wl,-soname,@libDEV9null_SONAME@
libDEV9null_LDADD=$(libDEV9null_a_OBJECTS)
-libDEV9null_a_SOURCES = DEV9.cpp DEV9.h Linux/Config.cpp
+libDEV9null_a_SOURCES = DEV9.cpp DEV9.h Linux/Config.cpp Linux/Config.h
+libDEV9null_a_SOURCES += \
+Linux/interface.h Linux/support.c \
+Linux/interface.c Linux/support.h \
+Linux/callbacks.h
#SUBDIRS = Linux
\ No newline at end of file