Module Name: src
Committed By: uebayasi
Date: Sun Jul 31 13:51:53 UTC 2011
Modified Files:
src/sys/dev/bluetooth: bcsp.c bthub.c btuart.c
src/sys/dev/ieee1394: fwdev.c fwmem.c fwohci.c
Log Message:
Put back #include "ioconf.h" per popular demand.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/dev/bluetooth/bcsp.c
cvs rdiff -u -r1.16 -r1.17 src/sys/dev/bluetooth/bthub.c
cvs rdiff -u -r1.25 -r1.26 src/sys/dev/bluetooth/btuart.c
cvs rdiff -u -r1.25 -r1.26 src/sys/dev/ieee1394/fwdev.c
cvs rdiff -u -r1.15 -r1.16 src/sys/dev/ieee1394/fwmem.c
cvs rdiff -u -r1.131 -r1.132 src/sys/dev/ieee1394/fwohci.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/bluetooth/bcsp.c
diff -u src/sys/dev/bluetooth/bcsp.c:1.19 src/sys/dev/bluetooth/bcsp.c:1.20
--- src/sys/dev/bluetooth/bcsp.c:1.19 Wed May 25 16:33:37 2011
+++ src/sys/dev/bluetooth/bcsp.c Sun Jul 31 13:51:53 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: bcsp.c,v 1.19 2011/05/25 16:33:37 uebayasi Exp $ */
+/* $NetBSD: bcsp.c,v 1.20 2011/07/31 13:51:53 uebayasi Exp $ */
/*
* Copyright (c) 2007 KIYOHARA Takashi
* All rights reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bcsp.c,v 1.19 2011/05/25 16:33:37 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcsp.c,v 1.20 2011/07/31 13:51:53 uebayasi Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -50,6 +50,8 @@
#include <dev/bluetooth/bcsp.h>
+#include "ioconf.h"
+
#ifdef BCSP_DEBUG
#ifdef DPRINTF
#undef DPRINTF
@@ -184,7 +186,6 @@
static void bcsp_packet_print(struct mbuf *m);
#endif
-extern struct cfdriver bcsp_cd;
/*
* It doesn't need to be exported, as only bcspattach() uses it,
Index: src/sys/dev/bluetooth/bthub.c
diff -u src/sys/dev/bluetooth/bthub.c:1.16 src/sys/dev/bluetooth/bthub.c:1.17
--- src/sys/dev/bluetooth/bthub.c:1.16 Wed May 25 16:33:37 2011
+++ src/sys/dev/bluetooth/bthub.c Sun Jul 31 13:51:53 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: bthub.c,v 1.16 2011/05/25 16:33:37 uebayasi Exp $ */
+/* $NetBSD: bthub.c,v 1.17 2011/07/31 13:51:53 uebayasi Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bthub.c,v 1.16 2011/05/25 16:33:37 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bthub.c,v 1.17 2011/07/31 13:51:53 uebayasi Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -51,6 +51,8 @@
#include <dev/bluetooth/btdev.h>
+#include "ioconf.h"
+
/*****************************************************************************
*
* Bluetooth Device Hub
@@ -61,8 +63,6 @@
static void bthub_attach(device_t, device_t, void *);
static int bthub_detach(device_t, int);
-extern struct cfdriver bthub_cd;
-
CFATTACH_DECL_NEW(bthub, 0,
bthub_match, bthub_attach, bthub_detach, NULL);
Index: src/sys/dev/bluetooth/btuart.c
diff -u src/sys/dev/bluetooth/btuart.c:1.25 src/sys/dev/bluetooth/btuart.c:1.26
--- src/sys/dev/bluetooth/btuart.c:1.25 Wed May 25 16:33:37 2011
+++ src/sys/dev/bluetooth/btuart.c Sun Jul 31 13:51:53 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: btuart.c,v 1.25 2011/05/25 16:33:37 uebayasi Exp $ */
+/* $NetBSD: btuart.c,v 1.26 2011/07/31 13:51:53 uebayasi Exp $ */
/*-
* Copyright (c) 2006, 2007 KIYOHARA Takashi
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: btuart.c,v 1.25 2011/05/25 16:33:37 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: btuart.c,v 1.26 2011/07/31 13:51:53 uebayasi Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -49,6 +49,8 @@
#include <netbt/bluetooth.h>
#include <netbt/hci.h>
+#include "ioconf.h"
+
struct btuart_softc {
device_t sc_dev;
struct tty * sc_tp; /* tty pointer */
@@ -97,8 +99,6 @@
static void btuart_output_sco(device_t, struct mbuf *);
static void btuart_stats(device_t, struct bt_stats *, int);
-extern struct cfdriver btuart_cd;
-
/*
* It doesn't need to be exported, as only btuartattach() uses it,
* but there's no "official" way to make it static.
Index: src/sys/dev/ieee1394/fwdev.c
diff -u src/sys/dev/ieee1394/fwdev.c:1.25 src/sys/dev/ieee1394/fwdev.c:1.26
--- src/sys/dev/ieee1394/fwdev.c:1.25 Wed May 25 16:33:37 2011
+++ src/sys/dev/ieee1394/fwdev.c Sun Jul 31 13:51:53 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: fwdev.c,v 1.25 2011/05/25 16:33:37 uebayasi Exp $ */
+/* $NetBSD: fwdev.c,v 1.26 2011/07/31 13:51:53 uebayasi Exp $ */
/*-
* Copyright (c) 2003 Hidetoshi Shimokawa
* Copyright (c) 1998-2002 Katsushi Kobayashi and Hidetoshi Shimokawa
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fwdev.c,v 1.25 2011/05/25 16:33:37 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fwdev.c,v 1.26 2011/07/31 13:51:53 uebayasi Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -58,6 +58,8 @@
#include <dev/ieee1394/fwmem.h>
#include <dev/ieee1394/iec68113.h>
+#include "ioconf.h"
+
#define FWNODE_INVAL 0xffff
dev_type_open(fw_open);
@@ -94,7 +96,6 @@
static int fw_write_async(struct fw_drv1 *, struct uio *, int);
static void fw_hand(struct fw_xfer *);
-extern struct cfdriver ieee1394if_cd;
int
fw_open(dev_t dev, int flags, int fmt, struct lwp *td)
Index: src/sys/dev/ieee1394/fwmem.c
diff -u src/sys/dev/ieee1394/fwmem.c:1.15 src/sys/dev/ieee1394/fwmem.c:1.16
--- src/sys/dev/ieee1394/fwmem.c:1.15 Wed May 25 16:33:37 2011
+++ src/sys/dev/ieee1394/fwmem.c Sun Jul 31 13:51:53 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: fwmem.c,v 1.15 2011/05/25 16:33:37 uebayasi Exp $ */
+/* $NetBSD: fwmem.c,v 1.16 2011/07/31 13:51:53 uebayasi Exp $ */
/*-
* Copyright (c) 2002-2003
* Hidetoshi Shimokawa. All rights reserved.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fwmem.c,v 1.15 2011/05/25 16:33:37 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fwmem.c,v 1.16 2011/07/31 13:51:53 uebayasi Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -51,6 +51,8 @@
#include <dev/ieee1394/firewirereg.h>
#include <dev/ieee1394/fwmem.h>
+#include "ioconf.h"
+
static int fwmem_speed=2, fwmem_debug=0;
static struct fw_eui64 fwmem_eui64;
@@ -61,8 +63,6 @@
int, void *);
static void fwmem_biodone(struct fw_xfer *);
-extern struct cfdriver ieee1394if_cd;
-
/*
* Setup sysctl(3) MIB, hw.fwmem.*
*
Index: src/sys/dev/ieee1394/fwohci.c
diff -u src/sys/dev/ieee1394/fwohci.c:1.131 src/sys/dev/ieee1394/fwohci.c:1.132
--- src/sys/dev/ieee1394/fwohci.c:1.131 Wed May 25 16:33:37 2011
+++ src/sys/dev/ieee1394/fwohci.c Sun Jul 31 13:51:53 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: fwohci.c,v 1.131 2011/05/25 16:33:37 uebayasi Exp $ */
+/* $NetBSD: fwohci.c,v 1.132 2011/07/31 13:51:53 uebayasi Exp $ */
/*-
* Copyright (c) 2003 Hidetoshi Shimokawa
@@ -37,7 +37,7 @@
*
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fwohci.c,v 1.131 2011/05/25 16:33:37 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fwohci.c,v 1.132 2011/07/31 13:51:53 uebayasi Exp $");
#include <sys/param.h>
#include <sys/atomic.h>
@@ -61,13 +61,12 @@
#include <dev/ieee1394/fwohcivar.h>
#include <dev/ieee1394/firewire_phy.h>
+#include "ioconf.h"
+
#undef OHCI_DEBUG
static int nocyclemaster = 0;
int firewire_phydma_enable = 1;
-
-extern struct cfdriver fwohci_cd;
-
/*
* Setup sysctl(3) MIB, hw.fwohci.*
*
