Simplify the COMPAT_PCI_DRIVER/DATA_SET hack. We can add:

#define COMPAT_PCI_DRIVER(name,data) DATA_SET(pcidevice_set,data)
.. to 2.2.x and 3.x if people think it's worth it.  Driver writers can do
this if it's not defined.  (The reason for this is that I'm trying to
progressively eliminate use of linker_sets where it hurts modularity and
runtime load capability, and these DATA_SET's keep getting in the way.)
This commit is contained in:
Peter Wemm 1999-05-09 17:07:30 +00:00
parent 9f08adb16f
commit 579f45fa60
57 changed files with 74 additions and 298 deletions

View file

@ -30,7 +30,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: if_oltr.c,v 1.3 1999/04/21 07:02:19 peter Exp $
* $Id: if_oltr.c,v 1.4 1999/04/24 20:24:02 peter Exp $
*/
@ -259,11 +259,7 @@ static struct pci_device oltr_device = {
NULL
};
#ifndef COMPAT_PCI_DRIVER
DATA_SET(pcidevice_set, oltr_device);
#else
COMPAT_PCI_DRIVER(oltr_pci, oltr_device);
#endif /* COMPAT_PCI_DRIVER */
int pci_cards = 0;
#endif /* NPCI */

View file

@ -47,7 +47,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: adv_pci.c,v 1.4 1998/12/22 18:14:15 gibbs Exp $
* $Id: adv_pci.c,v 1.5 1999/04/24 20:13:58 peter Exp $
*/
#include <pci.h>
@ -95,11 +95,7 @@ static struct pci_device adv_pci_driver = {
NULL
};
#ifdef COMPAT_PCI_DRIVER
COMPAT_PCI_DRIVER (adv_pci, adv_pci_driver);
#else
DATA_SET (pcidevice_set, adv_pci_driver);
#endif /* COMPAT_PCI_DRIVER */
static const char*
advpciprobe(pcici_t tag, pcidi_t type)

View file

@ -28,7 +28,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: adw_pci.c,v 1.3 1998/12/14 06:32:54 dillon Exp $
* $Id: adw_pci.c,v 1.4 1999/04/24 20:13:58 peter Exp $
*/
#include <pci.h>
@ -69,11 +69,7 @@ static struct pci_device adw_pci_driver = {
NULL
};
#ifdef COMPAT_PCI_DRIVER
COMPAT_PCI_DRIVER (adw_pci, adw_pci_driver);
#else
DATA_SET (pcidevice_set, adw_pci_driver);
#endif /* COMPAT_PCI_DRIVER */
static const char*
adwpciprobe(pcici_t tag, pcidi_t type)

View file

@ -1,4 +1,4 @@
/* $Id: brooktree848.c,v 1.72 1999/04/29 10:15:55 roger Exp $ */
/* $Id: brooktree848.c,v 1.73 1999/04/30 11:16:30 roger Exp $ */
/* BT848 Driver for Brooktree's Bt848, Bt849, Bt878 and Bt 879 based cards.
The Brooktree BT848 Driver driver is based upon Mark Tinguely and
Jim Lowe's driver for the Matrox Meteor PCI card . The
@ -527,11 +527,7 @@ static struct pci_device bktr_device = {
&bktr_count
};
#ifdef COMPAT_PCI_DRIVER
COMPAT_PCI_DRIVER (bktr, bktr_device);
#else
DATA_SET (pcidevice_set, bktr_device);
#endif /* COMPAT_PCI_DRIVER */
static d_open_t bktr_open;
static d_close_t bktr_close;

View file

@ -24,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: cy_pci.c,v 1.12 1999/04/24 20:13:58 peter Exp $
* $Id: cy_pci.c,v 1.13 1999/05/02 20:42:13 peter Exp $
*/
/*
@ -65,11 +65,7 @@ static struct pci_device cy_device = {
&cy_count,
NULL
};
#ifdef COMPAT_PCI_DRIVER
COMPAT_PCI_DRIVER(cy_pci, cy_device);
#else
DATA_SET(pcidevice_set, cy_device);
#endif /* COMPAT_PCI_DRIVER */
static const char *
cy_probe(config_id, device_id)

View file

@ -1,5 +1,5 @@
/* $NetBSD: if_de.c,v 1.82 1999/02/28 17:08:51 explorer Exp $ */
/* $Id: if_de.c,v 1.103 1999/04/24 20:13:59 peter Exp $ */
/* $Id: if_de.c,v 1.104 1999/05/03 09:36:29 dfr Exp $ */
/*-
* Copyright (c) 1994-1997 Matt Thomas (matt@3am-software.com)
@ -5378,11 +5378,7 @@ static struct pci_device dedevice = {
#endif
};
#ifdef COMPAT_PCI_DRIVER
COMPAT_PCI_DRIVER(de, dedevice);
#else
DATA_SET (pcidevice_set, dedevice);
#endif /* COMPAT_PCI_DRIVER */
#endif /* __FreeBSD__ */
#if defined(__bsdi__)

View file

