This commit was generated by cvs2svn to track changes on a CVS vendor

[deliverable/binutils-gdb.git] / sim / mn10300 / dv-mn103cpu.c

diff --git a/sim/mn10300/dv-mn103cpu.c b/sim/mn10300/dv-mn103cpu.c
index cce89f4cc196201fe0b2c91d9162273159831384..17245a24b5ab63d1aca0624370c0ce374fdd3abe 100644 (file)
--- a/sim/mn10300/dv-mn103cpu.c
+++ b/sim/mn10300/dv-mn103cpu.c
@@ -1,4 +1,4 @@
-/*  This file is part of the program GDB, the GU debugger.
+/*  This file is part of the program GDB, the GNU debugger.
     
     Copyright (C) 1998 Free Software Foundation, Inc.
     Contributed by Cygnus Solutions.
@@ -21,7 +21,7 @@
 
 
 #include "sim-main.h"
-#include "hw-base.h"
+#include "hw-main.h"
 
 /* DEVICE
 
@@ -33,7 +33,7 @@
 
    
    Implements the external mn10300 functionality.  This includes the
-   delivery of of interrupts generated from other devices and the
+   delivery of interrupts generated from other devices and the
    handling of device specific registers.
 
 
@@ -72,7 +72,7 @@
    ack (output)
 
    Output signal indicating that the processor is delivering a level
-   interrupt.  The value passed with the event specfies the level of
+   interrupt.  The value passed with the event specifies the level of
    the interrupt being delivered.
 
 
@@ -128,7 +128,7 @@ enum {
 };
 
 
-/* input port ID's */
+/* output port ID's */
 
 enum {
   ACK_PORT,
@@ -151,9 +151,9 @@ static const struct hw_port_descriptor mn103cpu_ports[] = {
 /* Finish off the partially created hw device.  Attach our local
    callbacks.  Wire up our port names etc */
 
-static hw_io_read_buffer_callback mn103cpu_io_read_buffer;
-static hw_io_write_buffer_callback mn103cpu_io_write_buffer;
-static hw_port_event_callback mn103cpu_port_event;
+static hw_io_read_buffer_method mn103cpu_io_read_buffer;
+static hw_io_write_buffer_method mn103cpu_io_write_buffer;
+static hw_port_event_method mn103cpu_port_event;
 
 static void
 attach_mn103cpu_regs (struct hw *me,
@@ -425,7 +425,7 @@ mn103cpu_io_write_buffer (struct hw *me,
 }     
 
 
-const struct hw_device_descriptor dv_mn103cpu_descriptor[] = {
+const struct hw_descriptor dv_mn103cpu_descriptor[] = {
   { "mn103cpu", mn103cpu_finish, },
   { NULL },
 };