From 9839d126cc1cf782fad713f4fbc3611cba628ade Mon Sep 17 00:00:00 2001 From: notaz Date: Tue, 25 Sep 2007 20:56:01 +0000 Subject: [PATCH] giz renderers and stuff git-svn-id: file:///home/notaz/opt/svn/PicoDrive@261 be3aeb3a-fb24-0410-a615-afba39da0efa --- Pico/Draw.s | 115 ++++++++++++++----------------- platform/common/emu.c | 3 +- platform/gizmondo/asm_utils.h | 2 +- platform/gizmondo/asm_utils.s | 104 ++++++++++++++-------------- platform/gizmondo/emu.c | 126 ++++++++++++++++++++++++++++------ platform/gizmondo/giz.h | 6 +- platform/gizmondo/menu.c | 11 ++- platform/gizmondo/menu.h | 4 +- platform/gp2x/emu.c | 5 +- 9 files changed, 229 insertions(+), 147 deletions(-) diff --git a/Pico/Draw.s b/Pico/Draw.s index f00f69f9..3a3da814 100644 --- a/Pico/Draw.s +++ b/Pico/Draw.s @@ -1758,51 +1758,43 @@ FinalizeLineRGB555: .if UNALIGNED_DRAWLINEDEST @ unaligned versions of loops + @ warning: starts drawing 2bytes before dst .fl_RGB555u: - ldr r12, [r1], #4 - ldr r7, [r1], #4 - - and r4, lr, r12, lsl #1 - ldrh r4, [r3, r4] - and r5, lr, r12, lsr #7 - ldrh r5, [r3, r5] - strh r4, [r0], #2 - b .fl_loopRGB555u_enter + sub r0, r0, #2 @ initial adjustment + mov r8, #0 .fl_loopRGB555u: ldr r12, [r1], #4 ldr r7, [r1], #4 - and r4, lr, r12, lsl #1 - ldrh r4, [r3, r4] - and r5, lr, r12, lsr #7 + and r6, lr, r12,lsl #1 + ldrh r6, [r3, r6] + and r5, lr, r12,lsr #7 ldrh r5, [r3, r5] + orr r4, r8, r6, lsl #16 - orr r4, r8, r4, lsl #16 - str r4, [r0], #4 - -.fl_loopRGB555u_enter: - and r6, lr, r12, lsr #15 + and r6, lr, r12,lsr #15 ldrh r6, [r3, r6] - and r8, lr, r12, lsr #23 + and r8, lr, r12,lsr #23 ldrh r8, [r3, r8] - orr r4, r5, r6, lsl #16 + orr r5, r5, r6, lsl #16 - and r5, lr, r7, lsl #1 - ldrh r5, [r3, r5] - and r6, lr, r7, lsr #7 + and r6, lr, r7, lsl #1 ldrh r6, [r3, r6] - orr r5, r8, r5, lsl #16 - - and r12,lr, r7, lsr #15 + and r12,lr, r7, lsr #7 ldrh r12,[r3, r12] - and r8, lr, r7, lsr #23 + orr r6, r8, r6, lsl #16 + + and r8, lr, r7, lsr #15 ldrh r8, [r3, r8] - orr r6, r6, r12,lsl #16 + and r7, lr, r7, lsr #23 subs r2, r2, #1 - stmia r0!, {r4,r5,r6} + orr r12,r12,r8, lsl #16 + ldrh r8, [r3, r7] + + stmia r0!, {r4,r5,r6,r12} bne .fl_loopRGB555u strh r8, [r0], #2 @@ -1812,70 +1804,67 @@ FinalizeLineRGB555: .fl_32scale_RGB555u: + sub r0, r0, #2 @ initial adjustment + mov r4, #0 @ r9 f800 07e0 001f | e000 0780 001c | 3800 01e0 0007 .fl_loop32scale_RGB555u: ldr r12, [r1], #4 ldr r7, [r1], #4 - and r4, lr, r12,lsl #1 - ldrh r4, [r3, r4] + and r6, lr, r12,lsl #1 + ldrh r6, [r3, r6] and r5, lr, r12,lsr #7 ldrh r5, [r3, r5] - and r4, r4, r9, lsl #2 -@ orr r4, rx, r4, lsl #16 - str r4, [r0], #4 @ pix_d -1, 0 - -.fl_loop32scale_RGB555u_enter: - and r4, r9, r4, lsr #2 @ r4=1/4 pix_s 0 + and r6, r6, r9, lsl #2 + orr r4, r4, r6, lsl #16 @ r4 = pix_d -1, 0 and r5, r5, r9, lsl #2 - sub r6, r5, r5, lsr #2 @ r6 = 3/4 pix_s 1 - add r4, r6, r4, lsr #2 @ r4=(1/4 pix_s 0) + (3/4 pix_s 1) - orr r4, r4, r5, lsl #15 + sub r8, r5, r5, lsr #2 @ r8 = 3/4 pix_s 1 + add r6, r8, r6, lsr #2 @ r6 = (1/4 pix_s 0) + (3/4 pix_s 1) + orr r5, r6, r5, lsl #15 and r6, lr, r12,lsr #15 ldrh r6, [r3, r6] and r12,lr, r12,lsr #23 ldrh r12,[r3, r12] and r6, r6, r9, lsl #2 - add r4, r4, r6, lsl #15 @ pix_d 1, 2 - -@@ TODO... - - mov r5, r5, lsr #1 - sub r6, r6, r6, lsr #2 @ r6 = 3/4 pix_s 2 - orr r5, r5, r6, lsl #16 + add r5, r5, r6, lsl #15 @ r5 = pix_d 1, 2 - and r6, lr, r7, lsl #1 - ldrh r6, [r3, r6] + and r8, lr, r7, lsl #1 + ldrh r8, [r3, r8] + and r10,lr, r7, lsr #7 + ldrh r10,[r3, r10] and r12,r12,r9, lsl #2 - add r5, r5, r12,lsl #14 @ pix_d 2, 3 - and r6, r6, r9, lsl #2 - orr r6, r12,r6, lsl #16 @ pix_d 4, 5 + sub r6, r6, r6, lsr #2 @ r6 = 3/4 pix_s 2 + add r6, r6, r12,lsr #2 + orr r6, r6, r12,lsl #16 @ r6 = pix_d 3, 4 - and r12,lr, r7, lsr #7 + and r8, r8, r9, lsl #2 + and r10,r10,r9, lsl #2 + sub r12,r10,r10,lsr #2 @ r12 = 3/4 pix_s 5 + orr r8, r8, r8, lsl #14 + add r8, r8, r12,lsl #16 @ r8 = pix_d 5, 6 + and r12,lr, r7, lsr #15 ldrh r12,[r3, r12] - and r10,lr, r7, lsr #15 - ldrh r10,[r3, r10] - and r12,r12,r9, lsl #2 - sub r8, r12,r12,lsr #2 @ r8 = 3/4 pix_s 1 - add r8, r8, r6, lsr #18 and r7, lr, r7, lsr #23 ldrh r7, [r3, r7] - and r10,r10,r9, lsl #2 - orr r8, r8, r10,lsl #15 - add r8, r8, r12,lsl #15 @ pix_d 6, 7 - sub r10,r10,r10,lsr #2 @ r10= 3/4 pix_s 2 + and r12,r12,r9, lsl #2 + add r10,r10,r12 + mov r10,r10, lsr #1 + sub r12,r12,r12,lsr #2 @ r12 = 3/4 pix_s 6 + orr r10,r10,r12,lsl #16 and r7, r7, r9, lsl #2 - add r10,r10,r7, lsr #2 @ += 1/4 pix_s 3 - orr r10,r10,r7, lsl #16 @ pix_d 8, 9 + add r10,r10,r7, lsl #14 @ r10 = pix_d 7, 8 subs r2, r2, #1 stmia r0!, {r4,r5,r6,r8,r10} + mov r4, r7 bne .fl_loop32scale_RGB555u + strh r4, [r0], #2 + ldmfd sp!, {r9,r10} ldmfd sp!, {r4-r8,lr} bx lr diff --git a/platform/common/emu.c b/platform/common/emu.c index 99fca497..c236778f 100644 --- a/platform/common/emu.c +++ b/platform/common/emu.c @@ -446,12 +446,13 @@ int emu_ReadConfig(int game, int no_defaults) if (currentConfig.CPUclock < 10 || currentConfig.CPUclock > 4096) currentConfig.CPUclock = 200; if (currentConfig.gamma < 10 || currentConfig.gamma > 300) currentConfig.gamma = 100; if (currentConfig.volume < 0 || currentConfig.volume > 99) currentConfig.volume = 50; +#ifdef __GP2X__ // if volume keys are unbound, bind them to volume control if (!currentConfig.KeyBinds[23] && !currentConfig.KeyBinds[22]) { currentConfig.KeyBinds[23] = 1<<29; // vol up currentConfig.KeyBinds[22] = 1<<30; // vol down } - +#endif if (bread > 0) config_slot_current = config_slot; return (bread > 0); // == sizeof(currentConfig)); } diff --git a/platform/gizmondo/asm_utils.h b/platform/gizmondo/asm_utils.h index 271dbc17..b477524e 100644 --- a/platform/gizmondo/asm_utils.h +++ b/platform/gizmondo/asm_utils.h @@ -1,3 +1,3 @@ -void vidCpy8to16_40(void *dest, void *src, short *pal, int lines); +void vidCpy8to16(void *dest, void *src, short *pal, int lines_and_flags); diff --git a/platform/gizmondo/asm_utils.s b/platform/gizmondo/asm_utils.s index ec2d55bd..91e57109 100644 --- a/platform/gizmondo/asm_utils.s +++ b/platform/gizmondo/asm_utils.s @@ -1,32 +1,37 @@ @ vim:filetype=armasm -.global vidCpy8to16_40 @ void *dest, void *src, short *pal, int lines +.global vidCpy8to16 @ void *dest, void *src, short *pal, int lines|(is32col<<8) -vidCpy8to16_40: - stmfd sp!, {r4-r9,lr} +vidCpy8to16: + stmfd sp!, {r4-r8,lr} + tst r3, #0x100 + and r3, r3, #0xff mov r3, r3, lsr #1 orr r3, r3, r3, lsl #8 - orr r3, r3, #(320/8-1)<<24 + orreq r3, r3, #(320/8-1)<<24 @ 40 col mode + orrne r3, r3, #(256/8-1)<<24 @ 32 col mode + orrne r3, r3, #0x10000 + addne r0, r0, #32*2 add r1, r1, #8 mov lr, #0xff mov lr, lr, lsl #1 - @ even lines -vcloop_40_aligned: + @ even lines first +vcloop_aligned: ldr r12, [r1], #4 ldr r7, [r1], #4 - and r4, lr, r12, lsl #1 + and r4, lr, r12,lsl #1 ldrh r4, [r2, r4] - and r5, lr, r12, lsr #7 + and r5, lr, r12,lsr #7 ldrh r5, [r2, r5] - and r6, lr, r12, lsr #15 + and r6, lr, r12,lsr #15 ldrh r6, [r2, r6] orr r4, r4, r5, lsl #16 - and r5, lr, r12, lsr #23 + and r5, lr, r12,lsr #23 ldrh r5, [r2, r5] and r8, lr, r7, lsl #1 ldrh r8, [r2, r8] @@ -36,22 +41,26 @@ vcloop_40_aligned: ldrh r6, [r2, r6] and r12,lr, r7, lsr #15 ldrh r12,[r2, r12] - and r9, lr, r7, lsr #23 - ldrh r9, [r2, r9] + and r7, lr, r7, lsr #23 + ldrh r7, [r2, r7] orr r8, r8, r6, lsl #16 subs r3, r3, #1<<24 - orr r12,r12, r9, lsl #16 + orr r12,r12, r7, lsl #16 stmia r0!, {r4,r5,r8,r12} - bpl vcloop_40_aligned + bpl vcloop_aligned + tst r3, #0x10000 add r1, r1, #336 @ skip a line and 1 col - add r0, r0, #320*2+2*2 - add r3, r3, #(320/8)<<24 + addne r1, r1, #64 @ skip more for 32col mode + add r0, r0, #(320+2)*2 + addne r0, r0, #64*2 + addeq r3, r3, #(320/8)<<24 + addne r3, r3, #(256/8)<<24 sub r3, r3, #1 tst r3, #0xff - bne vcloop_40_aligned + bne vcloop_aligned and r4, r3, #0xff00 orr r3, r3, r4, lsr #8 @@ -65,18 +74,10 @@ vcloop_40_aligned: mul r4, r5, r6 sub r1, r1, r4 -vcloop_40_unaligned_outer: - ldr r12, [r1], #4 - ldr r7, [r1], #4 - - and r4, lr, r12, lsl #1 - ldrh r4, [r2, r4] - and r5, lr, r12, lsr #7 - ldrh r5, [r2, r5] - strh r4, [r0], #2 - b vcloop_40_unaligned_enter + sub r0, r0, #2 + mov r8, #0 -vcloop_40_unaligned: +vcloop_unaligned: ldr r12, [r1], #4 ldr r7, [r1], #4 @@ -84,44 +85,47 @@ vcloop_40_unaligned: ldrh r6, [r2, r6] and r5, lr, r12, lsr #7 ldrh r5, [r2, r5] - orr r4, r4, r6, lsl #16 - str r4, [r0], #4 + orr r4, r8, r6, lsl #16 -vcloop_40_unaligned_enter: and r6, lr, r12, lsr #15 ldrh r6, [r2, r6] - - and r4, lr, r12, lsr #23 - ldrh r4, [r2, r4] + and r8, lr, r12, lsr #23 + ldrh r8, [r2, r8] orr r5, r5, r6, lsl #16 - and r8, lr, r7, lsl #1 - ldrh r8, [r2, r8] - and r6, lr, r7, lsr #7 + and r6, lr, r7, lsl #1 ldrh r6, [r2, r6] - orr r8, r4, r8, lsl #16 - - and r12,lr, r7, lsr #15 + and r12,lr, r7, lsr #7 ldrh r12,[r2, r12] + orr r6, r8, r6, lsl #16 + + and r8, lr, r7, lsr #15 + ldrh r8, [r2, r8] - and r4, lr, r7, lsr #23 - ldrh r4, [r2, r4] - orr r12,r6, r12,lsl #16 subs r3, r3, #1<<24 + and r7, lr, r7, lsr #23 + orr r12,r12,r8, lsl #16 + + ldrh r8, [r2, r7] - stmia r0!, {r5,r8,r12} - bpl vcloop_40_unaligned + stmia r0!, {r4,r5,r6,r12} + bpl vcloop_unaligned - strh r4, [r0], #2 + strh r8, [r0] + mov r8, #0 + tst r3, #0x10000 add r1, r1, #336 @ skip a line and 1 col - add r0, r0, #320*2+2*2 - add r3, r3, #(320/8)<<24 + addne r1, r1, #64 @ skip more for 32col mode + add r0, r0, #(320+2)*2 + addne r0, r0, #64*2 + addeq r3, r3, #(320/8)<<24 + addne r3, r3, #(256/8)<<24 sub r3, r3, #1 tst r3, #0xff - bne vcloop_40_unaligned_outer + bne vcloop_unaligned - ldmfd sp!, {r4-r9,lr} + ldmfd sp!, {r4-r8,lr} bx lr diff --git a/platform/gizmondo/emu.c b/platform/gizmondo/emu.c index 0828f3c1..8a575564 100644 --- a/platform/gizmondo/emu.c +++ b/platform/gizmondo/emu.c @@ -32,7 +32,6 @@ unsigned char *PicoDraw2FB = gfx_buffer; // temporary buffer for alt renderer ( int reset_timing = 0; static DWORD noticeMsgTime = 0; -static int osd_fps_x; static void blit(const char *fps, const char *notice); @@ -63,8 +62,14 @@ static void emu_msg_cb(const char *msg) static void emu_state_cb(const char *str) { + if (giz_screen == NULL) + giz_screen = Framework2D_LockBuffer(); + clearArea(0); blit("", str); + + Framework2D_UnlockBuffer(); + giz_screen = NULL; } static void emu_msg_tray_open(void) @@ -117,7 +122,7 @@ void emu_setDefaultConfig(void) { memset(¤tConfig, 0, sizeof(currentConfig)); currentConfig.lastRomFile[0] = 0; - currentConfig.EmuOpt = 0x1f | 0x600; // | confirm_save, cd_leds + currentConfig.EmuOpt = 0x1f | 0x680; // | confirm_save, cd_leds, 16bit rend currentConfig.PicoOpt = 0x0f | 0xc00; // | cd_pcm, cd_cdda currentConfig.PsndRate = 22050; currentConfig.PicoRegion = 0; // auto @@ -132,6 +137,7 @@ void emu_setDefaultConfig(void) currentConfig.KeyBinds[ 6] = 1<<5; currentConfig.KeyBinds[ 7] = 1<<6; currentConfig.KeyBinds[ 4] = 1<<7; + currentConfig.KeyBinds[13] = 1<<26; // switch rend currentConfig.KeyBinds[ 8] = 1<<27; // save state currentConfig.KeyBinds[ 9] = 1<<28; // load state currentConfig.KeyBinds[12] = 1<<29; // vol up @@ -177,28 +183,50 @@ void log1(void *p1, void *p2) } */ -short localPal[0x100]; -static void (*vidCpy8to16)(void *dest, void *src, short *pal, int lines) = NULL; +static void cd_leds(void) +{ + static int old_reg = 0; + unsigned int col_g, col_r, *p; + + if (!((Pico_mcd->s68k_regs[0] ^ old_reg) & 3)) return; // no change + old_reg = Pico_mcd->s68k_regs[0]; + + p = (unsigned int *)((short *)giz_screen + 321*2+4+2); + col_g = (old_reg & 2) ? 0x06000600 : 0; + col_r = (old_reg & 1) ? 0xc000c000 : 0; + *p++ = col_g; *p++ = col_g; p+=2; *p++ = col_r; *p++ = col_r; p += 321/2 - 12/2 + 1; + *p++ = col_g; p+=3; *p++ = col_r; p += 321/2 - 10/2; + *p++ = col_g; *p++ = col_g; p+=2; *p++ = col_r; *p++ = col_r; +} + + +static short localPal[0x100]; static void blit(const char *fps, const char *notice) { int emu_opt = currentConfig.EmuOpt; - if (PicoOpt&0x10) { + if (PicoOpt&0x10) + { + int lines_flags = 224; // 8bit fast renderer if (Pico.m.dirtyPal) { Pico.m.dirtyPal = 0; vidConvCpyRGB565(localPal, Pico.cram, 0x40); } - vidCpy8to16((unsigned short *)giz_screen+321*8, PicoDraw2FB+328*8, localPal, 224); - } else if (!(emu_opt&0x80)) { + if (!(Pico.video.reg[12]&1)) lines_flags|=0x100; + vidCpy8to16((unsigned short *)giz_screen+321*8, PicoDraw2FB+328*8, localPal, lines_flags); + } + else if (!(emu_opt&0x80)) + { + int lines_flags; // 8bit accurate renderer if (Pico.m.dirtyPal) { Pico.m.dirtyPal = 0; vidConvCpyRGB565(localPal, Pico.cram, 0x40); if (Pico.video.reg[0xC]&8) { // shadow/hilight mode //vidConvCpyRGB32sh(localPal+0x40, Pico.cram, 0x40); - //vidConvCpyRGB32hi(localPal+0x80, Pico.cram, 0x40); // TODO + //vidConvCpyRGB32hi(localPal+0x80, Pico.cram, 0x40); // TODO? blockcpy(localPal+0xc0, localPal+0x40, 0x40*2); localPal[0xc0] = 0x0600; localPal[0xd0] = 0xc000; @@ -211,18 +239,19 @@ static void blit(const char *fps, const char *notice) vidConvCpyRGB565(localPal+0x80, HighPal+0x40, 0x40); } */ } - // TODO... - vidCpy8to16((unsigned short *)giz_screen+321*8, PicoDraw2FB+328*8, localPal, 224); + lines_flags = (Pico.video.reg[1]&8) ? 240 : 224; + if (!(Pico.video.reg[12]&1)) lines_flags|=0x100; + vidCpy8to16((unsigned short *)giz_screen+321*8, PicoDraw2FB+328*8, localPal, lines_flags); } if (notice || (emu_opt & 2)) { int h = 232; if (notice) osd_text(4, h, notice); - if (emu_opt & 2) osd_text(osd_fps_x, h, fps); + if (emu_opt & 2) osd_text(OSD_FPS_X, h, fps); } -// if ((emu_opt & 0x400) && (PicoMCD & 1)) -// cd_leds(); + if ((emu_opt & 0x400) && (PicoMCD & 1)) + cd_leds(); } // clears whole screen or just the notice area (in all buffers) @@ -273,6 +302,59 @@ void emu_forcedFrame(void) // TODO } +static void RunEvents(unsigned int which) +{ + if (which & 0x1800) { // save or load (but not both) + int do_it = 1; + if ( emu_checkSaveFile(state_slot) && + (( (which & 0x1000) && (currentConfig.EmuOpt & 0x800)) || // load + (!(which & 0x1000) && (currentConfig.EmuOpt & 0x200))) ) { // save + int keys; + blit("", (which & 0x1000) ? "LOAD STATE? (PLAY=yes, STOP=no)" : "OVERWRITE SAVE? (PLAY=yes, STOP=no)"); + while( !((keys = Framework_PollGetButtons()) & (BTN_PLAY|BTN_STOP)) ) + Sleep(50); + if (keys & BTN_STOP) do_it = 0; + clearArea(0); + } + if (do_it) { + osd_text(4, 232, (which & 0x1000) ? "LOADING GAME" : "SAVING GAME"); + PicoStateProgressCB = emu_state_cb; + emu_SaveLoadGame((which & 0x1000) >> 12, 0); + PicoStateProgressCB = NULL; + } + + reset_timing = 1; + } + if (which & 0x0400) { // switch renderer + if ( PicoOpt&0x10) { PicoOpt&=~0x10; currentConfig.EmuOpt |= 0x80; } + else if (!(currentConfig.EmuOpt&0x80)) PicoOpt|= 0x10; + else currentConfig.EmuOpt &= ~0x80; + + vidResetMode(); + + if (PicoOpt&0x10) { + strcpy(noticeMsg, " 8bit fast renderer"); + } else if (currentConfig.EmuOpt&0x80) { + strcpy(noticeMsg, "16bit accurate renderer"); + } else { + strcpy(noticeMsg, " 8bit accurate renderer"); + } + + noticeMsgTime = GetTickCount(); + } + if (which & 0x0300) { + if(which&0x0200) { + state_slot -= 1; + if(state_slot < 0) state_slot = 9; + } else { + state_slot += 1; + if(state_slot > 9) state_slot = 0; + } + sprintf(noticeMsg, "SAVE SLOT %i [%s]", state_slot, emu_checkSaveFile(state_slot) ? "USED" : "FREE"); + noticeMsgTime = GetTickCount(); + } +} + static void updateKeys(void) { unsigned int keys, allActions[2] = { 0, 0 }, events; @@ -333,7 +415,7 @@ static void updateKeys(void) } events &= ~prevEvents; - //if (events) RunEvents(events); // TODO + if (events) RunEvents(events); if (movie_data) emu_updateMovie(); prevEvents = (allActions[0] | allActions[1]) >> 16; @@ -341,6 +423,16 @@ static void updateKeys(void) static void simpleWait(DWORD until) { + DWORD tval; + int diff; + + tval = GetTickCount(); + diff = (int)until - (int)tval; + if (diff >= 2) + Sleep(diff - 1); + + while ((tval = GetTickCount()) < until && until - tval < 512) // some simple overflow detection + spend_cycles(1024*2); } void emu_Loop(void) @@ -423,11 +515,6 @@ void emu_Loop(void) // check for mode changes modes = ((Pico.video.reg[12]&1)<<2)|(Pico.video.reg[1]&8); if (modes != oldmodes) { - osd_fps_x = OSD_FPS_X; - //if (modes & 4) - vidCpy8to16 = vidCpy8to16_40; - //else - // vidCpy8to16 = vidCpy8to16_32col; oldmodes = modes; clearArea(1); } @@ -525,7 +612,6 @@ void emu_Loop(void) Framework2D_UnlockBuffer(); giz_screen = NULL; } - //lprintf("after unlock\n"); // check time tval = GetTickCount(); diff --git a/platform/gizmondo/giz.h b/platform/gizmondo/giz.h index 478f6021..660db6d0 100644 --- a/platform/gizmondo/giz.h +++ b/platform/gizmondo/giz.h @@ -17,6 +17,10 @@ void lprintf_al(const char *fmt, ...); #define BTN_REW (1 << FRAMEWORK_BUTTON_REWIND) #define BTN_L (1 << FRAMEWORK_BUTTON_LEFT_SHOULDER) #define BTN_R (1 << FRAMEWORK_BUTTON_RIGHT_SHOULDER) -#define BTN_HOME (1 << FRAMEWORK_BUTTON_HOME) +#define BTN_HOME (1 << FRAMEWORK_BUTTON_HOME) +#define BTN_VOLUME (1 << FRAMEWORK_BUTTON_VOLUME) +#define BTN_BRIGHTNESS (1 << FRAMEWORK_BUTTON_BRIGHTNESS) +#define BTN_ALARM (1 << FRAMEWORK_BUTTON_ALARM) +#define BTN_POWER (1 << FRAMEWORK_BUTTON_POWER) diff --git a/platform/gizmondo/menu.c b/platform/gizmondo/menu.c index d8fb1563..ff1a3daa 100644 --- a/platform/gizmondo/menu.c +++ b/platform/gizmondo/menu.c @@ -33,7 +33,7 @@ #define gizKeyUnkn "???" static const char * const gizKeyNames[] = { "LEFT", "RIGHT", "UP", "DOWN", "STOP", "PLAY", "FORWARD", "REWIND", - "LEFT_SHOULDER", "RIGHT_SHOULDER", "HOME", "VOLUME", "BRIGHTNESS", "ALARM", "POWER", gizKeyUnkn, + "L", "R", "HOME", "VOLUME", "BRIGHTNESS", "ALARM", "POWER", gizKeyUnkn, gizKeyUnkn, gizKeyUnkn, gizKeyUnkn, gizKeyUnkn, gizKeyUnkn, gizKeyUnkn, gizKeyUnkn, gizKeyUnkn, gizKeyUnkn, gizKeyUnkn, gizKeyUnkn, gizKeyUnkn, gizKeyUnkn, gizKeyUnkn, gizKeyUnkn, gizKeyUnkn }; @@ -683,13 +683,13 @@ static void draw_key_config(const bind_action_t *opts, int opt_cnt, int player_i if (sel < opt_cnt) { text_out16(30, 180, "Press a button to bind/unbind"); - text_out16(30, 190, "Use SELECT to clear"); - text_out16(30, 200, "To bind UP/DOWN, hold SELECT"); + text_out16(30, 190, "Use HOME to clear"); + text_out16(30, 200, "To bind UP/DOWN, hold HOME"); text_out16(30, 210, "Select \"Done\" to exit"); } else { text_out16(30, 190, "Use Options -> Save cfg"); text_out16(30, 200, "to save controls"); - text_out16(30, 210, "Press B or X to exit"); + text_out16(30, 210, "Press PLAY or STOP to exit"); } menu_draw_end(); } @@ -702,7 +702,7 @@ static void key_config_loop(const bind_action_t *opts, int opt_cnt, int player_i for (;;) { draw_key_config(opts, opt_cnt, player_idx, sel); - inp = wait_for_input(CONFIGURABLE_KEYS); + inp = wait_for_input(CONFIGURABLE_KEYS|BTN_HOME); if (!(inp & BTN_HOME)) { prev_select = 0; if(inp & BTN_UP ) { sel--; if (sel < 0) sel = menu_sel_max; continue; } @@ -777,7 +777,6 @@ static bind_action_t emuctrl_actions[] = { "Switch Renderer", 1<<26 }, { "Volume Down ", 1<<30 }, { "Volume Up ", 1<<29 }, - { "Enter Menu ", 1<<23 }, }; static void kc_sel_loop(void) diff --git a/platform/gizmondo/menu.h b/platform/gizmondo/menu.h index 7784da9e..d4e96bef 100644 --- a/platform/gizmondo/menu.h +++ b/platform/gizmondo/menu.h @@ -10,8 +10,8 @@ int menu_loop_tray(void); void menu_romload_prepare(const char *rom_name); void menu_romload_end(void); -// TODO: add more? + #define CONFIGURABLE_KEYS \ (BTN_UP|BTN_DOWN|BTN_LEFT|BTN_RIGHT|BTN_STOP|BTN_PLAY|BTN_FWD|BTN_REW| \ - BTN_L|BTN_R) + BTN_L|BTN_R|BTN_VOLUME|BTN_BRIGHTNESS|BTN_ALARM) diff --git a/platform/gp2x/emu.c b/platform/gp2x/emu.c index 63b2d047..8bd1b66a 100644 --- a/platform/gp2x/emu.c +++ b/platform/gp2x/emu.c @@ -229,10 +229,9 @@ void osd_text(int x, int y, const char *text) static void cd_leds(void) { - // mmu problems? // static int old_reg; -// if (!((Pico_mcd->s68k_regs[0] ^ old_reg) & 3)) return; // no change +// if (!((Pico_mcd->s68k_regs[0] ^ old_reg) & 3)) return; // no change // mmu hack problems? old_reg = Pico_mcd->s68k_regs[0]; if ((PicoOpt&0x10)||!(currentConfig.EmuOpt&0x80)) { @@ -252,7 +251,7 @@ static void cd_leds(void) unsigned int col_r = (old_reg & 1) ? 0xc000c000 : 0; *p++ = col_g; *p++ = col_g; p+=2; *p++ = col_r; *p++ = col_r; p += 320/2 - 12/2; *p++ = col_g; *p++ = col_g; p+=2; *p++ = col_r; *p++ = col_r; p += 320/2 - 12/2; - *p++ = col_g; *p++ = col_g; p+=2; *p++ = col_r; *p++ = col_r; p += 320/2 - 12/2; + *p++ = col_g; *p++ = col_g; p+=2; *p++ = col_r; *p++ = col_r; } } -- 2.39.5