@ -32,7 +32,7 @@
* dptpci.c: PCI Bus Attachment for DPT SCSI HBAs
*/
#ident "$Id: dpt_pci.c,v 1.11 1998/12/14 06:32:55 dillon Exp $"
#ident "$Id: dpt_pci.c,v 1.12 1999/04/24 20:13:58 peter Exp $"
#include "opt_devfs.h"
#include "opt_dpt.h"
@ -78,11 +78,7 @@ static struct pci_device dpt_pci_driver =
NULL
};
#ifdef COMPAT_PCI_DRIVER
COMPAT_PCI_DRIVER(dpt_pci, dpt_pci_driver);
#else
DATA_SET(pcidevice_set, dpt_pci_driver);
#endif /* COMPAT_PCI_DRIVER */
/*
* Probe the PCI device.

View file

@ -17,7 +17,7 @@
* 4. Modifications may be freely made to this file if the above conditions
* are met.
*
* $Id: if_ed_p.c,v 1.14 1998/12/14 05:47:27 dillon Exp $
* $Id: if_ed_p.c,v 1.15 1999/04/24 20:14:00 peter Exp $
*/
#include "pci.h"
@ -64,11 +64,7 @@ static struct pci_device ed_pci_driver = {
NULL
};
#ifdef COMPAT_PCI_DRIVER
COMPAT_PCI_DRIVER (ed_pci, ed_pci_driver);
#else
DATA_SET (pcidevice_set, ed_pci_driver);
#endif /* COMPAT_PCI_DRIVER */
static const char*
ed_pci_probe (pcici_t tag, pcidi_t type)

View file

@ -114,11 +114,7 @@ static struct pci_device endevice = {
NULL,
};
#ifdef COMPAT_PCI_DRIVER
COMPAT_PCI_DRIVER (en, endevice);
#else
DATA_SET (pcidevice_set, endevice);
#endif /* COMPAT_PCI_DRIVER */
/*
* local defines (PCI specific stuff)

View file

@ -23,7 +23,7 @@
* Copies of this Software may be made, however, the above copyright
* notice must be reproduced on all copies.
*
* @(#) $Id: eni.c,v 1.5 1998/12/14 06:37:01 dillon Exp $
* @(#) $Id: eni.c,v 1.6 1999/04/24 20:17:05 peter Exp $
*
*/
@ -42,7 +42,7 @@
#include <dev/hea/eni_var.h>
#ifndef lint
__RCSID("@(#) $Id: eni.c,v 1.5 1998/12/14 06:37:01 dillon Exp $");
__RCSID("@(#) $Id: eni.c,v 1.6 1999/04/24 20:17:05 peter Exp $");
#endif
/*
@ -80,11 +80,7 @@ static struct pci_device eni_pci_device = {
#endif
};
#ifdef COMPAT_PCI_DRIVER
COMPAT_PCI_DRIVER (eni_pci, eni_pci_device);
#else
DATA_SET ( pcidevice_set, eni_pci_device );
#endif /* COMPAT_PCI_DRIVER */
#endif /* __FreeBSD__ */
/*

View file

@ -23,7 +23,7 @@
* Copies of this Software may be made, however, the above copyright
* notice must be reproduced on all copies.
*
* @(#) $Id: fore_load.c,v 1.5 1998/12/14 06:37:37 dillon Exp $
* @(#) $Id: fore_load.c,v 1.6 1999/04/24 20:17:05 peter Exp $
*
*/
@ -38,7 +38,7 @@
#include <dev/hfa/fore_include.h>
#ifndef lint
__RCSID("@(#) $Id: fore_load.c,v 1.5 1998/12/14 06:37:37 dillon Exp $");
__RCSID("@(#) $Id: fore_load.c,v 1.6 1999/04/24 20:17:05 peter Exp $");
#endif
@ -107,11 +107,7 @@ static struct pci_device fore_pci_device = {
#endif
};
#ifdef COMPAT_PCI_DRIVER
COMPAT_PCI_DRIVER(fore_pci, fore_pci_device);
#else
DATA_SET(pcidevice_set, fore_pci_device);
#endif /* COMPAT_PCI_DRIVER */
#endif

View file

@ -1,4 +1,4 @@
/* $Id: isp_pci.c,v 1.19 1999/04/11 02:47:31 eivind Exp $ */
/* $Id: isp_pci.c,v 1.20 1999/04/24 20:14:02 peter Exp $ */
/* release_4_3_99 */
/*
* PCI specific probe and attach routines for Qlogic ISP SCSI adapters.
@ -271,11 +271,7 @@ static struct pci_device isp_pci_driver = {
&ispunit,
NULL
};
#ifdef COMPAT_PCI_DRIVER
COMPAT_PCI_DRIVER (isp_pci, isp_pci_driver);
#else
DATA_SET (pcidevice_set, isp_pci_driver);
#endif /* COMPAT_PCI_DRIVER */
static PROBETYPE

View file

@ -17,7 +17,7 @@
* 4. Modifications may be freely made to this file if the above conditions
* are met.
*
* $Id: if_lnc_p.c,v 1.7 1998/12/14 06:32:55 dillon Exp $
* $Id: if_lnc_p.c,v 1.8 1999/04/24 20:14:00 peter Exp $
*/
#include "pci.h"
@ -49,11 +49,7 @@ static struct pci_device lnc_pci_driver = {
NULL
};
#ifdef COMPAT_PCI_DRIVER
COMPAT_PCI_DRIVER (lnc_pci, lnc_pci_driver);
#else
DATA_SET (pcidevice_set, lnc_pci_driver);
#endif /* COMPAT_PCI_DRIVER */
static const char*
lnc_pci_probe (pcici_t tag, pcidi_t type)

View file

