ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Whitespace cleanup in gtk_common_main

This commit is contained in:
riccardom 2009-04-23 20:34:27 +00:00
parent 05d9c1b169
commit f6c5dce881
1 changed files with 65 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

130
desmume/src/gtk/main.cpp
View File

@ -1508,82 +1508,82 @@ common_gtk_main( struct configured_features *my_config)
gint pStatusBar_Ctx; gint pStatusBar_Ctx;
#ifdef GDB_STUB #ifdef GDB_STUB
gdbstub_handle_t arm9_gdb_stub; gdbstub_handle_t arm9_gdb_stub;
gdbstub_handle_t arm7_gdb_stub; gdbstub_handle_t arm7_gdb_stub;
#endif #endif
struct armcpu_memory_iface *arm9_memio = &arm9_base_memory_iface; struct armcpu_memory_iface *arm9_memio = &arm9_base_memory_iface;
struct armcpu_memory_iface *arm7_memio = &arm7_base_memory_iface; struct armcpu_memory_iface *arm7_memio = &arm7_base_memory_iface;
struct armcpu_ctrl_iface *arm9_ctrl_iface; struct armcpu_ctrl_iface *arm9_ctrl_iface;
struct armcpu_ctrl_iface *arm7_ctrl_iface; struct armcpu_ctrl_iface *arm7_ctrl_iface;
/* the firmware settings */ /* the firmware settings */
struct NDS_fw_config_data fw_config; struct NDS_fw_config_data fw_config;
/* default the firmware settings, they may get changed later */ /* default the firmware settings, they may get changed later */
NDS_FillDefaultFirmwareConfigData( &fw_config); NDS_FillDefaultFirmwareConfigData( &fw_config);
/* use any language set on the command line */ /* use any language set on the command line */
if ( my_config->firmware_language != -1) { if ( my_config->firmware_language != -1) {
fw_config.language = my_config->firmware_language; fw_config.language = my_config->firmware_language;
} }
bad_glob_cflash_disk_image_file = my_config->cflash_disk_image_file; bad_glob_cflash_disk_image_file = my_config->cflash_disk_image_file;
#ifdef GDB_STUB #ifdef GDB_STUB
if ( my_config->arm9_gdb_port != 0) { if ( my_config->arm9_gdb_port != 0) {
arm9_gdb_stub = createStub_gdb( my_config->arm9_gdb_port, arm9_gdb_stub = createStub_gdb( my_config->arm9_gdb_port,
&arm9_memio, &arm9_memio,
&arm9_base_memory_iface); &arm9_base_memory_iface);
if ( arm9_gdb_stub == NULL) { if ( arm9_gdb_stub == NULL) {
g_printerr("Failed to create ARM9 gdbstub on port %d\n", g_printerr("Failed to create ARM9 gdbstub on port %d\n",
my_config->arm9_gdb_port); my_config->arm9_gdb_port);
exit( -1); exit( -1);
}
} }
if ( my_config->arm7_gdb_port != 0) { }
arm7_gdb_stub = createStub_gdb( my_config->arm7_gdb_port, if ( my_config->arm7_gdb_port != 0) {
arm7_gdb_stub = createStub_gdb( my_config->arm7_gdb_port,
&arm7_memio, &arm7_memio,
&arm7_base_memory_iface); &arm7_base_memory_iface);
if ( arm7_gdb_stub == NULL) { if ( arm7_gdb_stub == NULL) {
g_printerr("Failed to create ARM7 gdbstub on port %d\n", g_printerr("Failed to create ARM7 gdbstub on port %d\n",
my_config->arm7_gdb_port); my_config->arm7_gdb_port);
exit( -1); exit( -1);
}
} }
}
#endif #endif
/* FIXME: SDL_INIT_VIDEO is needed for joystick support to work!? /* FIXME: SDL_INIT_VIDEO is needed for joystick support to work!?
Perhaps it needs a "window" to catch events...? */ Perhaps it needs a "window" to catch events...? */
if(SDL_Init(SDL_INIT_TIMER|SDL_INIT_VIDEO) == -1) { if(SDL_Init(SDL_INIT_TIMER|SDL_INIT_VIDEO) == -1) {
g_printerr("Error trying to initialize SDL: %s\n", g_printerr("Error trying to initialize SDL: %s\n",
SDL_GetError()); SDL_GetError());
return 1; return 1;
} }
desmume_init( arm9_memio, &arm9_ctrl_iface, desmume_init( arm9_memio, &arm9_ctrl_iface,
arm7_memio, &arm7_ctrl_iface, arm7_memio, &arm7_ctrl_iface,
my_config->disable_sound); my_config->disable_sound);
/* /*
* Activate the GDB stubs * Activate the GDB stubs
* This has to come after the NDS_Init (called in desmume_init) * This has to come after the NDS_Init (called in desmume_init)
* where the cpus are set up. * where the cpus are set up.
*/ */
#ifdef GDB_STUB #ifdef GDB_STUB
if ( my_config->arm9_gdb_port != 0) { if ( my_config->arm9_gdb_port != 0) {
activateStub_gdb( arm9_gdb_stub, arm9_ctrl_iface); activateStub_gdb( arm9_gdb_stub, arm9_ctrl_iface);
} }
if ( my_config->arm7_gdb_port != 0) { if ( my_config->arm7_gdb_port != 0) {
activateStub_gdb( arm7_gdb_stub, arm7_ctrl_iface); activateStub_gdb( arm7_gdb_stub, arm7_ctrl_iface);
} }
#endif #endif
/* Create the dummy firmware */ /* Create the dummy firmware */
NDS_CreateDummyFirmware( &fw_config); NDS_CreateDummyFirmware( &fw_config);
/* Initialize joysticks */ /* Initialize joysticks */
if(!init_joy()) return 1; if(!init_joy()) return 1;
dTools_running = (BOOL*)malloc(sizeof(BOOL) * dTools_list_size); dTools_running = (BOOL*)malloc(sizeof(BOOL) * dTools_list_size);
if (dTools_running != NULL) if (dTools_running != NULL)
@ -1679,18 +1679,18 @@ common_gtk_main( struct configured_features *my_config)
//LoadFirmware("fw.bin"); //LoadFirmware("fw.bin");
gtk_fps_limiter_disabled = my_config->disable_limiter; gtk_fps_limiter_disabled = my_config->disable_limiter;
if ( !gtk_fps_limiter_disabled) { if ( !gtk_fps_limiter_disabled) {
/* create the semaphore used for fps limiting */ /* create the semaphore used for fps limiting */
fps_limiter_semaphore = SDL_CreateSemaphore( 1); fps_limiter_semaphore = SDL_CreateSemaphore( 1);
/* start a SDL timer for every FPS_LIMITER_FRAME_PERIOD frames to keep us at 60 fps */ /* start a SDL timer for every FPS_LIMITER_FRAME_PERIOD frames to keep us at 60 fps */
limiter_timer = SDL_AddTimer( 16 * FPS_LIMITER_FRAME_PERIOD, fps_limiter_fn, fps_limiter_semaphore); limiter_timer = SDL_AddTimer( 16 * FPS_LIMITER_FRAME_PERIOD, fps_limiter_fn, fps_limiter_semaphore);
if ( limiter_timer == NULL) { if ( limiter_timer == NULL) {
g_printerr("Error trying to start FPS limiter timer: %s\n", g_printerr("Error trying to start FPS limiter timer: %s\n",
SDL_GetError()); SDL_GetError());
return 1; return 1;
} }
} }
/* /*
@ -1704,9 +1704,9 @@ common_gtk_main( struct configured_features *my_config)
} }
#endif #endif
NDS_3D_ChangeCore(core); NDS_3D_ChangeCore(core);
if(my_config->engine_3d != 0 && gpu3D == &gpu3DNull){ if(my_config->engine_3d != 0 && gpu3D == &gpu3DNull) {
g_printerr("Failed to initialise openGL 3D emulation; " g_printerr("Failed to initialise openGL 3D emulation; "
"removing 3D support\n"); "removing 3D support\n");
} }
mmu_select_savetype(my_config->savetype, &backupmemorytype, &backupmemorysize); mmu_select_savetype(my_config->savetype, &backupmemorytype, &backupmemorysize);
@ -1739,14 +1739,14 @@ common_gtk_main( struct configured_features *my_config)
desmume_free(); desmume_free();
if ( !gtk_fps_limiter_disabled) { if ( !gtk_fps_limiter_disabled) {
/* tidy up the FPS limiter timer and semaphore */ /* tidy up the FPS limiter timer and semaphore */
SDL_RemoveTimer( limiter_timer); SDL_RemoveTimer( limiter_timer);
SDL_DestroySemaphore( fps_limiter_semaphore); SDL_DestroySemaphore( fps_limiter_semaphore);
} }
/* Unload joystick */ /* Unload joystick */
uninit_joy(); uninit_joy();
SDL_Quit(); SDL_Quit();
@ -1754,12 +1754,12 @@ common_gtk_main( struct configured_features *my_config)
g_free(config_file); g_free(config_file);
#ifdef GDB_STUB #ifdef GDB_STUB
if ( my_config->arm9_gdb_port != 0) { if ( my_config->arm9_gdb_port != 0) {
destroyStub_gdb( arm9_gdb_stub); destroyStub_gdb( arm9_gdb_stub);
} }
if ( my_config->arm7_gdb_port != 0) { if ( my_config->arm7_gdb_port != 0) {
destroyStub_gdb( arm7_gdb_stub); destroyStub_gdb( arm7_gdb_stub);
} }
#endif #endif
return EXIT_SUCCESS; return EXIT_SUCCESS;