Sun May 20 07:57:34 2012 UTC ()
DOH.  Replace a line that got accidently deleted in the last commit.


(skrll)
diff -r1.36 -r1.37 src/sys/arch/evbarm/dev/plcom.c
cvs diff -r1.36 -r1.37 src/sys/arch/evbarm/dev/plcom.c (expand / switch to unified diff)

--- src/sys/arch/evbarm/dev/plcom.c 2012/05/20 07:54:40 1.36
+++ src/sys/arch/evbarm/dev/plcom.c 2012/05/20 07:57:34 1.37
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: plcom.c,v 1.36 2012/05/20 07:54:40 skrll Exp $ */ 1/* $NetBSD: plcom.c,v 1.37 2012/05/20 07:57:34 skrll Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2001 ARM Ltd 4 * Copyright (c) 2001 ARM Ltd
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
@@ -84,27 +84,27 @@ @@ -84,27 +84,27 @@
84 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 84 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
85 * SUCH DAMAGE. 85 * SUCH DAMAGE.
86 * 86 *
87 * @(#)com.c 7.5 (Berkeley) 5/16/91 87 * @(#)com.c 7.5 (Berkeley) 5/16/91
88 */ 88 */
89 89
90/* 90/*
91 * COM driver for the Prime Cell PL010 UART, which is similar to the 16C550, 91 * COM driver for the Prime Cell PL010 UART, which is similar to the 16C550,
92 * but has a completely different programmer's model. 92 * but has a completely different programmer's model.
93 * Derived from the NS16550AF com driver. 93 * Derived from the NS16550AF com driver.
94 */ 94 */
95 95
96#include <sys/cdefs.h> 96#include <sys/cdefs.h>
97__KERNEL_RCSID(0, "$NetBSD: plcom.c,v 1.36 2012/05/20 07:54:40 skrll Exp $"); 97__KERNEL_RCSID(0, "$NetBSD: plcom.c,v 1.37 2012/05/20 07:57:34 skrll Exp $");
98 98
99#include "opt_plcom.h" 99#include "opt_plcom.h"
100#include "opt_ddb.h" 100#include "opt_ddb.h"
101#include "opt_kgdb.h" 101#include "opt_kgdb.h"
102#include "opt_lockdebug.h" 102#include "opt_lockdebug.h"
103#include "opt_multiprocessor.h" 103#include "opt_multiprocessor.h"
104 104
105#include "rnd.h" 105#include "rnd.h"
106#ifdef RND_COM 106#ifdef RND_COM
107#include <sys/rnd.h> 107#include <sys/rnd.h>
108#endif 108#endif
109 109
110/* 110/*
@@ -1559,26 +1559,27 @@ plcom_rxsoft(struct plcom_softc *sc, str @@ -1559,26 +1559,27 @@ plcom_rxsoft(struct plcom_softc *sc, str
1559 cc--; 1559 cc--;
1560 } 1560 }
1561 1561
1562 if (cc != scc) { 1562 if (cc != scc) {
1563 sc->sc_rbget = get; 1563 sc->sc_rbget = get;
1564 mutex_spin_enter(&sc->sc_lock); 1564 mutex_spin_enter(&sc->sc_lock);
1565 1565
1566 cc = sc->sc_rbavail += scc - cc; 1566 cc = sc->sc_rbavail += scc - cc;
1567 /* Buffers should be ok again, release possible block. */ 1567 /* Buffers should be ok again, release possible block. */
1568 if (cc >= sc->sc_r_lowat) { 1568 if (cc >= sc->sc_r_lowat) {
1569 if (ISSET(sc->sc_rx_flags, RX_IBUF_OVERFLOWED)) { 1569 if (ISSET(sc->sc_rx_flags, RX_IBUF_OVERFLOWED)) {
1570 CLR(sc->sc_rx_flags, RX_IBUF_OVERFLOWED); 1570 CLR(sc->sc_rx_flags, RX_IBUF_OVERFLOWED);
1571 SET(sc->sc_cr, PL010_CR_RIE | PL010_CR_RTIE); 1571 SET(sc->sc_cr, PL010_CR_RIE | PL010_CR_RTIE);
 1572 bus_space_write_1(sc->sc_iot, sc->sc_ioh, plcom_cr, sc->sc_cr);
1572 } 1573 }
1573 if (ISSET(sc->sc_rx_flags, RX_IBUF_BLOCKED)) { 1574 if (ISSET(sc->sc_rx_flags, RX_IBUF_BLOCKED)) {
1574 CLR(sc->sc_rx_flags, RX_IBUF_BLOCKED); 1575 CLR(sc->sc_rx_flags, RX_IBUF_BLOCKED);
1575 plcom_hwiflow(sc); 1576 plcom_hwiflow(sc);
1576 } 1577 }
1577 } 1578 }
1578 mutex_spin_exit(&sc->sc_lock); 1579 mutex_spin_exit(&sc->sc_lock);
1579 } 1580 }
1580} 1581}
1581 1582
1582integrate void 1583integrate void
1583plcom_txsoft(struct plcom_softc *sc, struct tty *tp) 1584plcom_txsoft(struct plcom_softc *sc, struct tty *tp)
1584{ 1585{