From 8fb92b9e2a95ec8ef137eba930287f3c29772e8d Mon Sep 17 00:00:00 2001
From: Yotam Barnoy
Date: Thu, 19 Aug 2010 11:18:01 +0000
Subject: PSP: made PSP compile with plugins.

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

svn-id: r52206
---
 backends/platform/psp/module.mk     | 1 -
 backends/plugins/elf-loader.cpp     | 8 --------
 backends/plugins/psp/psp-provider.h | 3 +--
 3 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/backends/platform/psp/module.mk b/backends/platform/psp/module.mk
index 4652189ab4..a854ec1252 100644
--- a/backends/platform/psp/module.mk
+++ b/backends/platform/psp/module.mk
@@ -11,7 +11,6 @@ MODULE_OBJS := powerman.o \
 	input.o \
 	cursor.o \
 	trace.o \
-	psploader.o \
 	pspkeyboard.o \
 	audio.o \
 	thread.o \
diff --git a/backends/plugins/elf-loader.cpp b/backends/plugins/elf-loader.cpp
index 9787c880ae..2cf61aa246 100644
--- a/backends/plugins/elf-loader.cpp
+++ b/backends/plugins/elf-loader.cpp
@@ -324,10 +324,6 @@ bool DLObject::open(const char *path) {
 	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 @@ bool DLObject::open(const char *path) {
 
 	DBG("loaded!/n");
 
-#ifdef __PSP__
-	PowerMan.endCriticalSection();
-#endif
-
 	flushDataCache();
 
 	ctors_start = symbol("___plugin_ctors");
diff --git a/backends/plugins/psp/psp-provider.h b/backends/plugins/psp/psp-provider.h
index efe62ecf2c..b7934179bf 100644
--- a/backends/plugins/psp/psp-provider.h
+++ b/backends/plugins/psp/psp-provider.h
@@ -40,10 +40,9 @@ class PSPPluginProvider : public ELFPluginProvider {
 	};
 
 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 */
-- 
cgit v1.2.3