BSD 4_4 release

[unix-history] / usr / src / sys / hp300 / stand / dcm.c

diff --git a/usr/src/sys/hp300/stand/dcm.c b/usr/src/sys/hp300/stand/dcm.c
index 8d6c7da..c230e3a 100644 (file)
--- a/usr/src/sys/hp300/stand/dcm.c
+++ b/usr/src/sys/hp300/stand/dcm.c
@@ -1,25 +1,50 @@
 /*
  * Copyright (c) 1988 University of Utah.
 /*
  * Copyright (c) 1988 University of Utah.

- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1990, 1993
+ *     The Regents of the University of California.  All rights reserved.

  *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
  *
  *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
  *

- * %sccs.include.redist.c%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.

  *
  *

- *     @(#)dcm.c       7.1 (Berkeley) %G%
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *     @(#)dcm.c       8.1 (Berkeley) 6/10/93

  */
 
 #ifdef DCMCONSOLE
  */
 
 #ifdef DCMCONSOLE

-#include "param.h"
-#include "machine/cons.h"
-#include "../hpdev/device.h"
-#include "../hpdev/dcmreg.h"
+#include <sys/param.h>
+#include <hp/dev/cons.h>
+#include <hp/dev/device.h>
+#include <hp300/dev/dcmreg.h>

 
 

-#define CONSPORT       (1)
-struct dcmdevice *CONSOLE = NULL;
+struct dcmdevice *dcmcnaddr = NULL;

 
 dcmprobe(cp)
        struct consdev *cp;
 
 dcmprobe(cp)
        struct consdev *cp;


@@ -28,16 +53,16 @@ dcmprobe(cp)
        register struct hp_hw *hw;
        register struct dcmdevice *dcm;
 
        register struct hp_hw *hw;
        register struct dcmdevice *dcm;
 

-       for (hw = sc_table; hw < &sc_table[MAX_CTLR]; hw++)
-               if (hw->hw_type == COMMDCM && !badaddr((caddr_t)hw->hw_addr))
+       for (hw = sc_table; hw < &sc_table[MAXCTLRS]; hw++)
+               if (HW_ISDEV(hw, D_COMMDCM) && !badaddr((caddr_t)hw->hw_kva))

                        break;
                        break;

-       if (hw->hw_type != COMMDCM) {
+       if (!HW_ISDEV(hw, D_COMMDCM)) {

                cp->cn_pri = CN_DEAD;
                return;
        }
                cp->cn_pri = CN_DEAD;
                return;
        }

-       CONSOLE = (struct dcmdevice *)hw->hw_addr;
+       dcmcnaddr = (struct dcmdevice *) hw->hw_kva;

 
 

-       dcm = CONSOLE;
+       dcm = dcmcnaddr;

        switch (dcm->dcm_rsid) {
        case DCMID:
                cp->cn_pri = CN_NORMAL;
        switch (dcm->dcm_rsid) {
        case DCMID:
                cp->cn_pri = CN_NORMAL;


@@ -54,8 +79,8 @@ dcmprobe(cp)
 dcminit(cp)
        struct consdev *cp;
 {
 dcminit(cp)
        struct consdev *cp;
 {

-       register struct dcmdevice *dcm = CONSOLE;
-       register int port = CONSPORT;
+       register struct dcmdevice *dcm = dcmcnaddr;
+       register int port = CONUNIT;

 
        dcm->dcm_ic = IC_ID;
        while (dcm->dcm_thead[port].ptr != dcm->dcm_ttail[port].ptr)
 
        dcm->dcm_ic = IC_ID;
        while (dcm->dcm_thead[port].ptr != dcm->dcm_ttail[port].ptr)


@@ -72,13 +97,13 @@ dcminit(cp)
 #ifndef SMALL
 dcmgetchar()
 {
 #ifndef SMALL
 dcmgetchar()
 {

-       register struct dcmdevice *dcm = CONSOLE;
+       register struct dcmdevice *dcm = dcmcnaddr;

        register struct dcmrfifo *fifo;
        register struct dcmpreg *pp;
        register unsigned head;
        int c, stat, port;
 
        register struct dcmrfifo *fifo;
        register struct dcmpreg *pp;
        register unsigned head;
        int c, stat, port;
 

-       port = CONSPORT;
+       port = CONUNIT;

        pp = dcm_preg(dcm, port);
        head = pp->r_head & RX_MASK;
        if (head == (pp->r_tail & RX_MASK))
        pp = dcm_preg(dcm, port);
        head = pp->r_head & RX_MASK;
        if (head == (pp->r_tail & RX_MASK))


@@ -102,13 +127,13 @@ dcmgetchar()
 dcmputchar(c)
        register int c;
 {
 dcmputchar(c)
        register int c;
 {

-       register struct dcmdevice *dcm = CONSOLE;
+       register struct dcmdevice *dcm = dcmcnaddr;

        register struct dcmpreg *pp;
        register int timo;
        unsigned tail;
        int port, stat;
 
        register struct dcmpreg *pp;
        register int timo;
        unsigned tail;
        int port, stat;
 

-       port = CONSPORT;
+       port = CONUNIT;

        pp = dcm_preg(dcm, port);
        tail = pp->t_tail & TX_MASK;
        timo = 50000;
        pp = dcm_preg(dcm, port);
        tail = pp->t_tail & TX_MASK;
        timo = 50000;