RaySollium99/libpicofe
1
0
Fork 0
mirror of https://github.com/RaySollium99/libpicofe.git synced 2025-09-05 14:57:46 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

bugfixes, new scaling, double ym upd at 940

Browse source 
git-svn-id: file:///home/notaz/opt/svn/PicoDrive/platform@83 be3aeb3a-fb24-0410-a615-afba39da0efa
This commit is contained in:
notaz 2007-03-31 13:57:45 +00:00
parent 17fa1e44f6
commit 79cad12255
11 changed files with 192 additions and 108 deletions
Download patch file Download diff file Expand all files Collapse all files

51
gp2x/940ctl.c
View file

@ -66,8 +66,10 @@ static int writebuff_ptr = 0;
/* OPN Mode Register Write */ /* OPN Mode Register Write */
static void set_timers( int v ) static int set_timers( int v )
{ {
int change;
/* b7 = CSM MODE */ /* b7 = CSM MODE */
/* b6 = 3 slot mode */ /* b6 = 3 slot mode */
/* b5 = reset b */ /* b5 = reset b */
@ -76,6 +78,7 @@ static void set_timers( int v )
/* b2 = timer enable a */ /* b2 = timer enable a */
/* b1 = load b */ /* b1 = load b */
/* b0 = load a */ /* b0 = load a */
change = (ST_mode ^ v) & 0xc0;
ST_mode = v; ST_mode = v;
/* reset Timer b flag */ /* reset Timer b flag */
@ -85,6 +88,8 @@ static void set_timers( int v )
/* reset Timer a flag */ /* reset Timer a flag */
if( v & 0x10 ) if( v & 0x10 )
ST_status &= ~1; ST_status &= ~1;
return change;
} }
/* YM2612 write */ /* YM2612 write */
@ -93,11 +98,14 @@ static void set_timers( int v )
/* returns 1 if sample affecting state changed */ /* returns 1 if sample affecting state changed */
int YM2612Write_940(unsigned int a, unsigned int v) int YM2612Write_940(unsigned int a, unsigned int v)
{ {
int addr; //, ret=1; int addr;
int upd = 1; /* the write affects sample generation */
v &= 0xff; /* adjust to 8 bit bus */ v &= 0xff; /* adjust to 8 bit bus */
a &= 3; a &= 3;
//printf("%05i:%03i: ym w ([%i] %02x)\n", Pico.m.frame_count, Pico.m.scanline, a, v);
switch( a ) { switch( a ) {
case 0: /* address port 0 */ case 0: /* address port 0 */
if (!addr_A1 && ST_address == v) if (!addr_A1 && ST_address == v)
@ -108,7 +116,7 @@ int YM2612Write_940(unsigned int a, unsigned int v)
(v == 0x24 || v == 0x25 || v == 0x26 || v == 0x2a)) (v == 0x24 || v == 0x25 || v == 0x26 || v == 0x2a))
return 0; return 0;
addr_A1 = 0; addr_A1 = 0;
//ret=0; upd = 0;
break; break;
case 1: /* data port 0 */ case 1: /* data port 0 */
@ -152,14 +160,16 @@ int YM2612Write_940(unsigned int a, unsigned int v)
} }
return 0; return 0;
case 0x27: /* mode, timer control */ case 0x27: /* mode, timer control */
set_timers( v ); if (set_timers( v ))
break; // other side needs ST.mode for 3slot mode break; // other side needs ST.mode for 3slot mode
return 0;
case 0x2a: /* DAC data (YM2612) */ case 0x2a: /* DAC data (YM2612) */
dacout = ((int)v - 0x80) << 6; /* level unknown (notaz: 8 seems to be too much) */ dacout = ((int)v - 0x80) << 6; /* level unknown (notaz: 8 seems to be too much) */
return 0; return 0;
case 0x2b: /* DAC Sel (YM2612) */ case 0x2b: /* DAC Sel (YM2612) */
/* b7 = dac enable */ /* b7 = dac enable */
dacen = v & 0x80; dacen = v & 0x80;
upd = 0;
break; // other side has to know this break; // other side has to know this
default: default:
break; break;
@ -173,7 +183,7 @@ int YM2612Write_940(unsigned int a, unsigned int v)
return 0; return 0;
ST_address = v; ST_address = v;
addr_A1 = 1; addr_A1 = 1;
//ret=0; upd = 0;
break; break;
case 3: /* data port 1 */ case 3: /* data port 1 */
@ -186,14 +196,25 @@ int YM2612Write_940(unsigned int a, unsigned int v)
break; break;
} }
//printf("ym pass\n");
if(currentConfig.EmuOpt & 4) { if(currentConfig.EmuOpt & 4) {
/* queue this write for 940 */ UINT16 *writebuff = shared_ctl->writebuffsel ? shared_ctl->writebuff0 : shared_ctl->writebuff1;
if (writebuff_ptr < 2047) {
if (shared_ctl->writebuffsel == 1) { /* detect rapid ym updates */
shared_ctl->writebuff0[writebuff_ptr++] = (a<<8)|v; if (upd && !(writebuff_ptr & 0x80000000) && Pico.m.scanline < 224) {
} else { int mid = Pico.m.pal ? 68 : 93;
shared_ctl->writebuff1[writebuff_ptr++] = (a<<8)|v; if (Pico.m.scanline > mid) {
//printf("%05i:%03i: rapid ym\n", Pico.m.frame_count, Pico.m.scanline);
writebuff[writebuff_ptr++ & 0xffff] = 0xfffe;
writebuff_ptr |= 0x80000000;
//printf("%05i:%03i: ym w ([%02x] %02x, upd=%i)\n", Pico.m.frame_count, Pico.m.scanline, addr, v, upd);
} }
}
/* queue this write for 940 */
if ((writebuff_ptr&0xffff) < 2047) {
writebuff[writebuff_ptr++ & 0xffff] = (a<<8)|v;
} else { } else {
printf("warning: writebuff_ptr > 2047 ([%i] %02x)\n", a, v); printf("warning: writebuff_ptr > 2047 ([%i] %02x)\n", a, v);
} }
@ -301,7 +322,7 @@ void YM2612PicoStateLoad_940(void)
addr_A1 = old_A1; addr_A1 = old_A1;
add_job_940(JOB940_PICOSTATELOAD); // add_job_940(JOB940_PICOSTATELOAD);
} }
@ -465,9 +486,9 @@ int YM2612UpdateOne_940(int *buffer, int length, int stereo, int is_buf_empty)
else memset32(buffer, 0, length<<stereo); else memset32(buffer, 0, length<<stereo);
if (shared_ctl->writebuffsel == 1) { if (shared_ctl->writebuffsel == 1) {
shared_ctl->writebuff0[writebuff_ptr] = 0xffff; shared_ctl->writebuff0[writebuff_ptr & 0xffff] = 0xffff;
} else { } else {
shared_ctl->writebuff1[writebuff_ptr] = 0xffff; shared_ctl->writebuff1[writebuff_ptr & 0xffff] = 0xffff;
} }
writebuff_ptr = 0; writebuff_ptr = 0;

