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

Finish migrating to new mem handling. Make carthw db external.

Browse source 
Still need to fix asm and protection emulation.


git-svn-id: file:///home/notaz/opt/svn/PicoDrive/platform@769 be3aeb3a-fb24-0410-a615-afba39da0efa
This commit is contained in:
notaz 2009-09-05 21:13:30 +00:00
parent 4182d35d5d
commit a4bd56c62d
7 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
common/emu.c
View file

@ -977,7 +977,7 @@ int emu_save_load_game(int load, int sram)
int truncate = 1; int truncate = 1;
if (PicoAHW & PAHW_MCD) if (PicoAHW & PAHW_MCD)
{ {
if (PicoOpt&POPT_EN_MCD_RAMCART) { if (PicoOpt & POPT_EN_MCD_RAMCART) {
sram_size = 0x12000; sram_size = 0x12000;
sram_data = SRam.data; sram_data = SRam.data;
if (sram_data) if (sram_data)
@ -988,9 +988,7 @@ int emu_save_load_game(int load, int sram)
truncate = 0; // the .brm may contain RAM cart data after normal brm truncate = 0; // the .brm may contain RAM cart data after normal brm
} }
} else { } else {
sram_size = SRam.end-SRam.start+1; sram_size = SRam.size;
if (Pico.m.sram_status & SRS_EEPROM)
sram_size = 0x2000;
sram_data = SRam.data; sram_data = SRam.data;
} }
if (!sram_data) return 0; // SRam forcefully disabled for this game if (!sram_data) return 0; // SRam forcefully disabled for this game

5
gp2x/Makefile
View file

@ -64,8 +64,9 @@ OBJS += platform/common/emu.o platform/common/menu.o platform/common/fonts.o pla
ifeq "$(amalgamate)" "1" ifeq "$(amalgamate)" "1"
OBJS += ../../picoAll.o OBJS += ../../picoAll.o
else else
OBJS += pico/area.o pico/cart.o pico/memory.o pico/misc.o pico/pico.o pico/sek.o pico/z80if.o \ OBJS += pico/area.o pico/cart.o pico/memory.o pico/pico.o pico/sek.o pico/z80if.o \
pico/videoport.o pico/draw2.o pico/draw.o pico/mode4.o pico/sms.o pico/patch.o pico/debug.o pico/videoport.o pico/draw2.o pico/draw.o pico/mode4.o pico/sms.o \
pico/misc.o pico/eeprom.o pico/patch.o pico/debug.o
# Pico - CD # Pico - CD
OBJS += pico/cd/pico.o pico/cd/memory.o pico/cd/sek.o pico/cd/LC89510.o \ 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/cd_sys.o pico/cd/cd_file.o pico/cd/cue.o pico/cd/gfx_cd.o \

2
gp2x/emu.c
View file

