[src/netbsd-1-5]: src/sys/arch/mvme68k/dev Pullup 1.4 - 1.5 (approved by tv)

[scw <scw%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6632a53560da
branches:  netbsd-1-5
changeset: 489792:6632a53560da
user:      scw <scw%NetBSD.org@localhost>
date:      Tue Oct 17 19:45:03 2000 +0000

description:
Pullup 1.4 - 1.5 (approved by tv)
Bring support for MVME162 into the 1.5 branch.

diffstat:

 sys/arch/mvme68k/dev/clmpcc_pcctwo.c |  13 ++++---------
 1 files changed, 4 insertions(+), 9 deletions(-)

diffs (41 lines):

diff -r 72bff29372a0 -r 6632a53560da sys/arch/mvme68k/dev/clmpcc_pcctwo.c
--- a/sys/arch/mvme68k/dev/clmpcc_pcctwo.c      Tue Oct 17 19:43:57 2000 +0000
+++ b/sys/arch/mvme68k/dev/clmpcc_pcctwo.c      Tue Oct 17 19:45:03 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: clmpcc_pcctwo.c,v 1.3.4.1 2000/07/22 15:48:06 scw Exp $ */
+/*     $NetBSD: clmpcc_pcctwo.c,v 1.3.4.2 2000/10/17 19:45:03 scw Exp $ */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -97,7 +97,8 @@
 
        pa = aux;
 
-       if (strcmp(pa->pa_name, clmpcc_cd.cd_name))
+       if (strcmp(pa->pa_name, clmpcc_cd.cd_name) ||
+           (machineid != MVME_167 && machineid != MVME_177))
                return (0);
 
        pa->pa_ipl = cf->pcctwocf_ipl;
@@ -140,12 +141,6 @@
        pcctwointr_establish(PCCTWOV_SCC_RX_EXCEP, clmpcc_rxintr, level, sc);
        pcctwointr_establish(PCCTWOV_SCC_TX, clmpcc_txintr, level, sc);
        pcctwointr_establish(PCCTWOV_SCC_MODEM, clmpcc_mdintr, level, sc);
-
-       /* Enable the interrupts */
-       pcc2_reg_write(sys_pcctwo, PCC2REG_SCC_MODEM_ICSR,
-           level | PCCTWO_ICR_IEN);
-       pcc2_reg_write(sys_pcctwo, PCC2REG_SCC_RX_ICSR, level | PCCTWO_ICR_IEN);
-       pcc2_reg_write(sys_pcctwo, PCC2REG_SCC_TX_ICSR, level | PCCTWO_ICR_IEN);
 }
 
 void
@@ -236,7 +231,7 @@
 {
        int maj;
 
-       if (machineid == MVME_147) {
+       if (machineid != MVME_167 && machineid != MVME_177) {
                cp->cn_pri = CN_DEAD;
                return;
        }