filename | src/sh4/intc.c |
changeset | 114:1cc849575bc7 |
prev | 31:495e480360d7 |
next | 157:fbe03268ad8a |
author | nkeynes |
date | Fri Mar 17 12:12:49 2006 +0000 (16 years ago) |
permissions | -rw-r--r-- |
last change | Fix intc_clear_interrupt being able to signal a new interrupt even if interrupts are blocked (oops) |
file | annotate | diff | log | raw |
1.1 --- a/src/sh4/intc.c Sun Dec 25 08:24:11 2005 +00001.2 +++ b/src/sh4/intc.c Fri Mar 17 12:12:49 2006 +00001.3 @@ -1,5 +1,5 @@1.4 /**1.5 - * $Id: intc.c,v 1.4 2005-12-25 08:24:11 nkeynes Exp $1.6 + * $Id: intc.c,v 1.5 2006-03-17 12:12:49 nkeynes Exp $1.7 *1.8 * SH4 onboard interrupt controller (INTC) implementation1.9 *1.10 @@ -141,10 +141,7 @@1.11 intc_pending[i] = intc_pending[++i];1.12 }1.13 intc_num_pending--;1.14 - if( intc_num_pending == 0 )1.15 - sh4r.int_pending = 0;1.16 - else1.17 - sh4r.int_pending = PRIORITY(intc_pending[intc_num_pending-1]);1.18 + intc_mask_changed();1.19 break;1.20 }1.21 }1.22 @@ -155,14 +152,6 @@1.23 {1.24 assert(intc_num_pending > 0);1.25 return INTCODE(intc_pending[intc_num_pending-1]);1.26 - /*1.27 - intc_num_pending--;1.28 - if( intc_num_pending > 0 )1.29 - sh4r.int_pending = PRIORITY(intc_pending[intc_num_pending-1]);1.30 - else1.31 - sh4r.int_pending = 0;1.32 - return INTCODE(intc_pending[intc_num_pending]);1.33 - */1.34 }1.36 void intc_mask_changed( void )
.