initial pandora port, with hardware scaling and stuff

[gpsp.git] / memory.c

diff --git a/memory.c b/memory.c
index e902af3..c0d4f11 100644 (file)
--- a/memory.c
+++ b/memory.c
@@ -19,8 +19,6 @@
 
 #include "common.h"
 
-u32 load_file_zip(u8 *filename);
-
 // This table is configured for sequential access on system defaults
 
 u32 waitstate_cycles_sequential[16][3] =
@@ -2158,10 +2156,14 @@ u32 load_gamepak(char *name)
   s32 file_size;
   u8 cheats_filename[256];
 
+#ifdef WIZ_BUILD
+  file_size = wiz_load_gamepak(name);
+#else
   if(!strcmp(dot_position, ".zip"))
     file_size = load_file_zip(name);
   else
     file_size = load_gamepak_raw(name);
+#endif
 
   // A dumb April fool's joke was here once :o
 
@@ -3113,9 +3115,7 @@ void bios_region_read_allow()
 
 void bios_region_read_protect()
 {
-#ifdef GP2X_BUILD
   memory_map_read[0] = NULL;
-#endif
 }