summaryrefslogtreecommitdiff
path: root/sys/arch/pmax/dev
diff options
context:
space:
mode:
authorglass <glass@NetBSD.org>1994-06-02 06:14:56 +0000
committerglass <glass@NetBSD.org>1994-06-02 06:14:56 +0000
commit5e54277664ad7e5e1b3217841be5a3425f002505 (patch)
treee3db06e6c611cb6db6665e668dd85033d2d89a10 /sys/arch/pmax/dev
parent20ddd6eee432c37d093294469a54075c4995eab3 (diff)
fix a few integration bugs, add vmfault debugging, more ultrix stuff
Diffstat (limited to 'sys/arch/pmax/dev')
-rw-r--r--sys/arch/pmax/dev/dc.c10
-rw-r--r--sys/arch/pmax/dev/scc.c12
2 files changed, 9 insertions, 13 deletions
diff --git a/sys/arch/pmax/dev/dc.c b/sys/arch/pmax/dev/dc.c
index b55c76a76e4..2fb9513a37b 100644
--- a/sys/arch/pmax/dev/dc.c
+++ b/sys/arch/pmax/dev/dc.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)dc.c 8.2 (Berkeley) 11/30/93
- * $Id: dc.c,v 1.5 1994/05/30 06:12:07 glass Exp $
+ * $Id: dc.c,v 1.6 1994/06/02 06:14:59 glass Exp $
*/
/*
@@ -193,14 +193,12 @@ dcprobe(cp)
/* init pseudo DMA structures */
pdp = &dcpdma[cp->pmax_unit * 4];
- tp = dc_tty[cp->pmax_unit * 4];
- if (tp == NULL)
- tp = dc_tty[cp->pmax_unit * 4] = ttymalloc();
for (cntr = 0; cntr < 4; cntr++) {
pdp->p_addr = (void *)dcaddr;
- pdp->p_arg = (int)tp;
+ tp = dc_tty[cp->pmax_unit * 4 + cntr] = ttymalloc();
+ pdp->p_arg = (int) tp;
pdp->p_fcn = dcxint;
- pdp++, tp++;
+ pdp++;
}
dcsoftCAR[cp->pmax_unit] = cp->pmax_flags | 0xB;
diff --git a/sys/arch/pmax/dev/scc.c b/sys/arch/pmax/dev/scc.c
index c79b24e3aee..c97d1c01ea8 100644
--- a/sys/arch/pmax/dev/scc.c
+++ b/sys/arch/pmax/dev/scc.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)scc.c 8.2 (Berkeley) 11/30/93
- * $Id: scc.c,v 1.5 1994/05/30 06:13:58 glass Exp $
+ * $Id: scc.c,v 1.6 1994/06/02 06:15:01 glass Exp $
*/
/*
@@ -195,15 +195,13 @@ sccprobe(cp)
pdp = &sc->scc_pdma[0];
/* init pseudo DMA structures */
- tp = scc_tty[cp->pmax_unit * 2];
- if (tp == NULL)
- tp = scc_tty[cp->pmax_unit * 2] = ttymalloc();
for (cntr = 0; cntr < 2; cntr++) {
pdp->p_addr = (void *)cp->pmax_addr;
+ tp = scc_tty[cp->pmax_unit * 2 + cntr] = ttymalloc();
pdp->p_arg = (int)tp;
pdp->p_fcn = (void (*)())0;
tp->t_dev = (dev_t)((cp->pmax_unit << 1) | cntr);
- pdp++, tp++;
+ pdp++;
}
sc->scc_softCAR = cp->pmax_flags | 0x2;
@@ -649,8 +647,8 @@ sccintr(unit)
if (tp->t_state & TS_FLUSH)
tp->t_state &= ~TS_FLUSH;
else {
- ndflush(&tp->t_outq, dp->p_mem - (caddr_t)
- tp->t_outq.c_cf);
+ ndflush(&tp->t_outq, dp->p_mem -
+ (caddr_t) tp->t_outq.c_cf);
dp->p_end = dp->p_mem = tp->t_outq.c_cf;
}
if (tp->t_line)