From 2d5a9a02425951f4efed764d135be96867eb532f Mon Sep 17 00:00:00 2001
From: "SND\\weimingzhi_cp"
 <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>
Date: Fri, 7 May 2010 04:31:29 +0000
Subject: preparing for refactor/cleanup, moved all definations into .c files,
 other minor cleanups. (Breaks Mac OS X and maybe windows as well for now,
 will fix later.)

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@47542 e17a0e51-4ae3-4d35-97c3-1a29b211df97
---
 libpcsxcore/psxcommon.h | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

(limited to 'libpcsxcore/psxcommon.h')

diff --git a/libpcsxcore/psxcommon.h b/libpcsxcore/psxcommon.h
index 931cdc93..1261aabd 100644
--- a/libpcsxcore/psxcommon.h
+++ b/libpcsxcore/psxcommon.h
@@ -27,7 +27,7 @@
 
 #include "config.h"
 
-/* System includes */
+// System includes
 #include <stdio.h>
 #include <string.h>
 #include <stdarg.h>
@@ -40,7 +40,7 @@
 #include <assert.h>
 #include <zlib.h>
 
-/* Define types */
+// Define types
 typedef int8_t s8;
 typedef int16_t s16;
 typedef int32_t s32;
@@ -53,7 +53,7 @@ typedef uint32_t u32;
 typedef uint64_t u64;
 typedef uintptr_t uptr;
 
-/* Local includes */
+// Local includes
 #include "system.h"
 #include "debug.h"
 
@@ -62,7 +62,7 @@ typedef uintptr_t uptr;
 #endif
 #define __inline inline
 
-/* Enables NLS/internationalization if active */
+// Enables NLS/internationalization if active
 #ifdef ENABLE_NLS
 
 #include <libintl.h>
@@ -102,7 +102,7 @@ typedef struct {
 	long Sio;
 	long Mdec;
 	long PsxAuto;
-	long PsxType;		/* NTSC or PAL */
+	long PsxType; // PSX_TYPE_NTSC or PSX_TYPE_PAL
 	long Cdda;
 	long HLE;
 	long Cpu;
@@ -117,7 +117,7 @@ typedef struct {
 #endif
 } PcsxConfig;
 
-PcsxConfig Config;
+extern PcsxConfig Config;
 
 extern int StatesC;
 extern int cdOpenCase;
@@ -134,14 +134,13 @@ extern int NetOpened;
 #define PSXCLK	33868800	/* 33.8688 Mhz */
 
 enum {
-	BIOS_USER_DEFINED,
+	BIOS_USER_DEFINED = 0,
 	BIOS_HLE
-};	/* BIOS Types */
+}; // BIOS Types
 
 enum {
-	PSX_TYPE_NTSC,
+	PSX_TYPE_NTSC = 0,
 	PSX_TYPE_PAL
-};	/* PSX Type */
+}; // PSX Type
 
-
-#endif /* __PSXCOMMON_H__ */
+#endif
-- 
cgit v1.2.3