import gdb-19990422 snapshot

[deliverable/binutils-gdb.git] / sim / i960 / devices.c

diff --git a/sim/i960/devices.c b/sim/i960/devices.c
index d34e6720201c30a8c2977469db68a22677354864..0a475691adf3004004bea419ac0b453387d0751e 100644 (file)
--- a/sim/i960/devices.c
+++ b/sim/i960/devices.c
@@ -32,10 +32,8 @@ device i960_devices;
 int
 device_io_read_buffer (device *me, void *source, int space,
                       address_word addr, unsigned nr_bytes,
-                      SIM_CPU *cpu, sim_cia cia)
+                      SIM_DESC sd, SIM_CPU *cpu, sim_cia cia)
 {
-  SIM_DESC sd = CPU_STATE (cpu);
-
   if (STATE_ENVIRONMENT (sd) != OPERATING_ENVIRONMENT)
     return nr_bytes;
 
@@ -70,10 +68,8 @@ device_io_read_buffer (device *me, void *source, int space,
 int
 device_io_write_buffer (device *me, const void *source, int space,
                        address_word addr, unsigned nr_bytes,
-                       SIM_CPU *cpu, sim_cia cia)
+                       SIM_DESC sd, SIM_CPU *cpu, sim_cia cia)
 {
-  SIM_DESC sd = CPU_STATE (cpu);
-
 #if WITH_SCACHE
   /* MSPR support is deprecated but is kept in for upward compatibility
      with existing overlay support.  */
@@ -105,4 +101,7 @@ device_io_write_buffer (device *me, const void *source, int space,
   return nr_bytes;
 }
 
-void device_error () {}
+void
+device_error (device *me, char *message, ...)
+{
+}