spu: handle stop better, split main func more
[pcsx_rearmed.git] / frontend / plat_pollux.c
index 8395e54..33e9417 100644 (file)
@@ -1,8 +1,22 @@
 /*
- * (C) Gražvydas "notaz" Ignotas, 2009-2011
+ * (C) Gražvydas "notaz" Ignotas, 2009-2012
  *
  * This work is licensed under the terms of the GNU GPLv2 or later.
  * See the COPYING file in the top-level directory.
+ *
+ * GPH claims:
+ *  Main Memory  : Wiz = 0       ~ 2A00000,      Caanoo = 0       ~ 5600000 (86M)
+ *  Frame Buffer : Wiz = 2A00000 ~ 2E00000 (4M), Caanoo = 5600000 ~ 5700000 (1M)
+ *  Sound Buffer : Wiz = 2E00000 ~ 3000000 (2M), Caanoo = 5700000 ~ 5800000 (1M)
+ *  YUV Buffer   :                               Caanoo = 5800000 ~ 6000000 (8M)
+ *  3D Buffer    : Wiz = 3000000 ~ 4000000 (16M),Caanoo = 6000000 ~ 8000000 (32M)
+ *
+ * Caanoo dram column (or row?) is 1024 bytes?
+ *
+ * pollux display array:
+ * 27:24 |  23:18  |  17:11  |  10:6  |  5:0
+ *  seg  | y[11:5] | x[11:6] | y[4:0] | x[5:0]
+ *       |  blk_index[12:0]  |   block[10:0]
  */
 
 #include <stdio.h>
 #include <linux/soundcard.h>
 #include <linux/input.h>
 
-#include "common/input.h"
-#include "gp2x/in_gp2x.h"
-#include "linux/in_evdev.h"
-#include "common/menu.h"
+#include "libpicofe/plat.h"
+#include "libpicofe/input.h"
+#include "libpicofe/gp2x/in_gp2x.h"
+#include "libpicofe/gp2x/soc_pollux.h"
+#include "libpicofe/linux/in_evdev.h"
+#include "libpicofe/menu.h"
 #include "warm/warm.h"
 #include "plugin_lib.h"
 #include "pl_gun_ts.h"
 #include "main.h"
 #include "menu.h"
 #include "plat.h"
-#include "pcnt.h"
-#include "../plugins/gpulib/cspace.h"
+#include "cspace.h"
+#include "../libpcsxcore/psxmem_map.h"
 
-int gp2x_dev_id;
 
-static int fbdev = -1, memdev = -1, battdev = -1, mixerdev = -1;
-static volatile unsigned short *memregs;
-static volatile unsigned int   *memregl;
+static int fbdev = -1;
 static void *fb_vaddrs[2];
 static unsigned int fb_paddrs[2];
 static int fb_work_buf;
-static int cpu_clock_allowed, have_warm;
-static unsigned int saved_video_regs[2][6];
+static int have_warm;
 #define FB_VRAM_SIZE (320*240*2*2*2) // 2 buffers with space for 24bpp mode
+static unsigned int uppermem_pbase, vram_pbase;
 
 static unsigned short *psx_vram;
-static unsigned int psx_vram_padds[512];
 static int psx_step, psx_width, psx_height, psx_bpp;
 static int psx_offset_x, psx_offset_y, psx_src_width, psx_src_height;
 static int fb_offset_x, fb_offset_y;
@@ -72,6 +84,36 @@ static const struct in_default_bind in_evdev_defbinds[] = {
        { 0, 0, 0 },
 };
 
