[src/trunk]: src/sys/arch Conditionalize usage of the COM_HW_HAYESP constant ...

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

details:   https://anonhg.NetBSD.org/src/rev/31d0a1352fe8
branches:  trunk
changeset: 548460:31d0a1352fe8
user:      he <he%NetBSD.org@localhost>
date:      Fri Jun 27 07:39:34 2003 +0000

description:
Conditionalize usage of the COM_HW_HAYESP constant on COM_HAYESP.
Add a dummy type argument to the local (au)comcnattach to match the change
in the prototype of the "real" comcnattach.

Reviewed and tested by simonb.

diffstat:

 sys/arch/evbmips/alchemy/machdep.c |   6 +++---
 sys/arch/mips/alchemy/dev/aucom.c  |  12 ++++++++----
 2 files changed, 11 insertions(+), 7 deletions(-)

diffs (73 lines):

diff -r a8c6e3fc96d9 -r 31d0a1352fe8 sys/arch/evbmips/alchemy/machdep.c
--- a/sys/arch/evbmips/alchemy/machdep.c        Fri Jun 27 07:22:36 2003 +0000
+++ b/sys/arch/evbmips/alchemy/machdep.c        Fri Jun 27 07:39:34 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.8 2003/04/26 11:05:11 ragge Exp $ */
+/* $NetBSD: machdep.c,v 1.9 2003/06/27 07:39:35 he Exp $ */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -43,7 +43,7 @@
  */
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.8 2003/04/26 11:05:11 ragge Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.9 2003/06/27 07:39:35 he Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -187,7 +187,7 @@
         */
        delay(160000000 / aucomcnrate);
        if (aucomcnattach(&pbc->pc_cpuregt, UART0_BASE, aucomcnrate,
-           curcpu()->ci_cpu_freq / 4,
+           curcpu()->ci_cpu_freq / 4, COM_TYPE_NORMAL,
            (TTYDEF_CFLAG & ~(CSIZE | PARENB)) | CS8) != 0)
                panic("pb1000: unable to initialize serial console");
 #else
diff -r a8c6e3fc96d9 -r 31d0a1352fe8 sys/arch/mips/alchemy/dev/aucom.c
--- a/sys/arch/mips/alchemy/dev/aucom.c Fri Jun 27 07:22:36 2003 +0000
+++ b/sys/arch/mips/alchemy/dev/aucom.c Fri Jun 27 07:39:34 2003 +0000
@@ -1,6 +1,6 @@
 #define        AU1x00_UART     /* XXX */
 
-/*     $NetBSD: aucom.c,v 1.5 2003/06/23 11:01:29 martin Exp $ */
+/*     $NetBSD: aucom.c,v 1.6 2003/06/27 07:39:34 he Exp $     */
 
 /*-
  * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -80,7 +80,7 @@
  * XXX: hacked to work with almost 16550-alike Alchemy Au1X00 on-chip uarts
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aucom.c,v 1.5 2003/06/23 11:01:29 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aucom.c,v 1.6 2003/06/27 07:39:34 he Exp $");
 
 #include "opt_com.h"
 #include "opt_ddb.h"
@@ -1520,9 +1520,12 @@
         *    overflows.
         *  * Otherwise set it a bit higher.
         */
+#ifdef COM_HAYESP
        if (ISSET(sc->sc_hwflags, COM_HW_HAYESP))
                sc->sc_fifo = FIFO_DMA_MODE | FIFO_ENABLE | FIFO_TRIGGER_8;
-       else if (ISSET(sc->sc_hwflags, COM_HW_FIFO))
+       else
+#endif
+       if (ISSET(sc->sc_hwflags, COM_HW_FIFO))
                sc->sc_fifo = FIFO_ENABLE |
                    (t->c_ospeed <= 1200 ? FIFO_TRIGGER_1 :
                     t->c_ospeed <= 38400 ? FIFO_TRIGGER_8 : FIFO_TRIGGER_4);
@@ -2409,9 +2412,10 @@
 };
 
 
+/*ARGSUSED*/
 int
 comcnattach(bus_space_tag_t iot, bus_addr_t iobase, int rate, int frequency,
-    tcflag_t cflag)
+    int type, tcflag_t cflag)
 {
        int res;