[src/trunk]: src/sys/dev/wscons Explicitly include generated ioconf.h for str...

[tsutsui <tsutsui%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f9a08130c4cc
branches:  trunk
changeset: 948345:f9a08130c4cc
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Sun Dec 27 16:09:33 2020 +0000

description:
Explicitly include generated ioconf.h for struct cfdrivers.

diffstat:

 sys/dev/wscons/wsbell.c    |   6 ++----
 sys/dev/wscons/wsdisplay.c |   7 +++----
 sys/dev/wscons/wskbd.c     |  11 +++++------
 sys/dev/wscons/wsmouse.c   |   8 ++++----
 4 files changed, 14 insertions(+), 18 deletions(-)

diffs (149 lines):

diff -r 2cd92fdbb90e -r f9a08130c4cc sys/dev/wscons/wsbell.c
--- a/sys/dev/wscons/wsbell.c   Sun Dec 27 15:15:45 2020 +0000
+++ b/sys/dev/wscons/wsbell.c   Sun Dec 27 16:09:33 2020 +0000
@@ -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 <nathanialsloss%yahoo.com.au@localhost>
@@ -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 @@
 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);
diff -r 2cd92fdbb90e -r f9a08130c4cc sys/dev/wscons/wsdisplay.c
--- a/sys/dev/wscons/wsdisplay.c        Sun Dec 27 15:15:45 2020 +0000
+++ b/sys/dev/wscons/wsdisplay.c        Sun Dec 27 16:09:33 2020 +0000
@@ -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 @@
 #include <dev/cons.h>
 
 #include "locators.h"
+#include "ioconf.h"
 
 #ifdef WSDISPLAY_MULTICONS
 static bool wsdisplay_multicons_enable = true;
@@ -177,8 +178,6 @@
 };
 #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 *);
diff -r 2cd92fdbb90e -r f9a08130c4cc sys/dev/wscons/wskbd.c
--- a/sys/dev/wscons/wskbd.c    Sun Dec 27 15:15:45 2020 +0000
+++ b/sys/dev/wscons/wskbd.c    Sun Dec 27 16:09:33 2020 +0000
@@ -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 @@
 #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 @@
 #define DPRINTF(x)
 #endif
 
-#include <dev/wscons/wsmuxvar.h>
-
 struct wskbd_internal {
        const struct wskbd_mapdata *t_keymap;
 
@@ -290,8 +291,6 @@
 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);
diff -r 2cd92fdbb90e -r f9a08130c4cc sys/dev/wscons/wsmouse.c
--- a/sys/dev/wscons/wsmouse.c  Sun Dec 27 15:15:45 2020 +0000
+++ b/sys/dev/wscons/wsmouse.c  Sun Dec 27 16:09:33 2020 +0000
@@ -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 @@
 #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 @@
 
 static void wsmouse_repeat(void *v);
 
-extern struct cfdriver wsmouse_cd;
-
 dev_type_open(wsmouseopen);
 dev_type_close(wsmouseclose);
 dev_type_read(wsmouseread);