Module Name: src
Committed By: christos
Date: Fri Aug 21 10:48:06 UTC 2015
Modified Files:
src/sys/arch/luna68k/dev: lunaws.c siotty.c
src/sys/arch/luna68k/luna68k: machdep.c
Added Files:
src/sys/arch/luna68k/dev: syscn.h
Log Message:
- move prototypes to common header file
- rename function to avoid confusion with pseudo-device attach
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/luna68k/dev/lunaws.c
cvs rdiff -u -r1.43 -r1.44 src/sys/arch/luna68k/dev/siotty.c
cvs rdiff -u -r0 -r1.1 src/sys/arch/luna68k/dev/syscn.h
cvs rdiff -u -r1.98 -r1.99 src/sys/arch/luna68k/luna68k/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/luna68k/dev/lunaws.c
diff -u src/sys/arch/luna68k/dev/lunaws.c:1.30 src/sys/arch/luna68k/dev/lunaws.c:1.31
--- src/sys/arch/luna68k/dev/lunaws.c:1.30 Sun Jul 20 07:14:56 2014
+++ src/sys/arch/luna68k/dev/lunaws.c Fri Aug 21 06:48:06 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: lunaws.c,v 1.30 2014/07/20 11:14:56 tsutsui Exp $ */
+/* $NetBSD: lunaws.c,v 1.31 2015/08/21 10:48:06 christos Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: lunaws.c,v 1.30 2014/07/20 11:14:56 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lunaws.c,v 1.31 2015/08/21 10:48:06 christos Exp $");
#include "opt_wsdisplay_compat.h"
#include "wsmouse.h"
@@ -50,6 +50,7 @@ __KERNEL_RCSID(0, "$NetBSD: lunaws.c,v 1
#include <luna68k/dev/omkbdmap.h>
#include <luna68k/dev/sioreg.h>
#include <luna68k/dev/siovar.h>
+#include <luna68k/dev/syscn.h>
#include "ioconf.h"
@@ -128,9 +129,6 @@ static void wsattach(device_t, device_t,
CFATTACH_DECL_NEW(ws, sizeof(struct ws_softc),
wsmatch, wsattach, NULL, NULL);
-extern int syscngetc(dev_t);
-extern void syscnputc(dev_t, int);
-
static int
wsmatch(device_t parent, cfdata_t cf, void *aux)
{
Index: src/sys/arch/luna68k/dev/siotty.c
diff -u src/sys/arch/luna68k/dev/siotty.c:1.43 src/sys/arch/luna68k/dev/siotty.c:1.44
--- src/sys/arch/luna68k/dev/siotty.c:1.43 Thu Aug 20 10:40:17 2015
+++ src/sys/arch/luna68k/dev/siotty.c Fri Aug 21 06:48:06 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: siotty.c,v 1.43 2015/08/20 14:40:17 christos Exp $ */
+/* $NetBSD: siotty.c,v 1.44 2015/08/21 10:48:06 christos Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: siotty.c,v 1.43 2015/08/20 14:40:17 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: siotty.c,v 1.44 2015/08/21 10:48:06 christos Exp $");
#include "opt_ddb.h"
@@ -53,6 +53,7 @@ __KERNEL_RCSID(0, "$NetBSD: siotty.c,v 1
#include <luna68k/dev/sioreg.h>
#include <luna68k/dev/siovar.h>
+#include <luna68k/dev/syscn.h>
#include "ioconf.h"
@@ -693,9 +694,6 @@ getsiocsr(struct sioreg *sio)
/*--------------------- console interface ----------------------*/
-int syscngetc(dev_t);
-void syscnputc(dev_t, int);
-
struct consdev syscons = {
NULL,
NULL,
@@ -710,7 +708,7 @@ struct consdev syscons = {
};
/* EXPORT */ void
-syscnattach(int channel)
+syscninit(int channel)
{
/*
* Channel A is immediately initialized with 9600N1 right after cold
Index: src/sys/arch/luna68k/luna68k/machdep.c
diff -u src/sys/arch/luna68k/luna68k/machdep.c:1.98 src/sys/arch/luna68k/luna68k/machdep.c:1.99
--- src/sys/arch/luna68k/luna68k/machdep.c:1.98 Mon Mar 24 15:46:24 2014
+++ src/sys/arch/luna68k/luna68k/machdep.c Fri Aug 21 06:48:06 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.98 2014/03/24 19:46:24 christos Exp $ */
+/* $NetBSD: machdep.c,v 1.99 2015/08/21 10:48:06 christos Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.98 2014/03/24 19:46:24 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.99 2015/08/21 10:48:06 christos Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -84,6 +84,8 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v
#include <machine/pte.h>
#include <machine/kcore.h> /* XXX should be pulled in by sys/kcore.h */
+#include <luna68k/dev/syscn.h>
+
#include <dev/cons.h>
#include <dev/mm.h>
@@ -137,7 +139,6 @@ int sysconsole; /* console: 0 for ttya,
extern struct consdev syscons;
extern void omfb_cnattach(void);
extern void ws_cnattach(void);
-extern void syscnattach(int);
/*
* On the 68020/68030, the value of delay_divisor is roughly
@@ -248,7 +249,7 @@ consinit(void)
{
if (sysconsole == 0)
- syscnattach(0);
+ syscninit(0);
else {
omfb_cnattach();
ws_cnattach();
Added files:
Index: src/sys/arch/luna68k/dev/syscn.h
diff -u /dev/null src/sys/arch/luna68k/dev/syscn.h:1.1
--- /dev/null Fri Aug 21 06:48:06 2015
+++ src/sys/arch/luna68k/dev/syscn.h Fri Aug 21 06:48:06 2015
@@ -0,0 +1,6 @@
+/* $NetBSD: syscn.h,v 1.1 2015/08/21 10:48:06 christos Exp $ */
+
+void syscninit(int);
+int syscngetc(dev_t);
+void syscnputc(dev_t, int);
+
