From 5a42372c0f4f04d087b19de62e6817699185b6e3 Mon Sep 17 00:00:00 2001
From: "fabio.olimpieri" <fabio.olimpieri@tin.it>
Date: Sun, 30 Oct 2011 18:33:58 +0000
Subject: [PATCH] Added real Cpu speed option, message info, makefile dist
 source

---
 Makefile              | 3 +++
 Makefile.wii          | 7 +++++++
 src/gui-sdl/gui-sdl.c | 6 +++---
 src/gui-sdl/menu.c    | 3 ++-
 src/main.c            | 6 +++++-
 5 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 7070384..c794eec 100644
--- a/Makefile
+++ b/Makefile
@@ -13,6 +13,9 @@ clean:
 
 dist:
 	make dist -f Makefile.wii
+	
+distsource:
+	make distsource -f Makefile.wii
 
 
 
diff --git a/Makefile.wii b/Makefile.wii
index 1a76db0..df77b31 100644
--- a/Makefile.wii
+++ b/Makefile.wii
@@ -57,6 +57,7 @@ clean:
 	@echo Cleaning $(OBJ_DIR)
 	@rm -rf $(OBJS) $(OBJ_DIR) src/machdep src/target.h src/md-fpp.h src/sysconfig.h $(SYMLINKS)
 	@rm -f src/blit.h src/blitfunc.c src/blitfunc.h src/blittable.c src/linetoscr.c
+	@rm -f uae.dol uae.elf
 	cd src/tools/ && make -f Makefile.wii clean
 
 $(OBJ_DIR):
@@ -173,6 +174,12 @@ dist:uae.dol
 	cp docs/configuration.txt $@/apps/uae/
 	cp docs/Joystick_mapping.txt $@/apps/uae/
 	cd $@ && tar -czf ../uae-wii-bin.tar.gz *
+	
+distsource:
+	cd .. && cp uae-wii uae-wii-v
+	cd ../uae-wii-v && find . -name ".svn" | xargs rm -rf
+	cd .. && tar -czf uae-wii-v.tar.gz uae-wii-v
+
 
 #---------------------------------------------------------------------------------
 run:
diff --git a/src/gui-sdl/gui-sdl.c b/src/gui-sdl/gui-sdl.c
index b4e04ca..2a6a934 100644
--- a/src/gui-sdl/gui-sdl.c
+++ b/src/gui-sdl/gui-sdl.c
@@ -120,7 +120,7 @@ static const char *emulation_messages[] = {
 		/*00*/		"Emulation accuracy",
 		/*01*/		"^|Fast|Compatible|Cycle-exact",
 		/*02*/		"CPU to chipset speed",
-		/*03*/		"^|max|90%|80%|60%|40%|20%|0%",
+		/*03*/		"^|real|max|90%|80%|60%|40%|20%|0%",
 		/*04*/		"Framerate",
 		/*05*/		"^|100%|50%|33%|25%|12%|custom",
 		/*06*/		"Floppy speed",
@@ -146,7 +146,7 @@ static const char *graphic_messages[] = {
 		NULL
 };
 
-static const int cpu_to_chipset_table[] = {-1,512*2,512*4, 512*8, 512*12, 512*16, 512*20};
+static const int cpu_to_chipset_table[] = {0,-1,512*2,512*4, 512*8, 512*12, 512*16, 512*20};
 static const int floppy_table[] = {100, 0, 400, 800};
 static const int framerate_table[] = {1, 2, 3, 4, 8};
 
@@ -930,7 +930,7 @@ void gui_message (const char *format,...)
     		   return; /* Deep trouble! */
     	   menu_init(screen);
        }
-       msgYesNo(msg, 0, 24, 24);
+       msgInfo(msg, -1, NULL);
 
        write_log (msg);
 }
diff --git a/src/gui-sdl/menu.c b/src/gui-sdl/menu.c
index aa99fd0..e2e6548 100644
--- a/src/gui-sdl/menu.c
+++ b/src/gui-sdl/menu.c
@@ -112,7 +112,8 @@ int msgInfo(char *text, int duration, SDL_Rect *irc)
 		SDL_FillRect(real_screen, &brc, SDL_MapRGB(real_screen->format, 0x00, 0x80, 0x00));
 		menu_print_font(real_screen, 0,0,0, FULL_DISPLAY_X/2-12, Y+42, "OK");
 		SDL_UpdateRect(real_screen, brc.x, brc.y, brc.w, brc.h);
-		menu_wait_key_press();
+		while (!(KEY_SELECT & menu_wait_key_press())) {}
+
 	}
 
 	return 1;
diff --git a/src/main.c b/src/main.c
index 1658a64..7526bc7 100644
--- a/src/main.c
+++ b/src/main.c
@@ -132,7 +132,11 @@ bool InitUSB()
 	bool isMounted = fatMountSimple("usb", &__io_usbstorage);
 	
 	bool isInserted = __io_usbstorage.isInserted();
-	if (!isInserted) return false; 
+	if (!isInserted) 
+	{
+	printf("USB device not found\n\n");
+	return false;
+	}
  
 	// USB Drive may be "sleeeeping" 
 	// We need to try Mounting a few times to wake it up