* dv-m68hc11eepr.c (m68hc11eepr_info): Fix print of current write

address.
	(m68hc11eepr_port_event): Fix detach/attach logic.
This commit is contained in:
Stephane Carrez 2001-07-28 19:19:05 +00:00
parent f9e2d83049
commit eefde3513e
2 changed files with 11 additions and 5 deletions

View file

@ -1,3 +1,9 @@
2001-07-28 Stephane Carrez <Stephane.Carrez@worldnet.fr>
* dv-m68hc11eepr.c (m68hc11eepr_info): Fix print of current write
address.
(m68hc11eepr_port_event): Fix detach/attach logic.
2001-07-22 Stephane Carrez <Stephane.Carrez@worldnet.fr> 2001-07-22 Stephane Carrez <Stephane.Carrez@worldnet.fr>
* Makefile.in (SIM_OBJS): Remove sim-resume.o * Makefile.in (SIM_OBJS): Remove sim-resume.o

View file

@ -1,5 +1,5 @@
/* dv-m68hc11eepr.c -- Simulation of the 68HC11 Internal EEPROM. /* dv-m68hc11eepr.c -- Simulation of the 68HC11 Internal EEPROM.
Copyright (C) 1999, 2000 Free Software Foundation, Inc. Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
Written by Stephane Carrez (stcarrez@worldnet.fr) Written by Stephane Carrez (stcarrez@worldnet.fr)
(From a driver model Contributed by Cygnus Solutions.) (From a driver model Contributed by Cygnus Solutions.)
@ -269,10 +269,10 @@ m68hc11eepr_port_event (struct hw *me,
The EEPROM CONFIG register is still enabled and can be programmed The EEPROM CONFIG register is still enabled and can be programmed
for a next configuration (taken into account only after a reset, for a next configuration (taken into account only after a reset,
see Motorola spec). */ see Motorola spec). */
if (cpu->ios[M6811_CONFIG] & M6811_EEON) if (!(cpu->ios[M6811_CONFIG] & M6811_EEON))
{ {
if (controller->mapped) if (controller->mapped)
hw_attach_address (hw_parent (me), M6811_EEPROM_LEVEL, hw_detach_address (hw_parent (me), M6811_EEPROM_LEVEL,
controller->attach_space, controller->attach_space,
controller->base_address, controller->base_address,
controller->size - 1, controller->size - 1,
@ -282,7 +282,7 @@ m68hc11eepr_port_event (struct hw *me,
else else
{ {
if (!controller->mapped) if (!controller->mapped)
hw_detach_address (hw_parent (me), M6811_EEPROM_LEVEL, hw_attach_address (hw_parent (me), M6811_EEPROM_LEVEL,
controller->attach_space, controller->attach_space,
controller->base_address, controller->base_address,
controller->size - 1, controller->size - 1,
@ -368,7 +368,7 @@ m68hc11eepr_info (struct hw *me)
sim_io_printf (sd, " Programming CONFIG register "); sim_io_printf (sd, " Programming CONFIG register ");
else else
sim_io_printf (sd, " Programming: 0x%04x ", sim_io_printf (sd, " Programming: 0x%04x ",
controller->eeprom_waddr); controller->eeprom_waddr + controller->base_address);
sim_io_printf (sd, "with 0x%02x\n", sim_io_printf (sd, "with 0x%02x\n",
controller->eeprom_wbyte); controller->eeprom_wbyte);