1.1 --- a/src/cpu.h	Mon Oct 08 11:52:13 2007 +0000
     1.2 +++ b/src/cpu.h	Fri Mar 28 12:32:25 2008 +0000
     1.3 @@ -1,5 +1,5 @@
     1.4  /**
     1.5 - * $Id: cpu.h,v 1.9 2007-10-08 11:50:15 nkeynes Exp $
     1.6 + * $Id$
     1.7   * 
     1.8   * Generic CPU definitions, primarily for providing information to the GUI.
     1.9   *
    1.10 @@ -19,9 +19,8 @@
    1.11  #ifndef dream_cpu_H
    1.12  #define dream_cpu_H 1
    1.13  
    1.14 -#include <stdint.h>
    1.15 -#include <stdlib.h>
    1.16 -#include <glib/gtypes.h>
    1.17 +#include "lxdream.h"
    1.18 +#include "mem.h"
    1.19  
    1.20  #ifdef __cplusplus
    1.21  extern "C" {
    1.22 @@ -58,8 +57,8 @@
    1.23      disasm_func_t disasm_func; /* Disassembly function */
    1.24      gboolean (*step_func)(); /* Single step function */
    1.25      int (*is_valid_page_func)(uint32_t); /* Test for valid memory page */
    1.26 -    void (*set_breakpoint)(uint32_t, int);
    1.27 -    gboolean (*clear_breakpoint)(uint32_t, int);
    1.28 +    void (*set_breakpoint)(uint32_t, breakpoint_type_t);
    1.29 +    gboolean (*clear_breakpoint)(uint32_t, breakpoint_type_t);
    1.30      int (*get_breakpoint)(uint32_t);
    1.31      size_t instr_size; /* Size of instruction */
    1.32      char *regs; /* Pointer to start of registers */