Module Name: src
Committed By: jmcneill
Date: Tue Oct 23 09:15:36 UTC 2018
Modified Files:
src/sys/arch/arm/fdt: plcom_fdt.c
src/sys/arch/arm/imx: imx23_plcom.c
src/sys/arch/evbarm/dev: plcom.c
src/sys/arch/evbarm/ifpga: plcom_ifpga.c
Log Message:
Fix blank line printed at attach on ACPI
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/fdt/plcom_fdt.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/imx/imx23_plcom.c
cvs rdiff -u -r1.55 -r1.56 src/sys/arch/evbarm/dev/plcom.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/evbarm/ifpga/plcom_ifpga.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/arm/fdt/plcom_fdt.c
diff -u src/sys/arch/arm/fdt/plcom_fdt.c:1.2 src/sys/arch/arm/fdt/plcom_fdt.c:1.3
--- src/sys/arch/arm/fdt/plcom_fdt.c:1.2 Fri Sep 7 12:50:58 2018
+++ src/sys/arch/arm/fdt/plcom_fdt.c Tue Oct 23 09:15:35 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: plcom_fdt.c,v 1.2 2018/09/07 12:50:58 jmcneill Exp $ */
+/* $NetBSD: plcom_fdt.c,v 1.3 2018/10/23 09:15:35 jmcneill Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: plcom_fdt.c,v 1.2 2018/09/07 12:50:58 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: plcom_fdt.c,v 1.3 2018/10/23 09:15:35 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -102,6 +102,10 @@ plcom_fdt_attach(device_t parent, device
aprint_error(": couldn't map device\n");
return;
}
+
+ aprint_naive("\n");
+ aprint_normal(": ARM PL011 UART\n");
+
plcom_attach_subr(sc);
aprint_normal_dev(self, "interrupting on %s\n", intrstr);
Index: src/sys/arch/arm/imx/imx23_plcom.c
diff -u src/sys/arch/arm/imx/imx23_plcom.c:1.1 src/sys/arch/arm/imx/imx23_plcom.c:1.2
--- src/sys/arch/arm/imx/imx23_plcom.c:1.1 Tue Nov 20 19:06:13 2012
+++ src/sys/arch/arm/imx/imx23_plcom.c Tue Oct 23 09:15:35 2018
@@ -1,4 +1,4 @@
-/* $Id: imx23_plcom.c,v 1.1 2012/11/20 19:06:13 jkunz Exp $ */
+/* $Id: imx23_plcom.c,v 1.2 2018/10/23 09:15:35 jmcneill Exp $ */
/*
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -83,6 +83,9 @@ imx23_plcom_attach(device_t parent, devi
if (plcom_attached)
return;
+ aprint_naive("\n");
+ aprint_normal("\n");
+
sc->sc_dev = self;
sc->sc_frequency = IMX23_UART_CLK;
sc->sc_hwflags = PLCOM_HW_TXFIFO_DISABLE;
Index: src/sys/arch/evbarm/dev/plcom.c
diff -u src/sys/arch/evbarm/dev/plcom.c:1.55 src/sys/arch/evbarm/dev/plcom.c:1.56
--- src/sys/arch/evbarm/dev/plcom.c:1.55 Fri Oct 12 23:57:00 2018
+++ src/sys/arch/evbarm/dev/plcom.c Tue Oct 23 09:15:36 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: plcom.c,v 1.55 2018/10/12 23:57:00 jmcneill Exp $ */
+/* $NetBSD: plcom.c,v 1.56 2018/10/23 09:15:36 jmcneill Exp $ */
/*-
* Copyright (c) 2001 ARM Ltd
@@ -94,7 +94,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: plcom.c,v 1.55 2018/10/12 23:57:00 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: plcom.c,v 1.56 2018/10/23 09:15:36 jmcneill Exp $");
#include "opt_plcom.h"
#include "opt_ddb.h"
@@ -438,8 +438,6 @@ plcom_attach_subr(struct plcom_softc *sc
struct plcom_instance *pi = &sc->sc_pi;
struct tty *tp;
- aprint_naive("\n");
-
callout_init(&sc->sc_diag_callout, 0);
mutex_init(&sc->sc_lock, MUTEX_DEFAULT, IPL_HIGH);
@@ -500,7 +498,6 @@ plcom_attach_subr(struct plcom_softc *sc
break;
}
}
- aprint_normal("\n");
if (ISSET(sc->sc_hwflags, PLCOM_HW_TXFIFO_DISABLE)) {
sc->sc_fifolen = 1;
Index: src/sys/arch/evbarm/ifpga/plcom_ifpga.c
diff -u src/sys/arch/evbarm/ifpga/plcom_ifpga.c:1.16 src/sys/arch/evbarm/ifpga/plcom_ifpga.c:1.17
--- src/sys/arch/evbarm/ifpga/plcom_ifpga.c:1.16 Tue Feb 19 10:57:10 2013
+++ src/sys/arch/evbarm/ifpga/plcom_ifpga.c Tue Oct 23 09:15:36 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: plcom_ifpga.c,v 1.16 2013/02/19 10:57:10 skrll Exp $ */
+/* $NetBSD: plcom_ifpga.c,v 1.17 2018/10/23 09:15:36 jmcneill Exp $ */
/*
* Copyright (c) 2001 ARM Ltd
@@ -32,7 +32,7 @@
/* Interface to plcom (PL010) serial driver. */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: plcom_ifpga.c,v 1.16 2013/02/19 10:57:10 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: plcom_ifpga.c,v 1.17 2018/10/23 09:15:36 jmcneill Exp $");
#include <sys/types.h>
#include <sys/device.h>
@@ -97,6 +97,9 @@ plcom_ifpga_attach(device_t parent, devi
return;
}
+ aprint_naive("\n");
+ aprint_normal("\n");
+
plcom_attach_subr(sc);
isc->sc_ih = ifpga_intr_establish(ifa->ifa_irq, IPL_SERIAL,
plcomintr, sc);
