From 8c2de2aa3372d27f5847aaceb8ad16aed7880e81 Mon Sep 17 00:00:00 2001 From: Joyce Janczyn Date: Wed, 10 Jun 1998 18:47:09 +0000 Subject: [PATCH] Wed June 10 14:34:00 1998 Joyce Janczyn * dv-mn103int.c (external_group): Use enumerated types to access correct group addresses. * dv-mn103tim.c (do_counter_event): Underflow of cascaded timer triggers an interrupt on the higher-numbered timer's port. --- sim/mn10300/ChangeLog | 8 ++++++++ sim/mn10300/dv-mn103int.c | 6 ++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/sim/mn10300/ChangeLog b/sim/mn10300/ChangeLog index 8854b2699d4..095054e6239 100644 --- a/sim/mn10300/ChangeLog +++ b/sim/mn10300/ChangeLog @@ -1,3 +1,11 @@ +start-sanitize-am30 +Wed June 10 14:34:00 1998 Joyce Janczyn + * dv-mn103int.c (external_group): Use enumerated types to access + correct group addresses. + * dv-mn103tim.c (do_counter_event): Underflow of cascaded timer + triggers an interrupt on the higher-numbered timer's port. + +end-sanitize-am30 Mon June 8 13:30:00 1998 Joyce Janczyn * interp.c: (mn10300_option_handler): New function parses arguments using sim-options. diff --git a/sim/mn10300/dv-mn103int.c b/sim/mn10300/dv-mn103int.c index 80781deadb6..3056331d6ae 100644 --- a/sim/mn10300/dv-mn103int.c +++ b/sim/mn10300/dv-mn103int.c @@ -197,10 +197,12 @@ enum { G21_PORT = 84, G22_PORT = 88, G23_PORT = 92, + IRQ0_PORT = G23_PORT, G24_PORT = 96, G25_PORT = 100, G26_PORT = 104, G27_PORT = 108, + IRQ4_PORT = G27_PORT, G28_PORT = 112, G29_PORT = 116, G30_PORT = 120, @@ -664,9 +666,9 @@ external_group (struct mn103int *controller, switch (offset) { case 0: - return &controller->group[16]; + return &controller->group[IRQ0_PORT/4]; case 1: - return &controller->group[20]; + return &controller->group[IRQ4_PORT/4]; default: return NULL; } -- 2.30.2