notaz.gp2x.de / libpicofe.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
add support for doublesized menu fonts
[libpicofe.git] / gp2x / 940ctl.c
diff --git a/gp2x/940ctl.c b/gp2x/940ctl.c
index 4a571ff..77083c9 100644 (file)
--- a/gp2x/940ctl.c
+++ b/gp2x/940ctl.c
@@ -18,9 +18,9 @@
 #include "../common/arm_utils.h"\r
 #include "../common/menu.h"\r
 #include "../common/emu.h"\r
-#include "../../Pico/PicoInt.h"\r
-#include "../../Pico/sound/ym2612.h"\r
-#include "../../Pico/sound/mix.h"\r
+#include "../../pico/pico_int.h"\r
+#include "../../pico/sound/ym2612.h"\r
+#include "../../pico/sound/mix.h"\r
 \r
 /* we will need some gp2x internals here */\r
 extern volatile unsigned short *gp2x_memregs; /* from minimal library rlyeh */\r
@@ -33,7 +33,7 @@ _940_ctl_t *shared_ctl = 0;
 unsigned char *mp3_mem = 0;\r
 \r
 #define MP3_SIZE_MAX (0x400000 + 0x800000) // 12M\r
-#define CODE940_FILE "pico940_v2.bin"\r
+#define CODE940_FILE "pico940_v3.bin"\r
 \r
 int crashed_940 = 0;\r
 \r
@@ -69,7 +69,8 @@ int YM2612Write_940(unsigned int a, unsigned int v, int scanline)
 \r
        //printf("%05i:%03i: ym w ([%i] %02x)\n", Pico.m.frame_count, Pico.m.scanline, a, v);\r
 \r
-       switch (a) {\r
+       switch (a)\r
+       {\r
                case 0: /* address port 0 */\r
                        if (addr_A1 == 0 && ST_address == v)\r
                                return 0; /* address already selected, don't send this command to 940 */\r
@@ -81,10 +82,6 @@ int YM2612Write_940(unsigned int a, unsigned int v, int scanline)
                        upd = 0;\r
                        break;\r
 \r
-               case 1: /* data port 0    */\r
-                       if (ST_address == 0x2b) upd = 0; /* DAC sel */\r
-                       break;\r
-\r
                case 2: /* address port 1 */\r
                        if (addr_A1 == 1 && ST_address == v)\r
                                return 0;\r
@@ -153,7 +150,7 @@ static void wait_busy_940(int job)
                gp2x_memregs[0x3b46>>1], gp2x_memregl[0x4500>>2], gp2x_memregl[0x4510>>2]);\r
        printf("last lr: %08x, lastjob: %i\n", shared_ctl->last_lr, shared_ctl->lastjob);\r
 \r
-       strcpy(menuErrorMsg, "940 crashed, too much overclock?");\r
+       me_update_msg("940 crashed, too much overclock?");\r
        engineState = PGS_Menu;\r
        crashed_940 = 1;\r
 }\r
@@ -186,6 +183,61 @@ void YM2612PicoStateLoad_940(void)
        addr_A1 = *(INT32 *) (REGS + 0x200);\r
 }\r
 \r
