notaz.gp2x.de
/
picodrive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
clear binds feature
[picodrive.git]
/
platform
/
gp2x
/
940ctl.c
diff --git
a/platform/gp2x/940ctl.c
b/platform/gp2x/940ctl.c
index
b372d92
..
921922c
100644
(file)
--- a/
platform/gp2x/940ctl.c
+++ b/
platform/gp2x/940ctl.c
@@
-11,22
+11,16
@@
#include <errno.h>
\r
\r
#include "code940/940shared.h"
\r
#include <errno.h>
\r
\r
#include "code940/940shared.h"
\r
-#include "gp2x.h"
\r
-#include "emu.h"
\r
-#include "menu.h"
\r
+#include "soc_mmsp2.h"
\r
+#include "soc.h"
\r
#include "../common/mp3.h"
\r
#include "../common/arm_utils.h"
\r
#include "../common/menu.h"
\r
#include "../common/emu.h"
\r
#include "../common/mp3.h"
\r
#include "../common/arm_utils.h"
\r
#include "../common/menu.h"
\r
#include "../common/emu.h"
\r
-#include "../../
Pico/PicoI
nt.h"
\r
-#include "../../
P
ico/sound/ym2612.h"
\r
-#include "../../
P
ico/sound/mix.h"
\r
+#include "../../
pico/pico_i
nt.h"
\r
+#include "../../
p
ico/sound/ym2612.h"
\r
+#include "../../
p
ico/sound/mix.h"
\r
\r
\r
-/* we will need some gp2x internals here */
\r
-extern volatile unsigned short *gp2x_memregs; /* from minimal library rlyeh */
\r
-extern volatile unsigned long *gp2x_memregl;
\r
-
\r
-extern int reset_timing;
\r
static unsigned char *shared_mem = 0;
\r
static _940_data_t *shared_data = 0;
\r
_940_ctl_t *shared_ctl = 0;
\r
static unsigned char *shared_mem = 0;
\r
static _940_data_t *shared_data = 0;
\r
_940_ctl_t *shared_ctl = 0;
\r
@@
-82,10
+76,6
@@
int YM2612Write_940(unsigned int a, unsigned int v, int scanline)
upd = 0;
\r
break;
\r
\r
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
case 2: /* address port 1 */
\r
if (addr_A1 == 1 && ST_address == v)
\r
return 0;
\r
@@
-154,7
+144,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
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
engineState = PGS_Menu;
\r
crashed_940 = 1;
\r
}
\r
@@
-251,7
+241,7
@@
static void internal_reset(void)
\r
\r
/* this must be called after mmu hack, the allocated regions must not get cached */
\r
\r
\r
/* this must be called after mmu hack, the allocated regions must not get cached */
\r
-void sharedmem_init(void)
\r
+void sharedmem
940
_init(void)
\r
{
\r
if (shared_mem != NULL) return;
\r
\r
{
\r
if (shared_mem != NULL) return;
\r
\r
@@
-274,7
+264,7
@@
void sharedmem_init(void)
}
\r
\r
\r
}
\r
\r
\r
-void sharedmem
_deinit
(void)
\r
+void sharedmem
940_finish
(void)
\r
{
\r
munmap(shared_mem, 0x210000);
\r
munmap(mp3_mem, MP3_SIZE_MAX);
\r
{
\r
munmap(shared_mem, 0x210000);
\r
munmap(mp3_mem, MP3_SIZE_MAX);
\r
@@
-291,8
+281,8
@@
void YM2612Init_940(int baseclock, int rate)
printf("YM2612Init_940()\n");
\r
printf("Mem usage: shared_data: %i, shared_ctl: %i\n", sizeof(*shared_data), sizeof(*shared_ctl));
\r
\r
printf("YM2612Init_940()\n");
\r
printf("Mem usage: shared_data: %i, shared_ctl: %i\n", sizeof(*shared_data), sizeof(*shared_ctl));
\r
\r
-
R
eset940(1, 2);
\r
-
P
ause940(1);
\r
+
r
eset940(1, 2);
\r
+
p
ause940(1);
\r
\r
gp2x_memregs[0x3B40>>1] = 0; // disable DUALCPU interrupts for 920
\r
gp2x_memregs[0x3B42>>1] = 1; // enable DUALCPU interrupts for 940
\r
\r
gp2x_memregs[0x3B40>>1] = 0; // disable DUALCPU interrupts for 920
\r
gp2x_memregs[0x3B42>>1] = 1; // enable DUALCPU interrupts for 940
\r
@@
-305,19
+295,14
@@
void YM2612Init_940(int baseclock, int rate)
{
\r
unsigned char ucData[1024];
\r
int nRead, i, nLen = 0;
\r
{
\r
unsigned char ucData[1024];
\r
int nRead, i, nLen = 0;
\r
- char binpath[
1024
];
\r
+ char binpath[
512
];
\r
FILE *fp;
\r
\r
FILE *fp;
\r
\r
- strncpy(binpath, g_argv[0], 1023);
\r
- binpath[1023] = 0;
\r
- for (i = strlen(binpath); i > 0; i--)
\r
- if (binpath[i] == '/') { binpath[i] = 0; break; }
\r
- strcat(binpath, "/" CODE940_FILE);
\r
-
\r
+ emu_make_path(binpath, CODE940_FILE, sizeof(binpath));
\r
fp = fopen(binpath, "rb");
\r
if(!fp)
\r
{
\r
fp = fopen(binpath, "rb");
\r
if(!fp)
\r
{
\r
- memset(g
p2x_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
text_out16(10, 100, "failed to open required file:");
\r
text_out16(10, 110, CODE940_FILE);
\r
gp2x_video_flip2();
\r
@@
-352,8
+337,8
@@
void YM2612Init_940(int baseclock, int rate)
gp2x_memregl[0x4510>>2] = 0xffffffff; // clear pending IRQs in INTPND
\r
\r
/* start the 940 */
\r
gp2x_memregl[0x4510>>2] = 0xffffffff; // clear pending IRQs in INTPND
\r
\r
/* start the 940 */
\r
-
R
eset940(0, 2);
\r
-
P
ause940(0);
\r
+
r
eset940(0, 2);
\r
+
p
ause940(0);
\r
\r
// YM2612ResetChip_940(); // will be done on JOB940_YM2612INIT
\r
\r
\r
// YM2612ResetChip_940(); // will be done on JOB940_YM2612INIT
\r
\r
@@
-403,8
+388,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
\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
}
\r
\r
/* give 940 ym job */
\r
@@
-512,7
+497,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
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
// 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
@@
-526,7
+511,7
@@
void mp3_start_play(FILE *f, int pos) // pos is 0-1023
byte_offs *= pos;
\r
byte_offs >>= 6;
\r
}
\r
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
\r
shared_ctl->mp3_offs = byte_offs;
\r
\r
@@
-535,7
+520,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
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
}
\r
\r
\r