@ -327,7 +327,7 @@ void pemu_update_display(const char *fps, const char *notice)
gp2x_video_setpalette(localPal, ret); gp2x_video_setpalette(localPal, ret);
} }
// a hack for VR // a hack for VR
if (PicoRead16Hook == PicoSVPRead16) if (PicoAHW & PAHW_SVP)
memset32((int *)(PicoDraw2FB+328*8+328*223), 0xe0e0e0e0, 328); memset32((int *)(PicoDraw2FB+328*8+328*223), 0xe0e0e0e0, 328);
// do actual copy // do actual copy
vidcpyM2(g_screen_ptr, PicoDraw2FB+328*8, vidcpyM2(g_screen_ptr, PicoDraw2FB+328*8,

6
linux/Makefile
View file

@ -32,9 +32,9 @@ OBJS += platform/gp2x/in_gp2x.o
endif endif
# Pico # Pico
OBJS += pico/area.o pico/cart.o pico/memory.o pico/misc.o pico/pico.o pico/sek.o \ OBJS += pico/area.o pico/cart.o pico/memory.o pico/pico.o pico/sek.o \
pico/videoport.o pico/draw2.o pico/draw.o pico/z80if.o pico/patch.o \ pico/videoport.o pico/draw2.o pico/draw.o pico/z80if.o pico/patch.o \
pico/mode4.o pico/sms.o pico/debug.o pico/mode4.o pico/sms.o pico/misc.o pico/eeprom.o pico/debug.o
# Pico - CD # Pico - CD
OBJS += pico/cd/pico.o pico/cd/memory.o pico/cd/sek.o pico/cd/LC89510.o \ 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/cd_sys.o pico/cd/cd_file.o pico/cd/cue.o pico/cd/gfx_cd.o \
@ -55,7 +55,7 @@ OBJS += unzip/unzip.o unzip/unzip_stream.o
ifeq "$(use_musashi)" "1" ifeq "$(use_musashi)" "1"
DEFINES += EMU_M68K DEFINES += EMU_M68K
OBJS += cpu/musashi/m68kops.o cpu/musashi/m68kcpu.o OBJS += cpu/musashi/m68kops.o cpu/musashi/m68kcpu.o
OBJS += cpu/musashi/m68kdasm.o #OBJS += cpu/musashi/m68kdasm.o
endif endif
ifeq "$(use_fame)" "1" ifeq "$(use_fame)" "1"
DEFINES += EMU_F68K DEFINES += EMU_F68K

1
linux/gp2x.c
View file

@ -425,6 +425,7 @@ void *gp2x_video_setpalette = gp2x_video_setpalette_;
void *gp2x_video_RGB_setscaling = do_nothing; void *gp2x_video_RGB_setscaling = do_nothing;
void *gp2x_video_wait_vsync = do_nothing; void *gp2x_video_wait_vsync = do_nothing;
void *gp2x_set_cpuclk = do_nothing; void *gp2x_set_cpuclk = do_nothing;
void *gp2x_read_battery = do_nothing;
void *set_lcd_custom_rate = do_nothing; void *set_lcd_custom_rate = do_nothing;
void *unset_lcd_custom_rate = do_nothing; void *unset_lcd_custom_rate = do_nothing;
void *set_lcd_gamma = do_nothing; void *set_lcd_gamma = do_nothing;

2
linux/port_config.h
View file

@ -26,7 +26,7 @@
#define SIMPLE_WRITE_SOUND 0 #define SIMPLE_WRITE_SOUND 0
#define mix_32_to_16l_stereo_lvl mix_32_to_16l_stereo #define mix_32_to_16l_stereo_lvl mix_32_to_16l_stereo
#define EL_LOGMASK (EL_ANOMALY|EL_STATUS|EL_UIO|EL_IDLE)//|EL_VDPDMA|EL_HVCNT|EL_ASVDP)//|EL_SVP) #define EL_LOGMASK (EL_ANOMALY|EL_STATUS|EL_UIO|EL_IDLE|EL_SRAMIO|EL_EEPROM)//|EL_VDPDMA|EL_HVCNT|EL_ASVDP)//|EL_SVP)
// EL_VDPDMA|EL_ASVDP|EL_SR) // |EL_BUSREQ|EL_Z80BNK) // EL_VDPDMA|EL_ASVDP|EL_SR) // |EL_BUSREQ|EL_Z80BNK)
//#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__)

2
pandora/emu.c
View file

@ -253,7 +253,7 @@ static void blit(const char *fps, const char *notice)
// gp2x_video_setpalette(localPal, 0x40); // gp2x_video_setpalette(localPal, 0x40);
} }
// a hack for VR // a hack for VR
if (PicoRead16Hook == PicoSVPRead16) if (PicoAHW & PAHW_SVP)
memset32((int *)(PicoDraw2FB+328*8+328*223), 0xe0e0e0e0, 328); memset32((int *)(PicoDraw2FB+328*8+328*223), 0xe0e0e0e0, 328);
// do actual copy // do actual copy
vidCpyM2((unsigned char *)g_screen_ptr+g_screen_width*8, PicoDraw2FB+328*8); vidCpyM2((unsigned char *)g_screen_ptr+g_screen_width*8, PicoDraw2FB+328*8);