[Scummvm-cvs-logs] SF.net SVN: scummvm:[52206] scummvm/branches/gsoc2010-plugins/backends

[bluddy at users.sourceforge.net]

Revision: 52206
          http://scummvm.svn.sourceforge.net/scummvm/?rev=52206&view=rev
Author:   bluddy
Date:     2010-08-19 11:18:01 +0000 (Thu, 19 Aug 2010)

Log Message:
-----------
PSP: made PSP compile with plugins.

Also removed criticalSection calls from elf-loader.cpp, since now streams are used so the criticalSections are automatic.

Modified Paths:
--------------
    scummvm/branches/gsoc2010-plugins/backends/platform/psp/module.mk
    scummvm/branches/gsoc2010-plugins/backends/plugins/elf-loader.cpp
    scummvm/branches/gsoc2010-plugins/backends/plugins/psp/psp-provider.h

Modified: scummvm/branches/gsoc2010-plugins/backends/platform/psp/module.mk
===================================================================
--- scummvm/branches/gsoc2010-plugins/backends/platform/psp/module.mk	2010-08-19 11:17:17 UTC (rev 52205)
+++ scummvm/branches/gsoc2010-plugins/backends/platform/psp/module.mk	2010-08-19 11:18:01 UTC (rev 52206)
@@ -11,7 +11,6 @@
 	input.o \
 	cursor.o \
 	trace.o \
-	psploader.o \
 	pspkeyboard.o \
 	audio.o \
 	thread.o \

Modified: scummvm/branches/gsoc2010-plugins/backends/plugins/elf-loader.cpp
===================================================================
--- scummvm/branches/gsoc2010-plugins/backends/plugins/elf-loader.cpp	2010-08-19 11:17:17 UTC (rev 52205)
+++ scummvm/branches/gsoc2010-plugins/backends/plugins/elf-loader.cpp	2010-08-19 11:18:01 UTC (rev 52206)
@@ -324,10 +324,6 @@
 	Common::SeekableReadStream* DLFile;
 	void *ctors_start, *ctors_end;
 
-#ifdef __PSP__
-	PowerMan.beginCriticalSection();
-#endif
-
 	DBG("open(\"%s\")\n", path);
 
 	Common::FSNode file(path);
@@ -347,10 +343,6 @@
 
 	DBG("loaded!/n");
 
-#ifdef __PSP__
-	PowerMan.endCriticalSection();
-#endif
-
 	flushDataCache();
 
 	ctors_start = symbol("___plugin_ctors");

Modified: scummvm/branches/gsoc2010-plugins/backends/plugins/psp/psp-provider.h
===================================================================
--- scummvm/branches/gsoc2010-plugins/backends/plugins/psp/psp-provider.h	2010-08-19 11:17:17 UTC (rev 52205)
+++ scummvm/branches/gsoc2010-plugins/backends/plugins/psp/psp-provider.h	2010-08-19 11:18:01 UTC (rev 52206)
@@ -40,10 +40,9 @@
 	};
 
 public:
-	Plugin* PSPPluginProvider::createPlugin(const Common::FSNode &node) const {
+	Plugin* createPlugin(const Common::FSNode &node) const {
 		return new PSPPlugin(node.getPath());
 	}
-}
 };
 
 #endif /* BACKENDS_PLUGINS_PSP_PSP_PROVIDER_H */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.