X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=ginge.git;a=blobdiff_plain;f=loader%2Femu.c;h=6ddbb4ada0f9d9c47e0362afe40ea6fbe9ff3495;hp=5adcc5d4a6ef5f859a24982f96792b7f5faa6d6f;hb=8cbb027881eadc228c7a0613b7afb6c566bf86fe;hpb=88d814e3677c8b71a62382bf839f452960472cac

diff --git a/loader/emu.c b/loader/emu.c
index 5adcc5d..6ddbb4a 100644
--- a/loader/emu.c
+++ b/loader/emu.c
@@ -1259,10 +1259,11 @@ fail:
   return -EINVAL;
 }
 
+static const char wm97xx_p[] =
+  "5507 0 -831476 0 -4218 16450692 65536"; // from 4.0 fw
+
 long emu_do_read(int fd, void *buf, int count)
 {
-  static const char wm97xx_p[] =
-    "5507 0 -831476 0 -4218 16450692 65536"; // from 4.0 fw
   int ret, pressed = 0, x, y;
   struct {
     u16 pressure, x, y;
@@ -1284,7 +1285,7 @@ long emu_do_read(int fd, void *buf, int count)
   case FAKEDEV_WM97XX:
     ret = host_read_ts(&pressed, &x, &y);
     if (ret == 0 && pressed) {
-      wm97xx.pressure = 1;
+      wm97xx.pressure = 0x8001; // TODO: check the real thing
       wm97xx.x =        x * 3750 / 1024 + 200;
       wm97xx.y = 3750 - y * 3750 / 1024 + 200;
     }
@@ -1303,7 +1304,7 @@ long emu_do_read(int fd, void *buf, int count)
     strncpy(buf, wm97xx_p, count);
     break;
   default:
-    err("read(%d, %d)\n", fd, count);
+    dbg("read(%d, %d)\n", fd, count);
     return -EINVAL;
   }
   return count;
@@ -1319,13 +1320,15 @@ static const struct {
   const char *to;
 } path_map[] = {
   { "/mnt/tmp", "./tmp" },
+  { "/mnt/sd", "./mntsd" },
 };
 
-static const char *wrap_path(const char *path)
+const char *emu_wrap_path(const char *path)
 {
   char *buff, *p;
   size_t size;
   int i, len;
+  long ret;
 
   // do only path mapping for now
   for (i = 0; i < ARRAY_SIZE(path_map); i++) {
@@ -1340,6 +1343,11 @@ static const char *wrap_path(const char *path)
       snprintf(buff + len, size - len, "%s%s", path_map[i].to,
         path + len + strlen(path_map[i].from));
       dbg("mapped path \"%s\" -> \"%s\"\n", path, buff);
+
+      ret = g_mkdir_raw(path_map[i].to, 0666);
+      if (ret != 0 && ret != -EEXIST)
+        err("mkdir(%s): %ld\n", path_map[i].to, ret);
+
       return buff;
     }
   }
@@ -1347,7 +1355,7 @@ static const char *wrap_path(const char *path)
   return path;
 }
 
-static void wrap_path_free(const char *w_path, const char *old_path)
+void emu_wrap_path_free(const char *w_path, const char *old_path)
 {
   if (w_path != old_path)
     free((void *)w_path);
@@ -1358,9 +1366,23 @@ void *emu_do_fopen(const char *path, const char *mode)
   const char *w_path;
   FILE *ret;
 
-  w_path = wrap_path(path);
-  ret = fopen(w_path, mode);
-  wrap_path_free(w_path, path);
+  if (strcmp(path, "/etc/pointercal") == 0) {
+    // use local pontercal, not host's
+    ret = fopen("pointercal", mode);
+    if (ret == NULL) {
+      ret = fopen("pointercal", "w");
+      if (ret != NULL) {
+        fwrite(wm97xx_p, 1, sizeof(wm97xx_p), ret);
+        fclose(ret);
+      }
+      ret = fopen("pointercal", mode);
+    }
+  }
+  else {
+    w_path = emu_wrap_path(path);
+    ret = fopen(w_path, mode);
+    emu_wrap_path_free(w_path, path);
+  }
 
   return ret;
 }
@@ -1387,7 +1409,7 @@ int emu_do_system(const char *command)
     // absolute path, but not a system command
     need_ginge = 1;
 
-  p2 = wrap_path(command);
+  p2 = emu_wrap_path(command);
   if (need_ginge) {
     make_local_path(tmp_path, sizeof(tmp_path), "ginge_prep");
     p = tmp_path + strlen(tmp_path);
@@ -1396,7 +1418,7 @@ int emu_do_system(const char *command)
   }
   else
     snprintf(tmp_path, sizeof(tmp_path), "%s", p2);
-  wrap_path_free(p2, command);
+  emu_wrap_path_free(p2, command);
 
   dbg("system: \"%s\"\n", tmp_path);
 
@@ -1436,7 +1458,7 @@ long emu_do_execve(const char *filename, char * const argv[],
   make_local_path(prep_path, 512, "ginge_prep");
   new_argv[0] = prep_path;
   new_argv[1] = "--nomenu";
-  new_argv[2] = wrap_path(filename);
+  new_argv[2] = emu_wrap_path(filename);
 
   if (argv[0] != NULL)
     for (i = 1; argv[i] != NULL; i++)