From 7789349f9aecd55c94d5b9c00bca908a872d6a08 Mon Sep 17 00:00:00 2001 From: notaz Date: Wed, 21 Mar 2007 22:59:44 +0000 Subject: [PATCH] buggy port of gfx/cd, silpheed started working? git-svn-id: file:///home/notaz/opt/svn/PicoDrive/platform@73 be3aeb3a-fb24-0410-a615-afba39da0efa --- gp2x/menu.c | 14 ++++++++------ linux/Makefile | 2 +- linux/port_config.h | 4 ++-- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/gp2x/menu.c b/gp2x/menu.c index 5cab760..d424152 100644 --- a/gp2x/menu.c +++ b/gp2x/menu.c @@ -744,8 +744,9 @@ static void draw_cd_menu_options(int menu_sel, char *b_us, char *b_eu, char *b_j 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&0x0800)?"ON":"OFF"); // 4 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 (slow) %s", (currentConfig.PicoOpt&0x2000)?"ON":"OFF"); // 6 - gp2x_text_out8(tl_x, (y+=10), "ReadAhead buffer %s", ra_buff); // 7 + gp2x_text_out8(tl_x, (y+=10), "ReadAhead buffer %s", ra_buff); // 6 + gp2x_text_out8(tl_x, (y+=10), "Scale/Rot. fx (buggy,slow) %s", (currentConfig.PicoOpt&0x1000)?"ON":"OFF"); // 7 + gp2x_text_out8(tl_x, (y+=10), "Better sync (slow) %s", (currentConfig.PicoOpt&0x2000)?"ON":"OFF"); // 8 gp2x_text_out8(tl_x, (y+=10), "Done"); // draw cursor @@ -761,7 +762,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) { - int menu_sel = 0, menu_sel_max = 8; + int menu_sel = 0, menu_sel_max = 9; unsigned long inp = 0; char bios_us[32], bios_eu[32], bios_jp[32], *bios, *p; @@ -791,8 +792,7 @@ static void cd_menu_loop_options(void) case 3: currentConfig.EmuOpt ^=0x0400; break; case 4: currentConfig.PicoOpt^=0x0800; break; case 5: currentConfig.PicoOpt^=0x0400; break; - case 6: currentConfig.PicoOpt^=0x2000; break; - case 7: + case 6: if (inp & GP2X_LEFT) { PicoCDBuffers >>= 1; if (PicoCDBuffers < 64) PicoCDBuffers = 0; @@ -802,7 +802,9 @@ static void cd_menu_loop_options(void) if (PicoCDBuffers > 4096) PicoCDBuffers = 4096; } break; - case 8: return; + case 7: currentConfig.PicoOpt^=0x1000; break; + case 8: currentConfig.PicoOpt^=0x2000; break; + case 9: return; } } if(inp & (GP2X_X|GP2X_A)) return; diff --git a/linux/Makefile b/linux/Makefile index 88d8735..0b8c37b 100644 --- a/linux/Makefile +++ b/linux/Makefile @@ -66,7 +66,7 @@ tidy: PicoDrive : $(OBJS) @echo $@ - @$(GCC) $(COPT) $(OBJS) ../gp2x/helix/helix_mp3_x86.a $(LDFLAGS) -lm -o $@ + @$(GCC) $(COPT) $(OBJS) ../gp2x/helix/helix_mp3_x86.a $(LDFLAGS) -lm -Wl,-Map=PicoDrive.map -o $@ ../../cpu/mz80/mz80.o : ../../cpu/mz80/mz80.asm diff --git a/linux/port_config.h b/linux/port_config.h index e5c88bb..a0a855a 100644 --- a/linux/port_config.h +++ b/linux/port_config.h @@ -12,8 +12,8 @@ // pico.c #define CAN_HANDLE_240_LINES 1 -#define dprintf(f,...) printf("%05i:%03i: " f "\n",Pico.m.frame_count,Pico.m.scanline,##__VA_ARGS__) -//#define dprintf(x...) +//#define dprintf(f,...) printf("%05i:%03i: " f "\n",Pico.m.frame_count,Pico.m.scanline,##__VA_ARGS__) +#define dprintf(x...) #endif //PORT_CONFIG_H -- 2.39.2