From 91f572c3b5feff8311fbb8b930fafbe53cc2a530 Mon Sep 17 00:00:00 2001
From: Jens Arnold <amiconn@rockbox.org>
Date: Tue, 28 Jun 2005 21:12:11 +0000
Subject: Iriver: Fix codec <-> plugin start address clash, leading to crashes
 when trying to run plugins while playing music.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6903 a1c6a512-1295-4272-9138-f99709370657
---
 apps/plugins/plugin.lds | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/apps/plugins/plugin.lds b/apps/plugins/plugin.lds
index 3e624d6a0b..d0ddb78cbf 100644
--- a/apps/plugins/plugin.lds
+++ b/apps/plugins/plugin.lds
@@ -23,19 +23,22 @@ OUTPUT_FORMAT(elf32-sh)
 #endif
 
 #define PLUGIN_LENGTH PLUGIN_BUFFER_SIZE
+#define DRAMSIZE (MEMORYSIZE * 0x100000) - PLUGIN_LENGTH - CODEC_SIZE
+#define CODEC_ORIGIN (DRAMORIG + (DRAMSIZE))
+#define PLUGIN_ORIGIN (CODEC_ORIGIN + CODEC_SIZE)
+
 
 #ifdef CODEC
 #define THIS_LENGTH CODEC_SIZE
+#define THIS_ORIGIN CODEC_ORIGIN
 #else
 #define THIS_LENGTH PLUGIN_LENGTH
+#define THIS_ORIGIN PLUGIN_ORIGIN
 #endif
 
-#define DRAMSIZE (MEMORYSIZE * 0x100000) - PLUGIN_LENGTH - CODEC_SIZE
-#define PLUGIN_ORIGIN (DRAMORIG + (DRAMSIZE))
-
 MEMORY
 {
-   PLUGIN_RAM : ORIGIN = PLUGIN_ORIGIN, LENGTH = THIS_LENGTH
+   PLUGIN_RAM : ORIGIN = THIS_ORIGIN, LENGTH = THIS_LENGTH
 #ifdef IRIVER_H100
    PLUGIN_IRAM : ORIGIN = IRAMORIG, LENGTH = IRAMSIZE
 #endif
-- 
cgit v1.2.3