@ -21,7 +21,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: if_fpa.c,v 1.8 1998/12/14 06:32:55 dillon Exp $
* $Id: if_fpa.c,v 1.9 1999/04/24 20:14:00 peter Exp $
*
*/
@ -214,11 +214,7 @@ static struct pci_device fpadevice = {
NULL
};
#ifdef COMPAT_PCI_DRIVER
COMPAT_PCI_DRIVER (fpa, fpadevice);
#else
DATA_SET (pcidevice_set, fpadevice);
#endif /* COMPAT_PCI_DRIVER */
#elif defined(__bsdi__)

View file

@ -29,7 +29,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: rp.c,v 1.24 1999/04/27 11:15:12 phk Exp $
* $Id: rp.c,v 1.25 1999/05/06 18:44:04 peter Exp $
*/
/*
@ -782,11 +782,7 @@ static struct pci_device rp_pcidevice = {
NULL
};
#ifdef COMPAT_PCI_DRIVER
COMPAT_PCI_DRIVER (rp_pci, rp_pcidevice);
#else
DATA_SET (pcidevice_set, rp_pcidevice);
#endif /* COMPAT_PCI_DRIVER */
static timeout_t rpdtrwakeup;

View file

@ -30,7 +30,7 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
* NO EVENT SHALL THE AUTHORS BE LIABLE.
*
* $Id: si.c,v 1.83 1999/05/02 20:35:44 peter Exp $
* $Id: si.c,v 1.84 1999/05/08 07:02:31 phk Exp $
*/
#ifndef lint
@ -149,11 +149,7 @@ static struct pci_device sipcidev = {
NULL,
};
#ifdef COMPAT_PCI_DRIVER
COMPAT_PCI_DRIVER (sipci, sipcidev);
#else
DATA_SET (pcidevice_set, sipcidev);
#endif /* COMPAT_PCI_DRIVER */
#endif

View file

@ -27,7 +27,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: if_sr_p.c,v 1.7 1998/12/14 06:32:56 dillon Exp $
* $Id: if_sr_p.c,v 1.8 1999/04/24 20:14:01 peter Exp $
*/
#include "pci.h"
@ -65,13 +65,10 @@ static struct pci_device sr_pci_driver =
sr_pci_probe,
sr_pci_attach,
&src_count,
NULL};
NULL
};
#ifdef COMPAT_PCI_DRIVER
COMPAT_PCI_DRIVER (sr_pci, sr_pci_driver);
#else
DATA_SET (pcidevice_set, sr_pci_driver);
#endif /* COMPAT_PCI_DRIVER */
static const char *
sr_pci_probe(pcici_t tag, pcidi_t type)

View file

@ -29,7 +29,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: if_ti.c,v 1.109 1999/04/29 16:22:07 wpaul Exp $
* $Id: if_ti.c,v 1.4 1999/04/29 16:27:51 wpaul Exp $
*/
/*
@ -128,7 +128,7 @@
#if !defined(lint)
static const char rcsid[] =
"$Id: if_ti.c,v 1.109 1999/04/29 16:22:07 wpaul Exp $";
"$Id: if_ti.c,v 1.4 1999/04/29 16:27:51 wpaul Exp $";
#endif
/*
@ -2483,8 +2483,4 @@ static struct pci_device ti_device = {
&ti_count,
NULL
};
#ifdef COMPAT_PCI_DRIVER
COMPAT_PCI_DRIVER(ti, ti_device);
#else
DATA_SET(pcidevice_set, ti_device);
#endif /* COMPAT_PCI_DRIVER */

View file

@ -1,5 +1,5 @@
/* $OpenBSD: if_tx.c,v 1.3 1998/10/10 04:30:09 jason Exp $ */
/* $Id: if_tx.c,v 1.24 1999/04/17 08:36:07 peter Exp $ */
/* $Id: if_tx.c,v 1.25 1999/04/24 20:14:01 peter Exp $ */
/*-
* Copyright (c) 1997 Semen Ustimenko (semen@iclub.nsu.ru)
@ -389,14 +389,11 @@ static struct pci_device txdevice = {
epic_freebsd_probe,
epic_freebsd_attach,
&epic_pci_count,
NULL };
NULL
};
/* Append this driver to pci drivers list */
#ifdef COMPAT_PCI_DRIVER
COMPAT_PCI_DRIVER (tx, txdevice);
#else
DATA_SET ( pcidevice_set, txdevice );
#endif /* COMPAT_PCI_DRIVER */
/* Synopsis: Check if device id corresponds with SMC83C170 id. */
static const char*

View file

@ -29,7 +29,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: if_vr.c,v 1.9 1999/02/23 15:38:24 wpaul Exp $
* $Id: if_vr.c,v 1.10 1999/04/24 20:14:01 peter Exp $
*/
/*
@ -97,7 +97,7 @@
#ifndef lint
static const char rcsid[] =
"$Id: if_vr.c,v 1.9 1999/02/23 15:38:24 wpaul Exp $";
"$Id: if_vr.c,v 1.10 1999/04/24 20:14:01 peter Exp $";
#endif
/*
@ -1959,8 +1959,4 @@ static struct pci_device vr_device = {
&vr_count,
NULL
};
#ifdef COMPAT_PCI_DRIVER
COMPAT_PCI_DRIVER(vr, vr_device);
#else
DATA_SET(pcidevice_set, vr_device);
#endif /* COMPAT_PCI_DRIVER */

View file

@ -137,11 +137,7 @@ static struct pci_device vxdevice = {
NULL
};
#ifdef COMPAT_PCI_DRIVER
COMPAT_PCI_DRIVER (vx, vxdevice);
#else
DATA_SET (pcidevice_set, vxdevice);
#endif /* COMPAT_PCI_DRIVER */
#endif /* NVX */
#endif /* NPCI */

