Module Name: src
Committed By: mrg
Date: Sun May 5 03:17:54 UTC 2019
Modified Files:
src/sys/dev/usb: if_atu.c if_aue.c if_cdce.c if_cue.c if_kue.c if_rum.c
if_udav.c if_upl.c if_ural.c if_url.c if_zyd.c stuirda.c uark.c
uaudio.c uberry.c ubsa.c ubt.c uchcom.c ucom.c ucycom.c udsbr.c
uep.c uftdi.c ugen.c ugensa.c uhid.c uhidev.c uhso.c uhub.c uipad.c
uipaq.c uirda.c ukbd.c ukyopon.c ulpt.c umass.c umct.c umidi.c
umodem.c ums.c uplcom.c urio.c usb.c uscanner.c usscanner.c ustir.c
uthum.c utoppy.c uts.c uvideo.c uvisor.c uvscom.c uyap.c uyurex.c
Log Message:
remove explicit 'extern struct cfdriver <my>_cd;' and use ioconf.h
To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 src/sys/dev/usb/if_atu.c src/sys/dev/usb/if_rum.c
cvs rdiff -u -r1.150 -r1.151 src/sys/dev/usb/if_aue.c
cvs rdiff -u -r1.46 -r1.47 src/sys/dev/usb/if_cdce.c src/sys/dev/usb/ucycom.c \
src/sys/dev/usb/uvideo.c
cvs rdiff -u -r1.80 -r1.81 src/sys/dev/usb/if_cue.c
cvs rdiff -u -r1.92 -r1.93 src/sys/dev/usb/if_kue.c src/sys/dev/usb/ums.c
cvs rdiff -u -r1.56 -r1.57 src/sys/dev/usb/if_udav.c
cvs rdiff -u -r1.62 -r1.63 src/sys/dev/usb/if_upl.c src/sys/dev/usb/if_url.c
cvs rdiff -u -r1.58 -r1.59 src/sys/dev/usb/if_ural.c
cvs rdiff -u -r1.51 -r1.52 src/sys/dev/usb/if_zyd.c
cvs rdiff -u -r1.19 -r1.20 src/sys/dev/usb/stuirda.c
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/usb/uark.c src/sys/dev/usb/uberry.c
cvs rdiff -u -r1.158 -r1.159 src/sys/dev/usb/uaudio.c
cvs rdiff -u -r1.36 -r1.37 src/sys/dev/usb/ubsa.c
cvs rdiff -u -r1.61 -r1.62 src/sys/dev/usb/ubt.c
cvs rdiff -u -r1.30 -r1.31 src/sys/dev/usb/uchcom.c
cvs rdiff -u -r1.123 -r1.124 src/sys/dev/usb/ucom.c
cvs rdiff -u -r1.26 -r1.27 src/sys/dev/usb/udsbr.c
cvs rdiff -u -r1.21 -r1.22 src/sys/dev/usb/uep.c
cvs rdiff -u -r1.68 -r1.69 src/sys/dev/usb/uftdi.c
cvs rdiff -u -r1.145 -r1.146 src/sys/dev/usb/ugen.c
cvs rdiff -u -r1.37 -r1.38 src/sys/dev/usb/ugensa.c src/sys/dev/usb/umct.c
cvs rdiff -u -r1.107 -r1.108 src/sys/dev/usb/uhid.c
cvs rdiff -u -r1.74 -r1.75 src/sys/dev/usb/uhidev.c
cvs rdiff -u -r1.29 -r1.30 src/sys/dev/usb/uhso.c
cvs rdiff -u -r1.141 -r1.142 src/sys/dev/usb/uhub.c src/sys/dev/usb/ukbd.c
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/usb/uipad.c
cvs rdiff -u -r1.23 -r1.24 src/sys/dev/usb/uipaq.c
cvs rdiff -u -r1.43 -r1.44 src/sys/dev/usb/uirda.c \
src/sys/dev/usb/usscanner.c
cvs rdiff -u -r1.22 -r1.23 src/sys/dev/usb/ukyopon.c src/sys/dev/usb/uyap.c
cvs rdiff -u -r1.102 -r1.103 src/sys/dev/usb/ulpt.c
cvs rdiff -u -r1.174 -r1.175 src/sys/dev/usb/umass.c
cvs rdiff -u -r1.76 -r1.77 src/sys/dev/usb/umidi.c
cvs rdiff -u -r1.70 -r1.71 src/sys/dev/usb/umodem.c
cvs rdiff -u -r1.81 -r1.82 src/sys/dev/usb/uplcom.c
cvs rdiff -u -r1.47 -r1.48 src/sys/dev/usb/urio.c
cvs rdiff -u -r1.178 -r1.179 src/sys/dev/usb/usb.c
cvs rdiff -u -r1.83 -r1.84 src/sys/dev/usb/uscanner.c
cvs rdiff -u -r1.39 -r1.40 src/sys/dev/usb/ustir.c
cvs rdiff -u -r1.15 -r1.16 src/sys/dev/usb/uthum.c src/sys/dev/usb/uyurex.c
cvs rdiff -u -r1.31 -r1.32 src/sys/dev/usb/utoppy.c
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/usb/uts.c
cvs rdiff -u -r1.49 -r1.50 src/sys/dev/usb/uvisor.c
cvs rdiff -u -r1.33 -r1.34 src/sys/dev/usb/uvscom.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/usb/if_atu.c
diff -u src/sys/dev/usb/if_atu.c:1.64 src/sys/dev/usb/if_atu.c:1.65
--- src/sys/dev/usb/if_atu.c:1.64 Fri Apr 26 06:33:34 2019
+++ src/sys/dev/usb/if_atu.c Sun May 5 03:17:54 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_atu.c,v 1.64 2019/04/26 06:33:34 msaitoh Exp $ */
+/* $NetBSD: if_atu.c,v 1.65 2019/05/05 03:17:54 mrg Exp $ */
/* $OpenBSD: if_atu.c,v 1.48 2004/12/30 01:53:21 dlg Exp $ */
/*
* Copyright (c) 2003, 2004
@@ -48,7 +48,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_atu.c,v 1.64 2019/04/26 06:33:34 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_atu.c,v 1.65 2019/05/05 03:17:54 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -282,7 +282,7 @@ int atu_match(device_t, cfdata_t, void *
void atu_attach(device_t, device_t, void *);
int atu_detach(device_t, int);
int atu_activate(device_t, enum devact);
-extern struct cfdriver atu_cd;
+
CFATTACH_DECL_NEW(atu, sizeof(struct atu_softc), atu_match, atu_attach,
atu_detach, atu_activate);
Index: src/sys/dev/usb/if_rum.c
diff -u src/sys/dev/usb/if_rum.c:1.64 src/sys/dev/usb/if_rum.c:1.65
--- src/sys/dev/usb/if_rum.c:1.64 Wed Sep 12 21:57:18 2018
+++ src/sys/dev/usb/if_rum.c Sun May 5 03:17:54 2019
@@ -1,5 +1,5 @@
/* $OpenBSD: if_rum.c,v 1.40 2006/09/18 16:20:20 damien Exp $ */
-/* $NetBSD: if_rum.c,v 1.64 2018/09/12 21:57:18 christos Exp $ */
+/* $NetBSD: if_rum.c,v 1.65 2019/05/05 03:17:54 mrg Exp $ */
/*-
* Copyright (c) 2005-2007 Damien Bergamini <[email protected]>
@@ -24,7 +24,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_rum.c,v 1.64 2018/09/12 21:57:18 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_rum.c,v 1.65 2019/05/05 03:17:54 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -234,7 +234,7 @@ static int rum_match(device_t, cfdata_t,
static void rum_attach(device_t, device_t, void *);
static int rum_detach(device_t, int);
static int rum_activate(device_t, enum devact);
-extern struct cfdriver rum_cd;
+
CFATTACH_DECL_NEW(rum, sizeof(struct rum_softc), rum_match, rum_attach,
rum_detach, rum_activate);
Index: src/sys/dev/usb/if_aue.c
diff -u src/sys/dev/usb/if_aue.c:1.150 src/sys/dev/usb/if_aue.c:1.151
--- src/sys/dev/usb/if_aue.c:1.150 Mon Apr 22 08:36:03 2019
+++ src/sys/dev/usb/if_aue.c Sun May 5 03:17:54 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_aue.c,v 1.150 2019/04/22 08:36:03 msaitoh Exp $ */
+/* $NetBSD: if_aue.c,v 1.151 2019/05/05 03:17:54 mrg Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_aue.c,v 1.150 2019/04/22 08:36:03 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_aue.c,v 1.151 2019/05/05 03:17:54 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -212,7 +212,7 @@ int aue_match(device_t, cfdata_t, void *
void aue_attach(device_t, device_t, void *);
int aue_detach(device_t, int);
int aue_activate(device_t, enum devact);
-extern struct cfdriver aue_cd;
+
CFATTACH_DECL_NEW(aue, sizeof(struct aue_softc), aue_match, aue_attach,
aue_detach, aue_activate);
Index: src/sys/dev/usb/if_cdce.c
diff -u src/sys/dev/usb/if_cdce.c:1.46 src/sys/dev/usb/if_cdce.c:1.47
--- src/sys/dev/usb/if_cdce.c:1.46 Tue Jun 26 06:48:02 2018
+++ src/sys/dev/usb/if_cdce.c Sun May 5 03:17:54 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cdce.c,v 1.46 2018/06/26 06:48:02 msaitoh Exp $ */
+/* $NetBSD: if_cdce.c,v 1.47 2019/05/05 03:17:54 mrg Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000-2003 Bill Paul <[email protected]>
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_cdce.c,v 1.46 2018/06/26 06:48:02 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cdce.c,v 1.47 2019/05/05 03:17:54 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -111,7 +111,7 @@ int cdce_match(device_t, cfdata_t, void
void cdce_attach(device_t, device_t, void *);
int cdce_detach(device_t, int);
int cdce_activate(device_t, enum devact);
-extern struct cfdriver cdce_cd;
+
CFATTACH_DECL_NEW(cdce, sizeof(struct cdce_softc), cdce_match, cdce_attach,
cdce_detach, cdce_activate);
Index: src/sys/dev/usb/ucycom.c
diff -u src/sys/dev/usb/ucycom.c:1.46 src/sys/dev/usb/ucycom.c:1.47
--- src/sys/dev/usb/ucycom.c:1.46 Sun Dec 10 17:03:07 2017
+++ src/sys/dev/usb/ucycom.c Sun May 5 03:17:54 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ucycom.c,v 1.46 2017/12/10 17:03:07 bouyer Exp $ */
+/* $NetBSD: ucycom.c,v 1.47 2019/05/05 03:17:54 mrg Exp $ */
/*
* Copyright (c) 2005 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ucycom.c,v 1.46 2017/12/10 17:03:07 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ucycom.c,v 1.47 2019/05/05 03:17:54 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -194,7 +194,7 @@ int ucycom_match(device_t, cfdata_t, voi
void ucycom_attach(device_t, device_t, void *);
int ucycom_detach(device_t, int);
int ucycom_activate(device_t, enum devact);
-extern struct cfdriver ucycom_cd;
+
CFATTACH_DECL_NEW(ucycom, sizeof(struct ucycom_softc), ucycom_match,
ucycom_attach, ucycom_detach, ucycom_activate);
Index: src/sys/dev/usb/uvideo.c
diff -u src/sys/dev/usb/uvideo.c:1.46 src/sys/dev/usb/uvideo.c:1.47
--- src/sys/dev/usb/uvideo.c:1.46 Sun Jan 21 13:57:12 2018
+++ src/sys/dev/usb/uvideo.c Sun May 5 03:17:54 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: uvideo.c,v 1.46 2018/01/21 13:57:12 skrll Exp $ */
+/* $NetBSD: uvideo.c,v 1.47 2019/05/05 03:17:54 mrg Exp $ */
/*
* Copyright (c) 2008 Patrick Mahoney
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvideo.c,v 1.46 2018/01/21 13:57:12 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvideo.c,v 1.47 2019/05/05 03:17:54 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -374,7 +374,7 @@ CFATTACH_DECL2_NEW(uvideo, sizeof(struct
uvideo_match, uvideo_attach, uvideo_detach, uvideo_activate, NULL,
uvideo_childdet);
-extern struct cfdriver uvideo_cd;
+
static const struct video_hw_if uvideo_hw_if = {
Index: src/sys/dev/usb/if_cue.c
diff -u src/sys/dev/usb/if_cue.c:1.80 src/sys/dev/usb/if_cue.c:1.81
--- src/sys/dev/usb/if_cue.c:1.80 Thu Aug 2 06:09:04 2018
+++ src/sys/dev/usb/if_cue.c Sun May 5 03:17:54 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cue.c,v 1.80 2018/08/02 06:09:04 riastradh Exp $ */
+/* $NetBSD: if_cue.c,v 1.81 2019/05/05 03:17:54 mrg Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
* Bill Paul <[email protected]>. All rights reserved.
@@ -56,7 +56,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_cue.c,v 1.80 2018/08/02 06:09:04 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cue.c,v 1.81 2019/05/05 03:17:54 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -116,7 +116,7 @@ int cue_match(device_t, cfdata_t, void *
void cue_attach(device_t, device_t, void *);
int cue_detach(device_t, int);
int cue_activate(device_t, enum devact);
-extern struct cfdriver cue_cd;
+
CFATTACH_DECL_NEW(cue, sizeof(struct cue_softc), cue_match, cue_attach,
cue_detach, cue_activate);
Index: src/sys/dev/usb/if_kue.c
diff -u src/sys/dev/usb/if_kue.c:1.92 src/sys/dev/usb/if_kue.c:1.93
--- src/sys/dev/usb/if_kue.c:1.92 Tue Jun 26 06:48:02 2018
+++ src/sys/dev/usb/if_kue.c Sun May 5 03:17:54 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_kue.c,v 1.92 2018/06/26 06:48:02 msaitoh Exp $ */
+/* $NetBSD: if_kue.c,v 1.93 2019/05/05 03:17:54 mrg Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
@@ -71,7 +71,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_kue.c,v 1.92 2018/06/26 06:48:02 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_kue.c,v 1.93 2019/05/05 03:17:54 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -161,7 +161,7 @@ int kue_match(device_t, cfdata_t, void *
void kue_attach(device_t, device_t, void *);
int kue_detach(device_t, int);
int kue_activate(device_t, enum devact);
-extern struct cfdriver kue_cd;
+
CFATTACH_DECL_NEW(kue, sizeof(struct kue_softc), kue_match, kue_attach,
kue_detach, kue_activate);
Index: src/sys/dev/usb/ums.c
diff -u src/sys/dev/usb/ums.c:1.92 src/sys/dev/usb/ums.c:1.93
--- src/sys/dev/usb/ums.c:1.92 Sat Dec 29 06:34:16 2018
+++ src/sys/dev/usb/ums.c Sun May 5 03:17:54 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ums.c,v 1.92 2018/12/29 06:34:16 maya Exp $ */
+/* $NetBSD: ums.c,v 1.93 2019/05/05 03:17:54 mrg Exp $ */
/*
* Copyright (c) 1998, 2017 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ums.c,v 1.92 2018/12/29 06:34:16 maya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ums.c,v 1.93 2019/05/05 03:17:54 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -99,7 +99,7 @@ void ums_attach(device_t, device_t, void
void ums_childdet(device_t, device_t);
int ums_detach(device_t, int);
int ums_activate(device_t, enum devact);
-extern struct cfdriver ums_cd;
+
CFATTACH_DECL2_NEW(ums, sizeof(struct ums_softc), ums_match, ums_attach,
ums_detach, ums_activate, NULL, ums_childdet);
Index: src/sys/dev/usb/if_udav.c
diff -u src/sys/dev/usb/if_udav.c:1.56 src/sys/dev/usb/if_udav.c:1.57
--- src/sys/dev/usb/if_udav.c:1.56 Tue Jan 22 03:42:28 2019
+++ src/sys/dev/usb/if_udav.c Sun May 5 03:17:54 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_udav.c,v 1.56 2019/01/22 03:42:28 msaitoh Exp $ */
+/* $NetBSD: if_udav.c,v 1.57 2019/05/05 03:17:54 mrg Exp $ */
/* $nabe: if_udav.c,v 1.3 2003/08/21 16:57:19 nabe Exp $ */
/*
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_udav.c,v 1.56 2019/01/22 03:42:28 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_udav.c,v 1.57 2019/05/05 03:17:54 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -90,7 +90,7 @@ int udav_match(device_t, cfdata_t, void
void udav_attach(device_t, device_t, void *);
int udav_detach(device_t, int);
int udav_activate(device_t, enum devact);
-extern struct cfdriver udav_cd;
+
CFATTACH_DECL_NEW(udav, sizeof(struct udav_softc), udav_match, udav_attach,
udav_detach, udav_activate);
Index: src/sys/dev/usb/if_upl.c
diff -u src/sys/dev/usb/if_upl.c:1.62 src/sys/dev/usb/if_upl.c:1.63
--- src/sys/dev/usb/if_upl.c:1.62 Tue Jun 26 06:48:02 2018
+++ src/sys/dev/usb/if_upl.c Sun May 5 03:17:54 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_upl.c,v 1.62 2018/06/26 06:48:02 msaitoh Exp $ */
+/* $NetBSD: if_upl.c,v 1.63 2019/05/05 03:17:54 mrg Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_upl.c,v 1.62 2018/06/26 06:48:02 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_upl.c,v 1.63 2019/05/05 03:17:54 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -176,7 +176,7 @@ int upl_match(device_t, cfdata_t, void *
void upl_attach(device_t, device_t, void *);
int upl_detach(device_t, int);
int upl_activate(device_t, enum devact);
-extern struct cfdriver upl_cd;
+
CFATTACH_DECL_NEW(upl, sizeof(struct upl_softc), upl_match, upl_attach,
upl_detach, upl_activate);
Index: src/sys/dev/usb/if_url.c
diff -u src/sys/dev/usb/if_url.c:1.62 src/sys/dev/usb/if_url.c:1.63
--- src/sys/dev/usb/if_url.c:1.62 Fri Mar 8 03:05:15 2019
+++ src/sys/dev/usb/if_url.c Sun May 5 03:17:54 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_url.c,v 1.62 2019/03/08 03:05:15 msaitoh Exp $ */
+/* $NetBSD: if_url.c,v 1.63 2019/05/05 03:17:54 mrg Exp $ */
/*
* Copyright (c) 2001, 2002
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_url.c,v 1.62 2019/03/08 03:05:15 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_url.c,v 1.63 2019/05/05 03:17:54 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -91,7 +91,7 @@ int url_match(device_t, cfdata_t, void *
void url_attach(device_t, device_t, void *);
int url_detach(device_t, int);
int url_activate(device_t, enum devact);
-extern struct cfdriver url_cd;
+
CFATTACH_DECL_NEW(url, sizeof(struct url_softc), url_match, url_attach,
url_detach, url_activate);
Index: src/sys/dev/usb/if_ural.c
diff -u src/sys/dev/usb/if_ural.c:1.58 src/sys/dev/usb/if_ural.c:1.59
--- src/sys/dev/usb/if_ural.c:1.58 Mon Sep 3 16:29:33 2018
+++ src/sys/dev/usb/if_ural.c Sun May 5 03:17:54 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ural.c,v 1.58 2018/09/03 16:29:33 riastradh Exp $ */
+/* $NetBSD: if_ural.c,v 1.59 2019/05/05 03:17:54 mrg Exp $ */
/* $FreeBSD: /repoman/r/ncvs/src/sys/dev/usb/if_ural.c,v 1.40 2006/06/02 23:14:40 sam Exp $ */
/*-
@@ -24,7 +24,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ural.c,v 1.58 2018/09/03 16:29:33 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ural.c,v 1.59 2019/05/05 03:17:54 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -339,7 +339,7 @@ int ural_match(device_t, cfdata_t, void
void ural_attach(device_t, device_t, void *);
int ural_detach(device_t, int);
int ural_activate(device_t, enum devact);
-extern struct cfdriver ural_cd;
+
CFATTACH_DECL_NEW(ural, sizeof(struct ural_softc), ural_match, ural_attach,
ural_detach, ural_activate);
Index: src/sys/dev/usb/if_zyd.c
diff -u src/sys/dev/usb/if_zyd.c:1.51 src/sys/dev/usb/if_zyd.c:1.52
--- src/sys/dev/usb/if_zyd.c:1.51 Mon Sep 3 16:29:33 2018
+++ src/sys/dev/usb/if_zyd.c Sun May 5 03:17:54 2019
@@ -1,5 +1,5 @@
/* $OpenBSD: if_zyd.c,v 1.52 2007/02/11 00:08:04 jsg Exp $ */
-/* $NetBSD: if_zyd.c,v 1.51 2018/09/03 16:29:33 riastradh Exp $ */
+/* $NetBSD: if_zyd.c,v 1.52 2019/05/05 03:17:54 mrg Exp $ */
/*-
* Copyright (c) 2006 by Damien Bergamini <[email protected]>
@@ -23,7 +23,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_zyd.c,v 1.51 2018/09/03 16:29:33 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_zyd.c,v 1.52 2019/05/05 03:17:54 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -160,7 +160,7 @@ int zyd_match(device_t, cfdata_t, void *
void zyd_attach(device_t, device_t, void *);
int zyd_detach(device_t, int);
int zyd_activate(device_t, enum devact);
-extern struct cfdriver zyd_cd;
+
CFATTACH_DECL_NEW(zyd, sizeof(struct zyd_softc), zyd_match,
zyd_attach, zyd_detach, zyd_activate);
Index: src/sys/dev/usb/stuirda.c
diff -u src/sys/dev/usb/stuirda.c:1.19 src/sys/dev/usb/stuirda.c:1.20
--- src/sys/dev/usb/stuirda.c:1.19 Fri Nov 25 12:56:29 2016
+++ src/sys/dev/usb/stuirda.c Sun May 5 03:17:54 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: stuirda.c,v 1.19 2016/11/25 12:56:29 skrll Exp $ */
+/* $NetBSD: stuirda.c,v 1.20 2019/05/05 03:17:54 mrg Exp $ */
/*
* Copyright (c) 2001,2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: stuirda.c,v 1.19 2016/11/25 12:56:29 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: stuirda.c,v 1.20 2019/05/05 03:17:54 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -104,7 +104,7 @@ int stuirda_match(device_t, cfdata_t, vo
void stuirda_attach(device_t, device_t, void *);
int stuirda_detach(device_t, int);
int stuirda_activate(device_t, enum devact);
-extern struct cfdriver stuirda_cd;
+
CFATTACH_DECL_NEW(stuirda, sizeof(struct stuirda_softc), stuirda_match,
stuirda_attach, stuirda_detach, stuirda_activate);
Index: src/sys/dev/usb/uark.c
diff -u src/sys/dev/usb/uark.c:1.13 src/sys/dev/usb/uark.c:1.14
--- src/sys/dev/usb/uark.c:1.13 Sat May 4 08:04:13 2019
+++ src/sys/dev/usb/uark.c Sun May 5 03:17:54 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: uark.c,v 1.13 2019/05/04 08:04:13 mrg Exp $ */
+/* $NetBSD: uark.c,v 1.14 2019/05/05 03:17:54 mrg Exp $ */
/* $OpenBSD: uark.c,v 1.13 2009/10/13 19:33:17 pirofti Exp $ */
/*
@@ -18,7 +18,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uark.c,v 1.13 2019/05/04 08:04:13 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uark.c,v 1.14 2019/05/05 03:17:54 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -98,7 +98,7 @@ int uark_match(device_t, cfd
void uark_attach(device_t, device_t, void *);
int uark_detach(device_t, int);
int uark_activate(device_t, enum devact);
-extern struct cfdriver uark_cd;
+
CFATTACH_DECL_NEW(uark, sizeof(struct uark_softc), uark_match, uark_attach,
uark_detach, uark_activate);
Index: src/sys/dev/usb/uberry.c
diff -u src/sys/dev/usb/uberry.c:1.13 src/sys/dev/usb/uberry.c:1.14
--- src/sys/dev/usb/uberry.c:1.13 Tue Jan 22 06:47:20 2019
+++ src/sys/dev/usb/uberry.c Sun May 5 03:17:54 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: uberry.c,v 1.13 2019/01/22 06:47:20 skrll Exp $ */
+/* $NetBSD: uberry.c,v 1.14 2019/05/05 03:17:54 mrg Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uberry.c,v 1.13 2019/01/22 06:47:20 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uberry.c,v 1.14 2019/05/05 03:17:54 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -93,7 +93,7 @@ int uberry_match(device_t, cfdata_t, voi
void uberry_attach(device_t, device_t, void *);
int uberry_detach(device_t, int);
int uberry_activate(device_t, enum devact);
-extern struct cfdriver uberry_cd;
+
CFATTACH_DECL_NEW(uberry, sizeof(struct uberry_softc), uberry_match,
uberry_attach, uberry_detach, NULL);
Index: src/sys/dev/usb/uaudio.c
diff -u src/sys/dev/usb/uaudio.c:1.158 src/sys/dev/usb/uaudio.c:1.159
--- src/sys/dev/usb/uaudio.c:1.158 Sat Mar 16 12:09:58 2019
+++ src/sys/dev/usb/uaudio.c Sun May 5 03:17:54 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: uaudio.c,v 1.158 2019/03/16 12:09:58 isaki Exp $ */
+/* $NetBSD: uaudio.c,v 1.159 2019/05/05 03:17:54 mrg Exp $ */
/*
* Copyright (c) 1999, 2012 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uaudio.c,v 1.158 2019/03/16 12:09:58 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uaudio.c,v 1.159 2019/05/05 03:17:54 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -381,7 +381,7 @@ int uaudio_detach(device_t, int);
void uaudio_childdet(device_t, device_t);
int uaudio_activate(device_t, enum devact);
-extern struct cfdriver uaudio_cd;
+
CFATTACH_DECL2_NEW(uaudio, sizeof(struct uaudio_softc),
uaudio_match, uaudio_attach, uaudio_detach, uaudio_activate, NULL,
Index: src/sys/dev/usb/ubsa.c
diff -u src/sys/dev/usb/ubsa.c:1.36 src/sys/dev/usb/ubsa.c:1.37
--- src/sys/dev/usb/ubsa.c:1.36 Sat May 4 08:04:13 2019
+++ src/sys/dev/usb/ubsa.c Sun May 5 03:17:54 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ubsa.c,v 1.36 2019/05/04 08:04:13 mrg Exp $ */
+/* $NetBSD: ubsa.c,v 1.37 2019/05/05 03:17:54 mrg Exp $ */
/*-
* Copyright (c) 2002, Alexander Kabaev <kan.FreeBSD.org>.
* All rights reserved.
@@ -54,7 +54,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ubsa.c,v 1.36 2019/05/04 08:04:13 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ubsa.c,v 1.37 2019/05/05 03:17:54 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -132,7 +132,7 @@ void ubsa_childdet(device_t, device_t);
int ubsa_detach(device_t, int);
int ubsa_activate(device_t, enum devact);
-extern struct cfdriver ubsa_cd;
+
CFATTACH_DECL2_NEW(ubsa, sizeof(struct ubsa_softc),
ubsa_match, ubsa_attach, ubsa_detach, ubsa_activate, NULL, ubsa_childdet);
Index: src/sys/dev/usb/ubt.c
diff -u src/sys/dev/usb/ubt.c:1.61 src/sys/dev/usb/ubt.c:1.62
--- src/sys/dev/usb/ubt.c:1.61 Wed Apr 18 15:01:03 2018
+++ src/sys/dev/usb/ubt.c Sun May 5 03:17:54 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ubt.c,v 1.61 2018/04/18 15:01:03 maxv Exp $ */
+/* $NetBSD: ubt.c,v 1.62 2019/05/05 03:17:54 mrg Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ubt.c,v 1.61 2018/04/18 15:01:03 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ubt.c,v 1.62 2019/05/05 03:17:54 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -293,7 +293,7 @@ int ubt_match(device_t, cfdata_t, void *
void ubt_attach(device_t, device_t, void *);
int ubt_detach(device_t, int);
int ubt_activate(device_t, enum devact);
-extern struct cfdriver ubt_cd;
+
CFATTACH_DECL_NEW(ubt, sizeof(struct ubt_softc), ubt_match, ubt_attach,
ubt_detach, ubt_activate);
Index: src/sys/dev/usb/uchcom.c
diff -u src/sys/dev/usb/uchcom.c:1.30 src/sys/dev/usb/uchcom.c:1.31
--- src/sys/dev/usb/uchcom.c:1.30 Sat May 4 08:04:13 2019
+++ src/sys/dev/usb/uchcom.c Sun May 5 03:17:54 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: uchcom.c,v 1.30 2019/05/04 08:04:13 mrg Exp $ */
+/* $NetBSD: uchcom.c,v 1.31 2019/05/05 03:17:54 mrg Exp $ */
/*
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uchcom.c,v 1.30 2019/05/04 08:04:13 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uchcom.c,v 1.31 2019/05/05 03:17:54 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -202,7 +202,7 @@ void uchcom_childdet(device_t, device_t)
int uchcom_detach(device_t, int);
int uchcom_activate(device_t, enum devact);
-extern struct cfdriver uchcom_cd;
+
CFATTACH_DECL2_NEW(uchcom,
sizeof(struct uchcom_softc),
Index: src/sys/dev/usb/ucom.c
diff -u src/sys/dev/usb/ucom.c:1.123 src/sys/dev/usb/ucom.c:1.124
--- src/sys/dev/usb/ucom.c:1.123 Wed May 1 06:01:01 2019
+++ src/sys/dev/usb/ucom.c Sun May 5 03:17:54 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ucom.c,v 1.123 2019/05/01 06:01:01 mrg Exp $ */
+/* $NetBSD: ucom.c,v 1.124 2019/05/05 03:17:54 mrg Exp $ */
/*
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ucom.c,v 1.123 2019/05/01 06:01:01 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ucom.c,v 1.124 2019/05/05 03:17:54 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -69,8 +69,8 @@ __KERNEL_RCSID(0, "$NetBSD: ucom.c,v 1.1
#include <dev/usb/ucomvar.h>
#include "ucom.h"
-
#include "locators.h"
+#include "ioconf.h"
#if NUCOM > 0
@@ -246,7 +246,7 @@ int ucom_match(device_t, cfdata_t, void
void ucom_attach(device_t, device_t, void *);
int ucom_detach(device_t, int);
int ucom_activate(device_t, enum devact);
-extern struct cfdriver ucom_cd;
+
CFATTACH_DECL_NEW(ucom, sizeof(struct ucom_softc), ucom_match, ucom_attach,
ucom_detach, ucom_activate);
Index: src/sys/dev/usb/udsbr.c
diff -u src/sys/dev/usb/udsbr.c:1.26 src/sys/dev/usb/udsbr.c:1.27
--- src/sys/dev/usb/udsbr.c:1.26 Sun Dec 4 10:12:35 2016
+++ src/sys/dev/usb/udsbr.c Sun May 5 03:17:54 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: udsbr.c,v 1.26 2016/12/04 10:12:35 skrll Exp $ */
+/* $NetBSD: udsbr.c,v 1.27 2019/05/05 03:17:54 mrg Exp $ */
/*
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: udsbr.c,v 1.26 2016/12/04 10:12:35 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udsbr.c,v 1.27 2019/05/05 03:17:54 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -106,7 +106,7 @@ void udsbr_attach(device_t, device_t, vo
void udsbr_childdet(device_t, device_t);
int udsbr_detach(device_t, int);
int udsbr_activate(device_t, enum devact);
-extern struct cfdriver udsbr_cd;
+
CFATTACH_DECL2_NEW(udsbr, sizeof(struct udsbr_softc), udsbr_match,
udsbr_attach, udsbr_detach, udsbr_activate, NULL, udsbr_childdet);
Index: src/sys/dev/usb/uep.c
diff -u src/sys/dev/usb/uep.c:1.21 src/sys/dev/usb/uep.c:1.22
--- src/sys/dev/usb/uep.c:1.21 Mon Dec 5 13:14:22 2016
+++ src/sys/dev/usb/uep.c Sun May 5 03:17:54 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: uep.c,v 1.21 2016/12/05 13:14:22 maya Exp $ */
+/* $NetBSD: uep.c,v 1.22 2019/05/05 03:17:54 mrg Exp $ */
/*
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
* eGalax USB touchpanel controller driver.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uep.c,v 1.21 2016/12/05 13:14:22 maya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uep.c,v 1.22 2019/05/05 03:17:54 mrg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -106,7 +106,7 @@ void uep_attach(device_t, device_t, void
void uep_childdet(device_t, device_t);
int uep_detach(device_t, int);
int uep_activate(device_t, enum devact);
-extern struct cfdriver uep_cd;
+
CFATTACH_DECL2_NEW(uep, sizeof(struct uep_softc), uep_match, uep_attach,
uep_detach, uep_activate, NULL, uep_childdet);
Index: src/sys/dev/usb/uftdi.c
diff -u src/sys/dev/usb/uftdi.c:1.68 src/sys/dev/usb/uftdi.c:1.69
--- src/sys/dev/usb/uftdi.c:1.68 Sat May 4 08:04:13 2019
+++ src/sys/dev/usb/uftdi.c Sun May 5 03:17:54 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: uftdi.c,v 1.68 2019/05/04 08:04:13 mrg Exp $ */
+/* $NetBSD: uftdi.c,v 1.69 2019/05/05 03:17:54 mrg Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uftdi.c,v 1.68 2019/05/04 08:04:13 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uftdi.c,v 1.69 2019/05/05 03:17:54 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -179,7 +179,7 @@ void uftdi_attach(device_t, device_t, vo
void uftdi_childdet(device_t, device_t);
int uftdi_detach(device_t, int);
int uftdi_activate(device_t, enum devact);
-extern struct cfdriver uftdi_cd;
+
CFATTACH_DECL2_NEW(uftdi, sizeof(struct uftdi_softc), uftdi_match,
uftdi_attach, uftdi_detach, uftdi_activate, NULL, uftdi_childdet);
Index: src/sys/dev/usb/ugen.c
diff -u src/sys/dev/usb/ugen.c:1.145 src/sys/dev/usb/ugen.c:1.146
--- src/sys/dev/usb/ugen.c:1.145 Fri Mar 1 11:06:56 2019
+++ src/sys/dev/usb/ugen.c Sun May 5 03:17:54 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ugen.c,v 1.145 2019/03/01 11:06:56 pgoyette Exp $ */
+/* $NetBSD: ugen.c,v 1.146 2019/05/05 03:17:54 mrg Exp $ */
/*
* Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ugen.c,v 1.145 2019/03/01 11:06:56 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ugen.c,v 1.146 2019/05/05 03:17:54 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -63,6 +63,8 @@ __KERNEL_RCSID(0, "$NetBSD: ugen.c,v 1.1
#include <dev/usb/usbdi.h>
#include <dev/usb/usbdi_util.h>
+#include "ioconf.h"
+
#ifdef UGEN_DEBUG
#define DPRINTF(x) if (ugendebug) printf x
#define DPRINTFN(n,x) if (ugendebug>(n)) printf x
@@ -188,7 +190,7 @@ int ugen_match(device_t, cfdata_t, void
void ugen_attach(device_t, device_t, void *);
int ugen_detach(device_t, int);
int ugen_activate(device_t, enum devact);
-extern struct cfdriver ugen_cd;
+
CFATTACH_DECL_NEW(ugen, sizeof(struct ugen_softc), ugen_match,
ugen_attach, ugen_detach, ugen_activate);
CFATTACH_DECL_NEW(ugenif, sizeof(struct ugen_softc), ugenif_match,
Index: src/sys/dev/usb/ugensa.c
diff -u src/sys/dev/usb/ugensa.c:1.37 src/sys/dev/usb/ugensa.c:1.38
--- src/sys/dev/usb/ugensa.c:1.37 Sat May 4 08:04:13 2019
+++ src/sys/dev/usb/ugensa.c Sun May 5 03:17:54 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ugensa.c,v 1.37 2019/05/04 08:04:13 mrg Exp $ */
+/* $NetBSD: ugensa.c,v 1.38 2019/05/05 03:17:54 mrg Exp $ */
/*
* Copyright (c) 2004, 2005 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ugensa.c,v 1.37 2019/05/04 08:04:13 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ugensa.c,v 1.38 2019/05/05 03:17:54 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -112,7 +112,7 @@ void ugensa_attach(device_t, device_t, v
void ugensa_childdet(device_t, device_t);
int ugensa_detach(device_t, int);
int ugensa_activate(device_t, enum devact);
-extern struct cfdriver ugensa_cd;
+
CFATTACH_DECL2_NEW(ugensa, sizeof(struct ugensa_softc), ugensa_match,
ugensa_attach, ugensa_detach, ugensa_activate, NULL, ugensa_childdet);
Index: src/sys/dev/usb/umct.c
diff -u src/sys/dev/usb/umct.c:1.37 src/sys/dev/usb/umct.c:1.38
--- src/sys/dev/usb/umct.c:1.37 Sat May 4 08:04:13 2019
+++ src/sys/dev/usb/umct.c Sun May 5 03:17:54 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: umct.c,v 1.37 2019/05/04 08:04:13 mrg Exp $ */
+/* $NetBSD: umct.c,v 1.38 2019/05/05 03:17:54 mrg Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umct.c,v 1.37 2019/05/04 08:04:13 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umct.c,v 1.38 2019/05/05 03:17:54 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -152,7 +152,7 @@ void umct_attach(device_t, device_t, voi
void umct_childdet(device_t, device_t);
int umct_detach(device_t, int);
int umct_activate(device_t, enum devact);
-extern struct cfdriver umct_cd;
+
CFATTACH_DECL2_NEW(umct, sizeof(struct umct_softc), umct_match,
umct_attach, umct_detach, umct_activate, NULL, umct_childdet);
Index: src/sys/dev/usb/uhid.c
diff -u src/sys/dev/usb/uhid.c:1.107 src/sys/dev/usb/uhid.c:1.108
--- src/sys/dev/usb/uhid.c:1.107 Sat Mar 23 02:19:31 2019
+++ src/sys/dev/usb/uhid.c Sun May 5 03:17:54 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: uhid.c,v 1.107 2019/03/23 02:19:31 mrg Exp $ */
+/* $NetBSD: uhid.c,v 1.108 2019/05/05 03:17:54 mrg Exp $ */
/*
* Copyright (c) 1998, 2004, 2008, 2012 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhid.c,v 1.107 2019/03/23 02:19:31 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhid.c,v 1.108 2019/05/05 03:17:54 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -70,6 +70,8 @@ __KERNEL_RCSID(0, "$NetBSD: uhid.c,v 1.1
#include <dev/usb/uhidev.h>
+#include "ioconf.h"
+
#ifdef UHID_DEBUG
#define DPRINTF(x) if (uhiddebug) printf x
#define DPRINTFN(n,x) if (uhiddebug>(n)) printf x
@@ -143,7 +145,7 @@ int uhid_match(device_t, cfdata_t, void
void uhid_attach(device_t, device_t, void *);
int uhid_detach(device_t, int);
int uhid_activate(device_t, enum devact);
-extern struct cfdriver uhid_cd;
+
CFATTACH_DECL_NEW(uhid, sizeof(struct uhid_softc), uhid_match, uhid_attach,
uhid_detach, uhid_activate);
Index: src/sys/dev/usb/uhidev.c
diff -u src/sys/dev/usb/uhidev.c:1.74 src/sys/dev/usb/uhidev.c:1.75
--- src/sys/dev/usb/uhidev.c:1.74 Thu Nov 15 23:01:46 2018
+++ src/sys/dev/usb/uhidev.c Sun May 5 03:17:54 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: uhidev.c,v 1.74 2018/11/15 23:01:46 jakllsch Exp $ */
+/* $NetBSD: uhidev.c,v 1.75 2019/05/05 03:17:54 mrg Exp $ */
/*
* Copyright (c) 2001, 2012 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhidev.c,v 1.74 2018/11/15 23:01:46 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhidev.c,v 1.75 2019/05/05 03:17:54 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -90,7 +90,7 @@ void uhidev_attach(device_t, device_t, v
void uhidev_childdet(device_t, device_t);
int uhidev_detach(device_t, int);
int uhidev_activate(device_t, enum devact);
-extern struct cfdriver uhidev_cd;
+
CFATTACH_DECL2_NEW(uhidev, sizeof(struct uhidev_softc), uhidev_match,
uhidev_attach, uhidev_detach, uhidev_activate, NULL, uhidev_childdet);
Index: src/sys/dev/usb/uhso.c
diff -u src/sys/dev/usb/uhso.c:1.29 src/sys/dev/usb/uhso.c:1.30
--- src/sys/dev/usb/uhso.c:1.29 Tue Jan 22 06:47:20 2019
+++ src/sys/dev/usb/uhso.c Sun May 5 03:17:54 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: uhso.c,v 1.29 2019/01/22 06:47:20 skrll Exp $ */
+/* $NetBSD: uhso.c,v 1.30 2019/05/05 03:17:54 mrg Exp $ */
/*-
* Copyright (c) 2009 Iain Hibbert
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhso.c,v 1.29 2019/01/22 06:47:20 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhso.c,v 1.30 2019/05/05 03:17:54 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -79,6 +79,7 @@ __KERNEL_RCSID(0, "$NetBSD: uhso.c,v 1.2
#include <dev/scsipi/scsi_disk.h>
#include "usbdevs.h"
+#include "ioconf.h"
#undef DPRINTF
#ifdef UHSO_DEBUG
@@ -336,7 +337,7 @@ int uhso_match(device_t, cfdata_t, void
void uhso_attach(device_t, device_t, void *);
int uhso_detach(device_t, int);
-extern struct cfdriver uhso_cd;
+
CFATTACH_DECL_NEW(uhso, sizeof(struct uhso_softc), uhso_match, uhso_attach,
uhso_detach, NULL);
Index: src/sys/dev/usb/uhub.c
diff -u src/sys/dev/usb/uhub.c:1.141 src/sys/dev/usb/uhub.c:1.142
--- src/sys/dev/usb/uhub.c:1.141 Tue Oct 23 01:49:37 2018
+++ src/sys/dev/usb/uhub.c Sun May 5 03:17:54 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: uhub.c,v 1.141 2018/10/23 01:49:37 manu Exp $ */
+/* $NetBSD: uhub.c,v 1.142 2019/05/05 03:17:54 mrg Exp $ */
/* $FreeBSD: src/sys/dev/usb/uhub.c,v 1.18 1999/11/17 22:33:43 n_hibma Exp $ */
/* $OpenBSD: uhub.c,v 1.86 2015/06/29 18:27:40 mpi Exp $ */
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhub.c,v 1.141 2018/10/23 01:49:37 manu Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhub.c,v 1.142 2019/05/05 03:17:54 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -140,7 +140,7 @@ void uhub_attach(device_t, device_t, voi
int uhub_rescan(device_t, const char *, const int *);
void uhub_childdet(device_t, device_t);
int uhub_detach(device_t, int);
-extern struct cfdriver uhub_cd;
+
CFATTACH_DECL3_NEW(uhub, sizeof(struct uhub_softc), uhub_match,
uhub_attach, uhub_detach, NULL, uhub_rescan, uhub_childdet,
DVF_DETACH_SHUTDOWN);
Index: src/sys/dev/usb/ukbd.c
diff -u src/sys/dev/usb/ukbd.c:1.141 src/sys/dev/usb/ukbd.c:1.142
--- src/sys/dev/usb/ukbd.c:1.141 Tue Jan 9 17:58:09 2018
+++ src/sys/dev/usb/ukbd.c Sun May 5 03:17:54 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ukbd.c,v 1.141 2018/01/09 17:58:09 christos Exp $ */
+/* $NetBSD: ukbd.c,v 1.142 2019/05/05 03:17:54 mrg Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ukbd.c,v 1.141 2018/01/09 17:58:09 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ukbd.c,v 1.142 2019/05/05 03:17:54 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_ddb.h"
@@ -371,7 +371,7 @@ static int ukbd_detach(device_t, int);
static int ukbd_activate(device_t, enum devact);
static void ukbd_childdet(device_t, device_t);
-extern struct cfdriver ukbd_cd;
+
CFATTACH_DECL2_NEW(ukbd, sizeof(struct ukbd_softc), ukbd_match, ukbd_attach,
ukbd_detach, ukbd_activate, NULL, ukbd_childdet);
Index: src/sys/dev/usb/uipad.c
diff -u src/sys/dev/usb/uipad.c:1.6 src/sys/dev/usb/uipad.c:1.7
--- src/sys/dev/usb/uipad.c:1.6 Sat Sep 30 13:01:50 2017
+++ src/sys/dev/usb/uipad.c Sun May 5 03:17:54 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: uipad.c,v 1.6 2017/09/30 13:01:50 sevan Exp $ */
+/* $NetBSD: uipad.c,v 1.7 2019/05/05 03:17:54 mrg Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipad.c,v 1.6 2017/09/30 13:01:50 sevan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipad.c,v 1.7 2019/05/05 03:17:54 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -100,7 +100,7 @@ void uipad_attach(device_t, device_t, vo
int uipad_detach(device_t, int);
int uipad_activate(device_t, enum devact);
-extern struct cfdriver uipad_cd;
+
CFATTACH_DECL_NEW(uipad, sizeof(struct uipad_softc), uipad_match,
uipad_attach, uipad_detach, NULL);
Index: src/sys/dev/usb/uipaq.c
diff -u src/sys/dev/usb/uipaq.c:1.23 src/sys/dev/usb/uipaq.c:1.24
--- src/sys/dev/usb/uipaq.c:1.23 Sat May 4 08:04:13 2019
+++ src/sys/dev/usb/uipaq.c Sun May 5 03:17:54 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: uipaq.c,v 1.23 2019/05/04 08:04:13 mrg Exp $ */
+/* $NetBSD: uipaq.c,v 1.24 2019/05/05 03:17:54 mrg Exp $ */
/* $OpenBSD: uipaq.c,v 1.1 2005/06/17 23:50:33 deraadt Exp $ */
/*
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipaq.c,v 1.23 2019/05/04 08:04:13 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipaq.c,v 1.24 2019/05/05 03:17:54 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -129,7 +129,7 @@ void uipaq_attach(device_t, device_t, vo
void uipaq_childdet(device_t, device_t);
int uipaq_detach(device_t, int);
int uipaq_activate(device_t, enum devact);
-extern struct cfdriver uipaq_cd;
+
CFATTACH_DECL2_NEW(uipaq, sizeof(struct uipaq_softc), uipaq_match,
uipaq_attach, uipaq_detach, uipaq_activate, NULL, uipaq_childdet);
Index: src/sys/dev/usb/uirda.c
diff -u src/sys/dev/usb/uirda.c:1.43 src/sys/dev/usb/uirda.c:1.44
--- src/sys/dev/usb/uirda.c:1.43 Sun Jan 21 13:57:12 2018
+++ src/sys/dev/usb/uirda.c Sun May 5 03:17:54 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: uirda.c,v 1.43 2018/01/21 13:57:12 skrll Exp $ */
+/* $NetBSD: uirda.c,v 1.44 2019/05/05 03:17:54 mrg Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uirda.c,v 1.43 2018/01/21 13:57:12 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uirda.c,v 1.44 2019/05/05 03:17:54 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -151,7 +151,7 @@ void uirda_attach(device_t, device_t, vo
void uirda_childdet(device_t, device_t);
int uirda_detach(device_t, int);
int uirda_activate(device_t, enum devact);
-extern struct cfdriver uirda_cd;
+
CFATTACH_DECL2_NEW(uirda, sizeof(struct uirda_softc), uirda_match,
uirda_attach, uirda_detach, uirda_activate, NULL, uirda_childdet);
Index: src/sys/dev/usb/usscanner.c
diff -u src/sys/dev/usb/usscanner.c:1.43 src/sys/dev/usb/usscanner.c:1.44
--- src/sys/dev/usb/usscanner.c:1.43 Sun Jan 21 13:57:12 2018
+++ src/sys/dev/usb/usscanner.c Sun May 5 03:17:54 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: usscanner.c,v 1.43 2018/01/21 13:57:12 skrll Exp $ */
+/* $NetBSD: usscanner.c,v 1.44 2019/05/05 03:17:54 mrg Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -47,7 +47,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usscanner.c,v 1.43 2018/01/21 13:57:12 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usscanner.c,v 1.44 2019/05/05 03:17:54 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -156,7 +156,7 @@ void usscanner_attach(device_t, device_t
void usscanner_childdet(device_t, device_t);
int usscanner_detach(device_t, int);
int usscanner_activate(device_t, enum devact);
-extern struct cfdriver usscanner_cd;
+
CFATTACH_DECL2_NEW(usscanner, sizeof(struct usscanner_softc),
usscanner_match, usscanner_attach, usscanner_detach, usscanner_activate,
NULL, usscanner_childdet);
Index: src/sys/dev/usb/ukyopon.c
diff -u src/sys/dev/usb/ukyopon.c:1.22 src/sys/dev/usb/ukyopon.c:1.23
--- src/sys/dev/usb/ukyopon.c:1.22 Sat May 4 23:52:18 2019
+++ src/sys/dev/usb/ukyopon.c Sun May 5 03:17:54 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ukyopon.c,v 1.22 2019/05/04 23:52:18 mrg Exp $ */
+/* $NetBSD: ukyopon.c,v 1.23 2019/05/05 03:17:54 mrg Exp $ */
/*
* Copyright (c) 1998, 2005 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ukyopon.c,v 1.22 2019/05/04 23:52:18 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ukyopon.c,v 1.23 2019/05/05 03:17:54 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -106,7 +106,7 @@ static int ukyopon_match(device_t, cfdat
static void ukyopon_attach(device_t, device_t, void *);
static int ukyopon_detach(device_t, int);
static int ukyopon_activate(device_t, enum devact);
-extern struct cfdriver ukyopon_cd;
+
CFATTACH_DECL_NEW(ukyopon, sizeof(struct ukyopon_softc), ukyopon_match,
ukyopon_attach, ukyopon_detach, ukyopon_activate);
Index: src/sys/dev/usb/uyap.c
diff -u src/sys/dev/usb/uyap.c:1.22 src/sys/dev/usb/uyap.c:1.23
--- src/sys/dev/usb/uyap.c:1.22 Tue Jan 22 06:47:20 2019
+++ src/sys/dev/usb/uyap.c Sun May 5 03:17:54 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: uyap.c,v 1.22 2019/01/22 06:47:20 skrll Exp $ */
+/* $NetBSD: uyap.c,v 1.23 2019/05/05 03:17:54 mrg Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uyap.c,v 1.22 2019/01/22 06:47:20 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uyap.c,v 1.23 2019/05/05 03:17:54 mrg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -57,7 +57,7 @@ int uyap_match(device_t, cfdata_t, void
void uyap_attach(device_t, device_t, void *);
int uyap_detach(device_t, int);
int uyap_activate(device_t, enum devact);
-extern struct cfdriver uyap_cd;
+
CFATTACH_DECL_NEW(uyap, sizeof(struct uyap_softc), uyap_match, uyap_attach,
uyap_detach, uyap_activate);
Index: src/sys/dev/usb/ulpt.c
diff -u src/sys/dev/usb/ulpt.c:1.102 src/sys/dev/usb/ulpt.c:1.103
--- src/sys/dev/usb/ulpt.c:1.102 Thu Feb 7 12:37:40 2019
+++ src/sys/dev/usb/ulpt.c Sun May 5 03:17:54 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ulpt.c,v 1.102 2019/02/07 12:37:40 skrll Exp $ */
+/* $NetBSD: ulpt.c,v 1.103 2019/05/05 03:17:54 mrg Exp $ */
/*
* Copyright (c) 1998, 2003 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ulpt.c,v 1.102 2019/02/07 12:37:40 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ulpt.c,v 1.103 2019/05/05 03:17:54 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -61,6 +61,8 @@ __KERNEL_RCSID(0, "$NetBSD: ulpt.c,v 1.1
#include <dev/usb/usbdevs.h>
#include <dev/usb/usb_quirks.h>
+#include "ioconf.h"
+
#define TIMEOUT hz*16 /* wait up to 16 seconds for a ready */
#define STEP hz/4
@@ -171,7 +173,7 @@ void ulpt_attach(device_t, device_t, voi
int ulpt_detach(device_t, int);
int ulpt_activate(device_t, enum devact);
-extern struct cfdriver ulpt_cd;
+
CFATTACH_DECL_NEW(ulpt, sizeof(struct ulpt_softc), ulpt_match, ulpt_attach,
ulpt_detach, ulpt_activate);
Index: src/sys/dev/usb/umass.c
diff -u src/sys/dev/usb/umass.c:1.174 src/sys/dev/usb/umass.c:1.175
--- src/sys/dev/usb/umass.c:1.174 Sun Feb 10 19:23:55 2019
+++ src/sys/dev/usb/umass.c Sun May 5 03:17:54 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: umass.c,v 1.174 2019/02/10 19:23:55 jdolecek Exp $ */
+/* $NetBSD: umass.c,v 1.175 2019/05/05 03:17:54 mrg Exp $ */
/*
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -124,7 +124,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umass.c,v 1.174 2019/02/10 19:23:55 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umass.c,v 1.175 2019/05/05 03:17:54 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -219,7 +219,7 @@ void umass_attach(device_t, device_t, vo
int umass_detach(device_t, int);
static void umass_childdet(device_t, device_t);
int umass_activate(device_t, enum devact);
-extern struct cfdriver umass_cd;
+
CFATTACH_DECL2_NEW(umass, sizeof(struct umass_softc), umass_match,
umass_attach, umass_detach, umass_activate, NULL, umass_childdet);
Index: src/sys/dev/usb/umidi.c
diff -u src/sys/dev/usb/umidi.c:1.76 src/sys/dev/usb/umidi.c:1.77
--- src/sys/dev/usb/umidi.c:1.76 Thu Feb 7 13:20:41 2019
+++ src/sys/dev/usb/umidi.c Sun May 5 03:17:54 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: umidi.c,v 1.76 2019/02/07 13:20:41 skrll Exp $ */
+/* $NetBSD: umidi.c,v 1.77 2019/05/05 03:17:54 mrg Exp $ */
/*
* Copyright (c) 2001, 2012, 2014 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umidi.c,v 1.76 2019/02/07 13:20:41 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umidi.c,v 1.77 2019/05/05 03:17:54 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -314,7 +314,7 @@ void umidi_attach(device_t, device_t, vo
void umidi_childdet(device_t, device_t);
int umidi_detach(device_t, int);
int umidi_activate(device_t, enum devact);
-extern struct cfdriver umidi_cd;
+
CFATTACH_DECL2_NEW(umidi, sizeof(struct umidi_softc), umidi_match,
umidi_attach, umidi_detach, umidi_activate, NULL, umidi_childdet);
Index: src/sys/dev/usb/umodem.c
diff -u src/sys/dev/usb/umodem.c:1.70 src/sys/dev/usb/umodem.c:1.71
--- src/sys/dev/usb/umodem.c:1.70 Sat May 4 08:04:13 2019
+++ src/sys/dev/usb/umodem.c Sun May 5 03:17:54 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: umodem.c,v 1.70 2019/05/04 08:04:13 mrg Exp $ */
+/* $NetBSD: umodem.c,v 1.71 2019/05/05 03:17:54 mrg Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umodem.c,v 1.70 2019/05/04 08:04:13 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umodem.c,v 1.71 2019/05/05 03:17:54 mrg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -84,7 +84,7 @@ void umodem_attach(device_t, device_t, v
int umodem_detach(device_t, int);
int umodem_activate(device_t, enum devact);
-extern struct cfdriver umodem_cd;
+
CFATTACH_DECL_NEW(umodem, sizeof(struct umodem_softc), umodem_match,
umodem_attach, umodem_detach, umodem_activate);
Index: src/sys/dev/usb/uplcom.c
diff -u src/sys/dev/usb/uplcom.c:1.81 src/sys/dev/usb/uplcom.c:1.82
--- src/sys/dev/usb/uplcom.c:1.81 Sat May 4 08:04:13 2019
+++ src/sys/dev/usb/uplcom.c Sun May 5 03:17:54 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: uplcom.c,v 1.81 2019/05/04 08:04:13 mrg Exp $ */
+/* $NetBSD: uplcom.c,v 1.82 2019/05/05 03:17:54 mrg Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uplcom.c,v 1.81 2019/05/04 08:04:13 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uplcom.c,v 1.82 2019/05/05 03:17:54 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -203,7 +203,7 @@ void uplcom_attach(device_t, device_t, v
void uplcom_childdet(device_t, device_t);
int uplcom_detach(device_t, int);
int uplcom_activate(device_t, enum devact);
-extern struct cfdriver uplcom_cd;
+
CFATTACH_DECL2_NEW(uplcom, sizeof(struct uplcom_softc), uplcom_match,
uplcom_attach, uplcom_detach, uplcom_activate, NULL, uplcom_childdet);
Index: src/sys/dev/usb/urio.c
diff -u src/sys/dev/usb/urio.c:1.47 src/sys/dev/usb/urio.c:1.48
--- src/sys/dev/usb/urio.c:1.47 Mon Sep 3 16:29:34 2018
+++ src/sys/dev/usb/urio.c Sun May 5 03:17:54 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: urio.c,v 1.47 2018/09/03 16:29:34 riastradh Exp $ */
+/* $NetBSD: urio.c,v 1.48 2019/05/05 03:17:54 mrg Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: urio.c,v 1.47 2018/09/03 16:29:34 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: urio.c,v 1.48 2019/05/05 03:17:54 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -62,6 +62,8 @@ __KERNEL_RCSID(0, "$NetBSD: urio.c,v 1.4
#include <dev/usb/usbdevs.h>
#include <dev/usb/urio.h>
+#include "ioconf.h"
+
#ifdef URIO_DEBUG
#define DPRINTF(x) if (uriodebug) printf x
#define DPRINTFN(n,x) if (uriodebug>(n)) printf x
@@ -130,7 +132,7 @@ int urio_match(device_t, cfdata_t, void
void urio_attach(device_t, device_t, void *);
int urio_detach(device_t, int);
int urio_activate(device_t, enum devact);
-extern struct cfdriver urio_cd;
+
CFATTACH_DECL_NEW(urio, sizeof(struct urio_softc), urio_match, urio_attach,
urio_detach, urio_activate);
Index: src/sys/dev/usb/usb.c
diff -u src/sys/dev/usb/usb.c:1.178 src/sys/dev/usb/usb.c:1.179
--- src/sys/dev/usb/usb.c:1.178 Fri Mar 1 11:06:56 2019
+++ src/sys/dev/usb/usb.c Sun May 5 03:17:54 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: usb.c,v 1.178 2019/03/01 11:06:56 pgoyette Exp $ */
+/* $NetBSD: usb.c,v 1.179 2019/05/05 03:17:54 mrg Exp $ */
/*
* Copyright (c) 1998, 2002, 2008, 2012 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usb.c,v 1.178 2019/03/01 11:06:56 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb.c,v 1.179 2019/05/05 03:17:54 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -74,6 +74,8 @@ __KERNEL_RCSID(0, "$NetBSD: usb.c,v 1.17
#include <dev/usb/usb_quirks.h>
#include <dev/usb/usbhist.h>
+#include "ioconf.h"
+
#if defined(USB_DEBUG)
#ifndef USBHIST_SIZE
@@ -212,7 +214,7 @@ static void usb_childdet(device_t, devic
static int usb_once_init(void);
static void usb_doattach(device_t);
-extern struct cfdriver usb_cd;
+
CFATTACH_DECL3_NEW(usb, sizeof(struct usb_softc),
usb_match, usb_attach, usb_detach, usb_activate, NULL, usb_childdet,
Index: src/sys/dev/usb/uscanner.c
diff -u src/sys/dev/usb/uscanner.c:1.83 src/sys/dev/usb/uscanner.c:1.84
--- src/sys/dev/usb/uscanner.c:1.83 Mon Sep 3 16:29:34 2018
+++ src/sys/dev/usb/uscanner.c Sun May 5 03:17:54 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: uscanner.c,v 1.83 2018/09/03 16:29:34 riastradh Exp $ */
+/* $NetBSD: uscanner.c,v 1.84 2019/05/05 03:17:54 mrg Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uscanner.c,v 1.83 2018/09/03 16:29:34 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uscanner.c,v 1.84 2019/05/05 03:17:54 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -56,6 +56,8 @@ __KERNEL_RCSID(0, "$NetBSD: uscanner.c,v
#include <dev/usb/usbdevs.h>
+#include "ioconf.h"
+
#ifdef USCANNER_DEBUG
#define DPRINTF(x) if (uscannerdebug) printf x
#define DPRINTFN(n,x) if (uscannerdebug>(n)) printf x
@@ -269,7 +271,7 @@ int uscanner_match(device_t, cfdata_t, v
void uscanner_attach(device_t, device_t, void *);
int uscanner_detach(device_t, int);
int uscanner_activate(device_t, enum devact);
-extern struct cfdriver uscanner_cd;
+
CFATTACH_DECL_NEW(uscanner, sizeof(struct uscanner_softc), uscanner_match,
uscanner_attach, uscanner_detach, uscanner_activate);
Index: src/sys/dev/usb/ustir.c
diff -u src/sys/dev/usb/ustir.c:1.39 src/sys/dev/usb/ustir.c:1.40
--- src/sys/dev/usb/ustir.c:1.39 Sun Jan 21 13:57:12 2018
+++ src/sys/dev/usb/ustir.c Sun May 5 03:17:54 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ustir.c,v 1.39 2018/01/21 13:57:12 skrll Exp $ */
+/* $NetBSD: ustir.c,v 1.40 2019/05/05 03:17:54 mrg Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ustir.c,v 1.39 2018/01/21 13:57:12 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ustir.c,v 1.40 2019/05/05 03:17:54 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -216,7 +216,7 @@ void ustir_attach(device_t, device_t, vo
void ustir_childdet(device_t, device_t);
int ustir_detach(device_t, int);
int ustir_activate(device_t, enum devact);
-extern struct cfdriver ustir_cd;
+
CFATTACH_DECL2_NEW(ustir, sizeof(struct ustir_softc), ustir_match,
ustir_attach, ustir_detach, ustir_activate, NULL, ustir_childdet);
Index: src/sys/dev/usb/uthum.c
diff -u src/sys/dev/usb/uthum.c:1.15 src/sys/dev/usb/uthum.c:1.16
--- src/sys/dev/usb/uthum.c:1.15 Thu Feb 7 12:39:31 2019
+++ src/sys/dev/usb/uthum.c Sun May 5 03:17:54 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: uthum.c,v 1.15 2019/02/07 12:39:31 skrll Exp $ */
+/* $NetBSD: uthum.c,v 1.16 2019/05/05 03:17:54 mrg Exp $ */
/* $OpenBSD: uthum.c,v 1.6 2010/01/03 18:43:02 deraadt Exp $ */
/*
@@ -22,7 +22,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uthum.c,v 1.15 2019/02/07 12:39:31 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uthum.c,v 1.16 2019/05/05 03:17:54 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -114,7 +114,7 @@ int uthum_sht1x_rh(unsigned int, int);
void uthum_intr(struct uhidev *, void *, u_int);
static void uthum_refresh(struct sysmon_envsys *, envsys_data_t *);
-extern struct cfdriver uthum_cd;
+
CFATTACH_DECL_NEW(uthum, sizeof(struct uthum_softc), uthum_match, uthum_attach,
uthum_detach, uthum_activate);
Index: src/sys/dev/usb/uyurex.c
diff -u src/sys/dev/usb/uyurex.c:1.15 src/sys/dev/usb/uyurex.c:1.16
--- src/sys/dev/usb/uyurex.c:1.15 Thu Feb 7 12:41:21 2019
+++ src/sys/dev/usb/uyurex.c Sun May 5 03:17:54 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: uyurex.c,v 1.15 2019/02/07 12:41:21 skrll Exp $ */
+/* $NetBSD: uyurex.c,v 1.16 2019/05/05 03:17:54 mrg Exp $ */
/* $OpenBSD: uyurex.c,v 1.3 2010/03/04 03:47:22 deraadt Exp $ */
/*
@@ -22,7 +22,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uyurex.c,v 1.15 2019/02/07 12:41:21 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uyurex.c,v 1.16 2019/05/05 03:17:54 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -113,7 +113,7 @@ void uyurex_intr(struct uhidev *, void *
static void uyurex_refresh(struct sysmon_envsys *, envsys_data_t *);
static void uyurex_delta(void *);
-extern struct cfdriver uyurex_cd;
+
CFATTACH_DECL_NEW(uyurex, sizeof(struct uyurex_softc),
uyurex_match, uyurex_attach, uyurex_detach, uyurex_activate);
Index: src/sys/dev/usb/utoppy.c
diff -u src/sys/dev/usb/utoppy.c:1.31 src/sys/dev/usb/utoppy.c:1.32
--- src/sys/dev/usb/utoppy.c:1.31 Mon Sep 3 16:29:34 2018
+++ src/sys/dev/usb/utoppy.c Sun May 5 03:17:54 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: utoppy.c,v 1.31 2018/09/03 16:29:34 riastradh Exp $ */
+/* $NetBSD: utoppy.c,v 1.32 2019/05/05 03:17:54 mrg Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: utoppy.c,v 1.31 2018/09/03 16:29:34 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: utoppy.c,v 1.32 2019/05/05 03:17:54 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -58,6 +58,8 @@ __KERNEL_RCSID(0, "$NetBSD: utoppy.c,v 1
#include <dev/usb/usb_quirks.h>
#include <dev/usb/utoppy.h>
+#include "ioconf.h"
+
#undef UTOPPY_DEBUG
#ifdef UTOPPY_DEBUG
#define UTOPPY_DBG_OPEN 0x0001
@@ -204,7 +206,7 @@ int utoppy_match(device_t, cfdata_t, voi
void utoppy_attach(device_t, device_t, void *);
int utoppy_detach(device_t, int);
int utoppy_activate(device_t, enum devact);
-extern struct cfdriver utoppy_cd;
+
CFATTACH_DECL_NEW(utoppy, sizeof(struct utoppy_softc), utoppy_match,
utoppy_attach, utoppy_detach, utoppy_activate);
Index: src/sys/dev/usb/uts.c
diff -u src/sys/dev/usb/uts.c:1.9 src/sys/dev/usb/uts.c:1.10
--- src/sys/dev/usb/uts.c:1.9 Sun Mar 25 09:34:02 2018
+++ src/sys/dev/usb/uts.c Sun May 5 03:17:54 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: uts.c,v 1.9 2018/03/25 09:34:02 ryoon Exp $ */
+/* $NetBSD: uts.c,v 1.10 2019/05/05 03:17:54 mrg Exp $ */
/*
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uts.c,v 1.9 2018/03/25 09:34:02 ryoon Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uts.c,v 1.10 2019/05/05 03:17:54 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -110,7 +110,7 @@ Static void uts_childdet(device_t, devic
Static int uts_detach(device_t, int);
Static int uts_activate(device_t, enum devact);
-extern struct cfdriver uts_cd;
+
CFATTACH_DECL2_NEW(uts, sizeof(struct uts_softc), uts_match, uts_attach,
uts_detach, uts_activate, NULL, uts_childdet);
Index: src/sys/dev/usb/uvisor.c
diff -u src/sys/dev/usb/uvisor.c:1.49 src/sys/dev/usb/uvisor.c:1.50
--- src/sys/dev/usb/uvisor.c:1.49 Sat May 4 08:04:13 2019
+++ src/sys/dev/usb/uvisor.c Sun May 5 03:17:54 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: uvisor.c,v 1.49 2019/05/04 08:04:13 mrg Exp $ */
+/* $NetBSD: uvisor.c,v 1.50 2019/05/05 03:17:54 mrg Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvisor.c,v 1.49 2019/05/04 08:04:13 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvisor.c,v 1.50 2019/05/05 03:17:54 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -191,7 +191,7 @@ void uvisor_attach(device_t, device_t, v
void uvisor_childdet(device_t, device_t);
int uvisor_detach(device_t, int);
int uvisor_activate(device_t, enum devact);
-extern struct cfdriver uvisor_cd;
+
CFATTACH_DECL2_NEW(uvisor, sizeof(struct uvisor_softc), uvisor_match,
uvisor_attach, uvisor_detach, uvisor_activate, NULL, uvisor_childdet);
Index: src/sys/dev/usb/uvscom.c
diff -u src/sys/dev/usb/uvscom.c:1.33 src/sys/dev/usb/uvscom.c:1.34
--- src/sys/dev/usb/uvscom.c:1.33 Sat May 4 08:04:13 2019
+++ src/sys/dev/usb/uvscom.c Sun May 5 03:17:54 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: uvscom.c,v 1.33 2019/05/04 08:04:13 mrg Exp $ */
+/* $NetBSD: uvscom.c,v 1.34 2019/05/05 03:17:54 mrg Exp $ */
/*-
* Copyright (c) 2001-2002, Shunsuke Akiyama <[email protected]>.
* All rights reserved.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvscom.c,v 1.33 2019/05/04 08:04:13 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvscom.c,v 1.34 2019/05/05 03:17:54 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -216,7 +216,7 @@ void uvscom_attach(device_t, device_t, v
void uvscom_childdet(device_t, device_t);
int uvscom_detach(device_t, int);
int uvscom_activate(device_t, enum devact);
-extern struct cfdriver uvscom_cd;
+
CFATTACH_DECL2_NEW(uvscom, sizeof(struct uvscom_softc), uvscom_match,
uvscom_attach, uvscom_detach, uvscom_activate, NULL, uvscom_childdet);
