Source-Changes-HG archive

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

[src/trunk]: src/sys/arch/evbarm/dev Fix shaddowed declarations of cn_trapped.



details:   https://anonhg.NetBSD.org/src/rev/a88e77f61e46
branches:  trunk
changeset: 581733:a88e77f61e46
user:      rearnsha <rearnsha%NetBSD.org@localhost>
date:      Sat Jun 04 13:38:08 2005 +0000

description:
Fix shaddowed declarations of cn_trapped.

diffstat:

 sys/arch/evbarm/dev/plcom.c |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (35 lines):

diff -r afbca1ee6886 -r a88e77f61e46 sys/arch/evbarm/dev/plcom.c
--- a/sys/arch/evbarm/dev/plcom.c       Sat Jun 04 13:35:05 2005 +0000
+++ b/sys/arch/evbarm/dev/plcom.c       Sat Jun 04 13:38:08 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: plcom.c,v 1.9 2003/08/07 16:27:20 agc Exp $    */
+/*     $NetBSD: plcom.c,v 1.10 2005/06/04 13:38:08 rearnsha Exp $      */
 
 /*-
  * Copyright (c) 2001 ARM Ltd
@@ -101,7 +101,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: plcom.c,v 1.9 2003/08/07 16:27:20 agc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: plcom.c,v 1.10 2005/06/04 13:38:08 rearnsha Exp $");
 
 #include "opt_plcom.h"
 #include "opt_ddb.h"
@@ -1815,7 +1815,7 @@
                                        bus_space_write_1(iot, ioh, plcom_ecr,
                                            0);
                                if (ISSET(rsr, RSR_BE)) {
-                                       int cn_trapped = 0;
+                                       cn_trapped = 0;
                                        cn_check_magic(sc->sc_tty->t_dev,
                                            CNC_BREAK, plcom_cnm_state);
                                        if (cn_trapped)
@@ -1830,6 +1830,7 @@
                                }
 
                                put[1] = rsr;
+                               cn_trapped = 0;
                                cn_check_magic(sc->sc_tty->t_dev,
                                               put[0], plcom_cnm_state);
                                if (cn_trapped) {



Home | Main Index | Thread Index | Old Index