&& wait_ret != -ETIMEDOUT)
{
err("fb_thread: futex error: %d\n", wait_ret);
- g_sleep(1);
+ sleep(1);
goto check_keys;
}
if (fb_sync_thread_paused) {
}
mmsp2.old_mlc_stl_adr = mmsp2.mlc_stl_adr;
return;
- case 0x2958:
+ case 0x2958: // MLC_STL_PALLT_A
mmsp2.mlc_stl_pallt_a = d & 0x1ff;
return;
- case 0x295a:
+ case 0x295a: // MLC_STL_PALLT_D
mmsp2.mlc_stl_pallt_d[mmsp2.mlc_stl_pallt_a++] = d;
mmsp2.mlc_stl_pallt_a &= 0x1ff;
mmsp2.v.dirty_pal = DIRTY_PAL_MMSP2;
if ((a & 0xfff00000) == 0x7f000000) {
u32 a_ = a & 0xffff;
switch (a_) {
+ // GP2X
+ case 0x295a: // MLC_STL_PALLT_D
+ // special unaligned 32bit write, allegro seems to rely on it
+ mmsp2.mlc_stl_pallt_d[mmsp2.mlc_stl_pallt_a++ & 0x1ff] = d;
+ mmsp2.mlc_stl_pallt_d[mmsp2.mlc_stl_pallt_a++ & 0x1ff] = d >> 16;
+ mmsp2.mlc_stl_pallt_a &= 0x1ff;
+ mmsp2.v.dirty_pal = DIRTY_PAL_MMSP2;
+ return;
// Wiz
case 0x4024: // MLCCONTROL0
case 0x4058: // MLCCONTROL1
#ifdef PND
if (geteuid() == 0) {
- fprintf(stderr, "don't try to run as root, device registers or memory "
- "might get trashed crashing the OS or even damaging the device.\n");
+ err("don't try to run as root, device registers or memory "
+ "might get trashed crashing the OS or even damaging the device.\n");
exit(1);
}
#endif
sigaction(SIGSEGV, &segv_action, NULL);
}
-int emu_read_gpiodev(void *buf, int count)
-{
- if (count <= 0) {
- err("gpiodev read %d?\n", count);
- return -1;
- }
- if (count > 4)
- count = 4;
-
- mmsp2.btn_state = host_read_btns();
- memcpy(buf, &mmsp2.btn_state, count);
- return count;
-}
-
-static void *emu_mmap_dev(unsigned int length, int prot, int flags, unsigned int offset)
+static long emu_mmap_dev(unsigned int length, int prot, int flags, unsigned int offset)
{
u8 *umem, *umem_end;
// SoC regs
if ((offset & ~0x1ffff) == 0xc0000000) {
- return mmap((void *)0x7f000000, length, PROT_NONE,
+ return g_mmap2_raw((void *)0x7f000000, length, PROT_NONE,
MAP_PRIVATE|MAP_ANONYMOUS|MAP_FIXED|MAP_NORESERVE, -1, 0);
}
// MMSP2 blitter
if ((offset & ~0xffff) == 0xe0020000) {
- return mmap((void *)0x7f100000, length, PROT_NONE,
+ return g_mmap2_raw((void *)0x7f100000, length, PROT_NONE,
MAP_PRIVATE|MAP_ANONYMOUS|MAP_FIXED|MAP_NORESERVE, -1, 0);
}
// upper mem
if ((offset & 0xfe000000) != 0x02000000) {
err("unexpected devmem mmap @ %08x\n", offset);
- errno = EINVAL;
- return MAP_FAILED;
+ return -EINVAL;
}
umem = uppermem_lookup(offset, &umem_end);
offset, umem + length - umem_end);
dbg("upper mem @ %08x %x = %p\n", offset, length, umem);
- return umem;
+ return (long)umem;
}
-void *emu_do_mmap(unsigned int length, int prot, int flags, int fd, unsigned int offset)
+long emu_do_mmap(unsigned int length, int prot, int flags, int fd,
+ unsigned int offset)
{
if (fd == FAKEDEV_MEM)
return emu_mmap_dev(length, prot, flags, offset);
return emu_mmap_dev(length, prot, flags, offset + 0x03381000);
err("bad/ni mmap(?, %d, %x, %x, %d, %08x)\n", length, prot, flags, fd, offset);
- errno = EINVAL;
- return MAP_FAILED;
+ return -EINVAL;
}
-int emu_do_munmap(void *addr, unsigned int length)
+long emu_do_munmap(void *addr, unsigned int length)
{
u8 *p = addr;
// set default buffer size to 16 * 1K
frag = (16<<16) | 10; // 16K
- ret = ioctl(fd, SNDCTL_DSP_SETFRAGMENT, &frag);
- if (ret != 0) {
- err("snd ioctl SETFRAGMENT %08x: ", frag);
- perror(NULL);
- }
+ ret = g_ioctl_raw(fd, SNDCTL_DSP_SETFRAGMENT, &frag);
+ if (ret != 0)
+ err("snd ioctl SETFRAGMENT %08x: %d\n", frag, ret);
#endif
}
-static int emu_sound_ioctl(int fd, int request, void *argp)
+static long emu_sound_ioctl(int fd, int request, void *argp)
{
int *arg = argp;
* Catch this and set to something that works. */
switch(request) {
case SNDCTL_DSP_SETFRAGMENT: {
- int ret, bsize, frag, frag_cnt;
+ int bsize, frag, frag_cnt;
+ long ret;
+
if (arg == NULL)
break;
}
frag |= frag_cnt << 16;
- ret = ioctl(fd, SNDCTL_DSP_SETFRAGMENT, &frag);
- if (ret != 0) {
- err("snd ioctl SETFRAGMENT %08x: ", frag);
- perror(NULL);
- }
+ ret = g_ioctl_raw(fd, SNDCTL_DSP_SETFRAGMENT, &frag);
+ if (ret != 0)
+ err("snd ioctl SETFRAGMENT %08x: %ld\n", frag, ret);
// indicate success even if we fail (because of ALSA mostly),
// things like MikMod will bail out otherwise.
return 0;
break;
}
- return ioctl(fd, request, argp);
+ return g_ioctl_raw(fd, request, argp);
}
-int emu_do_ioctl(int fd, int request, void *argp)
+long emu_do_ioctl(int fd, int request, void *argp)
{
if (fd == emu_interesting_fds[IFD_SOUND].fd)
return emu_sound_ioctl(fd, request, argp);
fail:
err("bad/ni ioctl(%d, %08x, %p)\n", fd, request, argp);
- errno = EINVAL;
- return -1;
+ 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)
+{
+ int ret, pressed = 0, x, y;
+ struct {
+ u16 pressure, x, y;
+ } wm97xx;
+
+ if (count < 0) {
+ err("read(%d, %d)\n", fd, count);
+ return -EINVAL;
+ }
+
+ switch (fd) {
+ case FAKEDEV_GPIO:
+ mmsp2.btn_state = host_read_btns();
+
+ if (count > 4)
+ count = 4;
+ memcpy(buf, &mmsp2.btn_state, count);
+ break;
+ case FAKEDEV_WM97XX:
+ ret = host_read_ts(&pressed, &x, &y);
+ if (ret == 0 && pressed) {
+ wm97xx.pressure = 0x8001; // TODO: check the real thing
+ wm97xx.x = x * 3750 / 1024 + 200;
+ wm97xx.y = 3750 - y * 3750 / 1024 + 200;
+ }
+ else {
+ wm97xx.pressure = 0;
+ wm97xx.x = wm97xx.y = 200;
+ }
+
+ if (count > sizeof(wm97xx))
+ count = sizeof(wm97xx);
+ memcpy(buf, &wm97xx, count);
+ break;
+ case FAKEDEV_WM97XX_P:
+ if (count < sizeof(wm97xx_p))
+ err("incomplete pointercal read\n");
+ strncpy(buf, wm97xx_p, count);
+ break;
+ default:
+ dbg("read(%d, %d)\n", fd, count);
+ return -EINVAL;
+ }
+ return count;
}
struct dev_fd_t emu_interesting_fds[] = {
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++) {
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;
}
}
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);
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;
}
// 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);
}
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);
return ret;
}
-int emu_do_execve(const char *filename, char *const argv[], char *const envp[])
+long emu_do_execve(const char *filename, char * const argv[],
+ char * const envp[])
{
const char **new_argv;
char *prep_path;
- int i, ret, argc;
+ int i, argc;
+ long ret;
if (filename == NULL)
return -1;
- if (strstr(filename, "/gp2xmenu") != NULL)
- exit(0);
+ if (strstr(filename, "gp2xmenu") != NULL)
+ host_forced_exit(0);
for (i = 0; argv[i] != NULL; i++)
;
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++)
dbg("execve \"%s\" %s \"%s\"\n", new_argv[0], new_argv[1], new_argv[2]);
ret = execve(new_argv[0], (char **)new_argv, envp);
- perror("execve");
+ err("execve(%s): %ld\n", new_argv[0], ret);
return ret;
}
notaz.gp2x.de / ginge.git / blobdiff