View file

@ -29,7 +29,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: rp.c,v 1.24 1999/04/27 11:15:12 phk Exp $
* $Id: rp.c,v 1.25 1999/05/06 18:44:04 peter Exp $
*/
/*
@ -782,11 +782,7 @@ static struct pci_device rp_pcidevice = {
NULL
};
#ifdef COMPAT_PCI_DRIVER
COMPAT_PCI_DRIVER (rp_pci, rp_pcidevice);
#else
DATA_SET (pcidevice_set, rp_pcidevice);
#endif /* COMPAT_PCI_DRIVER */
static timeout_t rpdtrwakeup;

View file

@ -30,7 +30,7 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
* NO EVENT SHALL THE AUTHORS BE LIABLE.
*
* $Id: si.c,v 1.83 1999/05/02 20:35:44 peter Exp $
* $Id: si.c,v 1.84 1999/05/08 07:02:31 phk Exp $
*/
#ifndef lint
@ -149,11 +149,7 @@ static struct pci_device sipcidev = {
NULL,
};
#ifdef COMPAT_PCI_DRIVER
COMPAT_PCI_DRIVER (sipci, sipcidev);
#else
DATA_SET (pcidevice_set, sipcidev);
#endif /* COMPAT_PCI_DRIVER */
#endif

View file

@ -33,7 +33,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: stallion.c,v 1.29 1999/05/06 18:44:05 peter Exp $
* $Id: stallion.c,v 1.30 1999/05/08 07:02:33 phk Exp $
*/
/*****************************************************************************/
@ -522,11 +522,7 @@ static struct pci_device stlpcidriver = {
NULL,
};
#ifdef COMPAT_PCI_DRIVER
COMPAT_PCI_DRIVER (stlpci, stlpcidriver);
#else
DATA_SET (pcidevice_set, stlpcidriver);
#endif /* COMPAT_PCI_DRIVER */
#endif

View file

@ -27,7 +27,7 @@
* i4b_isic_pci.c - PCI bus interface
* ==================================
*
* $Id: i4b_isic_pci.c,v 1.3 1999/03/07 16:08:16 hm Exp $
* $Id: i4b_isic_pci.c,v 1.4 1999/04/24 20:24:02 peter Exp $
*
* last edit-date: [Wed Feb 17 15:19:44 1999]
*
@ -102,11 +102,7 @@ static struct pci_device i4b_pci_driver = {
NULL
};
#ifndef COMPAT_PCI_DRIVER
DATA_SET (pcidevice_set, i4b_pci_driver);
#else
COMPAT_PCI_DRIVER (isic_pci, i4b_pci_driver);
#endif /* COMPAT_PCI_DRIVER */
static void isic_pci_intr_sc(struct isic_softc *sc);

View file

@ -26,7 +26,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: pcic_p.c,v 1.10 1999/04/24 20:14:03 peter Exp $
* $Id: pcic_p.c,v 1.11 1999/05/02 05:53:50 nate Exp $
*/
#include "pci.h"
@ -57,11 +57,7 @@ static struct pci_device pcic_pci_driver = {
NULL
};
#ifdef COMPAT_PCI_DRIVER
COMPAT_PCI_DRIVER(pcic_pci, pcic_pci_driver);
#else
DATA_SET(pcidevice_set, pcic_pci_driver);
#endif /* COMPAT_PCI_DRIVER */
/*
* Return the ID string for the controller if the vendor/product id

View file

@ -47,7 +47,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: adv_pci.c,v 1.4 1998/12/22 18:14:15 gibbs Exp $
* $Id: adv_pci.c,v 1.5 1999/04/24 20:13:58 peter Exp $
*/
#include <pci.h>
@ -95,11 +95,7 @@ static struct pci_device adv_pci_driver = {
NULL
};
#ifdef COMPAT_PCI_DRIVER
COMPAT_PCI_DRIVER (adv_pci, adv_pci_driver);
#else
DATA_SET (pcidevice_set, adv_pci_driver);
#endif /* COMPAT_PCI_DRIVER */
static const char*
advpciprobe(pcici_t tag, pcidi_t type)

View file

@ -28,7 +28,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: adw_pci.c,v 1.3 1998/12/14 06:32:54 dillon Exp $
* $Id: adw_pci.c,v 1.4 1999/04/24 20:13:58 peter Exp $
*/
#include <pci.h>
@ -69,11 +69,7 @@ static struct pci_device adw_pci_driver = {
NULL
};
#ifdef COMPAT_PCI_DRIVER
COMPAT_PCI_DRIVER (adw_pci, adw_pci_driver);
#else
DATA_SET (pcidevice_set, adw_pci_driver);
#endif /* COMPAT_PCI_DRIVER */
static const char*
adwpciprobe(pcici_t tag, pcidi_t type)

View file

@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: alpm.c,v 1.2 1999/04/24 20:13:58 peter Exp $
* $Id: alpm.c,v 1.3 1999/05/08 21:59:37 dfr Exp $
*
*/
@ -205,11 +205,7 @@ static struct pci_device alpm_device = {
&alpm_count
};
#ifdef COMPAT_PCI_DRIVER
COMPAT_PCI_DRIVER (alpm, alpm_device);
#else
DATA_SET (pcidevice_set, alpm_device);
#endif /* COMPAT_PCI_DRIVER */
static const char*
alpm_pci_probe(pcici_t tag, pcidi_t type)

