RaySollium99/picodrive
1
0
Fork 0
mirror of https://github.com/RaySollium99/picodrive.git synced 2025-09-05 07:17:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

revive pandora and win32 builds, rm gp2x dep for linux, lots of refactoring

Browse source 
git-svn-id: file:///home/notaz/opt/svn/PicoDrive@842 be3aeb3a-fb24-0410-a615-afba39da0efa
This commit is contained in:
notaz 2009-12-16 23:38:37 +00:00
parent 18b9412743
commit 697746df02
26 changed files with 723 additions and 1048 deletions
Download patch file Download diff file Expand all files Collapse all files

109
platform/pandora/Makefile
View file

@ -1,49 +1,39 @@
#export CROSS = arm-none-linux-gnueabi-
CROSS ?= $(CROSS_COMPILE)
LIBROOT = /home/notaz/dev/pnd/libroot
# settings
#mz80 = 1
#cz80 = 1
#debug_cyclone = 1
use_cyclone = 1
#use_musashi = 1
use_drz80 = 1
use_sh2drc = 1
#use_sh2mame = 1
asm_memory = 1
asm_render = 1
asm_ym2612 = 1
asm_misc = 1
asm_cdpico = 1
asm_cdmemory = 1
amalgamate = 0
#profile = 1
#use_musashi = 1
#use_famec = 1
#drc_debug = 3
-include Makefile.local
ifeq "$(debug_cyclone)" "1"
use_cyclone = 1
use_musashi = 1
endif
ifeq "$(use_musashi)" "1"
# due to CPU stop flag acces
asm_cdpico = 0
asm_memory = 0
asm_cdmemory = 0
else
use_cyclone = 1
endif
DEFINC = -I../.. -I. -DARM -DPANDORA -DIN_EVDEV
COPT_COMMON = -Wall -Winline -mcpu=cortex-a8 -mtune=cortex-a8 -march=armv7-a -I$(LIBROOT)/include
ARCH = arm
DEFINES += ARM PANDORA IN_EVDEV
CFLAGS += -I../.. -I. -I$(LIBROOT)/include
CFLAGS += -Wall -Winline -mcpu=cortex-a8 -mtune=cortex-a8 -march=armv7-a
ifeq ($(DEBUG),)
COPT_COMMON += -O2 # -ftracer -fstrength-reduce -fomit-frame-pointer -fstrict-aliasing -ffast-math
else
COPT_COMMON += -ggdb
CFLAGS += -O2 -fomit-frame-pointer -fstrict-aliasing -ffast-math
endif
ifeq "$(profile)" "1"
COPT_COMMON += -fprofile-generate
endif
ifeq "$(profile)" "2"
COPT_COMMON += -fprofile-use
endif
CFLAGS = $(COPT_COMMON)
SFLAGS = $(CFLAGS)
LDFLAGS += -lm -lpng -L$(LIBROOT)/lib -static
ASFLAGS = -mcpu=cortex-a8
CC = $(CROSS)gcc
STRIP = $(CROSS)strip
@ -52,7 +42,7 @@ LD = $(CROSS)ld
OBJCOPY = $(CROSS)objcopy
# frontend
OBJS += pandora.o emu.o asm_utils.o plat.o
OBJS += pandora.o emu.o asm_utils.o
# common
OBJS += platform/common/emu.o platform/common/menu.o platform/common/fonts.o platform/common/config.o \
@ -60,79 +50,32 @@ OBJS += platform/common/emu.o platform/common/menu.o platform/common/fonts.o pla
platform/common/readpng.o platform/common/input.o platform/common/main.o \
platform/linux/in_evdev.o platform/linux/sndout_oss.o platform/linux/plat.o
# Pico
ifeq "$(amalgamate)" "1"
OBJS += ../../picoAll.o
else
OBJS += pico/area.o pico/cart.o pico/memory.o pico/misc.o pico/pico.o pico/sek.o \
pico/videoport.o pico/draw2.o pico/draw.o pico/patch.o pico/debug.o
# Pico - CD
OBJS += pico/cd/pico.o pico/cd/memory.o pico/cd/sek.o pico/cd/LC89510.o \
pico/cd/cd_sys.o pico/cd/cd_file.o pico/cd/cue.o pico/cd/gfx_cd.o \
pico/cd/area.o pico/cd/misc.o pico/cd/pcm.o pico/cd/buffering.o
endif
# Pico - Pico
OBJS += pico/pico/pico.o pico/pico/memory.o pico/pico/xpcm.o
# Pico - carthw
OBJS += pico/carthw/carthw.o pico/carthw/svp/svp.o pico/carthw/svp/memory.o \
pico/carthw/svp/ssp16.o pico/carthw/svp/compiler.o pico/carthw/svp/stub_arm.o
# Pico - sound
ifneq "$(amalgamate)" "1"
OBJS += pico/sound/sound.o
endif
# ARM stuff
OBJS += pico/carthw/svp/compiler.o pico/carthw/svp/stub_arm.o
OBJS += pico/sound/mix_arm.o
OBJS += pico/sound/sn76496.o pico/sound/ym2612.o
# zlib
OBJS += zlib/gzio.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o zlib/trees.o \
zlib/deflate.o zlib/crc32.o zlib/adler32.o zlib/zutil.o zlib/compress.o
# unzip
OBJS += unzip/unzip.o unzip/unzip_stream.o
# debug
ifeq "$(debug_cyclone)" "1"
OBJS += pico/DebugCPU.o cpu/musashi/m68kdasm.o
endif
# CPU cores
ifeq "$(use_musashi)" "1"
DEFINC += -DEMU_M68K
OBJS += cpu/musashi/m68kops.o cpu/musashi/m68kcpu.o
endif
ifeq "$(use_cyclone)" "1"
DEFINC += -DEMU_C68K
OBJS += cpu/Cyclone/proj/Cyclone.o cpu/Cyclone/tools/idle.o
endif
ifeq "$(use_famec)" "1"
DEFINC += -DEMU_F68K
OBJS += cpu/fame/famec.o
endif
# drz80/mz80
ifeq "$(mz80)" "1"
DEFINC += -D_USE_MZ80
OBJS += cpu/mz80/mz80.o
else
ifeq "$(cz80)" "1"
DEFINC += -D_USE_CZ80
OBJS += cpu/cz80/cz80.o
else
DEFINC += -D_USE_DRZ80
OBJS += cpu/DrZ80/drz80.o
endif
endif
vpath %.c = ../..
vpath %.s = ../..
vpath %.S = ../..
DIRS = platform platform/gp2x platform/linux platform/common pico pico/cd pico/pico pico/sound pico/carthw/svp \
zlib unzip cpu cpu/musashi cpu/Cyclone/proj cpu/Cyclone/tools cpu/mz80 cpu/DrZ80
DIRS += platform/linux zlib unzip
all: mkdirs PicoDrive
include ../common/common.mak
include ../common/common_arm.mak
include ../common/revision.mak
CFLAGS += $(addprefix -D,$(DEFINES))
PicoDrive : $(OBJS) ../common/helix/$(CROSS)helix-mp3.a
@echo ">>>" $@
$(CC) -o $@ $(CFLAGS) $^ -lm -Wl,-Map=PicoDrive.map -lpng -L$(LIBROOT)/lib -static
$(CC) -o $@ $(CFLAGS) $^ $(LDFLAGS) -Wl,-Map=PicoDrive.map
ifeq ($(DEBUG),)
$(STRIP) $@
endif

