CVS commit: [netbsd-9] src/sys/arch/powerpc/ibm4xx/dev

[Martin Husemann]

Module Name:    src
Committed By:   martin
Date:           Tue Feb 25 20:12:20 UTC 2020

Modified Files:
        src/sys/arch/powerpc/ibm4xx/dev [netbsd-9]: com_opb.c

Log Message:
Pull up following revision(s) (requested by rin in ticket #728):

        sys/arch/powerpc/ibm4xx/dev/com_opb.c: revision 1.23

Belatedly catch up with MI com(4) change in com.c rev. 1.351:
http://cvsweb.netbsd.org/bsdweb.cgi/src/sys/dev/ic/com.c#rev1.351

XXX
pullup to netbsd-9


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.22.4.1 src/sys/arch/powerpc/ibm4xx/dev/com_opb.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/arch/powerpc/ibm4xx/dev/com_opb.c
diff -u src/sys/arch/powerpc/ibm4xx/dev/com_opb.c:1.22 src/sys/arch/powerpc/ibm4xx/dev/com_opb.c:1.22.4.1
--- src/sys/arch/powerpc/ibm4xx/dev/com_opb.c:1.22	Sat Dec  8 17:46:12 2018
+++ src/sys/arch/powerpc/ibm4xx/dev/com_opb.c	Tue Feb 25 20:12:20 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: com_opb.c,v 1.22 2018/12/08 17:46:12 thorpej Exp $ */
+/* $NetBSD: com_opb.c,v 1.22.4.1 2020/02/25 20:12:20 martin Exp $ */
 
 /*
  * Copyright 2001 Wasabi Systems, Inc.
@@ -61,7 +61,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_opb.c,v 1.22 2018/12/08 17:46:12 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_opb.c,v 1.22.4.1 2020/02/25 20:12:20 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -143,9 +143,6 @@ void
 com_opb_cnattach(int com_freq, int conaddr, int conspeed, int conmode)
 {
 	static int attached = 0;
-#if (NCOM > 0)
-	struct com_regs	regs;
-#endif
 
 	if (attached)
 		return;
@@ -153,12 +150,8 @@ com_opb_cnattach(int com_freq, int conad
 
 #if (NCOM > 0)
 	/* We *know* the com-console attaches to opb */
-	regs.cr_iot = opb_get_bus_space_tag();
-	regs.cr_iobase = conaddr;
-	regs.cr_nports = COM_NPORTS;
-	/* regs.ioh is initialized by comcnattach */
-
-	if (comcnattach1(&regs, conspeed, com_freq, COM_TYPE_NORMAL, conmode))
+	if (comcnattach(opb_get_bus_space_tag(), conaddr, conspeed, com_freq,
+	    COM_TYPE_NORMAL, conmode))
 		panic("can't init serial console @%x", conaddr);
 	else
 		return;