[Scummvm-cvs-logs] SF.net SVN: scummvm:[44424] scummvm/branches/branch-1-0-0/backends
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Sun Sep 27 23:59:19 CEST 2009
Revision: 44424
http://scummvm.svn.sourceforge.net/scummvm/?rev=44424&view=rev
Author: fingolfin
Date: 2009-09-27 21:59:18 +0000 (Sun, 27 Sep 2009)
Log Message:
-----------
NDS: Some cleanup; use ndstypes.h instead of jtypes.h
Modified Paths:
--------------
scummvm/branches/branch-1-0-0/backends/fs/ds/ds-fs.cpp
scummvm/branches/branch-1-0-0/backends/platform/ds/arm9/source/dsmain.cpp
scummvm/branches/branch-1-0-0/backends/platform/ds/arm9/source/fat/disc_io.h
scummvm/branches/branch-1-0-0/backends/platform/ds/arm9/source/fat/gba_nds_fat.h
scummvm/branches/branch-1-0-0/backends/platform/ds/arm9/source/fat/io_fcsr.c
scummvm/branches/branch-1-0-0/backends/platform/ds/arm9/source/osystem_ds.cpp
scummvm/branches/branch-1-0-0/backends/platform/ds/arm9/source/portdefs.h
scummvm/branches/branch-1-0-0/backends/platform/ds/commoninclude/NDS/scummvm_ipc.h
Modified: scummvm/branches/branch-1-0-0/backends/fs/ds/ds-fs.cpp
===================================================================
--- scummvm/branches/branch-1-0-0/backends/fs/ds/ds-fs.cpp 2009-09-27 21:52:14 UTC (rev 44423)
+++ scummvm/branches/branch-1-0-0/backends/fs/ds/ds-fs.cpp 2009-09-27 21:59:18 UTC (rev 44424)
@@ -770,6 +770,7 @@
}
void std_fprintf(FILE* handle, const char* fmt, ...) {
+ //FIXME: not implemented properly
consolePrintf("%s", fmt);
}
Modified: scummvm/branches/branch-1-0-0/backends/platform/ds/arm9/source/dsmain.cpp
===================================================================
--- scummvm/branches/branch-1-0-0/backends/platform/ds/arm9/source/dsmain.cpp 2009-09-27 21:52:14 UTC (rev 44423)
+++ scummvm/branches/branch-1-0-0/backends/platform/ds/arm9/source/dsmain.cpp 2009-09-27 21:59:18 UTC (rev 44424)
@@ -105,8 +105,6 @@
#include "backends/fs/ds/ds-fs.h"
#include "engine.h"
-
-
extern "C" void OurIntrMain(void);
extern "C" u32 getExceptionAddress( u32 opcodeAddress, u32 thumbState);
@@ -3278,10 +3276,10 @@
#endif
-extern "C" void consolePrintf(char * format, ...) {
+extern "C" void consolePrintf(const char * format, ...) {
char buffer[256];
va_list args;
- va_start (args, format);
+ va_start(args, format);
viprintf(format, args);
- va_end (args);
+ va_end(args);
}
Modified: scummvm/branches/branch-1-0-0/backends/platform/ds/arm9/source/fat/disc_io.h
===================================================================
--- scummvm/branches/branch-1-0-0/backends/platform/ds/arm9/source/fat/disc_io.h 2009-09-27 21:52:14 UTC (rev 44423)
+++ scummvm/branches/branch-1-0-0/backends/platform/ds/arm9/source/fat/disc_io.h 2009-09-27 21:59:18 UTC (rev 44424)
@@ -64,7 +64,7 @@
#endif
#ifdef NDS
- #include <nds/jtypes.h>
+ #include <nds/ndstypes.h>
#else
#include "gba_types.h"
#endif
Modified: scummvm/branches/branch-1-0-0/backends/platform/ds/arm9/source/fat/gba_nds_fat.h
===================================================================
--- scummvm/branches/branch-1-0-0/backends/platform/ds/arm9/source/fat/gba_nds_fat.h 2009-09-27 21:52:14 UTC (rev 44423)
+++ scummvm/branches/branch-1-0-0/backends/platform/ds/arm9/source/fat/gba_nds_fat.h 2009-09-27 21:59:18 UTC (rev 44424)
@@ -47,7 +47,7 @@
#endif
#ifdef NDS
- #include <nds/jtypes.h>
+ #include <nds/ndstypes.h>
#else
#include "gba_types.h"
#endif
Modified: scummvm/branches/branch-1-0-0/backends/platform/ds/arm9/source/fat/io_fcsr.c
===================================================================
--- scummvm/branches/branch-1-0-0/backends/platform/ds/arm9/source/fat/io_fcsr.c 2009-09-27 21:52:14 UTC (rev 44423)
+++ scummvm/branches/branch-1-0-0/backends/platform/ds/arm9/source/fat/io_fcsr.c 2009-09-27 21:59:18 UTC (rev 44424)
@@ -106,7 +106,7 @@
bool flagSramSector = false;
int numSectors = (numSecs > 0 ? numSecs : 256);
int readLength = numSectors * BYTE_PER_READ;
- u8* src;;
+ u8* src;
u8* dst;
// Find which region this read is in
Modified: scummvm/branches/branch-1-0-0/backends/platform/ds/arm9/source/osystem_ds.cpp
===================================================================
--- scummvm/branches/branch-1-0-0/backends/platform/ds/arm9/source/osystem_ds.cpp 2009-09-27 21:52:14 UTC (rev 44423)
+++ scummvm/branches/branch-1-0-0/backends/platform/ds/arm9/source/osystem_ds.cpp 2009-09-27 21:59:18 UTC (rev 44424)
@@ -181,7 +181,6 @@
{
u16 paletteValue = red | (green << 5) | (blue << 10);
-
if (DS::getIsDisplayMode8Bit()) {
int col = applyGamma(paletteValue);
BG_PALETTE[r] = col;
@@ -405,8 +404,6 @@
}
}
-
-
// consolePrintf("Slow method used!\n");
Modified: scummvm/branches/branch-1-0-0/backends/platform/ds/arm9/source/portdefs.h
===================================================================
--- scummvm/branches/branch-1-0-0/backends/platform/ds/arm9/source/portdefs.h 2009-09-27 21:52:14 UTC (rev 44423)
+++ scummvm/branches/branch-1-0-0/backends/platform/ds/arm9/source/portdefs.h 2009-09-27 21:59:18 UTC (rev 44424)
@@ -36,7 +36,7 @@
typedef signed int s32;
*/
-#include "nds/jtypes.h"
+#include "nds/ndstypes.h"
// Somebody removed these from scummsys.h, but they're still required, so I'm adding them here
@@ -66,7 +66,7 @@
#ifdef __cplusplus
extern "C" {
#endif
-void consolePrintf(char * format, ...);
+void consolePrintf(const char *format, ...);
#ifdef __cplusplus
}
#endif
@@ -85,7 +85,7 @@
#define ITCM_DATA __attribute__((section(".itcm")))
-// Since I can't change the engine at the moment (post lockdown) this define can go here.
+// FIXME: Since I can't change the engine at the moment (post lockdown) this define can go here.
// This define changes the mouse-relative motion which doesn't make sense on a touch screen to
// a more conventional form of input where the menus can be clicked on.
#define LURE_CLICKABLE_MENUS
Modified: scummvm/branches/branch-1-0-0/backends/platform/ds/commoninclude/NDS/scummvm_ipc.h
===================================================================
--- scummvm/branches/branch-1-0-0/backends/platform/ds/commoninclude/NDS/scummvm_ipc.h 2009-09-27 21:52:14 UTC (rev 44423)
+++ scummvm/branches/branch-1-0-0/backends/platform/ds/commoninclude/NDS/scummvm_ipc.h 2009-09-27 21:59:18 UTC (rev 44424)
@@ -27,7 +27,7 @@
//////////////////////////////////////////////////////////////////////
-#include <nds/jtypes.h>
+#include <nds/ndstypes.h>
#include <nds/ipc.h>
//////////////////////////////////////////////////////////////////////
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list