View file

@ -1,4 +1,4 @@
/* $Id: brooktree848.c,v 1.72 1999/04/29 10:15:55 roger Exp $ */
/* $Id: brooktree848.c,v 1.73 1999/04/30 11:16:30 roger Exp $ */
/* BT848 Driver for Brooktree's Bt848, Bt849, Bt878 and Bt 879 based cards.
The Brooktree BT848 Driver driver is based upon Mark Tinguely and
Jim Lowe's driver for the Matrox Meteor PCI card . The
@ -527,11 +527,7 @@ static struct pci_device bktr_device = {
&bktr_count
};
#ifdef COMPAT_PCI_DRIVER
COMPAT_PCI_DRIVER (bktr, bktr_device);
#else
DATA_SET (pcidevice_set, bktr_device);
#endif /* COMPAT_PCI_DRIVER */
static d_open_t bktr_open;
static d_close_t bktr_close;

View file

@ -24,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: cy_pci.c,v 1.12 1999/04/24 20:13:58 peter Exp $
* $Id: cy_pci.c,v 1.13 1999/05/02 20:42:13 peter Exp $
*/
/*
@ -65,11 +65,7 @@ static struct pci_device cy_device = {
&cy_count,
NULL
};
#ifdef COMPAT_PCI_DRIVER
COMPAT_PCI_DRIVER(cy_pci, cy_device);
#else
DATA_SET(pcidevice_set, cy_device);
#endif /* COMPAT_PCI_DRIVER */
static const char *
cy_probe(config_id, device_id)

View file

