Module Name: src
Committed By: tsutsui
Date: Sun Dec 27 16:09:33 UTC 2020
Modified Files:
src/sys/dev/wscons: wsbell.c wsdisplay.c wskbd.c wsmouse.c
Log Message:
Explicitly include generated ioconf.h for struct cfdrivers.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/wscons/wsbell.c
cvs rdiff -u -r1.161 -r1.162 src/sys/dev/wscons/wsdisplay.c
cvs rdiff -u -r1.143 -r1.144 src/sys/dev/wscons/wskbd.c
cvs rdiff -u -r1.68 -r1.69 src/sys/dev/wscons/wsmouse.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/dev/wscons/wsbell.c
diff -u src/sys/dev/wscons/wsbell.c:1.12 src/sys/dev/wscons/wsbell.c:1.13
--- src/sys/dev/wscons/wsbell.c:1.12 Sat Jun 22 08:03:01 2019
+++ src/sys/dev/wscons/wsbell.c Sun Dec 27 16:09:33 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: wsbell.c,v 1.12 2019/06/22 08:03:01 isaki Exp $ */
+/* $NetBSD: wsbell.c,v 1.13 2020/12/27 16:09:33 tsutsui Exp $ */
/*-
* Copyright (c) 2017 Nathanial Sloss <[email protected]>
@@ -107,7 +107,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsbell.c,v 1.12 2019/06/22 08:03:01 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsbell.c,v 1.13 2020/12/27 16:09:33 tsutsui Exp $");
#if defined(_KERNEL_OPT)
#include "wsmux.h"
@@ -174,8 +174,6 @@ static int wsbell_do_ioctl(struct wsbel
CFATTACH_DECL_NEW(wsbell, sizeof (struct wsbell_softc),
wsbell_match, wsbell_attach, wsbell_detach, wsbell_activate);
-extern struct cfdriver wsbell_cd;
-
extern dev_type_open(spkropen);
extern dev_type_close(spkrclose);
extern dev_type_ioctl(spkrioctl);
Index: src/sys/dev/wscons/wsdisplay.c
diff -u src/sys/dev/wscons/wsdisplay.c:1.161 src/sys/dev/wscons/wsdisplay.c:1.162
--- src/sys/dev/wscons/wsdisplay.c:1.161 Fri Dec 25 21:12:15 2020
+++ src/sys/dev/wscons/wsdisplay.c Sun Dec 27 16:09:33 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: wsdisplay.c,v 1.161 2020/12/25 21:12:15 tsutsui Exp $ */
+/* $NetBSD: wsdisplay.c,v 1.162 2020/12/27 16:09:33 tsutsui Exp $ */
/*
* Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsdisplay.c,v 1.161 2020/12/25 21:12:15 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsdisplay.c,v 1.162 2020/12/27 16:09:33 tsutsui Exp $");
#ifdef _KERNEL_OPT
#include "opt_wsdisplay_compat.h"
@@ -71,6 +71,7 @@ __KERNEL_RCSID(0, "$NetBSD: wsdisplay.c,
#include <dev/cons.h>
#include "locators.h"
+#include "ioconf.h"
#ifdef WSDISPLAY_MULTICONS
static bool wsdisplay_multicons_enable = true;
@@ -177,8 +178,6 @@ struct wsdisplay_scroll_data wsdisplay_d
};
#endif
-extern struct cfdriver wsdisplay_cd;
-
/* Autoconfiguration definitions. */
static int wsdisplay_emul_match(device_t , cfdata_t, void *);
static void wsdisplay_emul_attach(device_t, device_t, void *);
Index: src/sys/dev/wscons/wskbd.c
diff -u src/sys/dev/wscons/wskbd.c:1.143 src/sys/dev/wscons/wskbd.c:1.144
--- src/sys/dev/wscons/wskbd.c:1.143 Tue Feb 5 10:04:49 2019
+++ src/sys/dev/wscons/wskbd.c Sun Dec 27 16:09:33 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: wskbd.c,v 1.143 2019/02/05 10:04:49 mrg Exp $ */
+/* $NetBSD: wskbd.c,v 1.144 2020/12/27 16:09:33 tsutsui Exp $ */
/*
* Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved.
@@ -105,7 +105,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wskbd.c,v 1.143 2019/02/05 10:04:49 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wskbd.c,v 1.144 2020/12/27 16:09:33 tsutsui Exp $");
#ifdef _KERNEL_OPT
#include "opt_ddb.h"
@@ -143,11 +143,14 @@ __KERNEL_RCSID(0, "$NetBSD: wskbd.c,v 1.
#include <dev/wscons/wseventvar.h>
#include <dev/wscons/wscons_callbacks.h>
#include <dev/wscons/wsbelldata.h>
+#include <dev/wscons/wsmuxvar.h>
#ifdef KGDB
#include <sys/kgdb.h>
#endif
+#include "ioconf.h"
+
#ifdef WSKBD_DEBUG
#define DPRINTF(x) if (wskbddebug) printf x
int wskbddebug = 0;
@@ -155,8 +158,6 @@ int wskbddebug = 0;
#define DPRINTF(x)
#endif
-#include <dev/wscons/wsmuxvar.h>
-
struct wskbd_internal {
const struct wskbd_mapdata *t_keymap;
@@ -290,8 +291,6 @@ static int wskbd_do_ioctl(device_t, u_lo
CFATTACH_DECL_NEW(wskbd, sizeof (struct wskbd_softc),
wskbd_match, wskbd_attach, wskbd_detach, wskbd_activate);
-extern struct cfdriver wskbd_cd;
-
dev_type_open(wskbdopen);
dev_type_close(wskbdclose);
dev_type_read(wskbdread);
Index: src/sys/dev/wscons/wsmouse.c
diff -u src/sys/dev/wscons/wsmouse.c:1.68 src/sys/dev/wscons/wsmouse.c:1.69
--- src/sys/dev/wscons/wsmouse.c:1.68 Fri Nov 3 19:49:23 2017
+++ src/sys/dev/wscons/wsmouse.c Sun Dec 27 16:09:33 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: wsmouse.c,v 1.68 2017/11/03 19:49:23 maya Exp $ */
+/* $NetBSD: wsmouse.c,v 1.69 2020/12/27 16:09:33 tsutsui Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -104,7 +104,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsmouse.c,v 1.68 2017/11/03 19:49:23 maya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsmouse.c,v 1.69 2020/12/27 16:09:33 tsutsui Exp $");
#include "wsmouse.h"
#include "wsdisplay.h"
@@ -130,6 +130,8 @@ __KERNEL_RCSID(0, "$NetBSD: wsmouse.c,v
#include <dev/wscons/wseventvar.h>
#include <dev/wscons/wsmuxvar.h>
+#include "ioconf.h"
+
#if defined(WSMUX_DEBUG) && NWSMUX > 0
#define DPRINTF(x) if (wsmuxdebug) printf x
#define DPRINTFN(n,x) if (wsmuxdebug > (n)) printf x
@@ -192,8 +194,6 @@ CFATTACH_DECL_NEW(wsmouse, sizeof (struc
static void wsmouse_repeat(void *v);
-extern struct cfdriver wsmouse_cd;
-
dev_type_open(wsmouseopen);
dev_type_close(wsmouseclose);
dev_type_read(wsmouseread);
