PS2: fixed tabs and alignment

20 files changed, 299 insertions, 299 deletions

diff --git a/backends/platform/ps2/DmaPipe.cpp b/backends/platform/ps2/DmaPipe.cpp
index a346a67566..f3622ea2e5 100644
--- a/backends/platform/ps2/DmaPipe.cpp
+++ b/backends/platform/ps2/DmaPipe.cpp
@@ -50,7 +50,7 @@ DmaPipe::DmaPipe(uint32 size) {
 	size &= ~0x1F;
 	_buf = (uint64 *)memalign(64, size);
 	_curPipe = 0;
-    _pipes[0] = new SinglePipe(_buf, size >> 4);
+	_pipes[0] = new SinglePipe(_buf, size >> 4);
 	_pipes[1] = new SinglePipe(_buf + (size >> 4), size >> 4);
 
 	// reset DMAC Channel 2
@@ -80,7 +80,7 @@ void DmaPipe::uploadTex(uint32 dest, uint16 bufWidth, uint16 destOfsX, uint16 de
 	*(_pipes[_curPipe]->_chainHead) |= (1 << 28);
 	_pipes[_curPipe]->setGifLoopTag(4);
 	_pipes[_curPipe]->setReg(GPR_BITBLTBUF, GS_SET_DEST_BLTBUF((dest/256) & 0x3fff, (bufWidth/64) & 0x3f, pixelFmt & 0x3f));
-	_pipes[_curPipe]->setReg(	GPR_TRXPOS, GS_SET_DEST_TRXPOS(destOfsX, destOfsY));
+	_pipes[_curPipe]->setReg(   GPR_TRXPOS, GS_SET_DEST_TRXPOS(destOfsX, destOfsY));
 	_pipes[_curPipe]->setReg(   GPR_TRXREG, GS_SET_TRXREG(width, height));
 	_pipes[_curPipe]->setReg(   GPR_TRXDIR, 0);
 
@@ -194,7 +194,7 @@ void DmaPipe::setConfig(uint8 prModeCont, uint8 dither, uint8 colClamp) {
 
 	// set some defaults
 	// alpha blending formula: (A-B) * C + D
-		// set: A = dest pixel, b = 0, C = source alpha, D = source pixel, fix = don't care
+	// set: A = dest pixel, b = 0, C = source alpha, D = source pixel, fix = don't care
 
 	_pipes[_curPipe]->setReg(GPR_ALPHA_1, GS_SET_ALPHA(DEST_COLOR, ZERO_COLOR, SOURCE_ALPHA, SOURCE_COLOR, 0));
 	_pipes[_curPipe]->setReg(   GPR_PRIM, 0);
@@ -279,7 +279,7 @@ void SinglePipe::appendChain(uint64 dmaTag) {
 void SinglePipe::setReg(uint64 reg, uint64 value) {
 	*_bufPos++ = value;
 	*_bufPos++ = reg;
-    (*_chainSize)++;
+	(*_chainSize)++;
 }
 
 void SinglePipe::setListReg(uint64 value1, uint64 value2) {
diff --git a/backends/platform/ps2/Gs2dScreen.cpp b/backends/platform/ps2/Gs2dScreen.cpp
index 3a90c19f3c..cecc08d631 100644
--- a/backends/platform/ps2/Gs2dScreen.cpp
+++ b/backends/platform/ps2/Gs2dScreen.cpp
@@ -77,7 +77,7 @@ void runAnimThread(Gs2dScreen *param);
 
 int vblankStartHandler(int cause) {
 	// start of VBlank period
-	if (g_VblankCmd) {			  // is there a new image waiting?
+	if (g_VblankCmd) {                // is there a new image waiting?
 		GS_DISPFB1 = g_VblankCmd; // show it.
 		g_VblankCmd = 0;
 		iSignalSema(g_VblankSema);
@@ -87,8 +87,8 @@ int vblankStartHandler(int cause) {
 
 int dmacHandler(int channel) {
 	if (g_DmacCmd && (channel == 2)) { // GS DMA transfer finished,
-		g_VblankCmd = g_DmacCmd;	   // we want to show the image
-		g_DmacCmd = 0;				   // when the next vblank occurs
+		g_VblankCmd = g_DmacCmd;   // we want to show the image
+		g_DmacCmd = 0;             // when the next vblank occurs
 		iSignalSema(g_DmacSema);
 	}
 	return 0;
@@ -186,7 +186,7 @@ Gs2dScreen::Gs2dScreen(uint16 width, uint16 height, TVMode mode) {
 	_clutPtrs[TEXT]   = _clutPtrs[SCREEN] + 0x2000;
 	_texPtrs[SCREEN]  = _clutPtrs[SCREEN] + 0x3000;
 	_texPtrs[TEXT]    = 0;                          // these buffers are stored in the alpha gaps of the frame buffers
-	_texPtrs[MOUSE]   = 128 * 256 * 4;
+	_texPtrs[MOUSE]	  = 128 * 256 * 4;
 	_texPtrs[PRINTF]  = _texPtrs[MOUSE] + M_SIZE * M_SIZE * 4;
 
 	_showOverlay = false;
@@ -249,17 +249,17 @@ Gs2dScreen::Gs2dScreen(uint16 width, uint16 height, TVMode mode) {
 	createAnimTextures();
 
 	// create animation thread
-	ee_thread_t animationThread, thisThread;
+	ee_thread_t animThread, thisThread;
 	ReferThreadStatus(GetThreadId(), &thisThread);
 
 	_animStack = malloc(ANIM_STACK_SIZE);
-	animationThread.initial_priority = thisThread.current_priority - 3;
-	animationThread.stack      = _animStack;
-	animationThread.stack_size = ANIM_STACK_SIZE;
-	animationThread.func       = (void *)runAnimThread;
-	animationThread.gp_reg     = &_gp;
+	animThread.initial_priority = thisThread.current_priority - 3;
+	animThread.stack      = _animStack;
+	animThread.stack_size = ANIM_STACK_SIZE;
+	animThread.func       = (void *)runAnimThread;
+	animThread.gp_reg     = &_gp;
 
-	_animTid = CreateThread(&animationThread);
+	_animTid = CreateThread(&animThread);
 	assert(_animTid >= 0);
 	StartThread(_animTid, this);
 }
@@ -302,9 +302,9 @@ void Gs2dScreen::createAnimTextures(void) {
 			destPos++;
 		}
 		if (!(i & 1))
-			_dmaPipe->uploadTex( vramDest, 128, 0, 0,  GS_PSMT4HH, buf, 128, 16);
+			_dmaPipe->uploadTex( vramDest, 128, 0, 0, GS_PSMT4HH, buf, 128, 16);
 		else {
-			_dmaPipe->uploadTex( vramDest, 128, 0, 0,  GS_PSMT4HL, buf, 128, 16);
+			_dmaPipe->uploadTex( vramDest, 128, 0, 0, GS_PSMT4HL, buf, 128, 16);
 			vramDest += 128 * 16 * 4;
 		}
 		_dmaPipe->flush();
diff --git a/backends/platform/ps2/GsDefs.h b/backends/platform/ps2/GsDefs.h
index 9e7bab7052..4da08ae301 100644
--- a/backends/platform/ps2/GsDefs.h
+++ b/backends/platform/ps2/GsDefs.h
@@ -27,16 +27,16 @@
 
 // Gs2dScreen defines:
 
-#define PAL_NTSC_FLAG		(*(volatile uint8 *)0x1FC7FF52)
+#define PAL_NTSC_FLAG    (*(volatile uint8 *)0x1FC7FF52)
 
-#define GS_PMODE			*((volatile uint64 *)0x12000000)
-#define GS_CSR				*((volatile uint64 *)0x12001000)
-#define GS_DISPFB1			*((volatile uint64 *)0x12000070)
-#define GS_DISPLAY1			*((volatile uint64 *)0x12000080)
-#define GS_BGCOLOUR			*((volatile uint64 *)0x120000E0)
+#define GS_PMODE         *((volatile uint64 *)0x12000000)
+#define GS_CSR           *((volatile uint64 *)0x12001000)
+#define GS_DISPFB1       *((volatile uint64 *)0x12000070)
+#define GS_DISPLAY1      *((volatile uint64 *)0x12000080)
+#define GS_BGCOLOUR      *((volatile uint64 *)0x120000E0)
 
 enum GS_CSR_FIELDS {
-    CSR_SIGNAL = 1 << 0,
+	CSR_SIGNAL = 1 << 0,
 	CSR_FINISH = 1 << 1,
 	CSR_HSYNC  = 1 << 2,
 	CSR_VSYNC  = 1 << 3,
@@ -61,63 +61,63 @@ enum GS_CSR_FIELDS {
 //DmaPipe defines:
 
 enum GsRegs {
-	GPR_PRIM = 0x00,	// Select and configure current drawing primitive
-	GPR_RGBAQ,			// Setup current vertex color
-	GPR_ST,				// ...
-	GPR_UV,				// Specify Vertex Texture Coordinates
-	GPR_XYZF2,			// Set vertex coordinate
-	GPR_XYZ2,			// Set vertex coordinate and 'kick' drawing
-	GPR_TEX0_1,			// Texture Buffer Setup (Context 1)
-	GPR_TEX0_2,			// Texture Buffer Setup (Context 2)
-	GPR_CLAMP_1,		// ...
-	GPR_CLAMP_2,		// ...
-	GPR_FOG,			// ...
-
-	GPR_XYZF3 = 0x0C,	// ...
-	GPR_XYZ3,			// ...
-
-	GPR_TEX1_1 = 0x14,	// ...
-	GPR_TEX1_2,			// ...
-	GPR_TEX2_1,			// ...
-	GPR_TEX2_2,			// ...
-	GPR_XYOFFSET_1,		// Mapping from Primitive to Window coordinate system (Context 1)
-	GPR_XYOFFSET_2,		// Mapping from Primitive to Window coordinate system (Context 2)
-	GPR_PRMODECONT,		// ...
-	GPR_PRMODE,			// ...
-	GPR_TEXCLUT,		// ...
-
-	GPR_SCANMSK	= 0x22,	// ...
-
-	GPR_MIPTBP1_1 = 0x34,	// ...
-	GPR_MIPTBP1_2,		// ...
-	GPR_MIPTBP2_1,		// ...
-	GPR_MIPTBP2_2,		// ...
-
-	GPR_TEXA = 0x3b,	// ...
-
-	GPR_FOGCOL = 0x3d,	// ...
-
-	GPR_TEXFLUSH = 0x3f,// Write to this register before using newly loaded texture
-	GPR_SCISSOR_1,		// Setup clipping rectangle (Context 1)
-	GPR_SCISSOR_2,		// Setup clipping rectangle (Context 2)
-	GPR_ALPHA_1,		// Setup Alpha Blending Parameters (Context 1)
-	GPR_ALPHA_2,		// Setup Alpha Blending Parameters (Context 2)
-	GPR_DIMX,			// ...
-	GPR_DTHE,			// ...
-	GPR_COLCLAMP,		// ...
-	GPR_TEST_1,			// ...
-	GPR_TEST_2,			// ...
-	GPR_PABE,			// ...
-	GPR_FBA_1,			// ...
-	GPR_FBA_2,			// ...
-	GPR_FRAME_1,		// Frame buffer settings (Context 1)
-	GPR_FRAME_2,		// Frame buffer settings (Context 2)
-	GPR_ZBUF_1,			// ...
-	GPR_ZBUF_2,			// ...
-	GPR_BITBLTBUF,		// Setup Image Transfer Between EE and GS
-	GPR_TRXPOS,			// Setup Image Transfer Coordinates
-	GPR_TRXREG,			// Setup Image Transfer Size
-	GPR_TRXDIR,			// Set Image Transfer Directon + Start Transfer
+	GPR_PRIM = 0x00,        // Select and configure current drawing primitive
+	GPR_RGBAQ,              // Setup current vertex color
+	GPR_ST,                 // ...
+	GPR_UV,                 // Specify Vertex Texture Coordinates
+	GPR_XYZF2,              // Set vertex coordinate
+	GPR_XYZ2,               // Set vertex coordinate and 'kick' drawing
+	GPR_TEX0_1,             // Texture Buffer Setup (Context 1)
+	GPR_TEX0_2,             // Texture Buffer Setup (Context 2)
+	GPR_CLAMP_1,            // ...
+	GPR_CLAMP_2,            // ...
+	GPR_FOG,                // ...
+
+	GPR_XYZF3 = 0x0C,       // ...
+	GPR_XYZ3,               // ...
+
+	GPR_TEX1_1 = 0x14,      // ...
+	GPR_TEX1_2,             // ...
+	GPR_TEX2_1,             // ...
+	GPR_TEX2_2,             // ...
+	GPR_XYOFFSET_1,         // Mapping from Primitive to Window coordinate system (Context 1)
+	GPR_XYOFFSET_2,         // Mapping from Primitive to Window coordinate system (Context 2)
+	GPR_PRMODECONT,         // ...
+	GPR_PRMODE,             // ...
+	GPR_TEXCLUT,            // ...
+
+	GPR_SCANMSK = 0x22,     // ...
+
+	GPR_MIPTBP1_1 = 0x34,   // ...
+	GPR_MIPTBP1_2,          // ...
+	GPR_MIPTBP2_1,          // ...
+	GPR_MIPTBP2_2,          // ...
+
+	GPR_TEXA = 0x3b,        // ...
+
+	GPR_FOGCOL = 0x3d,      // ...
+
+	GPR_TEXFLUSH = 0x3f,    // Write to this register before using newly loaded texture
+	GPR_SCISSOR_1,          // Setup clipping rectangle (Context 1)
+	GPR_SCISSOR_2,          // Setup clipping rectangle (Context 2)
+	GPR_ALPHA_1,            // Setup Alpha Blending Parameters (Context 1)
+	GPR_ALPHA_2,            // Setup Alpha Blending Parameters (Context 2)
+	GPR_DIMX,               // ...
+	GPR_DTHE,               // ...
+	GPR_COLCLAMP,           // ...
+	GPR_TEST_1,             // ...
+	GPR_TEST_2,             // ...
+	GPR_PABE,               // ...
+	GPR_FBA_1,              // ...
+	GPR_FBA_2,              // ...
+	GPR_FRAME_1,            // Frame buffer settings (Context 1)
+	GPR_FRAME_2,            // Frame buffer settings (Context 2)
+	GPR_ZBUF_1,             // ...
+	GPR_ZBUF_2,             // ...
+	GPR_BITBLTBUF,          // Setup Image Transfer Between EE and GS
+	GPR_TRXPOS,             // Setup Image Transfer Coordinates
+	GPR_TRXREG,             // Setup Image Transfer Size
+	GPR_TRXDIR,             // Set Image Transfer Directon + Start Transfer
 	GPR_HWREG,
 
 	GPR_SIGNAL = 0x60,
@@ -135,15 +135,15 @@ enum PrimTypes {
 	PR_SPRITE
 };
 
-#define GS_PSMCT32		0x00
-#define GS_PSMCT24		0x01
-#define GS_PSMCT16		0x02
-#define GS_PSMCT16S		0x0A
-#define GS_PSMT8		0x13
-#define GS_PSMT4		0x14
-#define GS_PSMT4HL		0x24
-#define GS_PSMT4HH		0x2C
-#define GS_PSMT8H		0x1B
+#define GS_PSMCT32     0x00
+#define GS_PSMCT24     0x01
+#define GS_PSMCT16     0x02
+#define GS_PSMCT16S    0x0A
+#define GS_PSMT8       0x13
+#define GS_PSMT4       0x14
+#define GS_PSMT4HL     0x24
+#define GS_PSMT4HH     0x2C
+#define GS_PSMT8H      0x1B
 
 /*#define GS_SET_BITBLTBUF(sbp, sbw, spsm, dbp, dbw, dpsm) \
 	((uint64)(sbp)         | ((uint64)(sbw) << 16) | \
@@ -210,7 +210,7 @@ enum AlphaBlendColor {
 enum AlphaBlendAlpha {
 	SOURCE_ALPHA = 0,
 	DEST_ALPHA,
-    FIXED_ALPHA
+	FIXED_ALPHA
 };
 
 #define GS_SET_ALPHA(a, b, c, d, fix) \
diff --git a/backends/platform/ps2/asyncfio.cpp b/backends/platform/ps2/asyncfio.cpp
index 357ca955b1..0197ce33f8 100644
--- a/backends/platform/ps2/asyncfio.cpp
+++ b/backends/platform/ps2/asyncfio.cpp
@@ -63,7 +63,7 @@ int AsyncFio::open(const char *name, int ioMode, int mode) {
 	fileXioWaitAsync(FXIO_WAIT, &res);
 	SignalSema(_ioSema);
 	// dbg_printf("FIO: open ext(%s, %d, %d) => %d", name, ioMode, mode, res);
-    return res;
+	return res;
 }
 
 void AsyncFio::close(int handle) {
diff --git a/backends/platform/ps2/cd.c b/backends/platform/ps2/cd.c
index 1c54174c1d..e08437d34f 100644
--- a/backends/platform/ps2/cd.c
+++ b/backends/platform/ps2/cd.c
@@ -19,35 +19,35 @@ int cdvdInitialised = 0;
 
 void cdvdExit(void)
 {
-    cdvdInitialised = 0;
+	cdvdInitialised = 0;
 }
 
 
 int cdvdInit(int mode)
 {
 	int i=0,len=0,ret=0;
-    u8  *pkt;
-
-    cdvdCd.server = NULL;
-
-    do {
-        if ((ret = SifBindRpc(&cdvdCd, (signed)CDVD_INIT_BIND_RPC, 0)) < 0) {
-            return -1;
-        }
-        if (!cdvdCd.server) {
-            nopdelay();
-        }
-    }
+	u8 *pkt;
+
+	cdvdCd.server = NULL;
+
+	do {
+		if ((ret = SifBindRpc(&cdvdCd, (signed)CDVD_INIT_BIND_RPC, 0)) < 0) {
+			return -1;
+		}
+		if (!cdvdCd.server) {
+			nopdelay();
+		}
+	}
 	while(!cdvdCd.server);
 
-    pkt = (unsigned char *)sendBuffer;
-    PUSHDATA( int, pkt, mode, i);
-    pkt += i; len += i;
+	pkt = (unsigned char *)sendBuffer;
+	PUSHDATA(int, pkt, mode, i);
+	pkt += i; len += i;
 
 	if ((ret = SifCallRpc(&cdvdCd, 0, 0, sendBuffer, len, NULL, 0, 0, 0)) < 0)
-        return -1;
+		return -1;
 
-    cdvdInitialised = 1;
+	cdvdInitialised = 1;
 
-    return 0;
+	return 0;
 }
diff --git a/backends/platform/ps2/eecodyvdfs.h b/backends/platform/ps2/eecodyvdfs.h
index 1d43fb662f..fc959e32d6 100644
--- a/backends/platform/ps2/eecodyvdfs.h
+++ b/backends/platform/ps2/eecodyvdfs.h
@@ -40,7 +40,7 @@ struct CdClock {
 #ifdef __cplusplus
 extern "C" {
 #endif
-    int initCdvdFs(void);
+	int initCdvdFs(void);
 	void readRTC(struct CdClock *dest);
 	int driveStop(void);
 	int driveStandby(void);
diff --git a/backends/platform/ps2/fileio.h b/backends/platform/ps2/fileio.h
index afa2ca1f24..57c4a263d2 100644
--- a/backends/platform/ps2/fileio.h
+++ b/backends/platform/ps2/fileio.h
@@ -30,13 +30,13 @@
 #include "common/stream.h"
 
 enum {
-	CACHE_SIZE				= 2048 * 32,
-	MAX_READ_STEP			= 2048 * 16,
-	MAX_CACHED_FILES		= 6,
-	CACHE_READ_THRESHOLD	= 16 * 2048,
-	CACHE_FILL_MIN			= 2048 * 24,
-	READ_ALIGN				= 64,   // align all reads to the size of an EE cache line
-	READ_ALIGN_MASK			= READ_ALIGN - 1
+	CACHE_SIZE              = 2048 * 32,
+	MAX_READ_STEP           = 2048 * 16,
+	MAX_CACHED_FILES        = 6,
+	CACHE_READ_THRESHOLD    = 16 * 2048,
+	CACHE_FILL_MIN          = 2048 * 24,
+	READ_ALIGN              = 64,   // align all reads to the size of an EE cache line
+	READ_ALIGN_MASK         = READ_ALIGN - 1
 };
 
 // TODO: Make this a subclass of SeekableReadStream & WriteStream
diff --git a/backends/platform/ps2/iop/CoDyVDfs/common/codyvdirx.h b/backends/platform/ps2/iop/CoDyVDfs/common/codyvdirx.h
index e94e7dc8d6..59b4975702 100644
--- a/backends/platform/ps2/iop/CoDyVDfs/common/codyvdirx.h
+++ b/backends/platform/ps2/iop/CoDyVDfs/common/codyvdirx.h
@@ -26,13 +26,13 @@
 #define CDVDFS_IRX_ID 0xD004352
 
 // commands:
-#define READ_RTC		0
-#define SET_READ_SPEED	1
-#define DRIVE_STOP		2
-#define DRIVE_STANDBY	3
+#define READ_RTC        0
+#define SET_READ_SPEED  1
+#define DRIVE_STOP      2
+#define DRIVE_STANDBY   3
 
-#define CdTrayOpen		0
-#define CdTrayClose		1
-#define CdTrayCheck		2
+#define CdTrayOpen      0
+#define CdTrayClose     1
+#define CdTrayCheck     2
 
 #endif // CDVDFS_COMMON_H
diff --git a/backends/platform/ps2/iop/CoDyVDfs/iop/cdtypes.h b/backends/platform/ps2/iop/CoDyVDfs/iop/cdtypes.h
index ad86631cfd..66c583794f 100644
--- a/backends/platform/ps2/iop/CoDyVDfs/iop/cdtypes.h
+++ b/backends/platform/ps2/iop/CoDyVDfs/iop/cdtypes.h
@@ -39,24 +39,24 @@ typedef struct {
 } ISOPathTableRecord __attribute__ ((packed));
 
 typedef struct {
-    uint8 year; // Number of years since 1900
-    uint8 month; // Month of the year from 1 to 12
-    uint8 day; // Day of the Month from 1 to 31
-    uint8 hour; // Hour of the day from 0 to 23
-    uint8 min; // Minute of the hour from 0 to 59
-    uint8 sec; // second of the minute from 0 to 59
-    uint8 gmtOff; // Offset from Greenwich Mean Time in number of 15 minute intervals from -48(West) to +52(East)
+	uint8 year; // Number of years since 1900
+	uint8 month; // Month of the year from 1 to 12
+	uint8 day; // Day of the Month from 1 to 31
+	uint8 hour; // Hour of the day from 0 to 23
+	uint8 min; // Minute of the hour from 0 to 59
+	uint8 sec; // second of the minute from 0 to 59
+	uint8 gmtOff; // Offset from Greenwich Mean Time in number of 15 minute intervals from -48(West) to +52(East)
 	uint8 padding[10];
 } ISOTime __attribute__ ((packed));
 
 typedef struct {
-    uint8 year; // Number of years since 1900
-    uint8 month; // Month of the year from 1 to 12
-    uint8 day; // Day of the Month from 1 to 31
-    uint8 hour; // Hour of the day from 0 to 23
-    uint8 min; // Minute of the hour from 0 to 59
-    uint8 sec; // second of the minute from 0 to 59
-    uint8 gmtOff; // Offset from Greenwich Mean Time in number of 15 minute intervals from -48(West) to +52(East)
+	uint8 year; // Number of years since 1900
+	uint8 month; // Month of the year from 1 to 12
+	uint8 day; // Day of the Month from 1 to 31
+	uint8 hour; // Hour of the day from 0 to 23
+	uint8 min; // Minute of the hour from 0 to 59
+	uint8 sec; // second of the minute from 0 to 59
+	uint8 gmtOff; // Offset from Greenwich Mean Time in number of 15 minute intervals from -48(West) to +52(East)
 	//uint8 padding[10];
 } ISOFileTime __attribute__ ((packed));
 
@@ -96,38 +96,38 @@ typedef struct {
 	uint8	reserved[6];
 	uint8	reserved2;
 	uint8	reserved3;
-} ISORoot __attribute__((packed));	// 0x22
+} ISORoot __attribute__((packed)); // 0x22
 
 typedef struct {
-	uint8	type;					// 0x00
-	char	identifier[5];			// 0x01
-	uint8	version;				// 0x06
-	uint8	reserved1;				// 0x07
-	char	systemIdentifier[32];	// 0x08
+	uint8	type;                   // 0x00
+	char	identifier[5];          // 0x01
+	uint8	version;                // 0x06
+	uint8	reserved1;              // 0x07
+	char	systemIdentifier[32];   // 0x08
 	char	volumeIdentifier[32];	// 0x28
-	uint8	reserved2[8];			// 0x48
-	uint32	volumeSpaceSize;		// 0x50
-	uint32	volumeSpaceSizeBE;		// 0x54
-	char	reserved3[32];			// 0x58
-	uint32	volumeSetSize;			// 0x78
-	uint32	volumeSequenceNumber;	// 0x7C
-	uint32	logicalBlockSize;		// 0x80
-	uint32	pathTableSize;			// 0x84
-	uint32	pathTableSizeBE;		// 0x88
-	uint32	pathTablePos;			// 0x8C
-	uint32	pathTable2Pos;			// 0x90
-	uint32	pathTablePosBE;			// 0x94
-	uint32	pathTable2PosBE;		// 0x98
-	ISORoot	rootDir;				// 0x9C
-	ISOIds	ids;					// 0xBE
-	ISOTime creation;				// 0x32D
-	ISOTime	modification;			// 0x33E
-	ISOTime expiration;				// 0x34F
-	ISOTime effective;				// 0x360
-	uint8	fileStructureVersion;	// 0x371
-	uint8	reserved4;				// 0x372
-	uint8	applicationUse[512];	// 0x373
-	uint8	reserved5[653];			// 0x573
-} ISOPvd __attribute__ ((packed));	// 0x800
+	uint8	reserved2[8];           // 0x48
+	uint32	volumeSpaceSize;        // 0x50
+	uint32	volumeSpaceSizeBE;      // 0x54
+	char	reserved3[32];          // 0x58
+	uint32	volumeSetSize;          // 0x78
+	uint32	volumeSequenceNumber;   // 0x7C
+	uint32	logicalBlockSize;       // 0x80
+	uint32	pathTableSize;          // 0x84
+	uint32	pathTableSizeBE;        // 0x88
+	uint32	pathTablePos;           // 0x8C
+	uint32	pathTable2Pos;          // 0x90
+	uint32	pathTablePosBE;         // 0x94
+	uint32	pathTable2PosBE;        // 0x98
+	ISORoot	rootDir;                // 0x9C
+	ISOIds	ids;                    // 0xBE
+	ISOTime creation;               // 0x32D
+	ISOTime	modification;           // 0x33E
+	ISOTime expiration;             // 0x34F
+	ISOTime effective;              // 0x360
+	uint8	fileStructureVersion;   // 0x371
+	uint8	reserved4;              // 0x372
+	uint8	applicationUse[512];    // 0x373
+	uint8	reserved5[653];         // 0x573
+} ISOPvd __attribute__ ((packed));      // 0x800
 
 #endif // __CDTYPES_H__
diff --git a/backends/platform/ps2/iop/CoDyVDfs/iop/codyvdfs.c b/backends/platform/ps2/iop/CoDyVDfs/iop/codyvdfs.c
index 932d589a3b..2a94560843 100644
--- a/backends/platform/ps2/iop/CoDyVDfs/iop/codyvdfs.c
+++ b/backends/platform/ps2/iop/CoDyVDfs/iop/codyvdfs.c
@@ -59,7 +59,7 @@ int verifyDriveReady(void) {
 			return -1; // drive still not ready
 		}
 	}
-    if (mediaType == DISC_NONE)
+	if (mediaType == DISC_NONE)
 		return -1;
 	return 0;
 }
@@ -72,7 +72,7 @@ int cacheEnterDir(ISODirectoryRecord *dir) {
 	cachedDirOfs = 0;
 	cacheName = cachedDir + strlen(cachedDir);
 	memcpy(cacheName, dir->name, dir->len_fi);
-    cacheName[dir->len_fi] = '/';
+	cacheName[dir->len_fi] = '/';
 	cacheName[dir->len_fi + 1] = '\0';
 	return cdReadSectors(cachedDirLba, 1, cacheBuf, &rmode);
 }
@@ -104,7 +104,7 @@ ISODirectoryRecord *findEntryInCache(const char *name, int nameLen) {
 		if (i != cachedDirOfs) {
 			if (cdReadSectors(cachedDirLba + i, 1, cacheBuf, &rmode) < 0)
 				return NULL;
-            cachedDirOfs = i;
+			cachedDirOfs = i;
 		}
 
 		while (entry->len_dr && ((uint8 *)entry < cacheBuf + SECTOR_SIZE)) {
@@ -118,7 +118,7 @@ ISODirectoryRecord *findEntryInCache(const char *name, int nameLen) {
 			entry = (ISODirectoryRecord *)( (uint8 *)entry + entry->len_dr );
 		}
 	}
-    return NULL;
+	return NULL;
 }
 
 ISODirectoryRecord *findPath(const char *path) {
@@ -257,7 +257,7 @@ int initDisc(void) {
 
 				mediaType = discType;
 				DBG_PRINTF("Root directory in sector %d\n", fsRootLba);
-                return initRootCache();
+				return initRootCache();
 			}
 		}
 	}
@@ -290,46 +290,46 @@ int cd_init(iop_device_t *dev) {
 }
 
 iop_device_ops_t FS_ops = {
-    (void *) cd_init,
-    (void *) cd_dummy,
-    (void *) cd_dummy,
-    (void *) cd_open,
-    (void *) cd_close,
-    (void *) cd_read,
-    (void *) cd_dummy,
-    (void *) cd_lseek,
-    (void *) cd_dummy,
-    (void *) cd_dummy,
-    (void *) cd_dummy,
-    (void *) cd_dummy,
-    (void *) cd_dopen,
-    (void *) cd_dclose,
-    (void *) cd_dread,
-    (void *) cd_dummy,
-    (void *) cd_dummy,
+	(void *) cd_init,
+	(void *) cd_dummy,
+	(void *) cd_dummy,
+	(void *) cd_open,
+	(void *) cd_close,
+	(void *) cd_read,
+	(void *) cd_dummy,
+	(void *) cd_lseek,
+	(void *) cd_dummy,
+	(void *) cd_dummy,
+	(void *) cd_dummy,
+	(void *) cd_dummy,
+	(void *) cd_dopen,
+	(void *) cd_dclose,
+	(void *) cd_dread,
+	(void *) cd_dummy,
+	(void *) cd_dummy,
 };
 
 #define FS_NAME "cdfs"
 #define FS_DESC "CD-ROM"
 
 iop_device_t fsdriver = {
-    FS_NAME,
-    IOP_DT_FS | IOP_DT_FSEXT,
-    1,
-    FS_DESC,
-    &FS_ops
+	FS_NAME,
+	IOP_DT_FS | IOP_DT_FSEXT,
+	1,
+	FS_DESC,
+	&FS_ops
 };
 
 int _start(void) {
-    printf("CoDyVDfs v0.01\n");
+	printf("CoDyVDfs v0.01\n");
 
 	CdInit(1);
-    DelDrv(FS_NAME);
-    AddDrv(&fsdriver);
+	DelDrv(FS_NAME);
+	AddDrv(&fsdriver);
 
 	initRpc();
 	initFio();
-    return(0);
+	return(0);
 }
 
 int strnicmp(const char *s1, const char *s2, int n) {
diff --git a/backends/platform/ps2/iop/CoDyVDfs/iop/codyvdfs.h b/backends/platform/ps2/iop/CoDyVDfs/iop/codyvdfs.h
index b9f1edc194..93124f9037 100644
--- a/backends/platform/ps2/iop/CoDyVDfs/iop/codyvdfs.h
+++ b/backends/platform/ps2/iop/CoDyVDfs/iop/codyvdfs.h
@@ -51,20 +51,20 @@ enum ReadModes {
 };
 
 enum {
-    CdDiskNone = 0x00,
-    CdDiskDetect, // 0x01
-    CdDiskDetectCD, // 0x02
-    CdDiskDetectDVD, // 0x03
-    CdDiskDetectUnk = 0x05,
-    CdDiskCDPS1 = 0x10,
-    CdDiskCDDAPS1 = 0x11,
-    CdDiskCDPS2 = 0x12,
-    CdDiskCDDAPS2 = 0x13,
-    CdDiskDVDPS2 = 0x14,
-    CdDiskDVDV2 = 0xFC,
-    CdDiskCDDA = 0xFD,
-    CdDiskDVDV = 0xFE,
-    CdDiskIllegal = 0xFF
+	CdDiskNone = 0x00,
+	CdDiskDetect, // 0x01
+	CdDiskDetectCD, // 0x02
+	CdDiskDetectDVD, // 0x03
+	CdDiskDetectUnk = 0x05,
+	CdDiskCDPS1 = 0x10,
+	CdDiskCDDAPS1 = 0x11,
+	CdDiskCDPS2 = 0x12,
+	CdDiskCDDAPS2 = 0x13,
+	CdDiskDVDPS2 = 0x14,
+	CdDiskDVDV2 = 0xFC,
+	CdDiskCDDA = 0xFD,
+	CdDiskDVDV = 0xFE,
+	CdDiskIllegal = 0xFF
 };
 
 #define DISC_NOT_READY(type) ((type > CdDiskNone) && (type < CdDiskCDPS1) && (type != CdDiskDetectUnk))
diff --git a/backends/platform/ps2/iop/CoDyVDfs/iop/fiofs.c b/backends/platform/ps2/iop/CoDyVDfs/iop/fiofs.c
index 5c5cbf94ef..611211a715 100644
--- a/backends/platform/ps2/iop/CoDyVDfs/iop/fiofs.c
+++ b/backends/platform/ps2/iop/CoDyVDfs/iop/fiofs.c
@@ -171,13 +171,13 @@ int cd_read(iop_file_t *handle, void *dest, int length) {
 			numLba = bytesLeft >> 11;
 			if (cdReadSectors(readLba, numLba, destPos, &rmode) != 0)
 				break;
-            readLba += numLba;
+			readLba += numLba;
 			fd->pos += numLba << 11;
 			destPos += numLba << 11;
 			bytesLeft &= 0x7FF;
 		}
 	}
-    return destPos - (uint8 *)dest;
+	return destPos - (uint8 *)dest;
 }
 
 int cd_close(iop_file_t *handle) {
@@ -252,7 +252,7 @@ int cd_dread(iop_file_t *handle, iox_dirent_t *buf) {
 			}
 		}
 	}
-    return 0;
+	return 0;
 }
 
 int cd_dclose(iop_file_t *handle) {
diff --git a/backends/platform/ps2/iop/rpckbd/include/ps2kbd.h b/backends/platform/ps2/iop/rpckbd/include/ps2kbd.h
index 07d9c3d7f9..6bef7caefa 100644
--- a/backends/platform/ps2/iop/rpckbd/include/ps2kbd.h
+++ b/backends/platform/ps2/iop/rpckbd/include/ps2kbd.h
@@ -87,8 +87,8 @@ typedef struct _kbd_keymap
 #define KBD_RPC_SETSPECIALMAP   7 /* Sets the special key mapping */
 #define KBD_RPC_FLUSHBUFFER     9 /* Flush the internal buffer, probably best after a keymap change */
 #define KBD_RPC_RESETKEYMAP    10 /* Reset keymaps to default states */
-#define KBD_RPC_READKEY		   11
-#define KBD_RPC_READRAW		   12
+#define KBD_RPC_READKEY        11
+#define KBD_RPC_READRAW        12
 
 /* Note on keymaps. In normal keymap a 0 would indicate no key */
 /* Key maps are represented by 3 256*8bit tables. First table maps USB key to a char when not shifted */
diff --git a/backends/platform/ps2/ps2input.cpp b/backends/platform/ps2/ps2input.cpp
index 6f36c5ff90..e840bb2f19 100644
--- a/backends/platform/ps2/ps2input.cpp
+++ b/backends/platform/ps2/ps2input.cpp
@@ -170,7 +170,7 @@ bool Ps2Input::pollEvent(Common::Event *event) {
 	}
 	if (checkPadMouse || checkPadKbd) {
 		// no usb mouse, simulate it using the pad
-        uint16 buttons;
+		uint16 buttons;
 		int16 joyh, joyv;
 		_pad->readPad(&buttons, &joyh, &joyv);
 		uint16 btnChange = buttons ^ _padLastButtons;
@@ -474,11 +474,11 @@ const Common::KeyCode Ps2Input::_usbToSdlk[0x100] = {
 	/* DD */	Common::KEYCODE_INVALID,
 	/* DE */	Common::KEYCODE_INVALID,
 	/* DF */	Common::KEYCODE_INVALID,
-	/* E0 */    Common::KEYCODE_LCTRL,
+	/* E0 */	Common::KEYCODE_LCTRL,
 	/* E1 */	Common::KEYCODE_LSHIFT,
 	/* E2 */	Common::KEYCODE_LALT,
 	/* E3 */	Common::KEYCODE_INVALID,
-	/* E4 */    Common::KEYCODE_RCTRL,
+	/* E4 */	Common::KEYCODE_RCTRL,
 	/* E5 */	Common::KEYCODE_RSHIFT,
 	/* E6 */	Common::KEYCODE_RALT,
 	/* E7 */	Common::KEYCODE_INVALID,
@@ -509,39 +509,39 @@ const Common::KeyCode Ps2Input::_usbToSdlk[0x100] = {
 };
 
 const Common::KeyCode Ps2Input::_padCodes[16] = {
-	Common::KEYCODE_1,					// Select
-	Common::KEYCODE_INVALID,			// L3
-	Common::KEYCODE_INVALID,			// R3
-	Common::KEYCODE_F5,					// Start
-	Common::KEYCODE_INVALID,			// Up
-	Common::KEYCODE_INVALID,			// Right
-	Common::KEYCODE_INVALID,			// Down
-	Common::KEYCODE_INVALID,			// Left
-	Common::KEYCODE_KP0,				// L2
-	Common::KEYCODE_PERIOD,				// R2
-	Common::KEYCODE_n,					// L1
-	Common::KEYCODE_y,					// R1
-	Common::KEYCODE_ESCAPE,				// Triangle
-	Common::KEYCODE_INVALID,			// Circle  => Right mouse button
-	Common::KEYCODE_INVALID,			// Cross	=> Left mouse button
-	Common::KEYCODE_RETURN				// Square
+	Common::KEYCODE_1,                  // Select
+	Common::KEYCODE_INVALID,            // L3
+	Common::KEYCODE_INVALID,            // R3
+	Common::KEYCODE_F5,                 // Start
+	Common::KEYCODE_INVALID,            // Up
+	Common::KEYCODE_INVALID,            // Right
+	Common::KEYCODE_INVALID,            // Down
+	Common::KEYCODE_INVALID,            // Left
+	Common::KEYCODE_KP0,                // L2
+	Common::KEYCODE_PERIOD,             // R2
+	Common::KEYCODE_n,                  // L1
+	Common::KEYCODE_y,                  // R1
+	Common::KEYCODE_ESCAPE,             // Triangle
+	Common::KEYCODE_INVALID,            // Circle => Right mouse button
+	Common::KEYCODE_INVALID,            // Cross  => Left mouse button
+	Common::KEYCODE_RETURN              // Square
 };
 
 const Common::KeyCode Ps2Input::_padFlags[16] = {
-	Common::KEYCODE_INVALID,			 // Select
-	Common::KEYCODE_INVALID,			 // L3
-	Common::KEYCODE_INVALID,			 // R3
-	Common::KEYCODE_INVALID,			 // Start
-	Common::KEYCODE_INVALID,			 //	Up
-	Common::KEYCODE_INVALID,			 //	Right
-	Common::KEYCODE_INVALID,			 //	Down
-	Common::KEYCODE_INVALID,			 //	Left
-	Common::KEYCODE_INVALID,			 //	L2
-	Common::KEYCODE_INVALID,			 //	R2
-	Common::KEYCODE_INVALID,			 //	L1
-	Common::KEYCODE_INVALID,			 //	R1
-	Common::KEYCODE_INVALID,			 // Triangle
-	Common::KEYCODE_INVALID,			 //	Circle
-	Common::KEYCODE_INVALID,			 //	Cross
-	Common::KEYCODE_INVALID				 //	Square
+	Common::KEYCODE_INVALID,            // Select
+	Common::KEYCODE_INVALID,            // L3
+	Common::KEYCODE_INVALID,            // R3
+	Common::KEYCODE_INVALID,            // Start
+	Common::KEYCODE_INVALID,            // Up
+	Common::KEYCODE_INVALID,            // Right
+	Common::KEYCODE_INVALID,            // Down
+	Common::KEYCODE_INVALID,            // Left
+	Common::KEYCODE_INVALID,            // L2
+	Common::KEYCODE_INVALID,            // R2
+	Common::KEYCODE_INVALID,            // L1
+	Common::KEYCODE_INVALID,            // R1
+	Common::KEYCODE_INVALID,            // Triangle
+	Common::KEYCODE_INVALID,            // Circle
+	Common::KEYCODE_INVALID,            // Cross
+	Common::KEYCODE_INVALID             // Square
 };
diff --git a/backends/platform/ps2/ps2input.h b/backends/platform/ps2/ps2input.h
index b97daac042..5014feba82 100644
--- a/backends/platform/ps2/ps2input.h
+++ b/backends/platform/ps2/ps2input.h
@@ -44,7 +44,7 @@ private:
 	int mapKey(int key, int mod);
 	bool getKeyEvent(Common::Event *event, uint16 buttonCode, bool down);
 	OSystem_PS2 *_system;
-	Ps2Pad		*_pad;
+	Ps2Pad *_pad;
 
 	uint16 _minx, _maxx, _miny, _maxy;
 
diff --git a/backends/platform/ps2/ps2pad.cpp b/backends/platform/ps2/ps2pad.cpp
index 607b614691..60787bb796 100644
--- a/backends/platform/ps2/ps2pad.cpp
+++ b/backends/platform/ps2/ps2pad.cpp
@@ -34,7 +34,7 @@ Ps2Pad::Ps2Pad(OSystem_PS2 *system) {
 	_padStatus = STAT_NONE;
 
 	padInit(0); // initialize library
-	_port = _slot = 0;	// first controller, no multitap
+	_port = _slot = 0; // first controller, no multitap
 	initPad();
 }
 
diff --git a/backends/platform/ps2/ps2time.cpp b/backends/platform/ps2/ps2time.cpp
index 1cddd230a0..3c9e4fb995 100644
--- a/backends/platform/ps2/ps2time.cpp
+++ b/backends/platform/ps2/ps2time.cpp
@@ -30,9 +30,9 @@
 
 #define FROM_BCD(a) ((a >> 4) * 10 + (a & 0xF))
 
-static int	  g_timeSecs;
-static int	  g_day, g_month, g_year;
-static int	  g_lastTimeCheck;
+static int g_timeSecs;
+static int g_day, g_month, g_year;
+static int g_lastTimeCheck;
 extern volatile uint32 msecCount;
 
 void buildNewDate(int dayDiff) {
diff --git a/backends/platform/ps2/savefilemgr.cpp b/backends/platform/ps2/savefilemgr.cpp
index 46af42e193..2bd4bcba45 100644
--- a/backends/platform/ps2/savefilemgr.cpp
+++ b/backends/platform/ps2/savefilemgr.cpp
@@ -166,10 +166,10 @@ Common::OutSaveFile *Ps2SaveFileManager::openForSaving(const Common::String &fil
 			sprintf(path, "mc0:ScummVM/indy4/iq-points");
 		}
 		// FIXME : hack for bs1 saved games
-        else if (filename == "SAVEGAME.INF") {
-            mcCheck("mc0:ScummVM/sword1");
-            sprintf(path, "mc0:ScummVM/sword1/SAVEGAME.INF");
-        }
+		else if (filename == "SAVEGAME.INF") {
+			mcCheck("mc0:ScummVM/sword1");
+			sprintf(path, "mc0:ScummVM/sword1/SAVEGAME.INF");
+		}
 		else {
 			char temp[32];
 			strcpy(temp, filename.c_str());
diff --git a/backends/platform/ps2/systemps2.cpp b/backends/platform/ps2/systemps2.cpp
index 9882974f18..abea69604b 100644
--- a/backends/platform/ps2/systemps2.cpp
+++ b/backends/platform/ps2/systemps2.cpp
@@ -392,14 +392,14 @@ void OSystem_PS2::initTimer(void) {
 	timerThread.stack            = _timerStack;
 	timerThread.stack_size       = TIMER_STACK_SIZE;
 	timerThread.func             = (void *)systemTimerThread;
-	timerThread.gp_reg			 = &_gp;
+	timerThread.gp_reg           = &_gp;
 
 	// soundthread's priority is higher than main- and timerthread
 	soundThread.initial_priority = thisThread.current_priority - 2;
 	soundThread.stack            = _soundStack;
 	soundThread.stack_size       = SOUND_STACK_SIZE;
 	soundThread.func             = (void *)systemSoundThread;
-	soundThread.gp_reg			 = &_gp;
+	soundThread.gp_reg           = &_gp;
 
 	_timerTid = CreateThread(&timerThread);
 	_soundTid = CreateThread(&soundThread);
@@ -459,33 +459,33 @@ void OSystem_PS2::soundThreadCallback(void) {
 
 			// demux data into 2 buffers, L and R
 			 __asm__ (
-				"move  $t2, %1\n\t"			// dest buffer right
-				"move  $t3, %0\n\t"			// dest buffer left
-				"lui   $t8, 0x7000\n\t"		// muxed buffer, fixed at 0x70000000
-				"addiu $t9, $0, 100\n\t"	// number of loops
-				"mtsab $0, 2\n\t"			// set qword shift = 2 byte
+				"move  $t2, %1\n\t"             // dest buffer right
+				"move  $t3, %0\n\t"             // dest buffer left
+				"lui   $t8, 0x7000\n\t"         // muxed buffer, fixed at 0x70000000
+				"addiu $t9, $0, 100\n\t"        // number of loops
+				"mtsab $0, 2\n\t"               // set qword shift = 2 byte
 
 				"loop:\n\t"
-				"  lq $t4,  0($t8)\n\t"		// load 8 muxed samples
-				"  lq $t5, 16($t8)\n\t"		// load 8 more muxed samples
+				"  lq $t4,  0($t8)\n\t"         // load 8 muxed samples
+				"  lq $t5, 16($t8)\n\t"         // load 8 more muxed samples
 
-				"  qfsrv $t6, $0, $t4\n\t"	// shift right for second
-				"  qfsrv $t7, $0, $t5\n\t"	// packing step (right channel)
+				"  qfsrv $t6, $0, $t4\n\t"      // shift right for second
+				"  qfsrv $t7, $0, $t5\n\t"      // packing step (right channel)
 
-				"  ppach $t4, $t5, $t4\n\t"	// combine left channel data
-				"  ppach $t6, $t7, $t6\n\t"	// right channel data
+				"  ppach $t4, $t5, $t4\n\t"     // combine left channel data
+				"  ppach $t6, $t7, $t6\n\t"     // right channel data
 
-				"  sq $t4, 0($t3)\n\t"		// write back
-				"  sq $t6, 0($t2)\n\t"		//
+				"  sq $t4, 0($t3)\n\t"          // write back
+				"  sq $t6, 0($t2)\n\t"          //
 
-				"  addiu $t9, -1\n\t"		// decrement loop counter
-				"  addiu $t2, 16\n\t"		// increment pointers
+				"  addiu $t9, -1\n\t"           // decrement loop counter
+				"  addiu $t2, 16\n\t"           // increment pointers
 				"  addiu $t3, 16\n\t"
 				"  addiu $t8, 32\n\t"
-				"  bnez  $t9, loop\n\t"		// loop
+				"  bnez  $t9, loop\n\t"         // loop
 					:  // outputs
 			 		: "r"(soundBufL), "r"(soundBufR)  // inputs
-				//  : "$t2", "$t3", "$t4", "$t5", "$t6", "$t7", "$t8", "$t9"  // destroyed
+				    //  : "$t2", "$t3", "$t4", "$t5", "$t6", "$t7", "$t8", "$t9"  // destroyed
 					: "$10", "$11", "$12", "$13", "$14", "$15", "$24", "$25"  // destroyed
 			);
 			// and feed it into the SPU
@@ -666,7 +666,7 @@ void OSystem_PS2::unlockScreen(void) {
 const OSystem::GraphicsMode OSystem_PS2::_graphicsMode = { NULL, NULL, 0 };
 
 const OSystem::GraphicsMode *OSystem_PS2::getSupportedGraphicsModes(void) const {
-    return &_graphicsMode;
+	return &_graphicsMode;
 }
 
 bool OSystem_PS2::setGraphicsMode(int mode) {
@@ -735,7 +735,7 @@ void OSystem_PS2::msgPrintf(int millis, const char *format, ...) {
 		Graphics::g_sysfont.drawString(&surf, str, posX, posY, 300 - posX, 1);
 		posY += 14;
 
-        lnSta = lnEnd + 1;
+		lnSta = lnEnd + 1;
 	}
 
 	uint8 *scrBuf = (uint8 *)memalign(64, 320 * 200);
@@ -911,7 +911,7 @@ bool OSystem_PS2::prepMC() {
 }
 
 void OSystem_PS2::makeConfigPath() {
-    FILE *src, *dst;
+	FILE *src, *dst;
 	char path[128], *buf;
 	int32 size;
 
diff --git a/backends/platform/ps2/systemps2.h b/backends/platform/ps2/systemps2.h
index 3ba40a70f9..0ae6b2da57 100644
--- a/backends/platform/ps2/systemps2.h
+++ b/backends/platform/ps2/systemps2.h
@@ -138,26 +138,26 @@ private:
 	bool _mouseVisible;
 	bool _useMouse, _useKbd, _useHdd, _usbMassLoaded, _useNet;
 
-	Gs2dScreen	*_screen;
-	Ps2Input	*_input;
-	uint16		_oldMouseX, _oldMouseY;
-	uint32		_msgClearTime;
-	uint16		_printY;
+	Gs2dScreen *_screen;
+	Ps2Input *_input;
+	uint16 _oldMouseX, _oldMouseY;
+	uint32 _msgClearTime;
+	uint16 _printY;
 	bool _modeChanged;
 	int _screenChangeCount;
 
-	int			_mutexSema;
-	Ps2Mutex	_mutex[MAX_MUTEXES];
+	int _mutexSema;
+	Ps2Mutex _mutex[MAX_MUTEXES];
 
-	uint8		*_timerStack, *_soundStack;
-	int			_timerTid, _soundTid;
-	int			_intrId;
+	uint8 *_timerStack, *_soundStack;
+	int _timerTid, _soundTid;
+	int _intrId;
 	volatile bool _systemQuit;
 	static const GraphicsMode _graphicsMode;
 
-	int			_bootDevice;
-	char		*_bootPath;
-	char		*_configFile;
+	int _bootDevice;
+	char *_bootPath;
+	char *_configFile;
 };
 
 #endif // SYSTEMPS2_H