Fix up Linux. Comment out a bit of unused code.

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2463 96395faa-99c1-11dd-bbfe-3dabce05a288

pcsx2/Linux/pcsx2.cbp

@@ -470,6 +470,7 @@
 		<Unit filename="../gui/pxLogTextCtrl.cpp" />
 		<Unit filename="../gui/wxAppWithHelpers.cpp" />
 		<Unit filename="../gui/wxAppWithHelpers.h" />
+		<Unit filename="../pcsx2hostfs.cpp" />
 		<Unit filename="../ps2/BiosTools.cpp" />
 		<Unit filename="../ps2/BiosTools.h" />
 		<Unit filename="../ps2/GIFpath.cpp" />
@@ -484,7 +485,6 @@
 		<Unit filename="../x86/VifUnpackSSE.h" />
 		<Unit filename="../x86/VifUnpackSSE_Dynarec.cpp" />
 		<Unit filename="../x86/aVUzerorec.S" />
-		<Unit filename="../x86/aVif.S" />
 		<Unit filename="../x86/iCOP0.cpp" />
 		<Unit filename="../x86/iCOP0.h" />
 		<Unit filename="../x86/iCOP2.cpp" />
@@ -510,9 +510,6 @@
 		<Unit filename="../x86/iR5900MultDiv.h" />
 		<Unit filename="../x86/iR5900Shift.h" />
 		<Unit filename="../x86/iVU1micro.cpp" />
-		<Unit filename="../x86/iVif.cpp">
-			<Option compiler="gcc" use="0" buildCommand="gcc $options -S $includes -c $file -o $object" />
-		</Unit>
 		<Unit filename="../x86/ir5900tables.cpp" />
 		<Unit filename="../x86/ix86-32/iCore-32.cpp" />
 		<Unit filename="../x86/ix86-32/iR5900-32.cpp" />

pcsx2/Sifcmd.h

@@ -18,15 +18,15 @@
 
 /* from sifcmd.h */
 
-#define SYSTEM_CMD	0x80000000
+//#define SYSTEM_CMD	0x80000000
-
+//
-struct t_sif_cmd_header
+//struct t_sif_cmd_header
-{
+//{
-	u32 size;
+//	u32 size;
-	void *dest;
+//	void *dest;
-	s32 command;
+//	s32 command;
-	u32 unknown;
+//	u32 unknown;
-};
+//};
 
 struct t_sif_dma_transfer
 {
@@ -35,158 +35,158 @@ struct t_sif_dma_transfer
 	s32 size;
 	s32 attr;
 };
-
+//
-struct t_sif_handler
+//struct t_sif_handler
-{
+//{
-	void	(*handler)(void *a, void *b);
+//	void	(*handler)(void *a, void *b);
-	void *buff;
+//	void *buff;
-};
+//};
-
+//
-#define SYSTEM_CMD_CHANGE_SADDR	0x80000000
+//#define SYSTEM_CMD_CHANGE_SADDR	0x80000000
-#define SYSTEM_CMD_INIT_CMD	0x80000002
+//#define SYSTEM_CMD_INIT_CMD	0x80000002
-struct t_sif_saddr
+//struct t_sif_saddr
-{
+//{
-	struct t_sif_cmd_header	hdr;		//+00
+//	struct t_sif_cmd_header	hdr;		//+00
-	void *newaddr;	//+10
+//	void *newaddr;	//+10
-};						//=14
+//};						//=14
-
+//
-#define SYSTEM_CMD_SET_SREG	0x80000001
+//#define SYSTEM_CMD_SET_SREG	0x80000001
-struct t_sif_sreg
+//struct t_sif_sreg
-{
+//{
-	struct t_sif_cmd_header	hdr;		//+00
+//	struct t_sif_cmd_header	hdr;		//+00
-	s32 index;		//+10
+//	s32 index;		//+10
-	u32 value;		//+14
+//	u32 value;		//+14
-};						//=18
+//};						//=18
-
+//
-#define SYSTEM_CMD_RESET	0x80000003
+//#define SYSTEM_CMD_RESET	0x80000003
-struct t_sif_reset
+//struct t_sif_reset
-{
+//{
-	struct t_sif_cmd_header	hdr;		//+00
+//	struct t_sif_cmd_header	hdr;		//+00
-	s32 size;		//+10
+//	s32 size;		//+10
-	s32 flag;		//+14
+//	s32 flag;		//+14
-	char data[80];	//+18
+//	char data[80];	//+18
-};						//=68
+//};						//=68
 
 /* end of sifcmd.h */
 
 /* from sifsrpc.h */
 
