diff --git a/src/NDSSystem.cpp b/src/NDSSystem.cpp index 3b4984920..5a4a644db 100644 --- a/src/NDSSystem.cpp +++ b/src/NDSSystem.cpp @@ -476,7 +476,7 @@ void NDS_Reset( void) unsigned int i; u32 src; u32 dst; - FILE* inf; + FILE* inf = 0; NDS_header * header = NDS_getROMHeader(); if (!header) return ; @@ -550,7 +550,7 @@ void NDS_Reset( void) //_MMU_write32[ARMCPU_ARM9](0x02007FFC, 0xE92D4030); //ARM7 BIOS IRQ HANDLER - inf = fopen("BiosNds7.ROM","rb"); + //inf = fopen("BiosNds7.ROM","rb"); if(inf) { fread(MMU.ARM7_BIOS,1,16384,inf); fclose(inf); @@ -569,7 +569,7 @@ void NDS_Reset( void) } //ARM9 BIOS IRQ HANDLER - inf = fopen("BiosNds9.ROM","rb"); + //inf = fopen("BiosNds9.ROM","rb"); if(inf) { fread(ARM9Mem.ARM9_BIOS,1,4096,inf); fclose(inf); diff --git a/src/gtk-glade/dTools/callbacks_1_ioregs.cpp b/src/gtk-glade/dTools/callbacks_1_ioregs.cpp index c602ffa39..09ccbd72e 100755 --- a/src/gtk-glade/dTools/callbacks_1_ioregs.cpp +++ b/src/gtk-glade/dTools/callbacks_1_ioregs.cpp @@ -67,23 +67,23 @@ static u32 mem[NBR_IO_REGS]; static void update_regs_fast(){ char text[10]; - const char * mask; int i; u32 w, m; for( i = 0; i < NBR_IO_REGS; i++ ) { w = MMU_read32(cpu,Reg_Names_Addr[i].addr); m = mem[i]; if ( Reg_Names_Addr[i].trunc ) { - mask = " 0x%04X"; w &= 0xFFFF; m &= 0xFFFF; - } else { - mask = "0x%08X"; } mem[i] = w; if (w == m) continue; - sprintf(text, mask, w); + if ( Reg_Names_Addr[i].trunc ) + sprintf(text, " 0x%04lX", w); + else + sprintf(text, "0x%08lX", w); + dTools_display_select_attr(&dsp, 2); dTools_display_clear_char(&dsp, size_+3, i, 10); dTools_display_draw_text(&dsp, size_+3, i, text); @@ -93,7 +93,6 @@ static void update_regs_fast(){ static void update_regs() { char text[80]; - const char * mask; int len, i; if (init==FALSE) { @@ -115,9 +114,11 @@ static void update_regs() dTools_display_clear(&dsp); for( i = 0; i < NBR_IO_REGS; i++ ) { - mask = ( Reg_Names_Addr[i].trunc ) ? " 0x%04X" : "0x%08X"; mem[i] = MMU_read32(cpu,Reg_Names_Addr[i].addr); - sprintf(text, mask, mem[i]); + if ( Reg_Names_Addr[i].trunc ) + sprintf(text, " 0x%04lX", mem[i]); + else + sprintf(text, "0x%08lX", mem[i]); dTools_display_select_attr(&dsp, 0); dTools_display_draw_text(&dsp, 0, i, Reg_Names_Addr[i].name); diff --git a/src/gtk-glade/dTools/callbacks_2_memview.cpp b/src/gtk-glade/dTools/callbacks_2_memview.cpp index 539758141..fd44e6a22 100755 --- a/src/gtk-glade/dTools/callbacks_2_memview.cpp +++ b/src/gtk-glade/dTools/callbacks_2_memview.cpp @@ -183,6 +183,8 @@ gboolean on_wtools_2_draw_scroll_event (GtkWidget *widget, GdkEventScroll *event add_to_address(-STEP_ONE_PAGE); break; case GDK_SCROLL_DOWN: add_to_address(+STEP_ONE_PAGE); break; + case GDK_SCROLL_LEFT: + case GDK_SCROLL_RIGHT: default: break; }