X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=ginge.git;a=blobdiff_plain;f=loader%2Foverride.c;h=3d0d0cc350216e53a882102087c23e0a1ba81906;hp=1e0d4158f6bf8ae15f5124bc8c2f6f1b0406b110;hb=f2a1fca9e81b773927c0b28dffaa6e2ee8a5956a;hpb=7868435641e4209e956a591ff0844afc14f83f16

diff --git a/loader/override.c b/loader/override.c
index 1e0d415..3d0d0cc 100644
--- a/loader/override.c
+++ b/loader/override.c
@@ -41,6 +41,8 @@ static const struct dev_fd_t takeover_devs[] = {
   { "/dev/mmuhack", FAKEDEV_MMUHACK },
   { "/dev/tty",     FAKEDEV_TTY0 },
   { "/dev/tty0",    FAKEDEV_TTY0 },
+  { "/dev/touchscreen/wm97xx", FAKEDEV_WM97XX },
+  { "/etc/pointercal",         FAKEDEV_WM97XX_P },
 #ifdef PND
   { "/dev/input/event*", -1 }, // hide for now, may cause dupe events
 #endif
@@ -137,12 +139,12 @@ long w_read_raw(int fd, void *buf, size_t count)
 {
   long ret;
 
-  if (fd == FAKEDEV_GPIO)
-    ret = emu_read_gpiodev(buf, count);
+  if (FAKEDEV_MEM <= fd && fd < FAKEDEV_FD_BOUNDARY)
+    ret = emu_do_read(fd, buf, count);
   else
     ret = g_read_raw(fd, buf, count);
 
-  //strace("read(%d, %p, %ld) = %ld\n", fd, buf, count, ret);
+  //strace("read(%d, %p, %zd) = %ld\n", fd, buf, count, ret);
   return ret;
 }
 
@@ -282,6 +284,7 @@ static ssize_t w_readlink(const char *path, char *buf, size_t bufsiz)
 {
   long ret;
 
+#ifndef DL
   if (path != NULL && strncmp(path, "/proc/", 6) == 0
       && strcmp(strrchr(path, '/'), "/exe") == 0)
   {
@@ -290,6 +293,7 @@ static ssize_t w_readlink(const char *path, char *buf, size_t bufsiz)
       ret = bufsiz;
   }
   else
+#endif
     ret = g_readlink_raw(path, buf, bufsiz);
 
   strace("readlink(%s, %s, %zd) = %ld\n", path, buf, bufsiz, ret);