merge with latest Utah version

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

diff --git a/usr/src/sys/hp300/stand/cons.c b/usr/src/sys/hp300/stand/cons.c
index ec9a670..4190202 100644 (file)
--- a/usr/src/sys/hp300/stand/cons.c
+++ b/usr/src/sys/hp300/stand/cons.c
@@ -9,14 +9,14 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- * from: Utah $Hdr: cons.c 1.5 89/08/22$
+ * from: Utah $Hdr: cons.c 1.7 92/02/28$

  *
  *

- *     @(#)cons.c      7.4 (Berkeley) %G%
+ *     @(#)cons.c      7.5 (Berkeley) %G%

  */
 
 #include "sys/param.h"
 #include "samachdep.h"
  */
 
 #include "sys/param.h"
 #include "samachdep.h"

-#include "../hp300/cons.h"
+#include "../hp/dev/cons.h"

 
 #ifdef ITECONSOLE
 int    iteprobe(), iteinit(), itegetchar(), iteputchar();
 
 #ifdef ITECONSOLE
 int    iteprobe(), iteinit(), itegetchar(), iteputchar();


@@ -72,6 +72,13 @@ cngetc()
 cnputc(c)
        int c;
 {
 cnputc(c)
        int c;
 {

+#ifdef ROMPRF
+       extern int userom;
+
+       if (userom)
+               romputchar(c);
+       else
+#endif

        if (cn_tab)
                (*cn_tab->cn_putc)(c);
 }
        if (cn_tab)
                (*cn_tab->cn_putc)(c);
 }