-struct t_sif_rpc_rend
+//struct t_sif_rpc_rend
-{
+//{
-	struct t_sif_cmd_header	sifcmd;
+//	struct t_sif_cmd_header	sifcmd;
-	s32 rec_id;		/* 04 */
+//	s32 rec_id;		/* 04 */
-	void *pkt_addr;	/* 05 */
+//	void *pkt_addr;	/* 05 */
-	s32 rpc_id;		/* 06 */
+//	s32 rpc_id;		/* 06 */
-
+//
-	struct t_rpc_client_data	*client;	/* 7 */
+//	struct t_rpc_client_data	*client;	/* 7 */
-	u32 command;	/* 8 */
+//	u32 command;	/* 8 */
-	struct t_rpc_server_data	*server;	/* 9 */
+//	struct t_rpc_server_data	*server;	/* 9 */
-	void *buff;		/* 10 */
+//	void *buff;		/* 10 */
-	void *buff2;		/* 11 */
+//	void *buff2;		/* 11 */
-};
+//};
-
+//
-struct t_sif_rpc_other_data
+//struct t_sif_rpc_other_data
-{
+//{
-	struct t_sif_cmd_header	sifcmd;
+//	struct t_sif_cmd_header	sifcmd;
-	s32 rec_id;		/* 04 */
+//	s32 rec_id;		/* 04 */
-	void *pkt_addr;	/* 05 */
+//	void *pkt_addr;	/* 05 */
-	s32 rpc_id;		/* 06 */
+//	s32 rpc_id;		/* 06 */
-
+//
-	struct t_rpc_receive_data	*receive;	/* 07 */
+//	struct t_rpc_receive_data	*receive;	/* 07 */
-	void *src;		/* 08 */
+//	void *src;		/* 08 */
-	void *dest;		/* 09 */
+//	void *dest;		/* 09 */
-	s32 size;		/* 10 */
+//	s32 size;		/* 10 */
-};
+//};
-
+//
-struct t_sif_rpc_bind
+//struct t_sif_rpc_bind
-{
+//{
-	struct t_sif_cmd_header	sifcmd;
+//	struct t_sif_cmd_header	sifcmd;
-	s32 rec_id;		/* 04 */
+//	s32 rec_id;		/* 04 */
-	void *pkt_addr;	/* 05 */
+//	void *pkt_addr;	/* 05 */
-	s32 rpc_id;		/* 06 */
+//	s32 rpc_id;		/* 06 */
-	struct t_rpc_client_data	*client;	/* 07 */
+//	struct t_rpc_client_data	*client;	/* 07 */
-	s32 rpc_number;	/* 08 */
+//	s32 rpc_number;	/* 08 */
-};
+//};
-
+//
-struct t_sif_rpc_call
+//struct t_sif_rpc_call
-{
+//{
-	struct t_sif_cmd_header	sifcmd;
+//	struct t_sif_cmd_header	sifcmd;
-	s32 rec_id;		/* 04 */
+//	s32 rec_id;		/* 04 */
-	void *pkt_addr;	/* 05 */
+//	void *pkt_addr;	/* 05 */
-	s32 rpc_id;		/* 06 */
+//	s32 rpc_id;		/* 06 */
-	struct t_rpc_client_data	*client;	/* 07 */
+//	struct t_rpc_client_data	*client;	/* 07 */
-	s32 rpc_number;	/* 08 */
+//	s32 rpc_number;	/* 08 */
-	s32 send_size;	/* 09 */
+//	s32 send_size;	/* 09 */
-	void *receive;	/* 10 */
+//	void *receive;	/* 10 */
-	s32 rec_size;	/* 11 */
+//	s32 rec_size;	/* 11 */
-	s32 has_async_ef;	/* 12 */
+//	s32 has_async_ef;	/* 12 */
-	struct t_rpc_server_data	*server;	/* 13 */
+//	struct t_rpc_server_data	*server;	/* 13 */
-};
+//};
-
+//
-struct t_rpc_server_data
+//struct t_rpc_server_data
-{
+//{
-	s32 command;	/* 04	00 */
+//	s32 command;	/* 04	00 */
-
+//
-	void  *(*func)(u32, void *, int);	/* 05	01 */
+//	void  *(*func)(u32, void *, int);	/* 05	01 */
-	void *buff;		/* 06	02 */
+//	void *buff;		/* 06	02 */
-	s32 size;		/* 07	03 */
+//	s32 size;		/* 07	03 */
-
+//
-	void  *(*func2)(u32, void *, int);    /* 08	04 */
+//	void  *(*func2)(u32, void *, int);    /* 08	04 */
-	void *buff2;		/* 09	05 */
+//	void *buff2;		/* 09	05 */
-	s32 size2;		/* 10	06 */
+//	s32 size2;		/* 10	06 */
-
+//
-	struct t_rpc_client_data	*client;	/* 11	07 */
+//	struct t_rpc_client_data	*client;	/* 11	07 */
-	void *pkt_addr;	/* 12	08 */
+//	void *pkt_addr;	/* 12	08 */
-	s32 rpc_number;	/* 13	09 */
+//	s32 rpc_number;	/* 13	09 */
-
+//
-	void *receive;	/* 14	10 */
+//	void *receive;	/* 14	10 */
-	s32 rec_size;	/* 15	11 */
+//	s32 rec_size;	/* 15	11 */
-	s32 has_async_ef;	/* 16	12 */
+//	s32 has_async_ef;	/* 16	12 */
-	s32 rec_id;		/* 17	13 */
+//	s32 rec_id;		/* 17	13 */
-
+//
-	struct t_rpc_server_data	*link;		/* 18	14 */
+//	struct t_rpc_server_data	*link;		/* 18	14 */
-	struct r_rpc_server_data	*next;		/* 19	15 */
+//	struct r_rpc_server_data	*next;		/* 19	15 */
-	struct t_rpc_data_queue	*queued_object;	/* 20	16 */
+//	struct t_rpc_data_queue	*queued_object;	/* 20	16 */
-};
+//};
-
+//
-
+//
-struct t_rpc_header
+//struct t_rpc_header
-{
+//{
-	void *pkt_addr;	/* 04	00 */
+//	void *pkt_addr;	/* 04	00 */
-	u32 rpc_id;		/* 05	01 */
+//	u32 rpc_id;		/* 05	01 */
-	s32 sema_id;	/* 06	02 */
+//	s32 sema_id;	/* 06	02 */
-	u32 mode;		/* 07	03 */
+//	u32 mode;		/* 07	03 */
-};
+//};
-
+//
-
+//
-struct t_rpc_client_data
+//struct t_rpc_client_data
-{
+//{
-	struct t_rpc_header		hdr;
+//	struct t_rpc_header		hdr;
-	u32 command;	/* 04 	08 */
+//	u32 command;	/* 04 	08 */
-	void *buff; 		/* 05 	09 */
+//	void *buff; 		/* 05 	09 */
-	void *buff2;		/* 06 	10 */
+//	void *buff2;		/* 06 	10 */
-	void	(*end_function)(void *);	/* 07 	11 */
+//	void	(*end_function)(void *);	/* 07 	11 */
-	void *end_param;	/* 08 	12*/
+//	void *end_param;	/* 08 	12*/
-	struct t_rpc_server_data *server;	/* 09 	13 */
+//	struct t_rpc_server_data *server;	/* 09 	13 */
-};
+//};
-
+//
-struct t_rpc_receive_data
+//struct t_rpc_receive_data
-{
+//{
-	struct t_rpc_header hdr;
+//	struct t_rpc_header hdr;
-	void *src;		/* 04 */
+//	void *src;		/* 04 */
-	void *dest;		/* 05 */
+//	void *dest;		/* 05 */
-	s32 size;		/* 06 */
+//	s32 size;		/* 06 */
-};
+//};
-
+//
-struct t_rpc_data_queue
+//struct t_rpc_data_queue
-{
+//{
-	s32 thread_id;	/* 00 */
+//	s32 thread_id;	/* 00 */
-	s32 active;		/* 01 */
+//	s32 active;		/* 01 */
-	struct t_rpc_server_data *svdata_ref;	/* 02 */
+//	struct t_rpc_server_data *svdata_ref;	/* 02 */
-	struct t_rpc_server_data *start;		/* 03 */
+//	struct t_rpc_server_data *start;		/* 03 */
-	struct t_rpc_server_data *end;		/* 04 */
+//	struct t_rpc_server_data *end;		/* 04 */
-	struct t_rpc_data_queue *next;  	/* 05 */
+//	struct t_rpc_data_queue *next;  	/* 05 */
-};
+//};
 
 /* end of sifrpc.h */
 

pcsx2/pcsx2hostfs.cpp

@@ -16,8 +16,11 @@
 
 #include "PrecompiledHeader.h"
 #include "IopCommon.h"
-#include "Utilities/Console.h"
+#include "Utilities/Console.h"
-#include <io.h>
+
+#ifndef __LINUX__
+#include <io.h>
+#endif
 
 #pragma optimize("", off)
 
@@ -104,8 +107,12 @@ int pcsx2fio_remove(char *name)
 }
 
 int pcsx2fio_mkdir(char *name, int mode)
-{
+{
-	return mkdir(name);
+#ifdef __LINUX__
+	return mkdir(name,mode);
+#else
+	return mkdir(name);
+#endif
 }
 
 int pcsx2fio_rmdir(char *name)
@@ -132,7 +139,7 @@ int pcsx2fio_write_tty(const char* text, int length)
 {
 	wxString s = wxString::FromUTF8(text,length);
 
-	return printf("%s",s.ToAscii());
+	return printf("%s",s.ToAscii().data());
 }
 
 #define PARAM(offset,type) (*(type*)(buffer+(offset)))
@@ -196,4 +203,4 @@ u32 Pcsx2HostFSread32(u32 addr)
 		break;
 	}
 	return 0;
-}
+}