--- upstream/dynamips-0.2.6-RC5/dev_sb1_io.c	2007/10/06 16:09:07	6
+++ upstream/dynamips-0.2.7-RC1/dev_sb1_io.c	2007/10/06 16:23:47	7
@@ -1,5 +1,5 @@
 /*
- * Cisco 7200 (Predator) simulation platform.
+ * Cisco router simulation platform.
  * Copyright (c) 2005 Christophe Fillot (cf@utc.fr)
  *
  * SB-1 I/O devices.
@@ -18,7 +18,8 @@
 
 #include "utils.h"
 #include "ptask.h"
-#include "mips64.h"
+#include "cpu.h"
+#include "vm.h"
 #include "dynamips.h"
 #include "memory.h"
 #include "device.h"
@@ -112,7 +113,7 @@
 /*
  * dev_sb1_io_access()
  */
-void *dev_sb1_io_access(cpu_mips_t *cpu,struct vdevice *dev,
+void *dev_sb1_io_access(cpu_gen_t *cpu,struct vdevice *dev,
                         m_uint32_t offset,u_int op_size,u_int op_type,
                         m_uint64_t *data)
 {
@@ -256,10 +257,10 @@
       default:
          if (op_type == MTS_READ) {
             cpu_log(cpu,"SB1_IO","read from addr 0x%x, pc=0x%llx\n",
-                    offset,cpu->pc);
+                    offset,cpu_get_pc(cpu));
          } else {
             cpu_log(cpu,"SB1_IO","write to addr 0x%x, value=0x%llx, "
-                    "pc=0x%llx\n",offset,*data,cpu->pc);
+                    "pc=0x%llx\n",offset,*data,cpu_get_pc(cpu));
          }
 #endif
    }