Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/sgimips/sgimips Back out hasty previous commit -- b...



details:   https://anonhg.NetBSD.org/src/rev/65572c42a103
branches:  trunk
changeset: 557580:65572c42a103
user:      sekiya <sekiya%NetBSD.org@localhost>
date:      Mon Jan 12 12:50:07 2004 +0000

description:
Back out hasty previous commit -- bitwise arithmetic does not always match
integer arithmetic, as demonstrated in this case.

diffstat:

 sys/arch/sgimips/sgimips/ip2x.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 33b2c0518fab -r 65572c42a103 sys/arch/sgimips/sgimips/ip2x.c
--- a/sys/arch/sgimips/sgimips/ip2x.c   Mon Jan 12 12:32:00 2004 +0000
+++ b/sys/arch/sgimips/sgimips/ip2x.c   Mon Jan 12 12:50:07 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ip2x.c,v 1.7 2004/01/12 11:53:31 sekiya Exp $  */
+/*     $NetBSD: ip2x.c,v 1.8 2004/01/12 12:50:07 sekiya Exp $  */
 
 /*
  * Copyright (c) 2001, 2002 Rafal K. Boni
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip2x.c,v 1.7 2004/01/12 11:53:31 sekiya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip2x.c,v 1.8 2004/01/12 12:50:07 sekiya Exp $");
 
 #include "opt_cputype.h"
 #include "opt_machtypes.h"
@@ -242,7 +242,7 @@
 
        ret = 0;
        mstat = bus_space_read_4(iot, ioh, INT2_MAP_STATUS);
-       mmask = bus_space_read_4(iot, ioh, INT2_MAP_MASK0 | (which << 2));
+       mmask = bus_space_read_4(iot, ioh, INT2_MAP_MASK0 + (which << 2));
 
        mstat &= mmask;
 



Home | Main Index | Thread Index | Old Index