+static const struct menu_keymap key_pbtn_map[] =
+{
+       { KEY_UP,       PBTN_UP },
+       { KEY_DOWN,     PBTN_DOWN },
+       { KEY_LEFT,     PBTN_LEFT },
+       { KEY_RIGHT,    PBTN_RIGHT },
+       /* Caanoo */
+       { BTN_THUMB2,   PBTN_MOK },
+       { BTN_THUMB,    PBTN_MBACK },
+       { BTN_TRIGGER,  PBTN_MA2 },
+       { BTN_TOP,      PBTN_MA3 },
+       { BTN_BASE,     PBTN_MENU },
+       { BTN_TOP2,     PBTN_L },
+       { BTN_PINKIE,   PBTN_R },
+       /* "normal" keyboards */
+       { KEY_ENTER,    PBTN_MOK },
+       { KEY_ESC,      PBTN_MBACK },
+       { KEY_SEMICOLON,  PBTN_MA2 },
+       { KEY_APOSTROPHE, PBTN_MA3 },
+       { KEY_BACKSLASH,  PBTN_MENU },
+       { KEY_LEFTBRACE,  PBTN_L },
+       { KEY_RIGHTBRACE, PBTN_R },
+};
+
+static const struct in_pdata gp2x_evdev_pdata = {
+       .defbinds = in_evdev_defbinds,
+       .key_map = key_pbtn_map,
+       .kmap_size = sizeof(key_pbtn_map) / sizeof(key_pbtn_map[0]),
+};
+
 static void *fb_flip(void)
 {
        memregl[0x406C>>2] = memregl[0x446C>>2] = fb_paddrs[fb_work_buf];
@@ -123,88 +165,20 @@ static void pollux_changemode(int bpp, int is_bgr)
        memregl[0x4458>>2] = r;
 }
 
-/* note: both PLLs are programmed the same way,
- * the databook incorrectly states that PLL1 differs */
-static int decode_pll(unsigned int reg)
-{
-       long long v;
-       int p, m, s;
-
-       p = (reg >> 18) & 0x3f;
-       m = (reg >> 8) & 0x3ff;
-       s = reg & 0xff;
-
-       if (p == 0)
-               p = 1;
-
-       v = 27000000; // master clock
-       v = v * m / (p << s);
-       return v;
-}
-
-int plat_cpu_clock_get(void)
-{
-       return decode_pll(memregl[0xf004>>2]) / 1000000;
-}
-
-int plat_cpu_clock_apply(int mhz)
+static int cpu_clock_wrapper(int mhz)
 {
-       int adiv, mdiv, pdiv, sdiv = 0;
-       int i, vf000, vf004;
-
-       if (!cpu_clock_allowed)
-               return -1;
-       if (mhz == plat_cpu_clock_get())
-               return 0;
-
-       // m = MDIV, p = PDIV, s = SDIV
-       #define SYS_CLK_FREQ 27
-       pdiv = 9;
-       mdiv = (mhz * pdiv) / SYS_CLK_FREQ;
-       if (mdiv & ~0x3ff)
-               return -1;
-       vf004 = (pdiv<<18) | (mdiv<<8) | sdiv;
-
-       // attempt to keep the AHB divider close to 250, but not higher
-       for (adiv = 1; mhz / adiv > 250; adiv++)
-               ;
-
-       vf000 = memregl[0xf000>>2];
-       vf000 = (vf000 & ~0x3c0) | ((adiv - 1) << 6);
-       memregl[0xf000>>2] = vf000;
-       memregl[0xf004>>2] = vf004;
-       memregl[0xf07c>>2] |= 0x8000;
-       for (i = 0; (memregl[0xf07c>>2] & 0x8000) && i < 0x100000; i++)
-               ;
-
-       printf("clock set to %dMHz, AHB set to %dMHz\n", mhz, mhz / adiv);
-
        // stupid pll share hack - must restart audio
+       int pollux_cpu_clock_set(int cpu_clock);
        extern long SPUopen(void);
        extern long SPUclose(void);
+
+       pollux_cpu_clock_set(mhz);
        SPUclose();
        SPUopen();
 
        return 0;
 }
 
-int plat_get_bat_capacity(void)
-{
-       unsigned short magic_val = 0;
-
-       if (battdev < 0)
-               return -1;
-       if (read(battdev, &magic_val, sizeof(magic_val)) != sizeof(magic_val))
-               return -1;
-       switch (magic_val) {
-       default:
-       case 1: return 100;
-       case 2: return 66;
-       case 3: return 40;
-       case 4: return 0;
-       }
-}
-
 #define TIMER_BASE3 0x1980
 #define TIMER_REG(x) memregl[(TIMER_BASE3 + x) >> 2]
 
@@ -214,15 +188,6 @@ static __attribute__((unused)) unsigned int timer_get(void)
        return TIMER_REG(0);
 }
 
