daily update

[external/binutils.git] / sim / m32r / devices.c

diff --git a/sim/m32r/devices.c b/sim/m32r/devices.c
index d706869..085a14d 100644 (file)
--- a/sim/m32r/devices.c
+++ b/sim/m32r/devices.c
@@ -1,22 +1,21 @@
 /* m32r device support
-   Copyright (C) 1997, 1998 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1998, 2007, 2008, 2009 Free Software Foundation, Inc.
    Contributed by Cygnus Solutions.
 
 This file is part of GDB, the GNU debugger.
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
+the Free Software Foundation; either version 3 of the License, or
+(at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
-You should have received a copy of the GNU General Public License along
-with this program; if not, write to the Free Software Foundation, Inc.,
-59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "sim-main.h"
 
@@ -32,10 +31,8 @@ device m32r_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 +67,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 +100,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, ...)
+{
+}