diff options
| author | Andrew Cagney <cagney@redhat.com> | 1998-05-22 01:12:06 +0000 |
|---|---|---|
| committer | Andrew Cagney <cagney@redhat.com> | 1998-05-22 01:12:06 +0000 |
| commit | 56833aba592bcd020ef122c244cbfc697730bce9 (patch) | |
| tree | bb99f88b5ec683752f701606c91b4e2b9370a9de /sim/mn10300 | |
| parent | 5422c7498bcd5f0dee278cd08681e909f5f517ba (diff) | |
| download | fsf-binutils-gdb-56833aba592bcd020ef122c244cbfc697730bce9.zip fsf-binutils-gdb-56833aba592bcd020ef122c244cbfc697730bce9.tar.gz fsf-binutils-gdb-56833aba592bcd020ef122c244cbfc697730bce9.tar.bz2 | |
Back out of hw-main _callback -> _descriptor changes
Diffstat (limited to 'sim/mn10300')
| -rw-r--r-- | sim/mn10300/ChangeLog | 7 | ||||
| -rw-r--r-- | sim/mn10300/dv-mn103cpu.c | 12 | ||||
| -rw-r--r-- | sim/mn10300/dv-mn103int.c | 11 |
3 files changed, 12 insertions, 18 deletions
diff --git a/sim/mn10300/ChangeLog b/sim/mn10300/ChangeLog index 20eab28..de9e5ab 100644 --- a/sim/mn10300/ChangeLog +++ b/sim/mn10300/ChangeLog @@ -1,11 +1,4 @@ start-sanitize-am30 -Thu May 14 19:30:11 1998 Andrew Cagney <cagney@b1.cygnus.com> - - * dv-mn103cpu.c: Use struct hw_event. - * dv-mn103cpu.c, dv-mn103int.c: Don't include hw-base.h, include - hw-main.h - * dv-mn103cpu.c, dv-mn103int.c: Rename *_callback to *_method. - Wed May 6 13:29:06 1998 Andrew Cagney <cagney@b1.cygnus.com> * interp.c (sim_open): Create a polling PAL device. diff --git a/sim/mn10300/dv-mn103cpu.c b/sim/mn10300/dv-mn103cpu.c index 431c2bb..f85ea34 100644 --- a/sim/mn10300/dv-mn103cpu.c +++ b/sim/mn10300/dv-mn103cpu.c @@ -21,7 +21,7 @@ #include "sim-main.h" -#include "hw-main.h" +#include "hw-base.h" /* DEVICE @@ -107,7 +107,7 @@ struct mn103cpu_block { struct mn103cpu { struct mn103cpu_block block; - struct hw_event *pending_handler; + hw_event *pending_handler; int pending_level; int pending_nmi; int pending_reset; @@ -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_method mn103cpu_io_read_buffer; -static hw_io_write_buffer_method mn103cpu_io_write_buffer; -static hw_port_event_method mn103cpu_port_event; +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 void attach_mn103cpu_regs (struct hw *me, @@ -425,7 +425,7 @@ mn103cpu_io_write_buffer (struct hw *me, } -const struct hw_descriptor dv_mn103cpu_descriptor[] = { +const struct hw_device_descriptor dv_mn103cpu_descriptor[] = { { "mn103cpu", mn103cpu_finish, }, { NULL }, }; diff --git a/sim/mn10300/dv-mn103int.c b/sim/mn10300/dv-mn103int.c index f334d12..e8410e4 100644 --- a/sim/mn10300/dv-mn103int.c +++ b/sim/mn10300/dv-mn103int.c @@ -20,7 +20,8 @@ */ -#include "hw-main.h" +#include "sim-main.h" +#include "hw-base.h" /* DEVICE @@ -302,9 +303,9 @@ static const struct hw_port_descriptor mn103int_ports[] = { /* Finish off the partially created hw device. Attach our local callbacks. Wire up our port names etc */ -static hw_io_read_buffer_method mn103int_io_read_buffer; -static hw_io_write_buffer_method mn103int_io_write_buffer; -static hw_port_event_method mn103int_port_event; +static hw_io_read_buffer_callback mn103int_io_read_buffer; +static hw_io_write_buffer_callback mn103int_io_write_buffer; +static hw_port_event_callback mn103int_port_event; static void attach_mn103int_regs (struct hw *me, @@ -816,7 +817,7 @@ mn103int_io_write_buffer (struct hw *me, } -const struct hw_descriptor dv_mn103int_descriptor[] = { +const struct hw_device_descriptor dv_mn103int_descriptor[] = { { "mn103int", mn103int_finish, }, { NULL }, }; |