+void YM2612PicoStateSave2_940(int tat, int tbt)\r
+{\r
+       UINT8 *ym_remote_regs, *ym_local_regs;\r
+       add_job_940(JOB940_PICOSTATESAVE2);\r
+       if (CHECK_BUSY(JOB940_PICOSTATESAVE2)) wait_busy_940(JOB940_PICOSTATESAVE2);\r
+\r
+       ym_remote_regs = (UINT8 *) shared_ctl->writebuff0;\r
+       ym_local_regs  = YM2612GetRegs();\r
+       if (*(UINT32 *)(ym_remote_regs + 0x100) != 0x41534d59) {\r
+               printf("code940 didn't return valid save data\n");\r
+               return;\r
+       }\r
+\r
+       /* copy addin data only */\r
+       memcpy(ym_local_regs,         ym_remote_regs,         0x20);\r
+       memcpy(ym_local_regs + 0x100, ym_remote_regs + 0x100, 0x30);\r
+       memcpy(ym_local_regs + 0x0b8, ym_remote_regs + 0x0b8, 0x48);\r
+       memcpy(ym_local_regs + 0x1b8, ym_remote_regs + 0x1b8, 0x48);\r
+       *(INT32 *)(ym_local_regs + 0x108) = tat;\r
+       *(INT32 *)(ym_local_regs + 0x10c) = tbt;\r
+}\r
+\r
+int YM2612PicoStateLoad2_940(int *tat, int *tbt)\r
+{\r
+       UINT8 *ym_remote_regs, *ym_local_regs;\r
+       ym_local_regs  = YM2612GetRegs();\r
+       ym_remote_regs = (UINT8 *) shared_ctl->writebuff0;\r
+\r
+       if (*(UINT32 *)(ym_local_regs + 0x100) != 0x41534d59)\r
+               return -1;\r
+\r
+       *tat = *(INT32 *)(ym_local_regs + 0x108);\r
+       *tbt = *(INT32 *)(ym_local_regs + 0x10c);\r
+\r
+       if (CHECK_BUSY(JOB940_YM2612UPDATEONE)) wait_busy_940(JOB940_YM2612UPDATEONE);\r
+\r
+       /* flush writes */\r
+       if (shared_ctl->writebuffsel == 1) {\r
+               shared_ctl->writebuff0[writebuff_ptr & 0xffff] = 0xffff;\r
+       } else {\r
+               shared_ctl->writebuff1[writebuff_ptr & 0xffff] = 0xffff;\r
+       }\r
+       shared_ctl->writebuffsel ^= 1;\r
+       writebuff_ptr = 0;\r
+       add_job_940(JOB940_PICOSTATELOAD2_PREP);\r
+       if (CHECK_BUSY(JOB940_PICOSTATELOAD2_PREP)) wait_busy_940(JOB940_PICOSTATELOAD2_PREP);\r
+\r
+       memcpy(ym_remote_regs, ym_local_regs, 0x200);\r
+\r
+       add_job_940(JOB940_PICOSTATELOAD2);\r
+       if (CHECK_BUSY(JOB940_PICOSTATELOAD2)) wait_busy_940(JOB940_PICOSTATELOAD2);\r
+\r
+       return 0;\r
+}\r
+\r
 \r
 static void internal_reset(void)\r
 {\r
@@ -200,7 +252,7 @@ void sharedmem_init(void)
        if (shared_mem != NULL) return;\r
 \r
        shared_mem = (unsigned char *) mmap(0, 0x210000, PROT_READ|PROT_WRITE, MAP_SHARED, memdev, 0x2000000);\r
-       if(shared_mem == MAP_FAILED)\r
+       if (shared_mem == MAP_FAILED)\r
        {\r
                printf("mmap(shared_data) failed with %i\n", errno);\r
                exit(1);\r
@@ -230,7 +282,6 @@ void sharedmem_deinit(void)
 \r
 extern char **g_argv;\r
 \r
-/* none of the functions in this file should be called before this one */\r
 void YM2612Init_940(int baseclock, int rate)\r
 {\r
        printf("YM2612Init_940()\n");\r
@@ -262,7 +313,7 @@ void YM2612Init_940(int baseclock, int rate)
                fp = fopen(binpath, "rb");\r
                if(!fp)\r
                {\r
-                       memset(gp2x_screen, 0, 320*240*2);\r
+                       memset(g_screen_ptr, 0, 320*240*2);\r
                        text_out16(10, 100, "failed to open required file:");\r
                        text_out16(10, 110, CODE940_FILE);\r
                        gp2x_video_flip2();\r
@@ -348,8 +399,8 @@ int YM2612UpdateOne_940(int *buffer, int length, int stereo, int is_buf_empty)
 \r
        /* predict sample counter for next frame */\r
        if (PsndLen_exc_add) {\r
-               if (PsndLen_exc_cnt + PsndLen_exc_add >= 0x10000) length = PsndLen + 1;\r
-               else length = PsndLen;\r
+               length = PsndLen;\r
+               if (PsndLen_exc_cnt + PsndLen_exc_add >= 0x10000) length++;\r
        }\r
 \r
        /* give 940 ym job */\r
@@ -457,7 +508,7 @@ void mp3_start_play(FILE *f, int pos) // pos is 0-1023
                shared_ctl->mp3_len = ftell(f);\r
                loaded_mp3 = f;\r
 \r
-               if (PicoOpt&0x200) {\r
+               if (PicoOpt & POPT_EXT_FM) {\r
                        // as we are going to change 940's cacheable area, we must invalidate it's cache..\r
                        if (CHECK_BUSY(JOB940_MP3DECODE)) wait_busy_940(JOB940_MP3DECODE);\r
                        add_job_940(JOB940_INVALIDATE_DCACHE);\r
@@ -471,7 +522,7 @@ void mp3_start_play(FILE *f, int pos) // pos is 0-1023
                byte_offs *= pos;\r
                byte_offs >>= 6;\r
        }\r
-       // printf("mp3 pos1024: %i, byte_offs %i/%i\n", pos, byte_offs, shared_ctl->mp3_len);\r
+       printf("  mp3 pos1024: %i, byte_offs %i/%i\n", pos, byte_offs, shared_ctl->mp3_len);\r
 \r
        shared_ctl->mp3_offs = byte_offs;\r
 \r
@@ -480,7 +531,13 @@ void mp3_start_play(FILE *f, int pos) // pos is 0-1023
        mp3_job_started = 0;\r
        shared_ctl->mp3_buffsel = 1; // will change to 0 on first decode\r
 \r
-       if (!(PicoOpt&0x200)) mp3_start_local();\r
+       if (PicoOpt & POPT_EXT_FM)\r
+       {\r
+               add_job_940(JOB940_MP3RESET);\r
+               if (CHECK_BUSY(JOB940_MP3RESET)) wait_busy_940(JOB940_MP3RESET);\r
+       }\r
+       else\r
+               mp3_start_local();\r
 }\r
 \r
 \r
PicoDrive's frontend in a lib