1.1 --- a/src/aica/armcore.h	Tue Oct 09 08:12:29 2007 +0000
     1.2 +++ b/src/aica/armcore.h	Sun Jun 01 00:46:15 2008 +0000
     1.3 @@ -1,5 +1,5 @@
     1.4  /**
     1.5 - * $Id: armcore.h,v 1.15 2007-10-09 08:11:51 nkeynes Exp $
     1.6 + * $Id$
     1.7   * 
     1.8   * Interface definitions for the ARM CPU emulation core proper.
     1.9   *
    1.10 @@ -19,7 +19,8 @@
    1.11  #ifndef dream_armcore_H
    1.12  #define dream_armcore_H 1
    1.13  
    1.14 -#include "dream.h"
    1.15 +#include "lxdream.h"
    1.16 +#include "mem.h"
    1.17  #include <stdint.h>
    1.18  #include <stdio.h>
    1.19  
    1.20 @@ -88,8 +89,8 @@
    1.21  void arm_save_state( FILE *f );
    1.22  int arm_load_state( FILE *f );
    1.23  gboolean arm_execute_instruction( void );
    1.24 -void arm_set_breakpoint( uint32_t pc, int type );
    1.25 -gboolean arm_clear_breakpoint( uint32_t pc, int type );
    1.26 +void arm_set_breakpoint( uint32_t pc, breakpoint_type_t type );
    1.27 +gboolean arm_clear_breakpoint( uint32_t pc, breakpoint_type_t type );
    1.28  int arm_get_breakpoint( uint32_t pc );
    1.29  
    1.30  /* ARM Memory */