diff options
author | Jordi Vilalta Prat | 2008-01-27 19:47:41 +0000 |
---|---|---|
committer | Jordi Vilalta Prat | 2008-01-27 19:47:41 +0000 |
commit | 66e9d4f5e8f35b28f8abd9ce53a0da4da3ce8985 (patch) | |
tree | e27aadabecd8dd910884280e6559ff9c94c3d73c /backends/platform/gp32 | |
parent | 278857698dc7b1623096fe1ad12511dc4c886c7e (diff) | |
download | scummvm-rg350-66e9d4f5e8f35b28f8abd9ce53a0da4da3ce8985.tar.gz scummvm-rg350-66e9d4f5e8f35b28f8abd9ce53a0da4da3ce8985.tar.bz2 scummvm-rg350-66e9d4f5e8f35b28f8abd9ce53a0da4da3ce8985.zip |
Removed trailing spaces.
svn-id: r30664
Diffstat (limited to 'backends/platform/gp32')
-rw-r--r-- | backends/platform/gp32/gp32_main.cpp | 2 | ||||
-rw-r--r-- | backends/platform/gp32/gp32_osys.cpp | 10 | ||||
-rw-r--r-- | backends/platform/gp32/gp32_osys.h | 4 | ||||
-rw-r--r-- | backends/platform/gp32/gp32std.cpp | 2 | ||||
-rw-r--r-- | backends/platform/gp32/gp32std_input.cpp | 2 | ||||
-rw-r--r-- | backends/platform/gp32/gp32std_sound.cpp | 2 | ||||
-rw-r--r-- | backends/platform/gp32/gp_asmlib.s | 2 | ||||
-rw-r--r-- | backends/platform/gp32/memcpy.S | 68 | ||||
-rw-r--r-- | backends/platform/gp32/portdefs.h | 4 |
9 files changed, 48 insertions, 48 deletions
diff --git a/backends/platform/gp32/gp32_main.cpp b/backends/platform/gp32/gp32_main.cpp index e985993e5f..3db3dfe553 100644 --- a/backends/platform/gp32/gp32_main.cpp +++ b/backends/platform/gp32/gp32_main.cpp @@ -88,6 +88,6 @@ void GpMain(void *arg) { memBlockDeinit(); g_system->quit(); // TODO: Consider removing / replacing this! - + //return res; } diff --git a/backends/platform/gp32/gp32_osys.cpp b/backends/platform/gp32/gp32_osys.cpp index 56a9f103ed..866d97e966 100644 --- a/backends/platform/gp32/gp32_osys.cpp +++ b/backends/platform/gp32/gp32_osys.cpp @@ -194,7 +194,7 @@ void OSystem_GP32::copyRectToScreen(const byte *src, int pitch, int x, int y, in if (w <= 0 || h <= 0) return; - + byte *dst = _gameScreen + y * _screenWidth + x; if (_screenWidth == pitch && pitch == w) { @@ -346,7 +346,7 @@ void OSystem_GP32::copyRectToOverlay(const OverlayColor *buf, int pitch, int x, if (w <= 0 || h <= 0) return; - + OverlayColor *dst = _overlayBuffer + y * _overlayWidth + x; if (_overlayWidth == pitch && pitch == w) { memcpy(dst, buf, h * w * sizeof(OverlayColor)); @@ -504,7 +504,7 @@ bool OSystem_GP32::pollEvent(Common::Event &event) { if (!gp_pollButtonEvent(&ev)) return false; - + switch(ev.type) { case BUTTON_DOWN: if (ev.button == GPC_VK_LEFT) { @@ -715,9 +715,9 @@ bool OSystem_GP32::setSoundCallback(SoundProc proc, void *param) { if (ConfMan.hasKey("output_rate")) _samplesPerSec = ConfMan.getInt("output_rate"); - + _samplesPerSec = (int)g_vars.sampleRate; //hack - + if (_samplesPerSec == 0) { return false; } diff --git a/backends/platform/gp32/gp32_osys.h b/backends/platform/gp32/gp32_osys.h index 44a313265f..9938671962 100644 --- a/backends/platform/gp32/gp32_osys.h +++ b/backends/platform/gp32/gp32_osys.h @@ -54,7 +54,7 @@ protected: uint32 _shakePos; // Keyboard mouse emulation - struct KbdMouse { + struct KbdMouse { int16 x, y, x_vel, y_vel, x_max, y_max, x_down_count, y_down_count; uint32 last_time, delay_time, x_down_time, y_down_time; }; @@ -73,7 +73,7 @@ protected: byte *_mouseBuf; bool _adjustAspectRatio; - + /** Force full redraw on next updateScreen */ bool _forceFull; diff --git a/backends/platform/gp32/gp32std.cpp b/backends/platform/gp32/gp32std.cpp index 13ec3a1a2a..13c055ebfa 100644 --- a/backends/platform/gp32/gp32std.cpp +++ b/backends/platform/gp32/gp32std.cpp @@ -51,7 +51,7 @@ void _dprintf(const char *s, ...) { if (debnext == DEBUG_MAX) debnext = 0; gp_fillRect(frameBuffer1, 0, 243 - (DEBUG_MAX * 8) - 4, 320, (DEBUG_MAX * 8), 0); - + for (deb = debnext, deba = 0; deb < DEBUG_MAX; deb++, deba++) { //gp_fillRect(frameBuffer1, 0, (243 - (DEBUG_MAX * 8) - 4) + 8 * deba, 320, 8, 0); gp_textOut(frameBuffer1, 0, (240 - (DEBUG_MAX * 8) - 4) + 8 * deba, debline[deb], 0xFFFF); diff --git a/backends/platform/gp32/gp32std_input.cpp b/backends/platform/gp32/gp32std_input.cpp index a3ad7a00c8..41689d9472 100644 --- a/backends/platform/gp32/gp32std_input.cpp +++ b/backends/platform/gp32/gp32std_input.cpp @@ -148,7 +148,7 @@ public: return (numElement == MAX_EVENTS); } - bool get(GP32BtnEvent *ev) { + bool get(GP32BtnEvent *ev) { if (front == rear) { return false; } diff --git a/backends/platform/gp32/gp32std_sound.cpp b/backends/platform/gp32/gp32std_sound.cpp index 71c09c900c..68b33b95f2 100644 --- a/backends/platform/gp32/gp32std_sound.cpp +++ b/backends/platform/gp32/gp32std_sound.cpp @@ -151,7 +151,7 @@ int gp_soundBufStart(GPSOUNDBUF *sb) { } soundBuf.samplesize = 1 << shiftVal; - + // Allocate memory for the playing buffer bufferSize = soundBuf.samplesize * soundBuf.samples * 2; buffer = malloc(bufferSize); diff --git a/backends/platform/gp32/gp_asmlib.s b/backends/platform/gp32/gp_asmlib.s index 3d0bfd9a2e..e1f1d8cb39 100644 --- a/backends/platform/gp32/gp_asmlib.s +++ b/backends/platform/gp32/gp_asmlib.s @@ -322,7 +322,7 @@ _fincol6: gp_clearFramebuffer: @ r0 = framebuffer @ r1 = color - orr r1,r1,r1,lsl #16 @hi halfword = lo halfword + orr r1,r1,r1,lsl #16 @hi halfword = lo halfword mov r2,#38400 clear: str r1,[r0],#4 subs r2,r2,#1 diff --git a/backends/platform/gp32/memcpy.S b/backends/platform/gp32/memcpy.S index 1572831179..12853dbfc4 100644 --- a/backends/platform/gp32/memcpy.S +++ b/backends/platform/gp32/memcpy.S @@ -119,7 +119,7 @@ Lmemcpy_ft8: /* We have aligned source and destination */ subs r2, r2, #8 blt Lmemcpy_fl12 /* less than 12 bytes (4 from above) */ -subs r2, r2, #0x14 +subs r2, r2, #0x14 blt Lmemcpy_fl32 /* less than 32 bytes (12 from above) */ stmdb sp!, {r4} /* borrow r4 */ @@ -130,23 +130,23 @@ ldmia r1!, {r3, r4, r12, lr} stmia r0!, {r3, r4, r12, lr} ldmia r1!, {r3, r4, r12, lr} stmia r0!, {r3, r4, r12, lr} -subs r2, r2, #0x20 +subs r2, r2, #0x20 bge Lmemcpy_floop32 cmn r2, #0x10 ldmgeia r1!, {r3, r4, r12, lr} /* blat a remaining 16 bytes */ stmgeia r0!, {r3, r4, r12, lr} -subge r2, r2, #0x10 +subge r2, r2, #0x10 ldmia sp!, {r4} /* return r4 */ Lmemcpy_fl32: -adds r2, r2, #0x14 +adds r2, r2, #0x14 /* blat 12 bytes at a time */ Lmemcpy_floop12: ldmgeia r1!, {r3, r12, lr} stmgeia r0!, {r3, r12, lr} -subges r2, r2, #0x0c +subges r2, r2, #0x0c bge Lmemcpy_floop12 Lmemcpy_fl12: @@ -201,9 +201,9 @@ ldr lr, [r1], #4 cmp r12, #2 bgt Lmemcpy_fsrcul3 beq Lmemcpy_fsrcul2 -cmp r2, #0x0c +cmp r2, #0x0c blt Lmemcpy_fsrcul1loop4 -sub r2, r2, #0x0c +sub r2, r2, #0x0c stmdb sp!, {r4, r5} Lmemcpy_fsrcul1loop16: @@ -217,10 +217,10 @@ orr r5, r5, r12, lsl #24 mov r12, r12, lsr #8 orr r12, r12, lr, lsl #24 stmia r0!, {r3-r5, r12} -subs r2, r2, #0x10 +subs r2, r2, #0x10 bge Lmemcpy_fsrcul1loop16 ldmia sp!, {r4, r5} -adds r2, r2, #0x0c +adds r2, r2, #0x0c blt Lmemcpy_fsrcul1l4 Lmemcpy_fsrcul1loop4: @@ -236,9 +236,9 @@ sub r1, r1, #3 b Lmemcpy_fl4 Lmemcpy_fsrcul2: -cmp r2, #0x0c +cmp r2, #0x0c blt Lmemcpy_fsrcul2loop4 -sub r2, r2, #0x0c +sub r2, r2, #0x0c stmdb sp!, {r4, r5} Lmemcpy_fsrcul2loop16: @@ -252,10 +252,10 @@ orr r5, r5, r12, lsl #16 mov r12, r12, lsr #16 orr r12, r12, lr, lsl #16 stmia r0!, {r3-r5, r12} -subs r2, r2, #0x10 +subs r2, r2, #0x10 bge Lmemcpy_fsrcul2loop16 ldmia sp!, {r4, r5} -adds r2, r2, #0x0c +adds r2, r2, #0x0c blt Lmemcpy_fsrcul2l4 Lmemcpy_fsrcul2loop4: @@ -271,9 +271,9 @@ sub r1, r1, #2 b Lmemcpy_fl4 Lmemcpy_fsrcul3: -cmp r2, #0x0c +cmp r2, #0x0c blt Lmemcpy_fsrcul3loop4 -sub r2, r2, #0x0c +sub r2, r2, #0x0c stmdb sp!, {r4, r5} Lmemcpy_fsrcul3loop16: @@ -287,10 +287,10 @@ orr r5, r5, r12, lsl #8 mov r12, r12, lsr #24 orr r12, r12, lr, lsl #8 stmia r0!, {r3-r5, r12} -subs r2, r2, #0x10 +subs r2, r2, #0x10 bge Lmemcpy_fsrcul3loop16 ldmia sp!, {r4, r5} -adds r2, r2, #0x0c +adds r2, r2, #0x0c blt Lmemcpy_fsrcul3l4 Lmemcpy_fsrcul3loop4: @@ -330,18 +330,18 @@ ldmdb r1!, {r3, r4, r12, lr} stmdb r0!, {r3, r4, r12, lr} ldmdb r1!, {r3, r4, r12, lr} stmdb r0!, {r3, r4, r12, lr} -subs r2, r2, #0x20 +subs r2, r2, #0x20 bge Lmemcpy_bloop32 Lmemcpy_bl32: -cmn r2, #0x10 +cmn r2, #0x10 ldmgedb r1!, {r3, r4, r12, lr} /* blat a remaining 16 bytes */ stmgedb r0!, {r3, r4, r12, lr} -subge r2, r2, #0x10 -adds r2, r2, #0x14 +subge r2, r2, #0x10 +adds r2, r2, #0x14 ldmgedb r1!, {r3, r12, lr} /* blat a remaining 12 bytes */ stmgedb r0!, {r3, r12, lr} -subge r2, r2, #0x0c +subge r2, r2, #0x0c ldmia sp!, {r4, lr} Lmemcpy_bl12: @@ -393,9 +393,9 @@ ldr r3, [r1, #0] cmp r12, #2 blt Lmemcpy_bsrcul1 beq Lmemcpy_bsrcul2 -cmp r2, #0x0c +cmp r2, #0x0c blt Lmemcpy_bsrcul3loop4 -sub r2, r2, #0x0c +sub r2, r2, #0x0c stmdb sp!, {r4, r5, lr} Lmemcpy_bsrcul3loop16: @@ -409,10 +409,10 @@ orr r5, r5, r4, lsr #24 mov r4, r4, lsl #8 orr r4, r4, r3, lsr #24 stmdb r0!, {r4, r5, r12, lr} -subs r2, r2, #0x10 +subs r2, r2, #0x10 bge Lmemcpy_bsrcul3loop16 ldmia sp!, {r4, r5, lr} -adds r2, r2, #0x0c +adds r2, r2, #0x0c blt Lmemcpy_bsrcul3l4 Lmemcpy_bsrcul3loop4: @@ -428,9 +428,9 @@ add r1, r1, #3 b Lmemcpy_bl4 Lmemcpy_bsrcul2: -cmp r2, #0x0c +cmp r2, #0x0c blt Lmemcpy_bsrcul2loop4 -sub r2, r2, #0x0c +sub r2, r2, #0x0c stmdb sp!, {r4, r5, lr} Lmemcpy_bsrcul2loop16: @@ -444,10 +444,10 @@ orr r5, r5, r4, lsr #16 mov r4, r4, lsl #16 orr r4, r4, r3, lsr #16 stmdb r0!, {r4, r5, r12, lr} -subs r2, r2, #0x10 +subs r2, r2, #0x10 bge Lmemcpy_bsrcul2loop16 ldmia sp!, {r4, r5, lr} -adds r2, r2, #0x0c +adds r2, r2, #0x0c blt Lmemcpy_bsrcul2l4 Lmemcpy_bsrcul2loop4: @@ -463,9 +463,9 @@ add r1, r1, #2 b Lmemcpy_bl4 Lmemcpy_bsrcul1: -cmp r2, #0x0c +cmp r2, #0x0c blt Lmemcpy_bsrcul1loop4 -sub r2, r2, #0x0c +sub r2, r2, #0x0c stmdb sp!, {r4, r5, lr} Lmemcpy_bsrcul1loop32: @@ -479,10 +479,10 @@ orr r5, r5, r4, lsr #8 mov r4, r4, lsl #24 orr r4, r4, r3, lsr #8 stmdb r0!, {r4, r5, r12, lr} -subs r2, r2, #0x10 +subs r2, r2, #0x10 bge Lmemcpy_bsrcul1loop32 ldmia sp!, {r4, r5, lr} -adds r2, r2, #0x0c +adds r2, r2, #0x0c blt Lmemcpy_bsrcul1l4 Lmemcpy_bsrcul1loop4: diff --git a/backends/platform/gp32/portdefs.h b/backends/platform/gp32/portdefs.h index e58c634e16..dd0d70a25a 100644 --- a/backends/platform/gp32/portdefs.h +++ b/backends/platform/gp32/portdefs.h @@ -57,9 +57,9 @@ #undef fseek #undef ferror -#undef clearerr +#undef clearerr -#undef feof +#undef feof #undef getc #define FILE GPFILE |