[Scummvm-cvs-logs] SF.net SVN: scummvm: [32428] scummvm/trunk/backends/platform/ds/arm9/source
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Sat May 31 21:02:35 CEST 2008
Revision: 32428
http://scummvm.svn.sourceforge.net/scummvm/?rev=32428&view=rev
Author: fingolfin
Date: 2008-05-31 12:02:35 -0700 (Sat, 31 May 2008)
Log Message:
-----------
Fixing various warnings in the DS port
Modified Paths:
--------------
scummvm/trunk/backends/platform/ds/arm9/source/cdaudio.cpp
scummvm/trunk/backends/platform/ds/arm9/source/dsmain.cpp
scummvm/trunk/backends/platform/ds/arm9/source/fat/disc_io.h
scummvm/trunk/backends/platform/ds/arm9/source/gbampsave.cpp
scummvm/trunk/backends/platform/ds/arm9/source/gbampsave.h
scummvm/trunk/backends/platform/ds/arm9/source/osystem_ds.cpp
scummvm/trunk/backends/platform/ds/arm9/source/ramsave.h
scummvm/trunk/backends/platform/ds/arm9/source/wordcompletion.h
Modified: scummvm/trunk/backends/platform/ds/arm9/source/cdaudio.cpp
===================================================================
--- scummvm/trunk/backends/platform/ds/arm9/source/cdaudio.cpp 2008-05-31 18:33:56 UTC (rev 32427)
+++ scummvm/trunk/backends/platform/ds/arm9/source/cdaudio.cpp 2008-05-31 19:02:35 UTC (rev 32428)
@@ -21,8 +21,8 @@
*/
#include "cdaudio.h"
-#include "ds-fs.h"
-#include "config-manager.h"
+#include "backends/fs/ds/ds-fs.h"
+#include "common/config-manager.h"
#include "dsmain.h"
#include "NDS/scummvm_ipc.h"
#include "console2.h"
Modified: scummvm/trunk/backends/platform/ds/arm9/source/dsmain.cpp
===================================================================
--- scummvm/trunk/backends/platform/ds/arm9/source/dsmain.cpp 2008-05-31 18:33:56 UTC (rev 32427)
+++ scummvm/trunk/backends/platform/ds/arm9/source/dsmain.cpp 2008-05-31 19:02:35 UTC (rev 32428)
@@ -74,9 +74,9 @@
#include "system.h"
#include "osystem_ds.h"
#include "icons_raw.h"
-#include "gba_nds_fat.h"
-#include "disc_io.h"
-#include "config-manager.h"
+#include "fat/gba_nds_fat.h"
+#include "fat/disc_io.h"
+#include "common/config-manager.h"
#include "engines/scumm/scumm.h"
#include "keyboard_raw.h"
#include "keyboard_pal_raw.h"
@@ -89,14 +89,13 @@
#include "user_debugger.h"
#endif
#include "ramsave.h"
-#include "disc_io.h"
#include "blitters.h"
#include "cartreset_nolibfat.h"
#include "keys.h"
#ifdef USE_PROFILER
#include "profiler/cyg-profile.h"
#endif
-#include "ds-fs.h"
+#include "backends/fs/ds/ds-fs.h"
namespace DS {
@@ -749,7 +748,7 @@
if (displayModeIs8Bit) {
- static int test = 0;
+// static int test = 0;
// consolePrintf("saving buffer... %d\n", test++);
saveGameBackBuffer();
for (int r = 0; r < 32 * 32; r++) {
Modified: scummvm/trunk/backends/platform/ds/arm9/source/fat/disc_io.h
===================================================================
--- scummvm/trunk/backends/platform/ds/arm9/source/fat/disc_io.h 2008-05-31 18:33:56 UTC (rev 32427)
+++ scummvm/trunk/backends/platform/ds/arm9/source/fat/disc_io.h 2008-05-31 19:02:35 UTC (rev 32428)
@@ -53,7 +53,7 @@
//----------------------------------------------------------------------
#if defined _CF_USE_DMA && defined _CF_ALLOW_UNALIGNED
- #error You can't use both DMA and unaligned memory
+ #error You can not use both DMA and unaligned memory
#endif
// When compiling for NDS, make sure NDS is defined
Modified: scummvm/trunk/backends/platform/ds/arm9/source/gbampsave.cpp
===================================================================
--- scummvm/trunk/backends/platform/ds/arm9/source/gbampsave.cpp 2008-05-31 18:33:56 UTC (rev 32427)
+++ scummvm/trunk/backends/platform/ds/arm9/source/gbampsave.cpp 2008-05-31 19:02:35 UTC (rev 32428)
@@ -21,9 +21,9 @@
*/
#include "gbampsave.h"
-#include "gba_nds_fat.h"
-#include "ds-fs.h"
-#include "config-manager.h"
+#include "fat/gba_nds_fat.h"
+#include "backends/fs/ds/ds-fs.h"
+#include "common/config-manager.h"
/////////////////////////
// GBAMP Save File
Modified: scummvm/trunk/backends/platform/ds/arm9/source/gbampsave.h
===================================================================
--- scummvm/trunk/backends/platform/ds/arm9/source/gbampsave.h 2008-05-31 18:33:56 UTC (rev 32427)
+++ scummvm/trunk/backends/platform/ds/arm9/source/gbampsave.h 2008-05-31 19:02:35 UTC (rev 32428)
@@ -23,8 +23,8 @@
#ifndef _GBAMPSAVE_H_
#define _GBAMPSAVE_H_
-#include "system.h"
-#include "ds-fs.h"
+#include "common/system.h"
+#include "backends/fs/ds/ds-fs.h"
#define SAVE_BUFFER_SIZE 100000
Modified: scummvm/trunk/backends/platform/ds/arm9/source/osystem_ds.cpp
===================================================================
--- scummvm/trunk/backends/platform/ds/arm9/source/osystem_ds.cpp 2008-05-31 18:33:56 UTC (rev 32427)
+++ scummvm/trunk/backends/platform/ds/arm9/source/osystem_ds.cpp 2008-05-31 19:02:35 UTC (rev 32428)
@@ -32,12 +32,12 @@
#include "nds.h"
#include "dsmain.h"
#include "nds/registers_alt.h"
-#include "config-manager.h"
+#include "common/config-manager.h"
#include "common/str.h"
#include "cdaudio.h"
#include "graphics/surface.h"
#include "touchkeyboard.h"
-#include "ds-fs-factory.h"
+#include "backends/fs/ds/ds-fs-factory.h"
OSystem_DS* OSystem_DS::_instance = NULL;
Modified: scummvm/trunk/backends/platform/ds/arm9/source/ramsave.h
===================================================================
--- scummvm/trunk/backends/platform/ds/arm9/source/ramsave.h 2008-05-31 18:33:56 UTC (rev 32427)
+++ scummvm/trunk/backends/platform/ds/arm9/source/ramsave.h 2008-05-31 19:02:35 UTC (rev 32428)
@@ -23,8 +23,8 @@
#ifndef _RAMSAVE_H_
#define _RAMSAVE_H_
-#include "system.h"
-#include "savefile.h"
+#include "common/system.h"
+#include "common/savefile.h"
// SaveFileManager class
Modified: scummvm/trunk/backends/platform/ds/arm9/source/wordcompletion.h
===================================================================
--- scummvm/trunk/backends/platform/ds/arm9/source/wordcompletion.h 2008-05-31 18:33:56 UTC (rev 32427)
+++ scummvm/trunk/backends/platform/ds/arm9/source/wordcompletion.h 2008-05-31 19:02:35 UTC (rev 32428)
@@ -1,10 +1,7 @@
-
-
-
namespace DS {
extern bool findWordCompletions(char* input);
extern void addAutoCompleteLine(char* line);
extern void sortAutoCompleteWordList();
-}
\ No newline at end of file
+}
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