added warm lib

[gpsp.git] / main.c

diff --git a/main.c b/main.c
index 1f076c8..3bdc850 100644 (file)
--- a/main.c
+++ b/main.c
@@ -49,6 +49,7 @@ u64 frame_count_initial_timestamp = 0;
 u64 last_frame_interval_timestamp;
 u32 gp2x_fps_debug = 0;
 
+void gp2x_init(void);
 void gp2x_quit(void);
 #else
 
@@ -84,7 +85,11 @@ u32 oam_update_count = 0;
 u32 synchronize_flag = 1;
 
 u32 update_backup_flag = 1;
+#ifdef GP2X_BUILD
+u32 clock_speed = 200;
+#else
 u32 clock_speed = 333;
+#endif
 u8 main_path[512];
 
 void trigger_ext_event();
@@ -188,16 +193,11 @@ int main(int argc, char *argv[])
   u8 load_filename[512];
   u8 bios_filename[512];
 
-#ifdef GP2X_BUILD
-  if(gp2x_load_mmuhack() == -1)
-    delay_us(2500000);
-#endif
-
 #ifdef PSP_BUILD
   sceKernelRegisterSubIntrHandler(PSP_VBLANK_INT, 0,
    vblank_interrupt_handler, NULL);
   sceKernelEnableSubIntr(PSP_VBLANK_INT, 0);
-#else
+#elif !defined(GP2X_BUILD)
   freopen("CON", "wb", stdout);
 #endif
 
@@ -221,13 +221,13 @@ int main(int argc, char *argv[])
   delay_us(2500000);
 #endif
 
-  init_video();
-
 #ifdef GP2X_BUILD
   // Overclocking GP2X and MMU patch goes here
-  gp2x_overclock();
+  gp2x_init();
 #endif
 
+  init_video();
+
 #ifdef GP2X_BUILD
   sprintf(bios_filename, "%s/%s", main_path, "gba_bios.bin");
   if(load_bios(bios_filename) == -1)
@@ -351,7 +351,7 @@ int main(int argc, char *argv[])
    current_savestate_filename);
   load_state(current_savestate_filename); */
 
-  debug_on();
+//  debug_on();
 
   if(argc > 2)
   {
@@ -1008,7 +1008,8 @@ void get_ticks_us(u64 *ticks_return)
 
 void delay_us(u32 us_count)
 {
-  usleep(us_count);
+  //usleep(us_count);
+  SDL_Delay(us_count / 1000);
 }
 
 void get_ticks_us(u64 *ticks_return)