3
gp2x/Makefile
View file

@ -84,7 +84,8 @@ OBJS += mp3.o
# CPU cores # CPU cores
ifeq "$(use_musashi)" "1" ifeq "$(use_musashi)" "1"
DEFINC += -DEMU_M68K DEFINC += -DEMU_M68K
OBJS += _build\m68kcpu.o _build\m68kopac.o _build\m68kopdm.o _build\m68kopnz.o _build\m68kops.o OBJS += ../../cpu/musashi/m68kcpu.o ../../cpu/musashi/m68kopac.o ../../cpu/musashi/m68kopdm.o
OBJS += ../../cpu/musashi/m68kopnz.o ../../cpu/musashi/m68kops.o
else else
DEFINC += -DEMU_C68K DEFINC += -DEMU_C68K
OBJS += ../../cpu/Cyclone/proj/Cyclone.o OBJS += ../../cpu/Cyclone/proj/Cyclone.o

81
gp2x/emu.c
View file

@ -63,21 +63,7 @@ unsigned char *framebuff = 0; // temporary buffer for alt renderer
int state_slot = 0; int state_slot = 0;
int reset_timing = 0; int reset_timing = 0;
/*
// tmp
static FILE *logf = NULL;
void pprintf(char *texto, ...)
{
va_list args;
va_start(args,texto);
vfprintf(logf,texto,args);
va_end(args);
fflush(logf);
sync();
}
*/
// utilities // utilities
static void strlwr(char* string) static void strlwr(char* string)
{ {
@ -467,6 +453,18 @@ static void find_combos(void)
} }
void scaling_update(void)
{
PicoOpt &= ~0x4100;
switch (currentConfig.scaling) {
default: break; // off
case 1: // hw hor
case 2: PicoOpt |= 0x0100; break; // hw hor+vert
case 3: PicoOpt |= 0x4000; break; // sw hor
}
}
int emu_ReadConfig(int game) int emu_ReadConfig(int game)
{ {
FILE *f; FILE *f;
@ -501,6 +499,7 @@ int emu_ReadConfig(int game)
currentConfig.KeyBinds[22] = 1<<30; // vol down currentConfig.KeyBinds[22] = 1<<30; // vol down
currentConfig.gamma = 100; currentConfig.gamma = 100;
currentConfig.PicoCDBuffers = 64; currentConfig.PicoCDBuffers = 64;
currentConfig.scaling = 0;
strncpy(cfg, PicoConfigFile, 511); strncpy(cfg, PicoConfigFile, 511);
cfg[511] = 0; cfg[511] = 0;
} else { } else {
@ -516,7 +515,7 @@ int emu_ReadConfig(int game)
bread = fread(&currentConfig, 1, sizeof(currentConfig), f); bread = fread(&currentConfig, 1, sizeof(currentConfig), f);
fclose(f); fclose(f);
} }
printf((bread == sizeof(currentConfig)) ? "(ok)\n" : "(failed)\n"); printf(bread > 0 ? "(ok)\n" : "(failed)\n");
PicoOpt = currentConfig.PicoOpt; PicoOpt = currentConfig.PicoOpt;
PsndRate = currentConfig.PsndRate; PsndRate = currentConfig.PsndRate;
@ -527,6 +526,7 @@ int emu_ReadConfig(int game)
actionNames[ 8] = "Z"; actionNames[ 9] = "Y"; actionNames[ 8] = "Z"; actionNames[ 9] = "Y";
actionNames[10] = "X"; actionNames[11] = "MODE"; actionNames[10] = "X"; actionNames[11] = "MODE";
} }
scaling_update();
// some sanity checks // some sanity checks
if (currentConfig.CPUclock < 1 || currentConfig.CPUclock > 4096) currentConfig.CPUclock = 200; if (currentConfig.CPUclock < 1 || currentConfig.CPUclock > 4096) currentConfig.CPUclock = 200;
if (currentConfig.gamma < 10 || currentConfig.gamma > 300) currentConfig.gamma = 100; if (currentConfig.gamma < 10 || currentConfig.gamma > 300) currentConfig.gamma = 100;
@ -536,7 +536,7 @@ int emu_ReadConfig(int game)
currentConfig.KeyBinds[22] = 1<<30; // vol down currentConfig.KeyBinds[22] = 1<<30; // vol down
} }
return (bread == sizeof(currentConfig)); return (bread > 0); // == sizeof(currentConfig));
} }
@ -565,7 +565,9 @@ int emu_WriteConfig(int game)
bwrite = fwrite(&currentConfig, 1, sizeof(currentConfig), f); bwrite = fwrite(&currentConfig, 1, sizeof(currentConfig), f);
fflush(f); fflush(f);
fclose(f); fclose(f);
#ifndef NO_SYNC
sync(); sync();
#endif
} }
printf((bwrite == sizeof(currentConfig)) ? "(ok)\n" : "(failed)\n"); printf((bwrite == sizeof(currentConfig)) ? "(ok)\n" : "(failed)\n");
@ -581,8 +583,23 @@ void emu_Deinit(void)
SRam.changed = 0; SRam.changed = 0;
} }
if (!(currentConfig.EmuOpt & 0x20)) if (!(currentConfig.EmuOpt & 0x20)) {
emu_WriteConfig(0); FILE *f = fopen(PicoConfigFile, "r+b");
if (!f) emu_WriteConfig(0);
else {
// if we already have config, reload it, except last ROM
fseek(f, sizeof(currentConfig.lastRomFile), SEEK_SET);
fread(&currentConfig.EmuOpt, 1, sizeof(currentConfig) - sizeof(currentConfig.lastRomFile), f);
fseek(f, 0, SEEK_SET);
fwrite(&currentConfig, 1, sizeof(currentConfig), f);
fflush(f);
fclose(f);
#ifndef NO_SYNC
sync();
#endif
}
}
free(framebuff); free(framebuff);
PicoExit(); PicoExit();
@ -706,9 +723,13 @@ static void blit(const char *fps, const char *notice)
} }
} }
if (notice) osd_text(4, 232, notice); if (notice || (emu_opt & 2)) {
if (emu_opt & 2) int h = 232;
osd_text(osd_fps_x, 232, fps); if (currentConfig.scaling == 2 && !(Pico.video.reg[1]&8)) h -= 8;
if (notice) osd_text(4, h, notice);
if (emu_opt & 2)
osd_text(osd_fps_x, h, fps);
}
if ((emu_opt & 0x400) && (PicoMCD & 1)) if ((emu_opt & 0x400) && (PicoMCD & 1))
cd_leds(); cd_leds();
@ -771,7 +792,9 @@ static void vidResetMode(void)
} }
Pico.m.dirtyPal = 1; Pico.m.dirtyPal = 1;
// reset scaling // reset scaling
gp2x_video_RGB_setscaling((PicoOpt&0x100)&&!(Pico.video.reg[12]&1) ? 256 : 320, 240); 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);
} }
@ -1133,7 +1156,9 @@ void emu_Loop(void)
vidCpyM2 = vidCpyM2_32col; vidCpyM2 = vidCpyM2_32col;
} }
} }
gp2x_video_RGB_setscaling(scalex, 240); 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; oldmodes = modes;
clearArea(1); clearArea(1);
} }
@ -1171,7 +1196,7 @@ void emu_Loop(void)
if (frames_shown > frames_done) frames_shown = frames_done; if (frames_shown > frames_done) frames_shown = frames_done;
} }
} }
#if 0 #if 1
sprintf(fpsbuff, "%05i", Pico.m.frame_count); sprintf(fpsbuff, "%05i", Pico.m.frame_count);
#endif #endif
lim_time = (frames_done+1) * target_frametime; lim_time = (frames_done+1) * target_frametime;
@ -1446,7 +1471,9 @@ int emu_SaveLoadGame(int load, int sram)
ret = fwrite(sram_data, 1, sram_size, sramFile); ret = fwrite(sram_data, 1, sram_size, sramFile);
ret = (ret != sram_size) ? -1 : 0; ret = (ret != sram_size) ? -1 : 0;
fclose(sramFile); fclose(sramFile);
#ifndef NO_SYNC
sync(); sync();
#endif
} }
} }
return ret; return ret;
@ -1470,8 +1497,10 @@ int emu_SaveLoadGame(int load, int sram)
ret = PmovState(load ? 6 : 5, PmovFile); ret = PmovState(load ? 6 : 5, PmovFile);
areaClose(PmovFile); areaClose(PmovFile);
PmovFile = 0; PmovFile = 0;
if (!load) sync(); if (load) Pico.m.dirtyPal=1;
else Pico.m.dirtyPal=1; #ifndef NO_SYNC
else sync();
#endif
} }
else ret = -1; else ret = -1;
if (!ret) if (!ret)

