1.1 --- a/src/gui/gui.c	Sun Dec 25 03:35:08 2005 +0000
     1.2 +++ b/src/gui/gui.c	Sun Dec 25 05:57:00 2005 +0000
     1.3 @@ -1,3 +1,21 @@
     1.4 +/**
     1.5 + * $Id: gui.c,v 1.8 2005-12-25 05:57:00 nkeynes Exp $
     1.6 + * 
     1.7 + * Top-level GUI (GTK2) module.
     1.8 + *
     1.9 + * Copyright (c) 2005 Nathan Keynes.
    1.10 + *
    1.11 + * This program is free software; you can redistribute it and/or modify
    1.12 + * it under the terms of the GNU General Public License as published by
    1.13 + * the Free Software Foundation; either version 2 of the License, or
    1.14 + * (at your option) any later version.
    1.15 + *
    1.16 + * This program is distributed in the hope that it will be useful,
    1.17 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
    1.18 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    1.19 + * GNU General Public License for more details.
    1.20 + */
    1.21 +
    1.22  #include <stdlib.h>
    1.23  #include <stdarg.h>
    1.24  #include <gnome.h>
    1.25 @@ -5,8 +23,8 @@
    1.26  #include "dream.h"
    1.27  #include "dreamcast.h"
    1.28  #include "mem.h"
    1.29 -#include "sh4dasm.h"
    1.30 -#include "sh4core.h"
    1.31 +#include "sh4/sh4dasm.h"
    1.32 +#include "aica/armdasm.h"
    1.33  #include "gui/gui.h"
    1.34  
    1.35  #define REGISTER_FONT "-*-fixed-medium-r-normal--12-*-*-*-*-*-iso8859-1"
    1.36 @@ -23,7 +41,7 @@
    1.37  void gtk_gui_update( void );
    1.38  void gtk_gui_start( void );
    1.39  void gtk_gui_stop( void );
    1.40 -int gtk_gui_run_slice( int microsecs );
    1.41 +uint32_t gtk_gui_run_slice( uint32_t nanosecs );
    1.42  
    1.43  struct dreamcast_module gtk_gui_module = { "Debugger", gtk_gui_init,
    1.44  					   gtk_gui_update, gtk_gui_start, 
    1.45 @@ -88,12 +106,12 @@
    1.46      gtk_gui_update();
    1.47  }
    1.48  
    1.49 -int gtk_gui_run_slice( int microsecs ) 
    1.50 +uint32_t gtk_gui_run_slice( uint32_t nanosecs ) 
    1.51  {
    1.52      while( gtk_events_pending() )
    1.53  	gtk_main_iteration();
    1.54      update_icount(main_debug);
    1.55 -    return microsecs;
    1.56 +    return nanosecs;
    1.57  }
    1.58  
    1.59  void gtk_gui_update(void) {