Skip to content

Commit

Permalink
remove explicit 'extern struct cfdriver <my>_cd;' and use ioconf.h
Browse files Browse the repository at this point in the history
  • Loading branch information
mrgtwentythree committed May 5, 2019
1 parent abc94c2 commit 6914ed4
Show file tree
Hide file tree
Showing 54 changed files with 178 additions and 163 deletions.
6 changes: 3 additions & 3 deletions sys/dev/usb/if_atu.c
@@ -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
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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);

Expand Down
6 changes: 3 additions & 3 deletions sys/dev/usb/if_aue.c
@@ -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
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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);

Expand Down
6 changes: 3 additions & 3 deletions sys/dev/usb/if_cdce.c
@@ -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 <wpaul@windriver.com>
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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);

Expand Down
6 changes: 3 additions & 3 deletions sys/dev/usb/if_cue.c
@@ -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 <wpaul@ee.columbia.edu>. All rights reserved.
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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);

Expand Down
6 changes: 3 additions & 3 deletions sys/dev/usb/if_kue.c
@@ -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
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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);

Expand Down
6 changes: 3 additions & 3 deletions sys/dev/usb/if_rum.c
@@ -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 <damien.bergamini@free.fr>
Expand All @@ -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"
Expand Down Expand Up @@ -234,7 +234,7 @@ static int rum_match(device_t, cfdata_t, void *);
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);

Expand Down
6 changes: 3 additions & 3 deletions sys/dev/usb/if_udav.c
@@ -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 $ */

/*
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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);

Expand Down
6 changes: 3 additions & 3 deletions sys/dev/usb/if_upl.c
@@ -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.
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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);

Expand Down
6 changes: 3 additions & 3 deletions sys/dev/usb/if_ural.c
@@ -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 $ */

/*-
Expand All @@ -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"
Expand Down Expand Up @@ -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);

Expand Down
6 changes: 3 additions & 3 deletions sys/dev/usb/if_url.c
@@ -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
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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);

Expand Down
6 changes: 3 additions & 3 deletions sys/dev/usb/if_zyd.c
@@ -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 <damien.bergamini@free.fr>
Expand All @@ -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"
Expand Down Expand Up @@ -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);
Expand Down
6 changes: 3 additions & 3 deletions sys/dev/usb/stuirda.c
@@ -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.
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -104,7 +104,7 @@ int stuirda_match(device_t, cfdata_t, void *);
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);

Expand Down
6 changes: 3 additions & 3 deletions sys/dev/usb/uark.c
@@ -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 $ */

/*
Expand All @@ -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"
Expand Down Expand Up @@ -98,7 +98,7 @@ int uark_match(device_t, cfdata_t, void *);
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);

Expand Down
6 changes: 3 additions & 3 deletions sys/dev/usb/uaudio.c
@@ -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.
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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,
Expand Down
6 changes: 3 additions & 3 deletions sys/dev/usb/uberry.c
@@ -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.
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -93,7 +93,7 @@ int uberry_match(device_t, cfdata_t, void *);
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);

Expand Down
6 changes: 3 additions & 3 deletions sys/dev/usb/ubsa.c
@@ -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.
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 6914ed4

Please sign in to comment.