The-Homebrew-Cloud/uae-wii
2
0
Fork 0
mirror of https://github.com/Oibaf66/uae-wii.git synced 2024-11-22 02:29:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added real Cpu speed option, message info, makefile dist source

Browse Source
This commit is contained in:
fabio.olimpieri 2011-10-30 18:33:58 +00:00
parent cb8ac73b12
commit 5a42372c0f
5 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -14,5 +14,8 @@ clean:
dist: dist:
make dist -f Makefile.wii make dist -f Makefile.wii
distsource:
make distsource -f Makefile.wii

7
Makefile.wii
View File

@ -57,6 +57,7 @@ clean:
@echo Cleaning $(OBJ_DIR) @echo Cleaning $(OBJ_DIR)
@rm -rf $(OBJS) $(OBJ_DIR) src/machdep src/target.h src/md-fpp.h src/sysconfig.h $(SYMLINKS) @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 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 cd src/tools/ && make -f Makefile.wii clean
$(OBJ_DIR): $(OBJ_DIR):
@ -174,6 +175,12 @@ dist:uae.dol
cp docs/Joystick_mapping.txt $@/apps/uae/ cp docs/Joystick_mapping.txt $@/apps/uae/
cd $@ && tar -czf ../uae-wii-bin.tar.gz * 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: run:
wiiload uae.dol wiiload uae.dol

6
src/gui-sdl/gui-sdl.c
View File

@ -120,7 +120,7 @@ static const char *emulation_messages[] = {
/*00*/ "Emulation accuracy", /*00*/ "Emulation accuracy",
/*01*/ "^|Fast|Compatible|Cycle-exact", /*01*/ "^|Fast|Compatible|Cycle-exact",
/*02*/ "CPU to chipset speed", /*02*/ "CPU to chipset speed",
/*03*/ "^|max|90%|80%|60%|40%|20%|0%", /*03*/ "^|real|max|90%|80%|60%|40%|20%|0%",
/*04*/ "Framerate", /*04*/ "Framerate",
/*05*/ "^|100%|50%|33%|25%|12%|custom", /*05*/ "^|100%|50%|33%|25%|12%|custom",
/*06*/ "Floppy speed", /*06*/ "Floppy speed",
@ -146,7 +146,7 @@ static const char *graphic_messages[] = {
NULL 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 floppy_table[] = {100, 0, 400, 800};
static const int framerate_table[] = {1, 2, 3, 4, 8}; static const int framerate_table[] = {1, 2, 3, 4, 8};
@ -930,7 +930,7 @@ void gui_message (const char *format,...)
return; /* Deep trouble! */ return; /* Deep trouble! */
menu_init(screen); menu_init(screen);
} }
msgYesNo(msg, 0, 24, 24); msgInfo(msg, -1, NULL);
write_log (msg); write_log (msg);
} }

3
src/gui-sdl/menu.c
View File

@ -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)); 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"); 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); 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; return 1;

6
src/main.c
View File

@ -132,7 +132,11 @@ bool InitUSB()
bool isMounted = fatMountSimple("usb", &__io_usbstorage); bool isMounted = fatMountSimple("usb", &__io_usbstorage);
bool isInserted = __io_usbstorage.isInserted(); 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" // USB Drive may be "sleeeeping"
// We need to try Mounting a few times to wake it up // We need to try Mounting a few times to wake it up