-static void timer_cleanup(void)
-{
-       TIMER_REG(0x40) = 0x0c; /* be sure clocks are on */
-       TIMER_REG(0x08) = 0x23; /* stop the timer, clear irq in case it's pending */
-       TIMER_REG(0x00) = 0;    /* clear counter */
-       TIMER_REG(0x40) = 0;    /* clocks off */
-       TIMER_REG(0x44) = 0;    /* dividers back to default */
-}
-
 void plat_video_menu_enter(int is_rom_loaded)
 {
        if (pl_vout_buf != NULL) {
@@ -258,6 +223,7 @@ void plat_video_menu_leave(void)
 
        memset(g_menuscreen_ptr, 0, 320*240 * psx_bpp/8);
        g_menuscreen_ptr = fb_flip();
+       memset(g_menuscreen_ptr, 0, 320*240 * psx_bpp/8);
 }
 
 void *plat_prepare_screenshot(int *w, int *h, int *bpp)
@@ -273,24 +239,6 @@ void plat_minimize(void)
 {
 }
 
-static void pl_vout_set_raw_vram(void *vram)
-{
-       int i;
-
-       psx_vram = vram;
-
-       if (vram == NULL)
-               return;
-
-       if ((long)psx_vram & 0x7ff)
-               fprintf(stderr, "GPU plugin did not align vram\n");
-
-       for (i = 0; i < 512; i++) {
-               psx_vram[i * 1024] = 0; // touch
-               psx_vram_padds[i] = warm_virt2phys(&psx_vram[i * 1024]);
-       }
-}
-
 static void spend_cycles(int loops)
 {
        asm volatile (
@@ -304,18 +252,20 @@ static void spend_cycles(int loops)
 #define DMA_REG(x) memregl[(DMA_BASE6 + x) >> 2]
 
 /* this takes ~1.5ms, while ldm/stm ~1.95ms */
-static void raw_flip_dma(int x, int y)
+static void raw_blit_dma(int doffs, const void *vram, int w, int h,
+                        int sstride, int bgr24)
 {
+       unsigned int pixel_offset = (unsigned short *)vram - psx_vram;
        unsigned int dst = fb_paddrs[fb_work_buf] +
                        (fb_offset_y * 320 + fb_offset_x) * psx_bpp / 8;
-       int spsx_line = y + psx_offset_y;
-       int spsx_offset = (x + psx_offset_x) & 0x3f8;
+       int spsx_line = pixel_offset / 1024 + psx_offset_y;
+       int spsx_offset = (pixel_offset + psx_offset_x) & 0x3f8;
+       unsigned int vram_byte_pos, vram_byte_step;
        int dst_stride = 320 * psx_bpp / 8;
        int len = psx_src_width * psx_bpp / 8;
        int i;
 
-       warm_cache_op_all(WOP_D_CLEAN);
-       pcnt_start(PCNT_BLIT);
+       //warm_cache_op_all(WOP_D_CLEAN);
 
        dst &= ~7;
        len &= ~7;
@@ -329,62 +279,44 @@ static void raw_flip_dma(int x, int y)
                DMA_REG(0x24) = 1;
        }
 
-       for (i = psx_src_height; i > 0; i--, spsx_line += psx_step, dst += dst_stride) {
+       vram_byte_pos = vram_pbase;
+       vram_byte_pos += (spsx_line & 511) * 2 * 1024 + spsx_offset * 2;
+       vram_byte_step = psx_step * 2 * 1024;
+
+       for (i = psx_src_height; i > 0;
+            i--, vram_byte_pos += vram_byte_step, dst += dst_stride)
+       {
                while ((DMA_REG(0x2c) & 0x0f) < 4)
                        spend_cycles(10);
 
                // XXX: it seems we must always set all regs, what is autoincrement there for?
                DMA_REG(0x20) = 1;              // queue wait cmd
-               DMA_REG(0x10) = psx_vram_padds[spsx_line & 511] + spsx_offset * 2; // DMA src
+               DMA_REG(0x10) = vram_byte_pos;  // DMA src
                DMA_REG(0x14) = dst;            // DMA dst
                DMA_REG(0x18) = len - 1;        // len
                DMA_REG(0x1c) = 0x80000;        // go
        }
-
-       if (psx_bpp == 16) {
-               pl_vout_buf = g_menuscreen_ptr;
-               pl_print_hud(fb_offset_x);
-       }
-
-       g_menuscreen_ptr = fb_flip();
-       pl_rearmed_cbs.flip_cnt++;
-
-       pcnt_end(PCNT_BLIT);
 }
 
 #define make_flip_func(name, blitfunc)                                                  \
-static void name(int x, int y)                                                          \
+static void name(int doffs, const void *vram_, int w, int h, int sstride, int bgr24)    \
 {                                                                                       \
-        unsigned short *vram = psx_vram;                                                \
+        const unsigned short *vram = vram_;                                             \
         unsigned char *dst = (unsigned char *)g_menuscreen_ptr +                        \
                         (fb_offset_y * 320 + fb_offset_x) * psx_bpp / 8;                \
-        unsigned int src = (y + psx_offset_y) * 1024 + x + psx_offset_x;                \
         int dst_stride = 320 * psx_bpp / 8;                                             \
         int len = psx_src_width * psx_bpp / 8;                                          \
         int i;                                                                          \
                                                                                         \
-        pcnt_start(PCNT_BLIT);                                                          \
-                                                                                        \
-        for (i = psx_src_height; i > 0; i--, src += psx_step * 1024, dst += dst_stride) { \
-                src &= 1024*512-1;                                                      \
-                blitfunc(dst, vram + src, len);                                         \
-        }                                                                               \
-                                                                                        \
-        if (psx_bpp == 16) {                                                            \
-                pl_vout_buf = g_menuscreen_ptr;                                         \
-                pl_print_hud(fb_offset_x);                                              \
-        }                                                                               \
-                                                                                        \
-        g_menuscreen_ptr = fb_flip();                                                   \
-        pl_rearmed_cbs.flip_cnt++;                                                      \
-                                                                                        \
-        pcnt_end(PCNT_BLIT);                                                            \
+        vram += psx_offset_y * 1024 + psx_offset_x;                                     \
+        for (i = psx_src_height; i > 0; i--, vram += psx_step * 1024, dst += dst_stride)\
+                blitfunc(dst, vram, len);                                               \
 }
 
-make_flip_func(raw_flip_soft, memcpy)
-make_flip_func(raw_flip_soft_368, blit320_368)
-make_flip_func(raw_flip_soft_512, blit320_512)
-make_flip_func(raw_flip_soft_640, blit320_640)
+make_flip_func(raw_blit_soft, memcpy)
+make_flip_func(raw_blit_soft_368, blit320_368)
+make_flip_func(raw_blit_soft_512, blit320_512)
+make_flip_func(raw_blit_soft_640, blit320_640)
 
 void *plat_gvideo_set_mode(int *w_, int *h_, int *bpp_)
 {
@@ -401,20 +333,20 @@ void *plat_gvideo_set_mode(int *w_, int *h_, int *bpp_)
 
        switch (w + (bpp != 16) + !soft_scaling) {
        case 640:
-               pl_rearmed_cbs.pl_vout_raw_flip = raw_flip_soft_640;
+               pl_plat_blit = raw_blit_soft_640;
                w_max = 640;
                break;
        case 512:
-               pl_rearmed_cbs.pl_vout_raw_flip = raw_flip_soft_512;
+               pl_plat_blit = raw_blit_soft_512;
                w_max = 512;
                break;
        case 384:
        case 368:
-               pl_rearmed_cbs.pl_vout_raw_flip = raw_flip_soft_368;
+               pl_plat_blit = raw_blit_soft_368;
                w_max = 368;
                break;
        default:
-               pl_rearmed_cbs.pl_vout_raw_flip = have_warm ? raw_flip_dma : raw_flip_soft;
+               pl_plat_blit = have_warm ? raw_blit_dma : raw_blit_soft;
                w_max = 320;
                break;
        }
@@ -439,7 +371,7 @@ void *plat_gvideo_set_mode(int *w_, int *h_, int *bpp_)
        }
        fb_offset_y = 240/2 - h / 2;
 
-       psx_offset_x = poff_w;
+       psx_offset_x = poff_w * psx_bpp/8 / 2;
        psx_offset_y = poff_h;
        psx_src_width = w;
        psx_src_height = h;
@@ -459,7 +391,7 @@ void *plat_gvideo_set_mode(int *w_, int *h_, int *bpp_)
        *w_ = 320;
        *h_ = fb_offset_y + psx_src_height;
 
-       return NULL;
+       return g_menuscreen_ptr;
 }
 
 /* not really used, we do raw_flip */
@@ -469,55 +401,107 @@ void plat_gvideo_open(int is_pal)
 
 void *plat_gvideo_flip(void)
 {
-       return NULL;
+       g_menuscreen_ptr = fb_flip();
+       return g_menuscreen_ptr;
 }
 
 void plat_gvideo_close(void)
 {
 }
 
-static void save_multiple_regs(unsigned int *dest, int base, int count)
+static void *pl_emu_mmap(unsigned long addr, size_t size, int is_fixed,
+       enum psxMapTag tag)
 {
-       const volatile unsigned int *regs = memregl + base / 4;
-       int i;
+       unsigned int pbase;
+       void *retval;
+       int ret;
+
+       if (!have_warm)
+               goto basic_map;
+
+       switch (tag) {
+       case MAP_TAG_RAM:
+               if (size > 0x400000) {
+                       fprintf(stderr, "unexpected ram map request: %08lx %x\n",
+                               addr, size);
+                       exit(1);
+               }
+               pbase = (uppermem_pbase + 0xffffff) & ~0xffffff;
+               pbase += 0x400000;
+               retval = (void *)addr;
+               ret = warm_mmap_section(retval, pbase, size, WCB_C_BIT);
+               if (ret != 0) {
+                       fprintf(stderr, "ram section map failed\n");
+                       exit(1);
+               }
+               goto out;
+       case MAP_TAG_VRAM:
+               if (size > 0x400000) {
+                       fprintf(stderr, "unexpected vram map request: %08lx %x\n",
+                               addr, size);
+                       exit(1);
+               }
+               if (addr == 0)
+                       addr = 0x60000000;
+               vram_pbase = (uppermem_pbase + 0xffffff) & ~0xffffff;
+               retval = (void *)addr;
+
+               ret = warm_mmap_section(retval, vram_pbase, size, WCB_C_BIT);
+               if (ret != 0) {
+                       fprintf(stderr, "vram section map failed\n");
+                       exit(1);
+               }
+               goto out;
+       case MAP_TAG_LUTS:
+               // mostly for Wiz to not run out of RAM
+               if (size > 0x800000) {
+                       fprintf(stderr, "unexpected LUT map request: %08lx %x\n",
+                               addr, size);
+                       exit(1);
+               }
+               pbase = (uppermem_pbase + 0xffffff) & ~0xffffff;
+               pbase += 0x800000;
+               retval = (void *)addr;
+               ret = warm_mmap_section(retval, pbase, size, WCB_C_BIT);
+               if (ret != 0) {
+                       fprintf(stderr, "LUT section map failed\n");
+                       exit(1);
+               }
+               goto out;
+       default:
+               break;
+       }
+
+basic_map:
+       retval = plat_mmap(addr, size, 0, is_fixed);
 
-       for (i = 0; i < count; i++)
-               dest[i] = regs[i];
+out:
+       if (tag == MAP_TAG_VRAM)
+               psx_vram = retval;
+       return retval;
 }
 
-static void restore_multiple_regs(int base, const unsigned int *src, int count)
+static void pl_emu_munmap(void *ptr, size_t size, enum psxMapTag tag)
 {
-       volatile unsigned int *regs = memregl + base / 4;
-       int i;
-
-       for (i = 0; i < count; i++)
-               regs[i] = src[i];
+       switch (tag) {
+       case MAP_TAG_RAM:
+       case MAP_TAG_VRAM:
+       case MAP_TAG_LUTS:
+               warm_munmap_section(ptr, size);
+               break;
+       default:
+               plat_munmap(ptr, size);
+               break;
+       }
 }
 
 void plat_init(void)
 {
        const char *main_fb_name = "/dev/fb0";
        struct fb_fix_screeninfo fbfix;
-       int rate, timer_div, timer_div2;
-       int fbdev, ret, warm_ret;
-       FILE *f;
-
-       memdev = open("/dev/mem", O_RDWR);
-       if (memdev == -1) {
-               perror("open(/dev/mem) failed");
-               exit(1);
-       }
-
-       memregs = mmap(0, 0x20000, PROT_READ|PROT_WRITE, MAP_SHARED, memdev, 0xc0000000);
-       if (memregs == MAP_FAILED) {
-               perror("mmap(memregs) failed");
-               exit(1);
-       }
-       memregl = (volatile void *)memregs;
+       int ret;
 
-       // save video regs of both MLCs
-       save_multiple_regs(saved_video_regs[0], 0x4058, ARRAY_SIZE(saved_video_regs[0]));
-       save_multiple_regs(saved_video_regs[1], 0x4458, ARRAY_SIZE(saved_video_regs[1]));
+       plat_target_init();
 
        fbdev = open(main_fb_name, O_RDWR);
        if (fbdev == -1) {
@@ -531,97 +515,61 @@ void plat_init(void)
                perror("ioctl(fbdev) failed");
                exit(1);
        }
+       uppermem_pbase = fbfix.smem_start;
+
        printf("framebuffer: \"%s\" @ %08lx\n", fbfix.id, fbfix.smem_start);
        fb_paddrs[0] = fbfix.smem_start;
        fb_paddrs[1] = fb_paddrs[0] + 320*240*4; // leave space for 24bpp
 
-       fb_vaddrs[0] = mmap(0, FB_VRAM_SIZE, PROT_READ|PROT_WRITE,
+       ret = warm_init();
+       have_warm = (ret == 0);
+
+       if (have_warm) {
+               // map fb as write-through cached section
+               fb_vaddrs[0] = (void *)0x7fe00000;
+               ret = warm_mmap_section(fb_vaddrs[0], fb_paddrs[0],
+                       FB_VRAM_SIZE, WCB_C_BIT);
+               if (ret != 0) {
+                       fprintf(stderr, "fb section map failed\n");
+                       fb_vaddrs[0] = NULL;
+
+                       // we could continue but it would just get messy
+                       exit(1);
+               }
+       }
+       if (fb_vaddrs[0] == NULL) {
+               fb_vaddrs[0] = mmap(0, FB_VRAM_SIZE, PROT_READ|PROT_WRITE,
                                MAP_SHARED, memdev, fb_paddrs[0]);
-       if (fb_vaddrs[0] == MAP_FAILED) {
-               perror("mmap(fb_vaddrs) failed");
-               exit(1);
+               if (fb_vaddrs[0] == MAP_FAILED) {
+                       perror("mmap(fb_vaddrs) failed");
+                       exit(1);
+               }
+
+               memset(fb_vaddrs[0], 0, FB_VRAM_SIZE);
+               warm_change_cb_range(WCB_C_BIT, 1, fb_vaddrs[0], FB_VRAM_SIZE);
        }
+       printf("  mapped @%p\n", fb_vaddrs[0]);
+
        fb_vaddrs[1] = (char *)fb_vaddrs[0] + 320*240*4;
 
        memset(fb_vaddrs[0], 0, FB_VRAM_SIZE);
+
        pollux_changemode(16, 0);
        g_menuscreen_w = 320;
        g_menuscreen_h = 240;
        g_menuscreen_ptr = fb_flip();
 
-       warm_ret = warm_init();
-       have_warm = warm_ret == 0;
-       warm_change_cb_upper(WCB_B_BIT, 1);
-
-       /* some firmwares have sys clk on PLL0, we can't adjust CPU clock
-        * by reprogramming the PLL0 then, as it overclocks system bus */
-       if ((memregl[0xf000>>2] & 0x03000030) == 0x01000000)
-               cpu_clock_allowed = 1;
-       else {
-               cpu_clock_allowed = 0;
-               fprintf(stderr, "unexpected PLL config (%08x), overclocking disabled\n",
-                       memregl[0xf000>>2]);
-       }
-
-       /* find what PLL1 runs at, for the timer */
-       rate = decode_pll(memregl[0xf008>>2]);
-       printf("PLL1 @ %dHz\n", rate);
-
-       /* setup timer */
-       timer_div = (rate + 500000) / 1000000;
-       timer_div2 = 0;
-       while (timer_div > 256) {
-               timer_div /= 2;
-               timer_div2++;
-       }
-       if (1 <= timer_div && timer_div <= 256 && timer_div2 < 4) {
-               int timer_rate = (rate >> timer_div2) / timer_div;
-               if (TIMER_REG(0x08) & 8) {
-                       fprintf(stderr, "warning: timer in use, overriding!\n");
-                       timer_cleanup();
-               }
-               if (timer_rate != 1000000)
-                       fprintf(stderr, "warning: timer drift %d us\n", timer_rate - 1000000);
-
-               timer_div2 = (timer_div2 + 3) & 3;
-               TIMER_REG(0x44) = ((timer_div - 1) << 4) | 2;   /* using PLL1 */
-               TIMER_REG(0x40) = 0x0c;                         /* clocks on */
-               TIMER_REG(0x08) = 0x68 | timer_div2;            /* run timer, clear irq, latch value */
-       }
-       else
-               fprintf(stderr, "warning: could not make use of timer\n");
-
        /* setup DMA */
        DMA_REG(0x0c) = 0x20000; // pending IRQ clear
 
-       battdev = open("/dev/pollux_batt", O_RDONLY);
-       if (battdev < 0)
-               perror("Warning: could't open pollux_batt");
-
-       f = fopen("/dev/accel", "rb");
-       if (f) {
-               printf("detected Caanoo\n");
-               gp2x_dev_id = GP2X_DEV_CAANOO;
-               fclose(f);
-       }
-       else {
-               printf("detected Wiz\n");
-               gp2x_dev_id = GP2X_DEV_WIZ;
-       }
-
        in_tsbutton_init();
-       in_evdev_init(in_evdev_defbinds);
+       in_evdev_init(&gp2x_evdev_pdata);
        if (gp2x_dev_id == GP2X_DEV_CAANOO)
                caanoo_init();
        else
                wiz_init();
 
-       mixerdev = open("/dev/mixer", O_RDWR);
-       if (mixerdev == -1)
-               perror("open(/dev/mixer)");
-
-       pl_rearmed_cbs.pl_vout_raw_flip = have_warm ? raw_flip_dma : raw_flip_soft;
-       pl_rearmed_cbs.pl_vout_set_raw_vram = pl_vout_set_raw_vram;
+       pl_plat_blit = have_warm ? raw_blit_dma : raw_blit_soft;
 
        psx_src_width = 320;
        psx_src_height = 240;
@@ -629,27 +577,22 @@ void plat_init(void)
 
        pl_rearmed_cbs.screen_w = 320;
        pl_rearmed_cbs.screen_h = 240;
+
+       plat_target_setup_input();
+
+       plat_target.cpu_clock_set = cpu_clock_wrapper;
+
+       psxMapHook = pl_emu_mmap;
+       psxUnmapHook = pl_emu_munmap;
 }
 
 void plat_finish(void)
 {
        warm_finish();
-       timer_cleanup();
-
        memset(fb_vaddrs[0], 0, FB_VRAM_SIZE);
-       restore_multiple_regs(0x4058, saved_video_regs[0], ARRAY_SIZE(saved_video_regs[0]));
-       restore_multiple_regs(0x4458, saved_video_regs[1], ARRAY_SIZE(saved_video_regs[1]));
-       memregl[0x4058>>2] |= 0x10;
-       memregl[0x4458>>2] |= 0x10;
        munmap(fb_vaddrs[0], FB_VRAM_SIZE);
        close(fbdev);
-
-       if (battdev >= 0)
-               close(battdev);
-       if (mixerdev >= 0)
-               close(mixerdev);
-       munmap((void *)memregs, 0x20000);
-       close(memdev);
+       plat_target_finish();
 }
 
 /* Caanoo stuff, perhaps move later */
@@ -761,10 +704,15 @@ static int haptic_init(void)
        return 0;
 }
 
-void plat_trigger_vibrate(int is_strong)
+void plat_trigger_vibrate(int pad, int low, int high)
 {
+       int is_strong;
        int ret;
 
+       if (low == 0 && high == 0)
+               return;
+       is_strong = (high >= 0xf0);
+
        if (hapticdev == -2)
                return; // it's broken
        if (hapticdev < 0) {
@@ -806,30 +754,6 @@ static const struct in_default_bind in_gp2x_defbinds[] =
        { 0, 0, 0 },
 };
 
-void plat_step_volume(int is_up)
-{
-       static int volume = 50;
-       int ret, val;
-
-       if (mixerdev < 0)
-               return;
-
-       if (is_up) {
-               volume += 5;
-               if (volume > 255) volume = 255;
-       }
-       else {
-               volume -= 5;
-               if (volume < 0) volume = 0;
-       }
-       val = volume;
-       val |= val << 8;
-
-       ret = ioctl(mixerdev, SOUND_MIXER_WRITE_PCM, &val);
-       if (ret == -1)
-               perror("WRITE_PCM");
-}
-
 // unused dummy for in_gp2x
 volatile unsigned short *gp2x_memregs;