Module Name: src
Committed By: skrll
Date: Sat Nov 3 15:02:32 UTC 2018
Modified Files:
src/sys/arch/evbarm/amlogic: amlogic_machdep.c
src/sys/arch/evbarm/bcm53xx: bcm53xx_machdep.c
src/sys/arch/evbarm/fdt: fdt_machdep.c
src/sys/arch/evbarm/nitrogen6: nitrogen6_machdep.c
src/sys/arch/evbarm/zynq: zynq_machdep.c
Log Message:
Less is more
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/evbarm/amlogic/amlogic_machdep.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/evbarm/bcm53xx/bcm53xx_machdep.c
cvs rdiff -u -r1.53 -r1.54 src/sys/arch/evbarm/fdt/fdt_machdep.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/evbarm/nitrogen6/nitrogen6_machdep.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/zynq/zynq_machdep.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/evbarm/amlogic/amlogic_machdep.c
diff -u src/sys/arch/evbarm/amlogic/amlogic_machdep.c:1.26 src/sys/arch/evbarm/amlogic/amlogic_machdep.c:1.27
--- src/sys/arch/evbarm/amlogic/amlogic_machdep.c:1.26 Thu Oct 18 09:01:53 2018
+++ src/sys/arch/evbarm/amlogic/amlogic_machdep.c Sat Nov 3 15:02:32 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: amlogic_machdep.c,v 1.26 2018/10/18 09:01:53 skrll Exp $ */
+/* $NetBSD: amlogic_machdep.c,v 1.27 2018/11/03 15:02:32 skrll Exp $ */
/*
* Machine dependent functions for kernel setup for TI OSK5912 board.
@@ -125,7 +125,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amlogic_machdep.c,v 1.26 2018/10/18 09:01:53 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amlogic_machdep.c,v 1.27 2018/11/03 15:02:32 skrll Exp $");
#include "opt_console.h"
#include "opt_machdep.h"
@@ -238,15 +238,6 @@ void amlogic_platform_early_putchar(char
bs_protos(bs_notimpl);
-static dev_type_cnputc(earlyconsputc);
-static dev_type_cngetc(earlyconsgetc);
-
-static struct consdev earlycons = {
- .cn_putc = earlyconsputc,
- .cn_getc = earlyconsgetc,
- .cn_pollc = nullcnpollc,
-};
-
static void
earlyconsputc(dev_t dev, int c)
{
@@ -256,9 +247,15 @@ earlyconsputc(dev_t dev, int c)
static int
earlyconsgetc(dev_t dev)
{
- return 0; /* XXX */
+ return 0;
}
+static struct consdev earlycons = {
+ .cn_putc = earlyconsputc,
+ .cn_getc = earlyconsgetc,
+ .cn_pollc = nullcnpollc,
+};
+
/*
* Static device mappings. These peripheral registers are mapped at
* fixed virtual addresses very early in initarm() so that we can use
Index: src/sys/arch/evbarm/bcm53xx/bcm53xx_machdep.c
diff -u src/sys/arch/evbarm/bcm53xx/bcm53xx_machdep.c:1.18 src/sys/arch/evbarm/bcm53xx/bcm53xx_machdep.c:1.19
--- src/sys/arch/evbarm/bcm53xx/bcm53xx_machdep.c:1.18 Thu Oct 18 09:01:53 2018
+++ src/sys/arch/evbarm/bcm53xx/bcm53xx_machdep.c Sat Nov 3 15:02:32 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm53xx_machdep.c,v 1.18 2018/10/18 09:01:53 skrll Exp $ */
+/* $NetBSD: bcm53xx_machdep.c,v 1.19 2018/11/03 15:02:32 skrll Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
#define IDM_PRIVATE
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bcm53xx_machdep.c,v 1.18 2018/10/18 09:01:53 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm53xx_machdep.c,v 1.19 2018/11/03 15:02:32 skrll Exp $");
#include "opt_arm_debug.h"
#include "opt_console.h"
@@ -111,15 +111,6 @@ int comcnmode = CONMODE | CLOCAL;
#include <sys/kgdb.h>
#endif
-static dev_type_cnputc(earlyconsputc);
-static dev_type_cngetc(earlyconsgetc);
-
-static struct consdev earlycons = {
- .cn_putc = earlyconsputc,
- .cn_getc = earlyconsgetc,
- .cn_pollc = nullcnpollc,
-};
-
static void
earlyconsputc(dev_t dev, int c)
{
@@ -129,9 +120,15 @@ earlyconsputc(dev_t dev, int c)
static int
earlyconsgetc(dev_t dev)
{
- return 0; /* XXX */
+ return 0;
}
+static struct consdev earlycons = {
+ .cn_putc = earlyconsputc,
+ .cn_getc = earlyconsgetc,
+ .cn_pollc = nullcnpollc,
+};
+
/*
* Static device mappings. These peripheral registers are mapped at
* fixed virtual addresses very early in initarm() so that we can use
Index: src/sys/arch/evbarm/fdt/fdt_machdep.c
diff -u src/sys/arch/evbarm/fdt/fdt_machdep.c:1.53 src/sys/arch/evbarm/fdt/fdt_machdep.c:1.54
--- src/sys/arch/evbarm/fdt/fdt_machdep.c:1.53 Thu Nov 1 00:44:06 2018
+++ src/sys/arch/evbarm/fdt/fdt_machdep.c Sat Nov 3 15:02:32 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: fdt_machdep.c,v 1.53 2018/11/01 00:44:06 jmcneill Exp $ */
+/* $NetBSD: fdt_machdep.c,v 1.54 2018/11/03 15:02:32 skrll Exp $ */
/*-
* Copyright (c) 2015-2017 Jared McNeill <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdt_machdep.c,v 1.53 2018/11/01 00:44:06 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdt_machdep.c,v 1.54 2018/11/03 15:02:32 skrll Exp $");
#include "opt_machdep.h"
#include "opt_bootconfig.h"
@@ -129,15 +129,6 @@ static void fdt_cpu_rootconf(void);
static void fdt_reset(void);
static void fdt_powerdown(void);
-static dev_type_cnputc(earlyconsputc);
-static dev_type_cngetc(earlyconsgetc);
-
-static struct consdev earlycons = {
- .cn_putc = earlyconsputc,
- .cn_getc = earlyconsgetc,
- .cn_pollc = nullcnpollc,
-};
-
static void
earlyconsputc(dev_t dev, int c)
{
@@ -147,9 +138,15 @@ earlyconsputc(dev_t dev, int c)
static int
earlyconsgetc(dev_t dev)
{
- return 0; /* XXX */
+ return 0;
}
+static struct consdev earlycons = {
+ .cn_putc = earlyconsputc,
+ .cn_getc = earlyconsgetc,
+ .cn_pollc = nullcnpollc,
+};
+
#ifdef VERBOSE_INIT_ARM
#define VPRINTF(...) printf(__VA_ARGS__)
#else
Index: src/sys/arch/evbarm/nitrogen6/nitrogen6_machdep.c
diff -u src/sys/arch/evbarm/nitrogen6/nitrogen6_machdep.c:1.12 src/sys/arch/evbarm/nitrogen6/nitrogen6_machdep.c:1.13
--- src/sys/arch/evbarm/nitrogen6/nitrogen6_machdep.c:1.12 Sat Oct 20 05:58:34 2018
+++ src/sys/arch/evbarm/nitrogen6/nitrogen6_machdep.c Sat Nov 3 15:02:32 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: nitrogen6_machdep.c,v 1.12 2018/10/20 05:58:34 skrll Exp $ */
+/* $NetBSD: nitrogen6_machdep.c,v 1.13 2018/11/03 15:02:32 skrll Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nitrogen6_machdep.c,v 1.12 2018/10/20 05:58:34 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nitrogen6_machdep.c,v 1.13 2018/11/03 15:02:32 skrll Exp $");
#include "opt_evbarm_boardtype.h"
#include "opt_arm_debug.h"
@@ -108,15 +108,6 @@ void nitrogen6_platform_early_putchar(ch
#include <sys/kgdb.h>
#endif
-static dev_type_cnputc(earlyconsputc);
-static dev_type_cngetc(earlyconsgetc);
-
-static struct consdev earlycons = {
- .cn_putc = earlyconsputc,
- .cn_getc = earlyconsgetc,
- .cn_pollc = nullcnpollc,
-};
-
static void
earlyconsputc(dev_t dev, int c)
{
@@ -126,9 +117,15 @@ earlyconsputc(dev_t dev, int c)
static int
earlyconsgetc(dev_t dev)
{
- return 0; /* XXX */
+ return 0;
}
+static struct consdev earlycons = {
+ .cn_putc = earlyconsputc,
+ .cn_getc = earlyconsgetc,
+ .cn_pollc = nullcnpollc,
+};
+
/*
* Static device mappings. These peripheral registers are mapped at
* fixed virtual addresses very early in initarm() so that we can use
Index: src/sys/arch/evbarm/zynq/zynq_machdep.c
diff -u src/sys/arch/evbarm/zynq/zynq_machdep.c:1.5 src/sys/arch/evbarm/zynq/zynq_machdep.c:1.6
--- src/sys/arch/evbarm/zynq/zynq_machdep.c:1.5 Thu Oct 18 09:01:54 2018
+++ src/sys/arch/evbarm/zynq/zynq_machdep.c Sat Nov 3 15:02:32 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: zynq_machdep.c,v 1.5 2018/10/18 09:01:54 skrll Exp $ */
+/* $NetBSD: zynq_machdep.c,v 1.6 2018/11/03 15:02:32 skrll Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zynq_machdep.c,v 1.5 2018/10/18 09:01:54 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zynq_machdep.c,v 1.6 2018/11/03 15:02:32 skrll Exp $");
#include "opt_evbarm_boardtype.h"
#include "opt_arm_debug.h"
@@ -107,15 +107,6 @@ void zynq_platform_early_putchar(char);
#include <sys/kgdb.h>
#endif
-static dev_type_cnputc(earlyconsputc);
-static dev_type_cngetc(earlyconsgetc);
-
-static struct consdev earlycons = {
- .cn_putc = earlyconsputc,
- .cn_getc = earlyconsgetc,
- .cn_pollc = nullcnpollc,
-};
-
static void
earlyconsputc(dev_t dev, int c)
{
@@ -125,9 +116,15 @@ earlyconsputc(dev_t dev, int c)
static int
earlyconsgetc(dev_t dev)
{
- return 0; /* XXX */
+ return 0;
}
+static struct consdev earlycons = {
+ .cn_putc = earlyconsputc,
+ .cn_getc = earlyconsgetc,
+ .cn_pollc = nullcnpollc,
+};
+
/*
* Static device mappings. These peripheral registers are mapped at
* fixed virtual addresses very early in initarm() so that we can use