4
gp2x/emu.h
View file

@ -18,7 +18,7 @@ enum TPicoGameState {
typedef struct { typedef struct {
char lastRomFile[512]; char lastRomFile[512];
int EmuOpt; // LSb->MSb: use_sram, show_fps, enable_sound, gzip_saves, int EmuOpt; // LSb->MSb: use_sram, show_fps, enable_sound, gzip_saves,
// squidgehack, save_cfg_on_exit, <unused>, 16_bit_mode // squidgehack, no_save_cfg_on_exit, <unused>, 16_bit_mode
// craigix_ram, confirm_save, show_cd_leds // craigix_ram, confirm_save, show_cd_leds
// //
int PicoOpt; // used for config saving only, see Pico.h int PicoOpt; // used for config saving only, see Pico.h
@ -32,6 +32,7 @@ typedef struct {
int JoyBinds[4][32]; int JoyBinds[4][32];
int PicoAutoRgnOrder; int PicoAutoRgnOrder;
int PicoCDBuffers; int PicoCDBuffers;
int scaling; // 0=center, 1=hscale, 2=hvscale, 3=hsoftscale
} currentConfig_t; } currentConfig_t;
extern char romFileName[]; extern char romFileName[];
@ -52,4 +53,5 @@ int emu_check_save_file(int slot);
void emu_set_save_cbs(int gz); void emu_set_save_cbs(int gz);
void emu_forced_frame(void); void emu_forced_frame(void);
int find_bios(int region, char **bios_file); int find_bios(int region, char **bios_file);
void scaling_update(void);

27
gp2x/gp2x.c
View file

@ -52,19 +52,21 @@ void *gp2x_screen;
#define FRAMEBUFF_ADDR2 (FRAMEBUFF_ADDR1+0x30000) #define FRAMEBUFF_ADDR2 (FRAMEBUFF_ADDR1+0x30000)
#define FRAMEBUFF_ADDR3 (FRAMEBUFF_ADDR2+0x30000) #define FRAMEBUFF_ADDR3 (FRAMEBUFF_ADDR2+0x30000)
static const int gp2x_screenaddrs[] = { FRAMEBUFF_ADDR0, FRAMEBUFF_ADDR1, FRAMEBUFF_ADDR2, FRAMEBUFF_ADDR3 }; static const int gp2x_screenaddrs[4] = { FRAMEBUFF_ADDR0, FRAMEBUFF_ADDR1, FRAMEBUFF_ADDR2, FRAMEBUFF_ADDR3 };
static int gp2x_screenaddrs_use[4];
static unsigned short gp2x_screenaddr_old[4]; static unsigned short gp2x_screenaddr_old[4];
/* video stuff */ /* video stuff */
void gp2x_video_flip(void) void gp2x_video_flip(void)
{ {
unsigned short msw = (unsigned short)(gp2x_screenaddrs[screensel&3] >> 16); unsigned short lsw = (unsigned short) gp2x_screenaddrs_use[screensel&3];
unsigned short msw = (unsigned short)(gp2x_screenaddrs_use[screensel&3] >> 16);
gp2x_memregs[0x2910>>1] = msw; gp2x_memregs[0x2910>>1] = msw;
gp2x_memregs[0x2914>>1] = msw; gp2x_memregs[0x2914>>1] = msw;
gp2x_memregs[0x290E>>1] = 0; gp2x_memregs[0x290E>>1] = lsw;
gp2x_memregs[0x2912>>1] = 0; gp2x_memregs[0x2912>>1] = lsw;
// jump to other buffer: // jump to other buffer:
gp2x_screen = gp2x_screens[++screensel&3]; gp2x_screen = gp2x_screens[++screensel&3];
@ -73,7 +75,7 @@ void gp2x_video_flip(void)
/* doulblebuffered flip */ /* doulblebuffered flip */
void gp2x_video_flip2(void) void gp2x_video_flip2(void)
{ {
unsigned short msw = (unsigned short)(gp2x_screenaddrs[screensel&1] >> 16); unsigned short msw = (unsigned short)(gp2x_screenaddrs_use[screensel&1] >> 16);
gp2x_memregs[0x2910>>1] = msw; gp2x_memregs[0x2910>>1] = msw;
gp2x_memregs[0x2914>>1] = msw; gp2x_memregs[0x2914>>1] = msw;
@ -113,10 +115,17 @@ void gp2x_video_setpalette(int *pal, int len)
// TV Compatible function // // TV Compatible function //
void gp2x_video_RGB_setscaling(int W, int H) void gp2x_video_RGB_setscaling(int ln_offs, int W, int H)
{ {
float escalaw, escalah; float escalaw, escalah;
int bpp = (gp2x_memregs[0x28DA>>1]>>9)&0x3; int bpp = (gp2x_memregs[0x28DA>>1]>>9)&0x3;
unsigned short scalw;
// set offset
gp2x_screenaddrs_use[0] = gp2x_screenaddrs[0] + ln_offs * 320 * bpp;
gp2x_screenaddrs_use[1] = gp2x_screenaddrs[1] + ln_offs * 320 * bpp;
gp2x_screenaddrs_use[2] = gp2x_screenaddrs[2] + ln_offs * 320 * bpp;
gp2x_screenaddrs_use[3] = gp2x_screenaddrs[3] + ln_offs * 320 * bpp;
escalaw = 1024.0; // RGB Horiz LCD escalaw = 1024.0; // RGB Horiz LCD
escalah = 320.0; // RGB Vert LCD escalah = 320.0; // RGB Vert LCD
@ -131,7 +140,10 @@ void gp2x_video_RGB_setscaling(int W, int H)
} }
// scale horizontal // scale horizontal
gp2x_memregs[0x2906>>1]=(unsigned short)((float)escalaw *(W/320.0)); scalw = (unsigned short)((float)escalaw *(W/320.0));
/* if there is no horizontal scaling, vertical doesn't work. Here is a nasty wrokaround... */
if (H != 240 && W == 320) scalw--;
gp2x_memregs[0x2906>>1]=scalw;
// scale vertical // scale vertical
gp2x_memregl[0x2908>>2]=(unsigned long)((float)escalah *bpp *(H/240.0)); gp2x_memregl[0x2908>>2]=(unsigned long)((float)escalah *bpp *(H/240.0));
} }
@ -304,6 +316,7 @@ void gp2x_init(void)
gp2x_screenaddr_old[2] = gp2x_memregs[0x2912>>1]; gp2x_screenaddr_old[2] = gp2x_memregs[0x2912>>1];
gp2x_screenaddr_old[3] = gp2x_memregs[0x2914>>1]; gp2x_screenaddr_old[3] = gp2x_memregs[0x2914>>1];
memcpy(gp2x_screenaddrs_use, gp2x_screenaddrs, sizeof(gp2x_screenaddrs));
gp2x_memset_all_buffers(0, 0, 320*240*2); gp2x_memset_all_buffers(0, 0, 320*240*2);
// snd // snd

2
gp2x/gp2x.h
View file

@ -12,7 +12,7 @@ void gp2x_video_flip2(void);
void gp2x_video_changemode(int bpp); void gp2x_video_changemode(int bpp);
void gp2x_video_changemode2(int bpp); void gp2x_video_changemode2(int bpp);
void gp2x_video_setpalette(int *pal, int len); void gp2x_video_setpalette(int *pal, int len);
void gp2x_video_RGB_setscaling(int W, int H); void gp2x_video_RGB_setscaling(int ln_offs, int W, int H);
void gp2x_video_wait_vsync(void); void gp2x_video_wait_vsync(void);
void gp2x_memcpy_buffers(int buffers, void *data, int offset, int len); void gp2x_memcpy_buffers(int buffers, void *data, int offset, int len);
void gp2x_memcpy_all_buffers(void *data, int offset, int len); void gp2x_memcpy_all_buffers(void *data, int offset, int len);

124
gp2x/menu.c
View file

@ -286,7 +286,10 @@ static int scandir_cmp(const void *p1, const void *p2)
return alphasort(d1, d2); return alphasort(d1, d2);
} }
static char *filter_exts[] = { ".mp3", ".MP3", ".srm", ".brm", "s.gz", ".mds", "bcfg", ".txt", ".htm", "html", ".jpg", ".gpe" }; static char *filter_exts[] = {
".mp3", ".MP3", ".srm", ".brm", "s.gz", ".mds", "bcfg", ".txt", ".htm", "html",
".jpg", ".gpe", ".cue"
};
static int scandir_filter(const struct dirent *ent) static int scandir_filter(const struct dirent *ent)
{ {
@ -864,16 +867,15 @@ static void draw_amenu_options(int menu_sel)
//memset(gp2x_screen, 0, 320*240); //memset(gp2x_screen, 0, 320*240);
gp2x_pd_clone_buffer2(); gp2x_pd_clone_buffer2();
gp2x_text_out8(tl_x, y, "Scale 32 column mode %s", (currentConfig.PicoOpt&0x100)?"ON":"OFF"); // 0 gp2x_text_out8(tl_x, y, "Gamma correction %i.%02i", currentConfig.gamma / 100, currentConfig.gamma%100); // 0
gp2x_text_out8(tl_x, (y+=10), "Gamma correction %i.%02i", currentConfig.gamma / 100, currentConfig.gamma%100); // 1 gp2x_text_out8(tl_x, (y+=10), "Emulate Z80 %s", (currentConfig.PicoOpt&0x004)?"ON":"OFF"); // 1
gp2x_text_out8(tl_x, (y+=10), "Emulate Z80 %s", (currentConfig.PicoOpt&0x004)?"ON":"OFF"); // 2 gp2x_text_out8(tl_x, (y+=10), "Emulate YM2612 (FM) %s", (currentConfig.PicoOpt&0x001)?"ON":"OFF"); // 2
gp2x_text_out8(tl_x, (y+=10), "Emulate YM2612 (FM) %s", (currentConfig.PicoOpt&0x001)?"ON":"OFF"); // 3 gp2x_text_out8(tl_x, (y+=10), "Emulate SN76496 (PSG) %s", (currentConfig.PicoOpt&0x002)?"ON":"OFF"); // 3
gp2x_text_out8(tl_x, (y+=10), "Emulate SN76496 (PSG) %s", (currentConfig.PicoOpt&0x002)?"ON":"OFF"); // 4 gp2x_text_out8(tl_x, (y+=10), "gzip savestates %s", (currentConfig.EmuOpt &0x008)?"ON":"OFF"); // 4
gp2x_text_out8(tl_x, (y+=10), "gzip savestates %s", (currentConfig.EmuOpt &0x008)?"ON":"OFF"); // 5 gp2x_text_out8(tl_x, (y+=10), "Don't save config on exit %s", (currentConfig.EmuOpt &0x020)?"ON":"OFF"); // 5
gp2x_text_out8(tl_x, (y+=10), "Don't save config on exit %s", (currentConfig.EmuOpt &0x020)?"ON":"OFF"); // 6
gp2x_text_out8(tl_x, (y+=10), "needs restart:"); gp2x_text_out8(tl_x, (y+=10), "needs restart:");
gp2x_text_out8(tl_x, (y+=10), "craigix's RAM timings %s", (currentConfig.EmuOpt &0x100)?"ON":"OFF"); // 8 gp2x_text_out8(tl_x, (y+=10), "craigix's RAM timings %s", (currentConfig.EmuOpt &0x100)?"ON":"OFF"); // 7
gp2x_text_out8(tl_x, (y+=10), "squidgehack (now %s %s", mms, (currentConfig.EmuOpt &0x010)?"ON":"OFF"); // 9 gp2x_text_out8(tl_x, (y+=10), "squidgehack (now %s %s", mms, (currentConfig.EmuOpt &0x010)?"ON":"OFF"); // 8
gp2x_text_out8(tl_x, (y+=10), "Done"); gp2x_text_out8(tl_x, (y+=10), "Done");
// draw cursor // draw cursor
@ -884,7 +886,7 @@ static void draw_amenu_options(int menu_sel)
static void amenu_loop_options(void) static void amenu_loop_options(void)
{ {
int menu_sel = 0, menu_sel_max = 10; int menu_sel = 0, menu_sel_max = 9;
unsigned long inp = 0; unsigned long inp = 0;
for(;;) for(;;)
@ -895,21 +897,20 @@ static void amenu_loop_options(void)
if(inp & GP2X_DOWN) { menu_sel++; if (menu_sel > menu_sel_max) menu_sel = 0; } if(inp & GP2X_DOWN) { menu_sel++; if (menu_sel > menu_sel_max) menu_sel = 0; }
if((inp& GP2X_B)||(inp&GP2X_LEFT)||(inp&GP2X_RIGHT)) { // toggleable options if((inp& GP2X_B)||(inp&GP2X_LEFT)||(inp&GP2X_RIGHT)) { // toggleable options
switch (menu_sel) { switch (menu_sel) {
case 0: currentConfig.PicoOpt^=0x100; break; case 1: currentConfig.PicoOpt^=0x004; break;
case 2: currentConfig.PicoOpt^=0x004; break; case 2: currentConfig.PicoOpt^=0x001; break;
case 3: currentConfig.PicoOpt^=0x001; break; case 3: currentConfig.PicoOpt^=0x002; break;
case 4: currentConfig.PicoOpt^=0x002; break; case 4: currentConfig.EmuOpt ^=0x008; break;
case 5: currentConfig.EmuOpt ^=0x008; break; case 5: currentConfig.EmuOpt ^=0x020; break;
case 6: currentConfig.EmuOpt ^=0x020; break; case 7: currentConfig.EmuOpt ^=0x100; break;
case 8: currentConfig.EmuOpt ^=0x100; break; case 8: currentConfig.EmuOpt ^=0x010; break;
case 9: currentConfig.EmuOpt ^=0x010; break; case 9: return;
case 10: return;
} }
} }
if(inp & (GP2X_X|GP2X_A)) return; if(inp & (GP2X_X|GP2X_A)) return;
if(inp & (GP2X_LEFT|GP2X_RIGHT)) { // multi choise if(inp & (GP2X_LEFT|GP2X_RIGHT)) { // multi choise
switch (menu_sel) { switch (menu_sel) {
case 1: case 0:
while ((inp = gp2x_joystick_read(1)) & (GP2X_LEFT|GP2X_RIGHT)) { while ((inp = gp2x_joystick_read(1)) & (GP2X_LEFT|GP2X_RIGHT)) {
currentConfig.gamma += (inp & GP2X_LEFT) ? -1 : 1; currentConfig.gamma += (inp & GP2X_LEFT) ? -1 : 1;
if (currentConfig.gamma < 1) currentConfig.gamma = 1; if (currentConfig.gamma < 1) currentConfig.gamma = 1;
@ -949,8 +950,8 @@ static const char *region_name(unsigned int code)
static void draw_menu_options(int menu_sel) static void draw_menu_options(int menu_sel)
{ {
int tl_x = 25, tl_y = 40, y; int tl_x = 25, tl_y = 32, y;
char monostereo[8], strframeskip[8], *strrend; char monostereo[8], strframeskip[8], *strrend, *strscaling;
strcpy(monostereo, (currentConfig.PicoOpt&0x08)?"stereo":"mono"); strcpy(monostereo, (currentConfig.PicoOpt&0x08)?"stereo":"mono");
if (currentConfig.Frameskip < 0) if (currentConfig.Frameskip < 0)
@ -963,27 +964,34 @@ static void draw_menu_options(int menu_sel)
} else { } else {
strrend = " 8bit accurate"; strrend = " 8bit accurate";
} }
switch (currentConfig.scaling) {
default: strscaling = " OFF"; break;
case 1: strscaling = "hw horizontal"; break;
case 2: strscaling = "hw horiz. + vert."; break;
case 3: strscaling = "sw horizontal"; break;
}
y = tl_y; y = tl_y;
//memset(gp2x_screen, 0, 320*240); //memset(gp2x_screen, 0, 320*240);
gp2x_pd_clone_buffer2(); gp2x_pd_clone_buffer2();
gp2x_text_out8(tl_x, y, "Renderer: %s", strrend); // 0 gp2x_text_out8(tl_x, y, "Renderer: %s", strrend); // 0
gp2x_text_out8(tl_x, (y+=10), "Accurate timing (slower) %s", (currentConfig.PicoOpt&0x040)?"ON":"OFF"); // 1 gp2x_text_out8(tl_x, (y+=10), "Scaling: %s", strscaling); // 1
gp2x_text_out8(tl_x, (y+=10), "Accurate sprites (slower) %s", (currentConfig.PicoOpt&0x080)?"ON":"OFF"); // 2 gp2x_text_out8(tl_x, (y+=10), "Accurate timing (slower) %s", (currentConfig.PicoOpt&0x040)?"ON":"OFF"); // 2
gp2x_text_out8(tl_x, (y+=10), "Show FPS %s", (currentConfig.EmuOpt &0x002)?"ON":"OFF"); // 3 gp2x_text_out8(tl_x, (y+=10), "Accurate sprites (slower) %s", (currentConfig.PicoOpt&0x080)?"ON":"OFF"); // 3
gp2x_text_out8(tl_x, (y+=10), "Show FPS %s", (currentConfig.EmuOpt &0x002)?"ON":"OFF"); // 4
gp2x_text_out8(tl_x, (y+=10), "Frameskip %s", strframeskip); gp2x_text_out8(tl_x, (y+=10), "Frameskip %s", strframeskip);
gp2x_text_out8(tl_x, (y+=10), "Enable sound %s", (currentConfig.EmuOpt &0x004)?"ON":"OFF"); // 5 gp2x_text_out8(tl_x, (y+=10), "Enable sound %s", (currentConfig.EmuOpt &0x004)?"ON":"OFF"); // 6
gp2x_text_out8(tl_x, (y+=10), "Sound Quality: %5iHz %s", currentConfig.PsndRate, monostereo); gp2x_text_out8(tl_x, (y+=10), "Sound Quality: %5iHz %s", currentConfig.PsndRate, monostereo);
gp2x_text_out8(tl_x, (y+=10), "Use ARM940 core for sound %s", (currentConfig.PicoOpt&0x200)?"ON":"OFF"); // 7 gp2x_text_out8(tl_x, (y+=10), "Use ARM940 core for sound %s", (currentConfig.PicoOpt&0x200)?"ON":"OFF"); // 8
gp2x_text_out8(tl_x, (y+=10), "6 button pad %s", (currentConfig.PicoOpt&0x020)?"ON":"OFF"); // 8 gp2x_text_out8(tl_x, (y+=10), "6 button pad %s", (currentConfig.PicoOpt&0x020)?"ON":"OFF"); // 9
gp2x_text_out8(tl_x, (y+=10), "Genesis Region: %s", region_name(currentConfig.PicoRegion)); gp2x_text_out8(tl_x, (y+=10), "Genesis Region: %s", region_name(currentConfig.PicoRegion));
gp2x_text_out8(tl_x, (y+=10), "Use SRAM/BRAM savestates %s", (currentConfig.EmuOpt &0x001)?"ON":"OFF"); // 10 gp2x_text_out8(tl_x, (y+=10), "Use SRAM/BRAM savestates %s", (currentConfig.EmuOpt &0x001)?"ON":"OFF"); // 11
gp2x_text_out8(tl_x, (y+=10), "Confirm save overwrites %s", (currentConfig.EmuOpt &0x200)?"ON":"OFF"); // 11 gp2x_text_out8(tl_x, (y+=10), "Confirm save overwrites %s", (currentConfig.EmuOpt &0x200)?"ON":"OFF"); // 12
gp2x_text_out8(tl_x, (y+=10), "Save slot %i", state_slot); // 12 gp2x_text_out8(tl_x, (y+=10), "Save slot %i", state_slot); // 13
gp2x_text_out8(tl_x, (y+=10), "GP2X CPU clocks %iMhz", currentConfig.CPUclock); gp2x_text_out8(tl_x, (y+=10), "GP2X CPU clocks %iMhz", currentConfig.CPUclock);
gp2x_text_out8(tl_x, (y+=10), "[Sega/Mega CD options]"); gp2x_text_out8(tl_x, (y+=10), "[Sega/Mega CD options]");
gp2x_text_out8(tl_x, (y+=10), "[advanced options]"); // 15 gp2x_text_out8(tl_x, (y+=10), "[advanced options]"); // 16
gp2x_text_out8(tl_x, (y+=10), "Save cfg as default"); gp2x_text_out8(tl_x, (y+=10), "Save cfg as default");
if (rom_data) if (rom_data)
gp2x_text_out8(tl_x, (y+=10), "Save cfg for current game only"); gp2x_text_out8(tl_x, (y+=10), "Save cfg for current game only");
@ -1042,11 +1050,12 @@ static void menu_options_save(void)
} else { } else {
actionNames[8] = actionNames[9] = actionNames[10] = actionNames[11] = 0; actionNames[8] = actionNames[9] = actionNames[10] = actionNames[11] = 0;
} }
scaling_update();
} }
static int menu_loop_options(void) static int menu_loop_options(void)
{ {
int menu_sel = 0, menu_sel_max = 16; int menu_sel = 0, menu_sel_max = 17;
unsigned long inp = 0; unsigned long inp = 0;
if (rom_data) menu_sel_max++; if (rom_data) menu_sel_max++;
@ -1062,25 +1071,25 @@ static int menu_loop_options(void)
if(inp & GP2X_DOWN) { menu_sel++; if (menu_sel > menu_sel_max) menu_sel = 0; } if(inp & GP2X_DOWN) { menu_sel++; if (menu_sel > menu_sel_max) menu_sel = 0; }
if((inp& GP2X_B)||(inp&GP2X_LEFT)||(inp&GP2X_RIGHT)) { // toggleable options if((inp& GP2X_B)||(inp&GP2X_LEFT)||(inp&GP2X_RIGHT)) { // toggleable options
switch (menu_sel) { switch (menu_sel) {
case 1: currentConfig.PicoOpt^=0x040; break; case 2: currentConfig.PicoOpt^=0x040; break;
case 2: currentConfig.PicoOpt^=0x080; break; case 3: currentConfig.PicoOpt^=0x080; break;
case 3: currentConfig.EmuOpt ^=0x002; break; case 4: currentConfig.EmuOpt ^=0x002; break;
case 5: currentConfig.EmuOpt ^=0x004; break; case 6: currentConfig.EmuOpt ^=0x004; break;
case 7: currentConfig.PicoOpt^=0x200; break; case 8: currentConfig.PicoOpt^=0x200; break;
case 8: currentConfig.PicoOpt^=0x020; break; case 9: currentConfig.PicoOpt^=0x020; break;
case 10: currentConfig.EmuOpt ^=0x001; break; case 11: currentConfig.EmuOpt ^=0x001; break;
case 11: currentConfig.EmuOpt ^=0x200; break; case 12: currentConfig.EmuOpt ^=0x200; break;
case 14: cd_menu_loop_options(); case 15: cd_menu_loop_options();
if (engineState == PGS_ReloadRom) if (engineState == PGS_ReloadRom)
return 0; // test BIOS return 0; // test BIOS
break; break;
case 15: amenu_loop_options(); break; case 16: amenu_loop_options(); break;
case 16: // done (update and write) case 17: // done (update and write)
menu_options_save(); menu_options_save();
if (emu_WriteConfig(0)) strcpy(menuErrorMsg, "config saved"); if (emu_WriteConfig(0)) strcpy(menuErrorMsg, "config saved");
else strcpy(menuErrorMsg, "failed to write config"); else strcpy(menuErrorMsg, "failed to write config");
return 1; return 1;
case 17: // done (update and write for current game) case 18: // done (update and write for current game)
menu_options_save(); menu_options_save();
if (emu_WriteConfig(1)) strcpy(menuErrorMsg, "config saved"); if (emu_WriteConfig(1)) strcpy(menuErrorMsg, "config saved");
else strcpy(menuErrorMsg, "failed to write config"); else strcpy(menuErrorMsg, "failed to write config");
@ -1104,28 +1113,33 @@ static int menu_loop_options(void)
else if ( currentConfig.EmuOpt &0x80) currentConfig.EmuOpt &= ~0x80; else if ( currentConfig.EmuOpt &0x80) currentConfig.EmuOpt &= ~0x80;
} }
break; break;
case 4: case 1:
currentConfig.scaling += (inp & GP2X_LEFT) ? -1 : 1;
if (currentConfig.scaling < 0) currentConfig.scaling = 0;
if (currentConfig.scaling > 3) currentConfig.scaling = 3;
break;
case 5:
currentConfig.Frameskip += (inp & GP2X_LEFT) ? -1 : 1; currentConfig.Frameskip += (inp & GP2X_LEFT) ? -1 : 1;
if (currentConfig.Frameskip < 0) currentConfig.Frameskip = -1; if (currentConfig.Frameskip < 0) currentConfig.Frameskip = -1;
if (currentConfig.Frameskip > 32) currentConfig.Frameskip = 32; if (currentConfig.Frameskip > 32) currentConfig.Frameskip = 32;
break; break;
case 6: case 7:
if ((inp & GP2X_RIGHT) && currentConfig.PsndRate == 44100 && !(currentConfig.PicoOpt&0x08)) { if ((inp & GP2X_RIGHT) && currentConfig.PsndRate == 44100 && !(currentConfig.PicoOpt&0x08)) {
currentConfig.PsndRate = 8000; currentConfig.PicoOpt|= 0x08; currentConfig.PsndRate = 8000; currentConfig.PicoOpt|= 0x08;
} else if ((inp & GP2X_LEFT) && currentConfig.PsndRate == 8000 && (currentConfig.PicoOpt&0x08)) { } else if ((inp & GP2X_LEFT) && currentConfig.PsndRate == 8000 && (currentConfig.PicoOpt&0x08)) {
currentConfig.PsndRate = 44100; currentConfig.PicoOpt&=~0x08; currentConfig.PsndRate = 44100; currentConfig.PicoOpt&=~0x08;
} else currentConfig.PsndRate = sndrate_prevnext(currentConfig.PsndRate, inp & GP2X_RIGHT); } else currentConfig.PsndRate = sndrate_prevnext(currentConfig.PsndRate, inp & GP2X_RIGHT);
break; break;
case 9: case 10:
region_prevnext(inp & GP2X_RIGHT); region_prevnext(inp & GP2X_RIGHT);
break; break;
case 12: case 13:
if (inp & GP2X_RIGHT) { if (inp & GP2X_RIGHT) {
state_slot++; if (state_slot > 9) state_slot = 0; state_slot++; if (state_slot > 9) state_slot = 0;
} else {state_slot--; if (state_slot < 0) state_slot = 9; } else {state_slot--; if (state_slot < 0) state_slot = 9;
} }
break; break;
case 13: case 14:
while ((inp = gp2x_joystick_read(1)) & (GP2X_LEFT|GP2X_RIGHT)) { while ((inp = gp2x_joystick_read(1)) & (GP2X_LEFT|GP2X_RIGHT)) {
currentConfig.CPUclock += (inp & GP2X_LEFT) ? -1 : 1; currentConfig.CPUclock += (inp & GP2X_LEFT) ? -1 : 1;
if (currentConfig.CPUclock < 1) currentConfig.CPUclock = 1; if (currentConfig.CPUclock < 1) currentConfig.CPUclock = 1;
@ -1222,7 +1236,11 @@ static void menu_loop_root(void)
if (rom_data) menu_sel = menu_sel_min = 0; if (rom_data) menu_sel = menu_sel_min = 0;
if (PicoPatches) menu_sel_max = 9; if (PicoPatches) menu_sel_max = 9;
for(;;) /* make sure action buttons are not pressed on entering menu */
draw_menu_root(menu_sel);
while (gp2x_joystick_read(1) & (GP2X_B|GP2X_X|GP2X_SELECT)) usleep(50*1000);
for (;;)
{ {
draw_menu_root(menu_sel); draw_menu_root(menu_sel);
inp = wait_for_input(GP2X_UP|GP2X_DOWN|GP2X_B|GP2X_X|GP2X_SELECT); inp = wait_for_input(GP2X_UP|GP2X_DOWN|GP2X_B|GP2X_X|GP2X_SELECT);
@ -1324,7 +1342,7 @@ static void menu_gfx_prepare(void)
// switch to 8bpp // switch to 8bpp
gp2x_video_changemode2(8); gp2x_video_changemode2(8);
gp2x_video_RGB_setscaling(320, 240); gp2x_video_RGB_setscaling(0, 320, 240);
gp2x_video_flip2(); gp2x_video_flip2();
} }

2
gp2x/version.h
View file

@ -1,2 +1,2 @@
#define VERSION "1.31" #define VERSION "1.32"

2
linux/Makefile
View file

@ -90,7 +90,7 @@ PicoDrive : $(OBJS) ../gp2x/helix/helix_mp3_x86.a
../../Pico/sound/ym2612.o : ../../Pico/sound/ym2612.c ../../Pico/sound/ym2612.o : ../../Pico/sound/ym2612.c
@echo $@ @echo $@
@$(GCC) $(COPT_COMMON) $(DEFINC) -DEXTERNAL_YM2612 -c $< -o $@ # -mtune=arm940t @$(GCC) $(COPT_COMMON) $(DEFINC) -c $< -o $@ # -mtune=arm940t -DEXTERNAL_YM2612
# faked asm # faked asm
../../Pico/Draw.o : ../../Pico/Draw.c ../../Pico/Draw.o : ../../Pico/Draw.c

2
linux/gp2x.c
View file

@ -257,7 +257,7 @@ void gp2x_video_setpalette(int *pal, int len)
memcpy(current_pal, pal, len*4); memcpy(current_pal, pal, len*4);
} }
void gp2x_video_RGB_setscaling(int W, int H) void gp2x_video_RGB_setscaling(int v_offs, int W, int H)
{ {
} }

2
linux/port_config.h
View file

@ -4,7 +4,7 @@
#define PORT_CONFIG_H #define PORT_CONFIG_H
#define CPU_CALL #define CPU_CALL
#define NO_IONBF #define NO_SYNC
// draw2.c // draw2.c
#define START_ROW 0 // which row of tiles to start rendering at? #define START_ROW 0 // which row of tiles to start rendering at?