X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=gp2x%2Fgp2x.c;h=6d9f82e39f0afeff914df4898045287e80bd44b3;hb=42c8119010bfc48776e8c82e42cceb06d07c0247;hp=eeefcf68390efeb8255e600f968cdfbfeef2954a;hpb=5c6e71a06127c052326bf4dbae67d473030b6dc7;p=gpsp.git

diff --git a/gp2x/gp2x.c b/gp2x/gp2x.c
index eeefcf6..6d9f82e 100644
--- a/gp2x/gp2x.c
+++ b/gp2x/gp2x.c
@@ -46,12 +46,12 @@ static u32 fb_paddr[fb_buf_count];
 static void *fb_vaddr[fb_buf_count];
 static u32 fb_work_buf;
 static int fb_buf_use;
+static int fbdev;
 
 static void fb_video_init()
 {
   struct fb_fix_screeninfo fbfix;
   int i, ret;
-  int fbdev;
 
   fbdev = open("/dev/fb0", O_RDWR);
   if (fbdev < 0) {
@@ -68,7 +68,6 @@ static void fb_video_init()
 
   printf("framebuffer: \"%s\" @ %08lx\n", fbfix.id, fbfix.smem_start);
   fb_paddr[0] = fbfix.smem_start;
-  close(fbdev);
 
   fb_vaddr[0] = mmap(0, 320*240*2*fb_buf_count, PROT_READ|PROT_WRITE,
     MAP_SHARED, gpsp_gp2x_dev, fb_paddr[0]);
@@ -95,7 +94,6 @@ static void fb_video_init()
 
 void pollux_video_flip()
 {
-  warm_cache_op_all(WOP_D_CLEAN);
   gpsp_gp2x_memregl[0x406C>>2] = fb_paddr[fb_work_buf];
   gpsp_gp2x_memregl[0x4058>>2] |= 0x10;
   fb_work_buf++;
@@ -114,17 +112,118 @@ void fb_use_buffers(int count)
   memset(fb_vaddr[0], 0, 320*240*2*count);
 }
 
+void wiz_lcd_set_portrait(int y)
+{
+  static int old_y = -1;
+  int cmd[2] = { 0, 0 };
+
+  if (old_y == y)
+    return;
+  cmd[0] = y ? 6 : 5;
+  ioctl(fbdev, _IOW('D', 90, int[2]), cmd);
+  gpsp_gp2x_memregl[0x4004>>2] = y ? 0x013f00ef : 0x00ef013f;
+  gpsp_gp2x_memregl[0x4000>>2] |= 1 << 3;
+  old_y = y;
+}
+
 static void fb_video_exit()
 {
-  /* switch to default fb mem */
+  /* switch to default fb mem, turn portrait off */
   gpsp_gp2x_memregl[0x406C>>2] = fb_paddr[0];
   gpsp_gp2x_memregl[0x4058>>2] |= 0x10;
+  wiz_lcd_set_portrait(0);
+  close(fbdev);
+}
+
+static int wiz_gamepak_fd = -1;
+static u32 wiz_gamepak_size;
+
+static void wiz_gamepak_cleanup()
+{
+  if (wiz_gamepak_size)
+    munmap(gamepak_rom, wiz_gamepak_size);
+  if (wiz_gamepak_fd >= 0)
+    close(wiz_gamepak_fd);
+  gamepak_rom = NULL;
+  wiz_gamepak_size = 0;
+  wiz_gamepak_fd = -1;
+}
+
+u32 wiz_load_gamepak(char *name)
+{
+  char *dot_position = strrchr(name, '.');
+  u32 ret;
+
+  if (!strcasecmp(dot_position, ".zip"))
+  {
+    if (wiz_gamepak_fd >= 0)
+    {
+      wiz_gamepak_cleanup();
+      printf("switching to ROM malloc\n");
+      init_gamepak_buffer();
+    }
+    return load_file_zip(name);
+  }
+
+  if (wiz_gamepak_fd < 0)
+  {
+    extern void *gamepak_memory_map;
+    free(gamepak_rom);
+    free(gamepak_memory_map);
+    gamepak_memory_map = NULL;
+    printf("switching to ROM mmap\n");
+  }
+  else
+    wiz_gamepak_cleanup();
+
+  wiz_gamepak_fd = open(name, O_RDONLY|O_NOATIME, S_IRUSR);
+  if (wiz_gamepak_fd < 0)
+  {
+    perror("wiz_load_gamepak: open failed");
+    return -1;
+  }
+
+  ret = lseek(wiz_gamepak_fd, 0, SEEK_END);
+  wiz_gamepak_size = gamepak_ram_buffer_size = ret;
+
+  gamepak_rom = mmap(0, ret, PROT_READ, MAP_SHARED, wiz_gamepak_fd, 0);
+  if (gamepak_rom == MAP_FAILED)
+  {
+    perror("wiz_load_gamepak: mmap failed");
+    return -1;
+  }
+
+  return ret;
 }
+
 #endif
 
-void gp2x_init()
+static int get_romdir(char *buff, size_t size)
 {
   FILE *f;
+  char *s;
+  int r = -1;
+  
+  f = fopen("romdir.txt", "r");
+  if (f == NULL)
+    return -1;
+
+  s = fgets(buff, size, f);
+  if (s)
+  {
+    r = strlen(s);
+    while (r > 0 && isspace(buff[r-1]))
+      buff[--r] = 0;
+  }
+
+  fclose(f);
+  return r;
+}
+
+void gp2x_init()
+{
+  char buff[256];
+
   gpsp_gp2x_dev = open("/dev/mem",   O_RDWR);
   gpsp_gp2x_dev_audio = open("/dev/mixer", O_RDWR);
   gpsp_gp2x_memregl =
@@ -137,53 +236,42 @@ void gp2x_init()
   fb_video_init();
 #endif
 
-  f = fopen("romdir.txt", "r");
-  if (f != NULL)
-  {
-    char buff[256];
-    char *s = fgets(buff, sizeof(buff) - 1, f);
-    if (s)
-    {
-      int r = strlen(s);
-      while (r > 0 && isspace(buff[r-1]))
-        buff[--r] = 0;
-      chdir(buff);
-    }
-    fclose(f);
-  }
+  if (get_romdir(buff, sizeof(buff)) > 0)
+    chdir(buff);
 
   gp2x_sound_volume(1);
 }
 
-#include <errno.h>
 void gp2x_quit()
 {
-  char buff[256];
-  FILE *f;
+  char buff1[256], buff2[256];
 
-  getcwd(buff, sizeof(buff));
+  getcwd(buff1, sizeof(buff1));
   chdir(main_path);
-  f = fopen("romdir.txt", "r+");
-  if (f != NULL)
+  if (get_romdir(buff2, sizeof(buff2)) >= 0 &&
+    strcmp(buff1, buff2) != 0)
   {
-    fprintf(f, "%s", buff);
-    fclose(f);
-    truncate("romdir.txt", strlen(buff));
-    sync();
+    FILE *f = fopen("romdir.txt", "w");
+    if (f != NULL)
+    {
+      printf("writing romdir: %s\n", buff1);
+      fprintf(f, "%s", buff1);
+      fclose(f);
+    }
   }
 
   warm_finish();
 #ifdef WIZ_BUILD
   close(gpsp_gp2x_gpiodev);
   fb_video_exit();
+  wiz_gamepak_cleanup();
 #endif
   munmap((void *)gpsp_gp2x_memregl, 0x10000);
   close(gpsp_gp2x_dev_audio);
   close(gpsp_gp2x_dev);
 
   fcloseall();
-  //chdir("/usr/gp2x");
-  //execl("gp2xmenu", "gp2xmenu", NULL);
+  sync();
   exit(0);
 }
 
@@ -247,6 +335,8 @@ void set_FCLK(u32 MHZ)
 
   gpsp_gp2x_memregl[0xf004>>2] = v;
   gpsp_gp2x_memregl[0xf07c>>2] |= 0x8000;
+  while (gpsp_gp2x_memregl[0xf07c>>2] & 0x8000)
+    ;
 #else
   #define SYS_CLK_FREQ 7372800
   // m = MDIV + 8, p = PDIV + 2, s = SDIV