@ -32,7 +32,7 @@
* dptpci.c: PCI Bus Attachment for DPT SCSI HBAs
*/
#ident "$Id: dpt_pci.c,v 1.11 1998/12/14 06:32:55 dillon Exp $"
#ident "$Id: dpt_pci.c,v 1.12 1999/04/24 20:13:58 peter Exp $"
#include "opt_devfs.h"
#include "opt_dpt.h"
@ -78,11 +78,7 @@ static struct pci_device dpt_pci_driver =
NULL
};
#ifdef COMPAT_PCI_DRIVER
COMPAT_PCI_DRIVER(dpt_pci, dpt_pci_driver);
#else
DATA_SET(pcidevice_set, dpt_pci_driver);
#endif /* COMPAT_PCI_DRIVER */
/*
* Probe the PCI device.

View file

@ -36,7 +36,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
* OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: es1370.c,v 1.2 1999/04/24 20:13:58 peter Exp $
* $Id: es1370.c,v 1.3 1999/05/09 10:43:54 peter Exp $
*/
#include "pci.h"
@ -154,11 +154,7 @@ static struct pci_device es_pci_driver = {
NULL
};
#ifdef COMPAT_PCI_DRIVER
COMPAT_PCI_DRIVER(es_pci, es_pci_driver);
#else
DATA_SET(pcidevice_set, es_pci_driver);
#endif /* COMPAT_PCI_DRIVER */
static snddev_info es_op_desc = {
"ENSONIQ AudioPCI",

View file

@ -26,7 +26,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: ide_pci.c,v 1.32 1999/04/16 21:22:50 peter Exp $
* $Id: ide_pci.c,v 1.33 1999/04/24 20:13:58 peter Exp $
*/
#include "pci.h"
@ -1672,11 +1672,7 @@ static struct pci_device ide_pci_device = {
0
};
#ifdef COMPAT_PCI_DRIVER
COMPAT_PCI_DRIVER(ide_pci, ide_pci_device);
#else
DATA_SET(pcidevice_set, ide_pci_device);
#endif /* COMPAT_PCI_DRIVER */
/*
* Return a cookie if we may be able to do DMA on the specified

View file

@ -29,7 +29,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: if_ax.c,v 1.7 1999/04/08 17:42:47 wpaul Exp $
* $Id: if_ax.c,v 1.8 1999/04/24 20:13:59 peter Exp $
*/
/*
@ -87,7 +87,7 @@
#ifndef lint
static const char rcsid[] =
"$Id: if_ax.c,v 1.7 1999/04/08 17:42:47 wpaul Exp $";
"$Id: if_ax.c,v 1.8 1999/04/24 20:13:59 peter Exp $";
#endif
/*
@ -2238,8 +2238,4 @@ static struct pci_device ax_device = {
&ax_count,
NULL
};
#ifdef COMPAT_PCI_DRIVER
COMPAT_PCI_DRIVER(ax, ax_device);
#else
DATA_SET(pcidevice_set, ax_device);
#endif /* COMPAT_PCI_DRIVER */

View file

@ -1,5 +1,5 @@
/* $NetBSD: if_de.c,v 1.82 1999/02/28 17:08:51 explorer Exp $ */
/* $Id: if_de.c,v 1.103 1999/04/24 20:13:59 peter Exp $ */
/* $Id: if_de.c,v 1.104 1999/05/03 09:36:29 dfr Exp $ */
/*-
* Copyright (c) 1994-1997 Matt Thomas (matt@3am-software.com)
@ -5378,11 +5378,7 @@ static struct pci_device dedevice = {
#endif
};
#ifdef COMPAT_PCI_DRIVER
COMPAT_PCI_DRIVER(de, dedevice);
#else
DATA_SET (pcidevice_set, dedevice);
#endif /* COMPAT_PCI_DRIVER */
#endif /* __FreeBSD__ */
#if defined(__bsdi__)

View file

@ -17,7 +17,7 @@
* 4. Modifications may be freely made to this file if the above conditions
* are met.
*
* $Id: if_ed_p.c,v 1.14 1998/12/14 05:47:27 dillon Exp $
* $Id: if_ed_p.c,v 1.15 1999/04/24 20:14:00 peter Exp $
*/
#include "pci.h"
@ -64,11 +64,7 @@ static struct pci_device ed_pci_driver = {
NULL
};
#ifdef COMPAT_PCI_DRIVER
COMPAT_PCI_DRIVER (ed_pci, ed_pci_driver);
#else
DATA_SET (pcidevice_set, ed_pci_driver);
#endif /* COMPAT_PCI_DRIVER */
static const char*
ed_pci_probe (pcici_t tag, pcidi_t type)

View file

@ -114,11 +114,7 @@ static struct pci_device endevice = {
NULL,
};
#ifdef COMPAT_PCI_DRIVER
COMPAT_PCI_DRIVER (en, endevice);
#else
DATA_SET (pcidevice_set, endevice);
#endif /* COMPAT_PCI_DRIVER */
/*
* local defines (PCI specific stuff)

View file

@ -21,7 +21,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: if_fpa.c,v 1.8 1998/12/14 06:32:55 dillon Exp $
* $Id: if_fpa.c,v 1.9 1999/04/24 20:14:00 peter Exp $
*
*/
@ -214,11 +214,7 @@ static struct pci_device fpadevice = {
NULL
};
#ifdef COMPAT_PCI_DRIVER
COMPAT_PCI_DRIVER (fpa, fpadevice);
#else
DATA_SET (pcidevice_set, fpadevice);
#endif /* COMPAT_PCI_DRIVER */
#elif defined(__bsdi__)

View file

@ -17,7 +17,7 @@
* 4. Modifications may be freely made to this file if the above conditions
* are met.
*
* $Id: if_lnc_p.c,v 1.7 1998/12/14 06:32:55 dillon Exp $
* $Id: if_lnc_p.c,v 1.8 1999/04/24 20:14:00 peter Exp $
*/
#include "pci.h"
@ -49,11 +49,7 @@ static struct pci_device lnc_pci_driver = {
NULL
};
#ifdef COMPAT_PCI_DRIVER
COMPAT_PCI_DRIVER (lnc_pci, lnc_pci_driver);
#else
DATA_SET (pcidevice_set, lnc_pci_driver);
#endif /* COMPAT_PCI_DRIVER */
static const char*
lnc_pci_probe (pcici_t tag, pcidi_t type)

View file

@ -29,7 +29,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: if_mx.c,v 1.41 1999/05/06 15:07:10 wpaul Exp $
* $Id: if_mx.c,v 1.16 1999/05/06 15:32:45 wpaul Exp $
*/
/*
@ -94,7 +94,7 @@
#ifndef lint
static const char rcsid[] =
"$Id: if_mx.c,v 1.41 1999/05/06 15:07:10 wpaul Exp $";
"$Id: if_mx.c,v 1.16 1999/05/06 15:32:45 wpaul Exp $";
#endif
/*
@ -2491,8 +2491,4 @@ static struct pci_device mx_device = {
&mx_count,
NULL
};
#ifdef COMPAT_PCI_DRIVER
COMPAT_PCI_DRIVER(mx, mx_device);
#else
DATA_SET(pcidevice_set, mx_device);
#endif /* COMPAT_PCI_DRIVER */

View file

@ -29,7 +29,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: if_pn.c,v 1.17 1999/04/16 21:22:51 peter Exp $
* $Id: if_pn.c,v 1.18 1999/04/24 20:14:00 peter Exp $
*/
/*
@ -97,7 +97,7 @@
#ifndef lint
static const char rcsid[] =
"$Id: if_pn.c,v 1.17 1999/04/16 21:22:51 peter Exp $";
"$Id: if_pn.c,v 1.18 1999/04/24 20:14:00 peter Exp $";
#endif
#ifdef __alpha__
@ -2282,8 +2282,4 @@ static struct pci_device pn_device = {
&pn_count,
NULL
};
#ifdef COMPAT_PCI_DRIVER
COMPAT_PCI_DRIVER(pn, pn_device);
#else
DATA_SET(pcidevice_set, pn_device);
#endif /* COMPAT_PCI_DRIVER */

View file

@ -29,7 +29,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: if_rl.c,v 1.13 1999/04/12 21:37:00 wpaul Exp $
* $Id: if_rl.c,v 1.14 1999/04/24 20:14:01 peter Exp $
*/
/*
@ -127,7 +127,7 @@
#ifndef lint
static const char rcsid[] =
"$Id: if_rl.c,v 1.13 1999/04/12 21:37:00 wpaul Exp $";
"$Id: if_rl.c,v 1.14 1999/04/24 20:14:01 peter Exp $";
#endif
/*
@ -1914,8 +1914,4 @@ static struct pci_device rl_device = {
&rl_count,
NULL
};
#ifdef COMPAT_PCI_DRIVER
COMPAT_PCI_DRIVER(rl, rl_device);
#else
DATA_SET(pcidevice_set, rl_device);
#endif /* COMPAT_PCI_DRIVER */

View file

@ -27,7 +27,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: if_sr_p.c,v 1.7 1998/12/14 06:32:56 dillon Exp $
* $Id: if_sr_p.c,v 1.8 1999/04/24 20:14:01 peter Exp $
*/
#include "pci.h"
@ -65,13 +65,10 @@ static struct pci_device sr_pci_driver =
sr_pci_probe,
sr_pci_attach,
&src_count,
NULL};
NULL
};
#ifdef COMPAT_PCI_DRIVER
COMPAT_PCI_DRIVER (sr_pci, sr_pci_driver);
#else
DATA_SET (pcidevice_set, sr_pci_driver);
#endif /* COMPAT_PCI_DRIVER */
static const char *
sr_pci_probe(pcici_t tag, pcidi_t type)

