mirror of
https://github.com/RaySollium99/libpicofe.git
synced 2025-09-05 14:57:46 -04:00
Cyclone poll detection problem fixed
git-svn-id: file:///home/notaz/opt/svn/PicoDrive/platform@307 be3aeb3a-fb24-0410-a615-afba39da0efa
This commit is contained in:
parent
677b5dd814
commit
6245d5a03d
7 changed files with 25 additions and 13 deletions
|
@ -1,9 +1,2 @@
|
||||||
#if defined(__GP2X__)
|
|
||||||
#include <stdio.h>
|
|
||||||
#define lprintf printf
|
|
||||||
#elif defined(PSP)
|
|
||||||
extern void lprintf(const char *fmt, ...);
|
extern void lprintf(const char *fmt, ...);
|
||||||
#else
|
|
||||||
#include "giz.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
|
@ -34,7 +34,7 @@ endif
|
||||||
DEFINC = -I../.. -I. -DARM -D__GP2X__ # -DBENCHMARK
|
DEFINC = -I../.. -I. -DARM -D__GP2X__ # -DBENCHMARK
|
||||||
COPT_COMMON = -static -Wall -Winline
|
COPT_COMMON = -static -Wall -Winline
|
||||||
ifeq ($(DEBUG),)
|
ifeq ($(DEBUG),)
|
||||||
COPT_COMMON += -O2 -ftracer -fstrength-reduce -fomit-frame-pointer -fstrict-aliasing -ffast-math
|
COPT_COMMON += -O3 -ftracer -fstrength-reduce -fomit-frame-pointer -fstrict-aliasing -ffast-math
|
||||||
else
|
else
|
||||||
COPT_COMMON += -ggdb
|
COPT_COMMON += -ggdb
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -43,7 +43,7 @@ char romFileName[PATH_MAX];
|
||||||
|
|
||||||
extern int crashed_940;
|
extern int crashed_940;
|
||||||
|
|
||||||
static short sndBuffer[2*44100/50];
|
static short __attribute__((aligned(4))) sndBuffer[2*44100/50];
|
||||||
static struct timeval noticeMsgTime = { 0, 0 }; // when started showing
|
static struct timeval noticeMsgTime = { 0, 0 }; // when started showing
|
||||||
static int osd_fps_x;
|
static int osd_fps_x;
|
||||||
static int combo_keys = 0, combo_acts = 0; // keys and actions which need button combos
|
static int combo_keys = 0, combo_acts = 0; // keys and actions which need button combos
|
||||||
|
|
10
gp2x/gp2x.c
10
gp2x/gp2x.c
|
@ -22,6 +22,7 @@
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
#include <stdarg.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <sys/mman.h>
|
#include <sys/mman.h>
|
||||||
|
@ -375,4 +376,13 @@ void gp2x_deinit(void)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* lprintf */
|
||||||
|
void lprintf(const char *fmt, ...)
|
||||||
|
{
|
||||||
|
va_list vl;
|
||||||
|
|
||||||
|
va_start(vl, fmt);
|
||||||
|
vprintf(fmt, vl);
|
||||||
|
va_end(vl);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
|
@ -155,11 +155,12 @@ static void cdload_progress_cb(int percent)
|
||||||
|
|
||||||
smalltext_out16(1, 3*10, "Processing CD image / MP3s", 0xffff);
|
smalltext_out16(1, 3*10, "Processing CD image / MP3s", 0xffff);
|
||||||
smalltext_out16_lim(1, 4*10, romFileName, 0xffff, 80);
|
smalltext_out16_lim(1, 4*10, romFileName, 0xffff, 80);
|
||||||
dst += 30;
|
dst += 320*30;
|
||||||
|
|
||||||
if (len > 320) len = 320;
|
if (len > 320) len = 320;
|
||||||
for (ln = 8; ln > 0; ln--, dst += 320)
|
for (ln = 8; ln > 0; ln--, dst += 320)
|
||||||
memset(dst, 0xff, len*2);
|
memset(dst, 0xff, len*2);
|
||||||
|
menu_flip();
|
||||||
cdload_called = 1;
|
cdload_called = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -182,7 +183,7 @@ void menu_romload_prepare(const char *rom_name)
|
||||||
|
|
||||||
void menu_romload_end(void)
|
void menu_romload_end(void)
|
||||||
{
|
{
|
||||||
PicoCartLoadProgressCB = NULL;
|
PicoCartLoadProgressCB = PicoCDLoadProgressCB = NULL;
|
||||||
smalltext_out16(1, cdload_called ? 60 : 30, "Starting emulation...", 0xffff);
|
smalltext_out16(1, cdload_called ? 60 : 30, "Starting emulation...", 0xffff);
|
||||||
menu_flip();
|
menu_flip();
|
||||||
}
|
}
|
||||||
|
|
|
@ -18,7 +18,7 @@
|
||||||
#define CAN_HANDLE_240_LINES 1
|
#define CAN_HANDLE_240_LINES 1
|
||||||
|
|
||||||
// logging emu events
|
// logging emu events
|
||||||
#define EL_LOGMASK 0 // (EL_STATUS|EL_ANOMALY|EL_UIO|EL_SRAMIO) // xffff
|
#define EL_LOGMASK EL_STATUS // (EL_STATUS|EL_ANOMALY|EL_UIO|EL_SRAMIO|EL_INTS|EL_CDPOLL) // xffff
|
||||||
|
|
||||||
//#define dprintf(f,...) printf("%05i:%03i: " f "\n",Pico.m.frame_count,Pico.m.scanline,##__VA_ARGS__)
|
//#define dprintf(f,...) printf("%05i:%03i: " f "\n",Pico.m.frame_count,Pico.m.scanline,##__VA_ARGS__)
|
||||||
#define dprintf(x...)
|
#define dprintf(x...)
|
||||||
|
|
|
@ -428,5 +428,13 @@ void spend_cycles(int c)
|
||||||
usleep(c/200);
|
usleep(c/200);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* lprintf */
|
||||||
|
void lprintf(const char *fmt, ...)
|
||||||
|
{
|
||||||
|
va_list vl;
|
||||||
|
|
||||||
|
va_start(vl, fmt);
|
||||||
|
vprintf(fmt, vl);
|
||||||
|
va_end(vl);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue