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

1.20 release

Browse source 
git-svn-id: file:///home/notaz/opt/svn/PicoDrive/platform@57 be3aeb3a-fb24-0410-a615-afba39da0efa
This commit is contained in:
notaz 2007-02-25 23:04:33 +00:00
parent 4ffd28584e
commit dccc2bd01c
4 changed files with 22 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

8
gp2x/emu.c
View file

@ -424,8 +424,6 @@ static void romfname_ext(char *dst, const char *prefix, const char *ext)
dst[511-8] = 0; dst[511-8] = 0;
if (dst[strlen(dst)-4] == '.') dst[strlen(dst)-4] = 0; if (dst[strlen(dst)-4] == '.') dst[strlen(dst)-4] = 0;
if (ext) strcat(dst, ext); if (ext) strcat(dst, ext);
printf("romfname_ext: %s\n", dst);
} }
@ -973,9 +971,9 @@ void emu_forced_frame(void)
PicoOpt = po_old; PicoOpt = po_old;
if (!(Pico.video.reg[12]&1)) { if (!(Pico.video.reg[12]&1)) {
vidCpyM2 = vidCpyM2_40col; vidCpyM2 = vidCpyM2_32col;
clearArea(1); clearArea(1);
} else vidCpyM2 = vidCpyM2_32col; } else vidCpyM2 = vidCpyM2_40col;
vidCpyM2((unsigned char *)gp2x_screen+320*8, framebuff+328*8); vidCpyM2((unsigned char *)gp2x_screen+320*8, framebuff+328*8);
vidConvCpyRGB32(localPal, Pico.cram, 0x40); vidConvCpyRGB32(localPal, Pico.cram, 0x40);
@ -1369,8 +1367,10 @@ int emu_SaveLoadGame(int load, int sram)
// make save filename // make save filename
saveFname = emu_GetSaveFName(load, sram, state_slot); saveFname = emu_GetSaveFName(load, sram, state_slot);
if (saveFname == NULL) { if (saveFname == NULL) {
if (!sram) {
strcpy(noticeMsg, load ? "LOAD FAILED (missing file)" : "SAVE FAILED "); strcpy(noticeMsg, load ? "LOAD FAILED (missing file)" : "SAVE FAILED ");
gettimeofday(&noticeMsgTime, 0); gettimeofday(&noticeMsgTime, 0);
}
return -1; return -1;
} }

18
gp2x/menu.c
View file

@ -688,9 +688,10 @@ static void draw_cd_menu_options(int menu_sel, char *b_us, char *b_eu, char *b_j
gp2x_text_out8(tl_x, y, "USA BIOS: %s", b_us); // 0 gp2x_text_out8(tl_x, y, "USA BIOS: %s", b_us); // 0
gp2x_text_out8(tl_x, (y+=10), "EUR BIOS: %s", b_eu); // 1 gp2x_text_out8(tl_x, (y+=10), "EUR BIOS: %s", b_eu); // 1
gp2x_text_out8(tl_x, (y+=10), "JAP BIOS: %s", b_jp); // 2 gp2x_text_out8(tl_x, (y+=10), "JAP BIOS: %s", b_jp); // 2
gp2x_text_out8(tl_x, (y+=10), "CD LEDs %s", (currentConfig.EmuOpt &0x400)?"ON":"OFF"); // 3 gp2x_text_out8(tl_x, (y+=10), "CD LEDs %s", (currentConfig.EmuOpt &0x0400)?"ON":"OFF"); // 3
gp2x_text_out8(tl_x, (y+=10), "CDDA audio (using mp3s) %s", (currentConfig.PicoOpt&0x800)?"ON":"OFF"); // 4 gp2x_text_out8(tl_x, (y+=10), "CDDA audio (using mp3s) %s", (currentConfig.PicoOpt&0x0800)?"ON":"OFF"); // 4
gp2x_text_out8(tl_x, (y+=10), "PCM audio %s", (currentConfig.PicoOpt&0x400)?"ON":"OFF"); // 5 gp2x_text_out8(tl_x, (y+=10), "PCM audio %s", (currentConfig.PicoOpt&0x0400)?"ON":"OFF"); // 5
gp2x_text_out8(tl_x, (y+=10), "Better sync (very slow) %s", (currentConfig.PicoOpt&0x2000)?"ON":"OFF"); // 6
gp2x_text_out8(tl_x, (y+=10), "Done"); gp2x_text_out8(tl_x, (y+=10), "Done");
// draw cursor // draw cursor
@ -706,7 +707,7 @@ static void draw_cd_menu_options(int menu_sel, char *b_us, char *b_eu, char *b_j
static void cd_menu_loop_options(void) static void cd_menu_loop_options(void)
{ {
int menu_sel = 0, menu_sel_max = 6; int menu_sel = 0, menu_sel_max = 7;
unsigned long inp = 0; unsigned long inp = 0;
char bios_us[32], bios_eu[32], bios_jp[32], *bios, *p; char bios_us[32], bios_eu[32], bios_jp[32], *bios, *p;
@ -733,10 +734,11 @@ static void cd_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 3: currentConfig.EmuOpt ^=0x400; break; case 3: currentConfig.EmuOpt ^=0x0400; break;
case 4: currentConfig.PicoOpt^=0x800; break; case 4: currentConfig.PicoOpt^=0x0800; break;
case 5: currentConfig.PicoOpt^=0x400; break; case 5: currentConfig.PicoOpt^=0x0400; break;
case 6: return; case 6: currentConfig.PicoOpt^=0x2000; break;
case 7: return;
} }
} }
if(inp & (GP2X_X|GP2X_A)) return; if(inp & (GP2X_X|GP2X_A)) return;

2
gp2x/version.h
View file

@ -1,2 +1,2 @@
#define VERSION "1.15" #define VERSION "1.20"

5
linux/gp2x.c
View file

@ -260,6 +260,11 @@ void gp2x_video_RGB_setscaling(int W, int H)
{ {
} }
void gp2x_memcpy_buffers(int buffers, void *data, int offset, int len)
{
memcpy((char *)gp2x_screen + offset, data, len);
}
void gp2x_memcpy_all_buffers(void *data, int offset, int len) void gp2x_memcpy_all_buffers(void *data, int offset, int len)
{ {
memcpy((char *)gp2x_screen + offset, data, len); memcpy((char *)gp2x_screen + offset, data, len);