View file

@ -29,7 +29,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: if_ti.c,v 1.109 1999/04/29 16:22:07 wpaul Exp $
* $Id: if_ti.c,v 1.4 1999/04/29 16:27:51 wpaul Exp $
*/
/*
@ -128,7 +128,7 @@
#if !defined(lint)
static const char rcsid[] =
"$Id: if_ti.c,v 1.109 1999/04/29 16:22:07 wpaul Exp $";
"$Id: if_ti.c,v 1.4 1999/04/29 16:27:51 wpaul Exp $";
#endif
/*
@ -2483,8 +2483,4 @@ static struct pci_device ti_device = {
&ti_count,
NULL
};
#ifdef COMPAT_PCI_DRIVER
COMPAT_PCI_DRIVER(ti, ti_device);
#else
DATA_SET(pcidevice_set, ti_device);
#endif /* COMPAT_PCI_DRIVER */

View file

@ -29,7 +29,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: if_tl.c,v 1.30 1999/05/06 15:32:49 wpaul Exp $
* $Id: if_tl.c,v 1.31 1999/05/06 18:13:08 peter Exp $
*/
/*
@ -221,7 +221,7 @@
#if !defined(lint)
static const char rcsid[] =
"$Id: if_tl.c,v 1.30 1999/05/06 15:32:49 wpaul Exp $";
"$Id: if_tl.c,v 1.31 1999/05/06 18:13:08 peter Exp $";
#endif
/*
@ -2830,8 +2830,4 @@ static struct pci_device tl_device = {
&tl_count,
NULL
};
#ifdef COMPAT_PCI_DRIVER
COMPAT_PCI_DRIVER(tl, tl_device);
#else
DATA_SET(pcidevice_set, tl_device);
#endif /* COMPAT_PCI_DRIVER */

View file

@ -1,5 +1,5 @@
/* $OpenBSD: if_tx.c,v 1.3 1998/10/10 04:30:09 jason Exp $ */
/* $Id: if_tx.c,v 1.24 1999/04/17 08:36:07 peter Exp $ */
/* $Id: if_tx.c,v 1.25 1999/04/24 20:14:01 peter Exp $ */
/*-
* Copyright (c) 1997 Semen Ustimenko (semen@iclub.nsu.ru)
@ -389,14 +389,11 @@ static struct pci_device txdevice = {
epic_freebsd_probe,
epic_freebsd_attach,
&epic_pci_count,
NULL };
NULL
};
/* Append this driver to pci drivers list */
#ifdef COMPAT_PCI_DRIVER
COMPAT_PCI_DRIVER (tx, txdevice);
#else
DATA_SET ( pcidevice_set, txdevice );
#endif /* COMPAT_PCI_DRIVER */
/* Synopsis: Check if device id corresponds with SMC83C170 id. */
static const char*

View file

@ -29,7 +29,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: if_vr.c,v 1.9 1999/02/23 15:38:24 wpaul Exp $
* $Id: if_vr.c,v 1.10 1999/04/24 20:14:01 peter Exp $
*/
/*
@ -97,7 +97,7 @@
#ifndef lint
static const char rcsid[] =
"$Id: if_vr.c,v 1.9 1999/02/23 15:38:24 wpaul Exp $";
"$Id: if_vr.c,v 1.10 1999/04/24 20:14:01 peter Exp $";
#endif
/*
@ -1959,8 +1959,4 @@ static struct pci_device vr_device = {
&vr_count,
NULL
};
#ifdef COMPAT_PCI_DRIVER
COMPAT_PCI_DRIVER(vr, vr_device);
#else
DATA_SET(pcidevice_set, vr_device);
#endif /* COMPAT_PCI_DRIVER */

View file

@ -137,11 +137,7 @@ static struct pci_device vxdevice = {
NULL
};
#ifdef COMPAT_PCI_DRIVER
COMPAT_PCI_DRIVER (vx, vxdevice);
#else
DATA_SET (pcidevice_set, vxdevice);
#endif /* COMPAT_PCI_DRIVER */
#endif /* NVX */
#endif /* NPCI */

View file

@ -29,7 +29,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: if_wb.c,v 1.7 1999/02/01 21:25:52 wpaul Exp $
* $Id: if_wb.c,v 1.8 1999/04/24 20:14:02 peter Exp $
*/
/*
@ -121,7 +121,7 @@
#ifndef lint
static const char rcsid[] =
"$Id: if_wb.c,v 1.7 1999/02/01 21:25:52 wpaul Exp $";
"$Id: if_wb.c,v 1.8 1999/04/24 20:14:02 peter Exp $";
#endif
/*
@ -2149,8 +2149,4 @@ static struct pci_device wb_device = {
&wb_count,
NULL
};
#ifdef COMPAT_PCI_DRIVER
COMPAT_PCI_DRIVER(wb, wb_device);
#else
DATA_SET(pcidevice_set, wb_device);
#endif /* COMPAT_PCI_DRIVER */