665
platform/pandora/emu.c
View file

@ -4,112 +4,38 @@
// For commercial use, separate licencing terms must be obtained.
#include <stdio.h>
#include <stdlib.h>
#include <sys/time.h>
#include <stdarg.h>
#include "../common/arm_utils.h"
#include "../common/fonts.h"
#include "../common/emu.h"
#include "../common/menu.h"
#include "../common/config.h"
#include "../common/input.h"
#include "../common/plat.h"
#include "../common/arm_utils.h"
#include "../linux/sndout_oss.h"
#include "asm_utils.h"
#include "version.h"
#include <pico/pico_int.h>
#include <pico/patch.h>
#include <pico/sound/mix.h>
#include <zlib/zlib.h>
//#define PFRAMES
#define BENCHMARK
//#define USE_320_SCREEN 1
#ifdef BENCHMARK
#define OSD_FPS_X (800-200)
#else
#define OSD_FPS_X (800-120)
#endif
#define USE_320_SCREEN 1
static short __attribute__((aligned(4))) sndBuffer[2*44100/50];
static unsigned char temp_frame[g_screen_width * g_screen_height * 2];
unsigned char *PicoDraw2FB = temp_frame;
static int osd_fps_x;
unsigned char *PicoDraw2FB = NULL; // temporary buffer for alt renderer
char cpu_clk_name[] = "unused";
#define PICO_PEN_ADJUST_X 4
#define PICO_PEN_ADJUST_Y 2
static int pico_pen_x = 0, pico_pen_y = 240/2;
int plat_get_root_dir(char *dst, int len)
{
extern char **g_argv;
int j;
strncpy(dst, g_argv[0], len);
len -= 32; // reserve
if (len < 0) len = 0;
dst[len] = 0;
for (j = strlen(dst); j > 0; j--)
if (dst[j] == '/') { dst[j+1] = 0; break; }
return j + 1;
}
void pemu_prep_defconfig(void)
{
memset(&defaultConfig, 0, sizeof(defaultConfig));
defaultConfig.EmuOpt = 0x8f | 0x00600; // | <- confirm_save, cd_leds
defaultConfig.s_PicoOpt = 0x0f | POPT_EXT_FM|POPT_EN_MCD_PCM|POPT_EN_MCD_CDDA|POPT_EN_SVP_DRC;
defaultConfig.s_PicoOpt |= POPT_ACC_SPRITES|POPT_EN_MCD_GFX;
defaultConfig.EmuOpt &= ~8; // no save gzip
defaultConfig.s_PsndRate = 44100;
defaultConfig.s_PicoRegion = 0;
defaultConfig.s_PicoAutoRgnOrder = 0x184; // US, EU, JP
defaultConfig.s_PicoCDBuffers = 0;
defaultConfig.Frameskip = 0;
defaultConfig.CPUclock = 200;
defaultConfig.volume = 50;
defaultConfig.scaling = 0;
defaultConfig.turbo_rate = 15;
// XXX: move elsewhere
g_menubg_ptr = temp_frame;
}
static void textOut16(int x, int y, const char *text)
void pemu_validate_config(void)
{
int i,l,len=strlen(text);
unsigned int *screen = (unsigned int *)((unsigned short *)g_screen_ptr + (x&~1) + y*g_screen_width);
for (i = 0; i < len; i++)
{
for (l=0;l<16;)
{
unsigned char fd = fontdata8x8[((text[i])*8)+l/2];
unsigned int *d = &screen[l*g_screen_width/2];
if (fd&0x80) d[0]=0xffffffff;
if (fd&0x40) d[1]=0xffffffff;
if (fd&0x20) d[2]=0xffffffff;
if (fd&0x10) d[3]=0xffffffff;
if (fd&0x08) d[4]=0xffffffff;
if (fd&0x04) d[5]=0xffffffff;
if (fd&0x02) d[6]=0xffffffff;
if (fd&0x01) d[7]=0xffffffff;
l++; d = &screen[l*g_screen_width/2];
if (fd&0x80) d[0]=0xffffffff;
if (fd&0x40) d[1]=0xffffffff;
if (fd&0x20) d[2]=0xffffffff;
if (fd&0x10) d[3]=0xffffffff;
if (fd&0x08) d[4]=0xffffffff;
if (fd&0x04) d[5]=0xffffffff;
if (fd&0x02) d[6]=0xffffffff;
if (fd&0x01) d[7]=0xffffffff;
l++;
}
screen += 8;
}
}
// FIXME: cleanup
static void osd_text(int x, int y, const char *text)
{
int len = strlen(text)*8;
@ -163,25 +89,6 @@ static void draw_cd_leds(void)
}
}
static void draw_pico_ptr(void)
{
unsigned short *p = (unsigned short *)g_screen_ptr;
// only if pen enabled and for 16bit modes
if (pico_inp_mode == 0 || (PicoOpt&0x10) || !(currentConfig.EmuOpt&0x80)) return;
if (!(Pico.video.reg[12]&1) && !(PicoOpt&POPT_DIS_32C_BORDER))
p += 32;
p += g_screen_width * (pico_pen_y + PICO_PEN_ADJUST_Y);
p += pico_pen_x + PICO_PEN_ADJUST_X;
p[0] ^= 0xffff;
p[319] ^= 0xffff;
p[320] ^= 0xffff;
p[321] ^= 0xffff;
p[640] ^= 0xffff;
}
#ifdef USE_320_SCREEN
static int EmuScanBegin16(unsigned int num)
@ -236,188 +143,78 @@ static int EmuScanEnd16(unsigned int num)
#endif // USE_320_SCREEN
int localPal[0x100];
static void (*vidCpyM2)(void *dest, void *src) = NULL;
static void blit(const char *fps, const char *notice)
void pemu_update_display(const char *fps, const char *notice)
{
int emu_opt = currentConfig.EmuOpt;
if (PicoOpt&0x10)
{
// 8bit fast renderer
if (Pico.m.dirtyPal) {
Pico.m.dirtyPal = 0;
vidConvCpyRGB32(localPal, Pico.cram, 0x40);
// feed new palette to our device
// gp2x_video_setpalette(localPal, 0x40);
}
// a hack for VR
if (PicoAHW & PAHW_SVP)
memset32((int *)(PicoDraw2FB+328*8+328*223), 0xe0e0e0e0, 328);
// do actual copy
vidCpyM2((unsigned char *)g_screen_ptr+g_screen_width*8, PicoDraw2FB+328*8);
if (notice || (currentConfig.EmuOpt & EOPT_SHOW_FPS)) {
if (notice)
osd_text(4, 460, notice);
if (currentConfig.EmuOpt & EOPT_SHOW_FPS)
osd_text(osd_fps_x, 460, fps);
}
else if (!(emu_opt&0x80))
{
// 8bit accurate renderer
if (Pico.m.dirtyPal)
{
int pallen = 0xc0;
Pico.m.dirtyPal = 0;
if (Pico.video.reg[0xC]&8) // shadow/hilight mode
{
vidConvCpyRGB32(localPal, Pico.cram, 0x40);
vidConvCpyRGB32sh(localPal+0x40, Pico.cram, 0x40);
vidConvCpyRGB32hi(localPal+0x80, Pico.cram, 0x40);
memcpy32(localPal+0xc0, localPal+0x40, 0x40);
pallen = 0x100;
}
else if (rendstatus & PDRAW_SONIC_MODE) { // mid-frame palette changes
vidConvCpyRGB32(localPal, Pico.cram, 0x40);
vidConvCpyRGB32(localPal+0x40, HighPal, 0x40);
vidConvCpyRGB32(localPal+0x80, HighPal+0x40, 0x40);
pallen = 0xc0;
}
else {
vidConvCpyRGB32(localPal, Pico.cram, 0x40);
memcpy32(localPal+0x80, localPal, 0x40);
}
if (pallen > 0xc0) {
localPal[0xc0] = 0x0000c000;
localPal[0xd0] = 0x00c00000;
localPal[0xe0] = 0x00000000; // reserved pixels for OSD
localPal[0xf0] = 0x00ffffff;
}
// gp2x_video_setpalette(localPal, pallen);
}
}
if (notice || (emu_opt & 2)) {
int h = g_screen_height-16;
if (currentConfig.scaling == 2 && !(Pico.video.reg[1]&8)) h -= 16;
if (notice) osd_text(4, h, notice);
if (emu_opt & 2)
osd_text(osd_fps_x, h, fps);
}
if ((emu_opt & 0x400) && (PicoAHW & PAHW_MCD))
if ((PicoAHW & PAHW_MCD) && (currentConfig.EmuOpt & EOPT_EN_CD_LEDS))
draw_cd_leds();
if (PicoAHW & PAHW_PICO)
draw_pico_ptr();
//gp2x_video_wait_vsync();
// gp2x_video_flip();
}
// clears whole screen or just the notice area (in all buffers)
static void clearArea(int full)
void plat_video_toggle_renderer(int is_next, int force_16bpp, int is_menu)
{
if (full) memset(g_screen_ptr, 0, g_screen_width*g_screen_height*2);
else memset((short *)g_screen_ptr + g_screen_width * (g_screen_height - 16), 0,
g_screen_width * 16 * 2);
}
static void vidResetMode(void)
{
#if 0
if (PicoOpt&0x10) {
gp2x_video_changemode(8);
} else if (currentConfig.EmuOpt&0x80) {
gp2x_video_changemode(16);
#ifdef USE_320_SCREEN
PicoDrawSetColorFormat(1);
PicoScanBegin = EmuScanBegin16;
#else
PicoDrawSetColorFormat(-1);
PicoScanEnd = EmuScanEnd16;
#endif
} else {
gp2x_video_changemode(8);
PicoDrawSetColorFormat(2);
PicoScanBegin = EmuScanBegin8;
}
if ((PicoOpt&0x10)||!(currentConfig.EmuOpt&0x80)) {
// setup pal for 8-bit modes
localPal[0xc0] = 0x0000c000; // MCD LEDs
localPal[0xd0] = 0x00c00000;
localPal[0xe0] = 0x00000000; // reserved pixels for OSD
localPal[0xf0] = 0x00ffffff;
gp2x_video_setpalette(localPal, 0x100);
gp2x_memset_all_buffers(0, 0xe0, 320*240);
gp2x_video_flip();
}
Pico.m.dirtyPal = 1;
// reset scaling
if (currentConfig.scaling == 2 && !(Pico.video.reg[1]&8))
gp2x_video_RGB_setscaling(8, (PicoOpt&0x100)&&!(Pico.video.reg[12]&1) ? 256 : 320, 224);
else gp2x_video_RGB_setscaling(0, (PicoOpt&0x100)&&!(Pico.video.reg[12]&1) ? 256 : 320, 240);
#else
#ifdef USE_320_SCREEN
// this will auto-select SMS/32X renderers
PicoDrawSetColorFormat(1);
PicoScanBegin = EmuScanBegin16;
#else
PicoDrawSetColorFormat(-1);
PicoScanEnd = EmuScanEnd16;
#endif
#endif
}
void plat_video_menu_enter(int is_rom_loaded)
{
}
static void update_volume(int has_changed, int is_up)
void plat_video_menu_begin(void)
{
memcpy32(g_screen_ptr, g_menubg_ptr, g_screen_width * g_screen_height * 2 / 4);
}
void plat_video_menu_end(void)
{
}
void plat_status_msg_clear(void)
{
unsigned short *d = (unsigned short *)g_screen_ptr + g_screen_width * g_screen_height;
int l = g_screen_width * 8;
memset32((int *)(d - l), 0, l * 2 / 4);
}
void plat_status_msg_busy_next(const char *msg)
{
plat_status_msg_clear();
pemu_update_display("", msg);
emu_status_msg("");
reset_timing = 1;
}
void plat_status_msg_busy_first(const char *msg)
{
// memset32(g_screen_ptr, 0, g_screen_width * g_screen_height * 2 / 4);
plat_status_msg_busy_next(msg);
}
void plat_update_volume(int has_changed, int is_up)
{
static int prev_frame = 0, wait_frames = 0;
int vol = currentConfig.volume;
if (has_changed)
{
if (vol < 5 && (PicoOpt&8) && prev_frame == Pico.m.frame_count - 1 && wait_frames < 12)
wait_frames++;
else {
if (is_up) {
if (vol < 99) vol++;
} else {
if (vol > 0) vol--;
}
wait_frames = 0;
sndout_oss_setvol(vol, vol);
currentConfig.volume = vol;
if (is_up) {
if (vol < 99) vol++;
} else {
if (vol > 0) vol--;
}
sprintf(noticeMsg, "VOL: %02i", vol);
gettimeofday(&noticeMsgTime, 0);
wait_frames = 0;
sndout_oss_setvol(vol, vol);
currentConfig.volume = vol;
emu_status_msg("VOL: %02i", vol);
prev_frame = Pico.m.frame_count;
}
// set the right mixer func
if (!(PicoOpt&8)) return; // just use defaults for mono
if (vol >= 5)
PsndMix_32_to_16l = mix_32_to_16l_stereo;
else {
mix_32_to_16l_level = 5 - vol;
PsndMix_32_to_16l = mix_32_to_16l_stereo_lvl;
}
}
static void updateSound(int len)
{
if (PicoOpt&8) len<<=1;
/* avoid writing audio when lagging behind to prevent audio lag */
if (PicoSkipFrame != 2)
sndout_oss_write(PsndOut, len<<1);
}
static void SkipFrame(int do_audio)
{
PicoSkipFrame=do_audio ? 1 : 2;
PicoFrame();
PicoSkipFrame=0;
}
void pemu_forced_frame(int opts)
{
int po_old = PicoOpt;
@ -427,7 +224,6 @@ void pemu_forced_frame(int opts)
PicoOpt |= opts|POPT_ACC_SPRITES; // acc_sprites
currentConfig.EmuOpt |= 0x80;
//vidResetMode();
#ifdef USE_320_SCREEN
PicoDrawSetColorFormat(1);
PicoScanBegin = EmuScanBegin16;
@ -438,38 +234,22 @@ void pemu_forced_frame(int opts)
Pico.m.dirtyPal = 1;
PicoFrameDrawOnly();
/*
if (!(Pico.video.reg[12]&1)) {
vidCpyM2 = vidCpyM2_32col;
clearArea(1);
} else vidCpyM2 = vidCpyM2_40col;
vidCpyM2((unsigned char *)g_screen_ptr+g_screen_width*8, PicoDraw2FB+328*8);
vidConvCpyRGB32(localPal, Pico.cram, 0x40);
gp2x_video_setpalette(localPal, 0x40);
*/
PicoOpt = po_old;
currentConfig.EmuOpt = eo_old;
}
void plat_debug_cat(char *str)
static void updateSound(int len)
{
}
len <<= 1;
if (PicoOpt & POPT_EN_STEREO)
len <<= 1;
static void simpleWait(int thissec, int lim_time)
{
struct timeval tval;
if ((currentConfig.EmuOpt & EOPT_NO_FRMLIMIT) && !sndout_oss_can_write(len))
return;
spend_cycles(1024);
gettimeofday(&tval, 0);
if (thissec != tval.tv_sec) tval.tv_usec+=1000000;
while (tval.tv_usec < lim_time)
{
spend_cycles(1024);
gettimeofday(&tval, 0);
if (thissec != tval.tv_sec) tval.tv_usec+=1000000;
}
/* avoid writing audio when lagging behind to prevent audio lag */
if (PicoSkipFrame != 2)
sndout_oss_write(PsndOut, len);
}
void pemu_sound_start(void)
@ -491,7 +271,7 @@ void pemu_sound_start(void)
sndout_oss_start(PsndRate, 16, (PicoOpt&8)>>3);
sndout_oss_setvol(currentConfig.volume, currentConfig.volume);
PicoWriteSound = updateSound;
update_volume(0, 0);
plat_update_volume(0, 0);
memset(sndBuffer, 0, sizeof(sndBuffer));
PsndOut = sndBuffer;
PsndRate_old = PsndRate;
@ -509,224 +289,89 @@ void pemu_sound_wait(void)
// don't need to do anything, writes will block by themselves
}
void pemu_loop(void)
void plat_debug_cat(char *str)
{
char fpsbuff[24]; // fps count c string
struct timeval tval; // timing
int pframes_done, pframes_shown, pthissec; // "period" frames, used for sync
int frames_done, frames_shown, thissec; // actual frames
int oldmodes = 0, target_fps, target_frametime, lim_time, vsync_offset, i;
char *notice = 0;
printf("entered emu_Loop()\n");
fpsbuff[0] = 0;
// make sure we are in correct mode
vidResetMode();
Pico.m.dirtyPal = 1;
oldmodes = ((Pico.video.reg[12]&1)<<2) ^ 0xc;
// pal/ntsc might have changed, reset related stuff
target_fps = Pico.m.pal ? 50 : 60;
target_frametime = 1000000/target_fps;
reset_timing = 1;
pemu_sound_start();
// prepare CD buffer
if (PicoAHW & PAHW_MCD) PicoCDBufferInit();
// calc vsync offset to sync timing code with vsync
if (currentConfig.EmuOpt&0x2000) {
gettimeofday(&tval, 0);
//gp2x_video_wait_vsync();
gettimeofday(&tval, 0);
vsync_offset = tval.tv_usec;
while (vsync_offset >= target_frametime)
vsync_offset -= target_frametime;
if (!vsync_offset) vsync_offset++;
printf("vsync_offset: %i\n", vsync_offset);
} else
vsync_offset = 0;
frames_done = frames_shown = thissec =
pframes_done = pframes_shown = pthissec = 0;
// loop
while (engineState == PGS_Running)
{
int modes;
gettimeofday(&tval, 0);
if (reset_timing) {
reset_timing = 0;
pthissec = tval.tv_sec;
pframes_shown = pframes_done = tval.tv_usec/target_frametime;
}
// show notice message?
if (noticeMsgTime.tv_sec)
{
static int noticeMsgSum;
if((tval.tv_sec*1000000+tval.tv_usec) - (noticeMsgTime.tv_sec*1000000+noticeMsgTime.tv_usec) > 2000000) { // > 2.0 sec
noticeMsgTime.tv_sec = noticeMsgTime.tv_usec = 0;
clearArea(0);
notice = 0;
} else {
int sum = noticeMsg[0]+noticeMsg[1]+noticeMsg[2];
if (sum != noticeMsgSum) { clearArea(0); noticeMsgSum = sum; }
notice = noticeMsg;
}
}
// check for mode changes
modes = ((Pico.video.reg[12]&1)<<2)|(Pico.video.reg[1]&8);
if (modes != oldmodes)
{
int scalex = g_screen_width;
osd_fps_x = OSD_FPS_X;
if (modes & 4) {
vidCpyM2 = vidCpyM2_40col;
} else {
if (PicoOpt & 0x100) {
vidCpyM2 = vidCpyM2_32col_nobord;
scalex = 256;
osd_fps_x = OSD_FPS_X - 64;
} else {
vidCpyM2 = vidCpyM2_32col;
}
}
//if (currentConfig.scaling == 2 && !(modes&8)) // want vertical scaling and game is not in 240 line mode
// gp2x_video_RGB_setscaling(8, scalex, 224);
// else gp2x_video_RGB_setscaling(0, scalex, 240);
oldmodes = modes;
clearArea(1);
}
// second changed?
if (thissec != tval.tv_sec)
{
#ifdef BENCHMARK
static int bench = 0, bench_fps = 0, bench_fps_s = 0, bfp = 0, bf[4];
if (++bench == 4) {
bench = 0;
bench_fps_s = bench_fps / 4;
bf[bfp++ & 3] = bench_fps / 4;
bench_fps = 0;
}
bench_fps += frames_shown;
sprintf(fpsbuff, "%3i/%3i/%3i", frames_shown, bench_fps_s, (bf[0]+bf[1]+bf[2]+bf[3])>>2);
printf("%s\n", fpsbuff);
#else
if (currentConfig.EmuOpt & 2) {
sprintf(fpsbuff, "%3i/%3i", frames_shown, frames_done);
if (fpsbuff[5] == 0) { fpsbuff[5] = fpsbuff[6] = ' '; fpsbuff[7] = 0; }
}
#endif
frames_shown = frames_done = 0;
thissec = tval.tv_sec;
}
#ifdef PFRAMES
sprintf(fpsbuff, "%i", Pico.m.frame_count);
#endif
if (pthissec != tval.tv_sec)
{
if (PsndOut == 0 && currentConfig.Frameskip >= 0) {
pframes_done = pframes_shown = 0;
} else {
// it is quite common for this implementation to leave 1 fame unfinished
// when second changes, but we don't want buffer to starve.
if(PsndOut && pframes_done < target_fps && pframes_done > target_fps-5) {
emu_update_input();
SkipFrame(1); pframes_done++;
}
pframes_done -= target_fps; if (pframes_done < 0) pframes_done = 0;
pframes_shown -= target_fps; if (pframes_shown < 0) pframes_shown = 0;
if (pframes_shown > pframes_done) pframes_shown = pframes_done;
}
pthissec = tval.tv_sec;
}
lim_time = (pframes_done+1) * target_frametime + vsync_offset;
if (currentConfig.Frameskip >= 0) // frameskip enabled
{
for(i = 0; i < currentConfig.Frameskip; i++) {
emu_update_input();
SkipFrame(1); pframes_done++; frames_done++;
if (PsndOut && !reset_timing) { // do framelimitting if sound is enabled
gettimeofday(&tval, 0);
if (pthissec != tval.tv_sec) tval.tv_usec+=1000000;
if (tval.tv_usec < lim_time) { // we are too fast
simpleWait(pthissec, lim_time);
}
}
lim_time += target_frametime;
}
}
else if (tval.tv_usec > lim_time) // auto frameskip
{
// no time left for this frame - skip
if (tval.tv_usec - lim_time >= 300000) {
/* something caused a slowdown for us (disk access? cache flush?)
* try to recover by resetting timing... */
reset_timing = 1;
continue;
}
emu_update_input();
SkipFrame(tval.tv_usec < lim_time+target_frametime*2); pframes_done++; frames_done++;
continue;
}
emu_update_input();
PicoFrame();
// check time
gettimeofday(&tval, 0);
if (pthissec != tval.tv_sec) tval.tv_usec+=1000000;
if (currentConfig.Frameskip < 0 && tval.tv_usec - lim_time >= 300000) // slowdown detection
reset_timing = 1;
#if 1
else if (PsndOut != NULL || currentConfig.Frameskip < 0)
{
// sleep or vsync if we are still too fast
// usleep sleeps for ~20ms minimum, so it is not a solution here
if (!reset_timing && tval.tv_usec < lim_time)
{
// we are too fast
if (vsync_offset) {
if (lim_time - tval.tv_usec > target_frametime/2)
simpleWait(pthissec, lim_time - target_frametime/4);
// gp2x_video_wait_vsync();
} else {
simpleWait(pthissec, lim_time);
}
}
}
#endif
blit(fpsbuff, notice);
pframes_done++; pframes_shown++;
frames_done++; frames_shown++;
}
emu_set_fastforward(0);
if (PicoAHW & PAHW_MCD) PicoCDBufferFree();
// save SRAM
if ((currentConfig.EmuOpt & EOPT_EN_SRAM) && SRam.changed) {
/* FIXME: plat_status_msg_busy_first */
emu_state_cb("Writing SRAM/BRAM..");
emu_save_load_game(0, 1);
SRam.changed = 0;
}
// if in 8bit mode, generate 16bit image for menu background
if ((PicoOpt&0x10) || !(currentConfig.EmuOpt&0x80))
pemu_forced_frame(POPT_EN_SOFTSCALE);
}
void emu_video_mode_change(int start_line, int line_count, int is_32cols)
{
osd_fps_x = 260;
// clear whole screen in all buffers
memset32(g_screen_ptr, 0, g_screen_width * g_screen_height * 2 / 4);
}
void pemu_loop_prep(void)
{
#ifdef USE_320_SCREEN
PicoDrawSetColorFormat(1);
PicoScanBegin = EmuScanBegin16;
#else
PicoDrawSetColorFormat(-1);
PicoScanEnd = EmuScanEnd16;
#endif
pemu_sound_start();
}
void pemu_loop_end(void)
{
int po_old = PicoOpt;
int eo_old = currentConfig.EmuOpt;
pemu_sound_stop();
memset32(g_screen_ptr, 0, g_screen_width * g_screen_height * 2 / 4);
/* do one more frame for menu bg */
PicoOpt &= ~POPT_ALT_RENDERER;
PicoOpt |= POPT_EN_SOFTSCALE|POPT_ACC_SPRITES;
currentConfig.EmuOpt |= EOPT_16BPP;
PicoDrawSetColorFormat(1);
Pico.m.dirtyPal = 1;
PicoFrame();
PicoOpt = po_old;
currentConfig.EmuOpt = eo_old;
}
/* XXX: avoid busy wait somehow? */
void plat_wait_till_us(unsigned int us_to)
{
unsigned int now;
spend_cycles(1024);
now = plat_get_ticks_us();
while ((signed int)(us_to - now) > 512)
{
spend_cycles(1024);
now = plat_get_ticks_us();
}
}
void plat_video_wait_vsync(void)
{
}
const char *plat_get_credits(void)
{
return "PicoDrive v" VERSION " (c) notaz, 2006-2009\n\n\n"
"Credits:\n"
"fDave: Cyclone 68000 core,\n"
" base code of PicoDrive\n"
"Reesy & FluBBa: DrZ80 core\n"
"MAME devs: YM2612 and SN76496 cores\n"
"rlyeh and others: minimal SDK\n"
"Squidge: mmuhack\n"
"Dzz: ARM940 sample\n"
"GnoStiC / Puck2099: USB joy code\n"
"craigix: GP2X hardware\n"
"ketchupgun: skin design\n"
"\n"
"special thanks (for docs, ideas):\n"
" Charles MacDonald, Haze,\n"
" Stephane Dallongeville,\n"
" Lordus, Exophase, Rokas,\n"
" Nemesis, Tasco Deluxe";
}

20
platform/pandora/pandora.c
View file

@ -13,15 +13,17 @@
#include "../linux/sndout_oss.h"
#include "../common/arm_linux.h"
#include "../common/emu.h"
#include "pandora.h"
static int fbdev = -1;
#define SCREEN_MAP_SIZE (800*480*2)
static void *screen = MAP_FAILED;
/* common */
void pnd_init(void)
void plat_early_init(void)
{
}
void plat_init(void)
{
printf("entering init()\n"); fflush(stdout);
@ -47,7 +49,7 @@ void pnd_init(void)
printf("exitting init()\n"); fflush(stdout);
}
void pnd_exit(void)
void plat_finish(void)
{
if (screen != MAP_FAILED)
munmap(screen, SCREEN_MAP_SIZE);
@ -69,13 +71,3 @@ void lprintf(const char *fmt, ...)
va_end(vl);
}
/* fake GP2X */
/*
void set_gamma(int g100, int A_SNs_curve) {}
void set_FCLK(unsigned MHZ) {}
void set_LCD_custom_rate(int rate) {}
void unset_LCD_custom_rate(void) {}
void Pause940(int yes) {}
void Reset940(int yes, int bank) {}
*/

2
platform/pandora/version.h Normal file
View file

@ -0,0 +1,2 @@
#define VERSION "1.70"