notaz.gp2x.de
/
libpicofe.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
start splitting plat menu code; batt + clock in menu; bugfix
[libpicofe.git]
/
gp2x
/
940ctl.c
diff --git
a/gp2x/940ctl.c
b/gp2x/940ctl.c
index
f01ffa3
..
38a9f9d
100644
(file)
--- a/
gp2x/940ctl.c
+++ b/
gp2x/940ctl.c
@@
-11,22
+11,17
@@
#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/PicoInt.h"
\r
-#include "../../Pico/sound/ym2612.h"
\r
-#include "../../Pico/sound/mix.h"
\r
+#include "../common/input.h"
\r
+#include "../../pico/pico_int.h"
\r
+#include "../../pico/sound/ym2612.h"
\r
+#include "../../pico/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
@@
-150,7
+145,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
@@
-247,7
+242,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
@@
-270,7
+265,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
@@
-287,8
+282,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
@@
-300,23
+295,19
@@
void YM2612Init_940(int baseclock, int rate)
if (crashed_940)
\r
{
\r
unsigned char ucData[1024];
\r
if (crashed_940)
\r
{
\r
unsigned char ucData[1024];
\r
- int nRead,
i,
nLen = 0;
\r
- char binpath[
1024
];
\r
+ int nRead, nLen = 0;
\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
+ in_menu_wait(PBTN_MOK|PBTN_MBACK, 100);
\r
printf("failed to open %s\n", binpath);
\r
exit(1);
\r
}
\r
printf("failed to open %s\n", binpath);
\r
exit(1);
\r
}
\r
@@
-348,8
+339,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