some fixes

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@127 a1c6a512-1295-4272-9138-f99709370657

3 files changed, 7 insertions, 11 deletions

diff --git a/firmware/test/memory/config.h b/firmware/test/memory/config.h
index aba52b5599..9775fd4893 100644
--- a/firmware/test/memory/config.h
+++ b/firmware/test/memory/config.h
@@ -6,7 +6,6 @@
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
  * $Id$
- *
  * Copyright (C) 2002 by Alan Korr
  *
  * All files in this archive are subject to the GNU General Public License.
diff --git a/firmware/test/memory/defines.h b/firmware/test/memory/defines.h
index 804731cea3..4e01515831 100644
--- a/firmware/test/memory/defines.h
+++ b/firmware/test/memory/defines.h
@@ -6,7 +6,6 @@
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
  * $Id$
- *
  * Copyright (C) 2002 by Alan Korr
  *
  * All files in this archive are subject to the GNU General Public License.
diff --git a/firmware/test/memory/test.y b/firmware/test/memory/test.y
index 481339b31b..b3b39acc26 100644
--- a/firmware/test/memory/test.y
+++ b/firmware/test/memory/test.y
@@ -1,5 +1,6 @@
 %{
 #include "memory.h"
+#include "memory-page.h"
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -63,7 +64,7 @@ spy
 
 check
   : CHECK expression
-    { memory_check (yylval); }
+    { __memory_check (yylval); }
   ;
 
 expression
@@ -112,21 +113,19 @@ void prompt (void)
 
 void allocate (int order)
   {
-    extern char free_page[0];
     void *address;
     printf("\nallocating a page of %d bytes...",512<<order);
     if ((unsigned)order > 21)
       printf (" bad order !");
     else if ((address = memory_allocate_page (order)))
-      printf (" page #%d allocated !",((char *)address - free_page) >> 9);
+      printf (" page #%d allocated !",((char *)address - (char *)__memory_free_page) >> 9);
     else
       printf (" cannot allocate a page !");
   }
 
 void release (int page)
   {
-    extern char free_page[0];
-    void *address = (void *)(free_page + (page << 9));
+    void *address = (void *)((char *)__memory_free_page + (page << 9));
     printf("\nreleasing page #%d...",page);
     if ((unsigned)page >= (2*1024*1024/512))
       printf (" bad page number !");
@@ -138,13 +137,12 @@ void release (int page)
 
 void spy (int page)
   {
-    extern char free_page[0];
-    void *address = (void *)(free_page + (page << 9));
+    void *address = (void *)((char *)__memory_free_page + (page << 9));
     printf("\nspying page #%d...",page);
     if ((unsigned)page >= (2*1024*1024/512))
       printf (" bad page number !");
     else
-      memory_spy_page (address);
+      __memory_spy_page (address);
   }
 
 void dump (void)
@@ -152,7 +150,7 @@ void dump (void)
     int order;
     printf("\ndumping free pages list...");
     for (order = 0; order < 13; ++order)
-      memory_dump (order);
+      __memory_dump (order);
   }
 
 int main ()