1.1 --- a/src/aica/audio.c	Mon Jul 21 00:37:13 2008 +0000
     1.2 +++ b/src/aica/audio.c	Mon Jul 21 01:01:39 2008 +0000
     1.3 @@ -118,8 +118,10 @@
     1.4      } else if( audio_set_driver( audio_driver ) == FALSE ) {
     1.5          ERROR( "Failed to initialize audio driver '%s', using null driver", 
     1.6                  audio_driver->name );
     1.7 +        audio_driver = &audio_null_driver;
     1.8          audio_set_driver( &audio_null_driver );
     1.9 -    }    
    1.10 +    }
    1.11 +    return audio_driver;
    1.12  }
    1.13  
    1.14  /**

     2.1 --- a/src/aica/audio.h	Mon Jul 21 00:37:13 2008 +0000
     2.2 +++ b/src/aica/audio.h	Mon Jul 21 01:01:39 2008 +0000
     2.3 @@ -102,6 +102,11 @@
     2.4  gboolean audio_set_driver( audio_driver_t driver );
     2.5  
     2.6  /**
     2.7 + * Initialize the audio driver, using the specified driver if available.
     2.8 + */
     2.9 +audio_driver_t audio_init_driver( const char *preferred_driver );
    2.10 +
    2.11 +/**
    2.12   * Mark the current write buffer as full and prepare the next buffer for
    2.13   * writing. Returns the next buffer to write to.
    2.14   * If all buffers are full, returns NULL.

     3.1 --- a/src/config.c	Mon Jul 21 00:37:13 2008 +0000
     3.2 +++ b/src/config.c	Mon Jul 21 01:01:39 2008 +0000
     3.3 @@ -135,7 +135,7 @@
     3.4      lxdream_set_config_value(&global_config[key], value);
     3.5  }
     3.6  
     3.7 -const lxdream_config_entry_t lxdream_get_config_entry( int key )
     3.8 +const struct lxdream_config_entry * lxdream_get_config_entry( int key )
     3.9  {
    3.10      return &global_config[key];
    3.11  }

     4.1 --- a/src/config.h	Mon Jul 21 00:37:13 2008 +0000
     4.2 +++ b/src/config.h	Mon Jul 21 01:01:39 2008 +0000
     4.3 @@ -59,7 +59,7 @@
     4.4  
     4.5  /* Global config values */
     4.6  const gchar *lxdream_get_config_value( int key );
     4.7 -const lxdream_config_entry_t lxdream_get_config_entry( int key );
     4.8 +const struct lxdream_config_entry * lxdream_get_config_entry( int key );
     4.9  
    4.10  void lxdream_set_global_config_value( int key, const gchar *value );
    4.11  void lxdream_set_config_value( lxdream_config_entry_t entry, const gchar *value );

     5.1 --- a/src/drivers/osx_iokit.c	Mon Jul 21 00:37:13 2008 +0000
     5.2 +++ b/src/drivers/osx_iokit.c	Mon Jul 21 01:01:39 2008 +0000
     5.3 @@ -20,9 +20,11 @@
     5.4   */
     5.5  
     5.6  #include <glib/gmem.h>
     5.7 +#include <glib/gstrfuncs.h>
     5.8  #include <sys/param.h>
     5.9  #include <paths.h>
    5.10  #include <string.h>
    5.11 +#include <unistd.h>
    5.12  #include <stdio.h>
    5.13  #include <fcntl.h>
    5.14  #include <CoreFoundation/CFRunLoop.h>
    5.15 @@ -261,6 +263,7 @@
    5.16          IOObjectRelease(object);
    5.17      }
    5.18      IOObjectRelease(iterator);
    5.19 +    return 0;
    5.20  }
    5.21  
    5.22  
    5.23 @@ -341,6 +344,7 @@
    5.24          ERROR( "IOServiceAddMatchingNotification failed" );
    5.25      }
    5.26      osx_hid_inserted(NULL, iokit_iterators[2]);
    5.27 +    return TRUE;
    5.28  }
    5.29  
    5.30  void osx_unregister_iokit_notifications()

     6.1 --- a/src/gdrom/cdi.c	Mon Jul 21 00:37:13 2008 +0000
     6.2 +++ b/src/gdrom/cdi.c	Mon Jul 21 01:01:39 2008 +0000
     6.3 @@ -19,6 +19,7 @@
     6.4  #include <stdlib.h>
     6.5  #include <stdio.h>
     6.6  #include <stdint.h>
     6.7 +#include <string.h>
     6.8  #include <fcntl.h>
     6.9  #include <errno.h>
    6.10  #include <sys/stat.h>

     7.1 --- a/src/gdrom/gdi.c	Mon Jul 21 00:37:13 2008 +0000
     7.2 +++ b/src/gdrom/gdi.c	Mon Jul 21 01:01:39 2008 +0000
     7.3 @@ -19,6 +19,7 @@
     7.4  #include <stdlib.h>
     7.5  #include <stdio.h>
     7.6  #include <stdint.h>
     7.7 +#include <string.h>
     7.8  #include <fcntl.h>
     7.9  #include <errno.h>
    7.10  #include <sys/stat.h>

     8.1 --- a/src/gdrom/gdimage.c	Mon Jul 21 00:37:13 2008 +0000
     8.2 +++ b/src/gdrom/gdimage.c	Mon Jul 21 01:01:39 2008 +0000
     8.3 @@ -17,6 +17,7 @@
     8.4   */
     8.5  
     8.6  #include <assert.h>
     8.7 +#include <stdlib.h>
     8.8  #include <string.h>
     8.9  #include <netinet/in.h>
    8.10  

     9.1 --- a/src/gdrom/gdrom.c	Mon Jul 21 00:37:13 2008 +0000
     9.2 +++ b/src/gdrom/gdrom.c	Mon Jul 21 01:01:39 2008 +0000
     9.3 @@ -31,7 +31,7 @@
     9.4  
     9.5  DEFINE_HOOK( gdrom_disc_change_hook, gdrom_disc_change_hook_t )
     9.6  
     9.7 -gdrom_fire_disc_changed( gdrom_disc_t disc )
     9.8 +static void gdrom_fire_disc_changed( gdrom_disc_t disc )
     9.9  {
    9.10      CALL_HOOKS( gdrom_disc_change_hook, disc, disc == NULL ? NULL : disc->name );
    9.11  }

    10.1 --- a/src/main.c	Mon Jul 21 00:37:13 2008 +0000
    10.2 +++ b/src/main.c	Mon Jul 21 01:01:39 2008 +0000
    10.3 @@ -22,12 +22,14 @@
    10.4  #include <getopt.h>
    10.5  #include "gettext.h"
    10.6  #include "lxdream.h"
    10.7 -#include "syscall.h"
    10.8  #include "mem.h"
    10.9  #include "dreamcast.h"
   10.10 +#include "dream.h"
   10.11  #include "display.h"
   10.12 +#include "gui.h"
   10.13 +#include "gdlist.h"
   10.14 +#include "syscall.h"
   10.15  #include "loader.h"
   10.16 -#include "gui.h"
   10.17  #include "aica/audio.h"
   10.18  #include "gdrom/gdrom.h"
   10.19  #include "maple/maple.h"
   10.20 @@ -210,7 +212,7 @@
   10.21      }
   10.22      mem_set_trace( trace_regions, TRUE );
   10.23  
   10.24 -    audio_init_driver( audio_driver_name, 44100, AUDIO_FMT_16ST );
   10.25 +    audio_init_driver( audio_driver_name );
   10.26  
   10.27      headless = display_driver_name != NULL && strcasecmp( display_driver_name, "null" ) == 0;
   10.28      if( headless ) {

    11.1 --- a/src/sh4/sh4core.h	Mon Jul 21 00:37:13 2008 +0000
    11.2 +++ b/src/sh4/sh4core.h	Mon Jul 21 01:01:39 2008 +0000
    11.3 @@ -161,6 +161,8 @@
    11.4  void TMU_save_state( FILE * );
    11.5  int TMU_load_state( FILE * );
    11.6  void TMU_update_clocks( void );
    11.7 +uint32_t sh4_translate_run_slice(uint32_t);
    11.8 +uint32_t sh4_emulate_run_slice(uint32_t);
    11.9  
   11.10  /* SH4 instruction support methods */
   11.11  void sh4_sleep( void );