View file

@ -29,7 +29,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: if_xl.c,v 1.101 1999/05/05 16:54:54 wpaul Exp $
* $Id: if_xl.c,v 1.36 1999/05/05 17:05:06 wpaul Exp $
*/
/*
@ -159,7 +159,7 @@
#if !defined(lint)
static const char rcsid[] =
"$Id: if_xl.c,v 1.101 1999/05/05 16:54:54 wpaul Exp $";
"$Id: if_xl.c,v 1.36 1999/05/05 17:05:06 wpaul Exp $";
#endif
/*
@ -2930,8 +2930,4 @@ static struct pci_device xl_device = {
&xl_count,
NULL
};
#ifdef COMPAT_PCI_DRIVER
COMPAT_PCI_DRIVER(xl, xl_device);
#else
DATA_SET(pcidevice_set, xl_device);
#endif /* COMPAT_PCI_DRIVER */

View file

@ -1,4 +1,4 @@
/* $Id: isp_pci.c,v 1.19 1999/04/11 02:47:31 eivind Exp $ */
/* $Id: isp_pci.c,v 1.20 1999/04/24 20:14:02 peter Exp $ */
/* release_4_3_99 */
/*
* PCI specific probe and attach routines for Qlogic ISP SCSI adapters.
@ -271,11 +271,7 @@ static struct pci_device isp_pci_driver = {
&ispunit,
NULL
};
#ifdef COMPAT_PCI_DRIVER
COMPAT_PCI_DRIVER (isp_pci, isp_pci_driver);
#else
DATA_SET (pcidevice_set, isp_pci_driver);
#endif /* COMPAT_PCI_DRIVER */
static PROBETYPE

View file

@ -208,11 +208,7 @@ static struct pci_device met_device = {
&met_count
};
#ifdef COMPAT_PCI_DRIVER
COMPAT_PCI_DRIVER (meteor, met_device);
#else
DATA_SET (pcidevice_set, met_device);
#endif /* COMPAT_PCI_DRIVER */
#if defined(METEOR_FreeBSD_210) /* XXX */
d_open_t meteor_open;

View file

@ -1,6 +1,6 @@
/**************************************************************************
**
** $Id: ncr.c,v 1.143 1999/04/24 20:14:02 peter Exp $
** $Id: ncr.c,v 1.144 1999/05/06 20:16:37 ken Exp $
**
** Device driver for the NCR 53C8XX PCI-SCSI-Controller Family.
**
@ -1361,7 +1361,7 @@ static void ncr_attach (pcici_t tag, int unit);
#if !defined(lint)
static const char ident[] =
"\n$Id: ncr.c,v 1.143 1999/04/24 20:14:02 peter Exp $\n";
"\n$Id: ncr.c,v 1.144 1999/05/06 20:16:37 ken Exp $\n";
#endif
static const u_long ncr_version = NCR_VERSION * 11
@ -1410,11 +1410,7 @@ static struct pci_device ncr_device = {
NULL
};
#ifdef COMPAT_PCI_DRIVER
COMPAT_PCI_DRIVER (ncr, ncr_device);
#else
DATA_SET (pcidevice_set, ncr_device);
#endif /* COMPAT_PCI_DRIVER */
static char *ncr_name (ncb_p np)
{

View file

@ -26,7 +26,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: pcic_p.c,v 1.10 1999/04/24 20:14:03 peter Exp $
* $Id: pcic_p.c,v 1.11 1999/05/02 05:53:50 nate Exp $
*/
#include "pci.h"
@ -57,11 +57,7 @@ static struct pci_device pcic_pci_driver = {
NULL
};
#ifdef COMPAT_PCI_DRIVER
COMPAT_PCI_DRIVER(pcic_pci, pcic_pci_driver);
#else
DATA_SET(pcidevice_set, pcic_pci_driver);
#endif /* COMPAT_PCI_DRIVER */
/*
* Return the ID string for the controller if the vendor/product id

View file

@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: simos.c,v 1.4 1999/04/24 20:14:03 peter Exp $
* $Id: simos.c,v 1.5 1999/05/06 20:16:39 ken Exp $
*/
#include <sys/param.h>
@ -82,11 +82,7 @@ struct pci_device simos_driver = {
&simos_unit,
NULL
};
#ifdef COMPAT_PCI_DRIVER
COMPAT_PCI_DRIVER (simos, simos_driver);
#else
DATA_SET (pcidevice_set, simos_driver);
#endif /* COMPAT_PCI_DRIVER */
static const char *
simos_probe(pcici_t tag, pcidi_t type)

View file

@ -6,7 +6,7 @@
* this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp
* ----------------------------------------------------------------------------
*
* $Id: xrpu.c,v 1.8 1999/03/12 11:09:18 phk Exp $
* $Id: xrpu.c,v 1.9 1999/04/24 20:14:03 peter Exp $
*
* A very simple device driver for PCI cards based on Xilinx 6200 series
* FPGA/RPU devices. Current Functionality is to allow you to open and
@ -198,11 +198,7 @@ static struct pci_device xrpu_device = {
NULL
};
#ifdef COMPAT_PCI_DRIVER
COMPAT_PCI_DRIVER (xrpu, xrpu_device);
#else
DATA_SET (pcidevice_set, xrpu_device);
#endif /* COMPAT_PCI_DRIVER */
static const char*
xrpu_probe (pcici_t tag, pcidi_t typea)