Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update for config changes.

This commit is contained in:
thorpej 1998-01-12 09:39:57 +00:00
parent 1934051221
commit 06ce220790
38 changed files with 62 additions and 206 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/dev/ata/wd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: wd.c,v 1.166 1997/10/13 00:47:33 explorer Exp $ */ /* $NetBSD: wd.c,v 1.167 1998/01/12 09:43:49 thorpej Exp $ */
/* /*
* Copyright (c) 1994, 1995 Charles M. Hannum. All rights reserved. * Copyright (c) 1994, 1995 Charles M. Hannum. All rights reserved.
@ -98,9 +98,7 @@ struct cfattach wd_ca = {
sizeof(struct wd_softc), wdprobe, wdattach sizeof(struct wd_softc), wdprobe, wdattach
}; };
struct cfdriver wd_cd = { extern struct cfdriver wd_cd;
NULL, "wd", DV_DISK
};
void wdgetdefaultlabel __P((struct wd_softc *, struct disklabel *)); void wdgetdefaultlabel __P((struct wd_softc *, struct disklabel *));
void wdgetdisklabel __P((struct wd_softc *)); void wdgetdisklabel __P((struct wd_softc *));
@ -128,7 +126,7 @@ wdprobe(parent, match, aux)
struct cfdata *cf = match; struct cfdata *cf = match;
struct wd_link *d_link = aux; struct wd_link *d_link = aux;
int drive; int drive;
if (d_link == NULL) if (d_link == NULL)
return 0; return 0;
if (d_link->type != ATA) if (d_link->type != ATA)

6
sys/dev/ic/mb86960.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mb86960.c,v 1.19 1998/01/05 07:31:08 perry Exp $ */ /* $NetBSD: mb86960.c,v 1.20 1998/01/12 09:43:37 thorpej Exp $ */
/* /*
* All Rights Reserved, Copyright (C) Fujitsu Limited 1995 * All Rights Reserved, Copyright (C) Fujitsu Limited 1995
@ -245,10 +245,6 @@ struct cfattach fe_ca = {
sizeof(struct fe_softc), feprobe, feattach sizeof(struct fe_softc), feprobe, feattach
}; };
struct cfdriver fe_cd = {
NULL, "fe", DV_IFNET
};
/* Ethernet constants. To be defined in if_ehter.h? FIXME. */ /* Ethernet constants. To be defined in if_ehter.h? FIXME. */
#define ETHER_MIN_LEN 60 /* with header, without CRC. */ #define ETHER_MIN_LEN 60 /* with header, without CRC. */
#define ETHER_MAX_LEN 1514 /* with header, without CRC. */ #define ETHER_MAX_LEN 1514 /* with header, without CRC. */

6
sys/dev/ic/mb86960var.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: mb86960var.h,v 1.19 1998/01/05 07:31:08 perry Exp $ */ /* $NetBSD: mb86960var.h,v 1.20 1998/01/12 09:43:37 thorpej Exp $ */
/* /*
* All Rights Reserved, Copyright (C) Fujitsu Limited 1995 * All Rights Reserved, Copyright (C) Fujitsu Limited 1995
@ -245,10 +245,6 @@ struct cfattach fe_ca = {
sizeof(struct fe_softc), feprobe, feattach sizeof(struct fe_softc), feprobe, feattach
}; };
struct cfdriver fe_cd = {
NULL, "fe", DV_IFNET
};
/* Ethernet constants. To be defined in if_ehter.h? FIXME. */ /* Ethernet constants. To be defined in if_ehter.h? FIXME. */
#define ETHER_MIN_LEN 60 /* with header, without CRC. */ #define ETHER_MIN_LEN 60 /* with header, without CRC. */
#define ETHER_MAX_LEN 1514 /* with header, without CRC. */ #define ETHER_MAX_LEN 1514 /* with header, without CRC. */

6
sys/dev/ic/wdc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: wdc.c,v 1.10 1998/01/07 08:47:54 mikel Exp $ */ /* $NetBSD: wdc.c,v 1.11 1998/01/12 09:43:50 thorpej Exp $ */
/* /*
* Copyright (c) 1994, 1995 Charles M. Hannum. All rights reserved. * Copyright (c) 1994, 1995 Charles M. Hannum. All rights reserved.
@ -93,10 +93,6 @@ struct cfattach wdc_ca = {
sizeof(struct wdc_softc), wdcprobe, wdcattach sizeof(struct wdc_softc), wdcprobe, wdcattach
}; };
struct cfdriver wdc_cd = {
NULL, "wdc", DV_DULL
};
void wdcstart __P((struct wdc_softc *)); void wdcstart __P((struct wdc_softc *));
int wdcreset __P((struct wdc_softc *, int)); int wdcreset __P((struct wdc_softc *, int));
#define VERBOSE 1 #define VERBOSE 1

6
sys/dev/isa/ast.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ast.c,v 1.41 1997/10/20 18:43:05 thorpej Exp $ */ /* $NetBSD: ast.c,v 1.42 1998/01/12 09:43:30 thorpej Exp $ */
/* /*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved. * Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@ -74,10 +74,6 @@ struct cfattach ast_ca = {
sizeof(struct ast_softc), astprobe, astattach sizeof(struct ast_softc), astprobe, astattach
}; };
struct cfdriver ast_cd = {
NULL, "ast", DV_TTY
};
int int
astprobe(parent, self, aux) astprobe(parent, self, aux)
struct device *parent; struct device *parent;

6
sys/dev/isa/boca.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: boca.c,v 1.27 1997/10/20 18:43:07 thorpej Exp $ */ /* $NetBSD: boca.c,v 1.28 1998/01/12 09:43:30 thorpej Exp $ */
/* /*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved. * Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@ -70,10 +70,6 @@ struct cfattach boca_ca = {
sizeof(struct boca_softc), bocaprobe, bocaattach, sizeof(struct boca_softc), bocaprobe, bocaattach,
}; };
struct cfdriver boca_cd = {
NULL, "boca", DV_TTY
};
int int
bocaprobe(parent, self, aux) bocaprobe(parent, self, aux)
struct device *parent; struct device *parent;

6
sys/dev/isa/esp_isa.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: esp_isa.c,v 1.6 1997/10/20 18:43:09 thorpej Exp $ */ /* $NetBSD: esp_isa.c,v 1.7 1998/01/12 09:43:31 thorpej Exp $ */
/*- /*-
* Copyright (c) 1997 The NetBSD Foundation, Inc. * Copyright (c) 1997 The NetBSD Foundation, Inc.
@ -168,10 +168,6 @@ struct cfattach esp_isa_ca = {
sizeof(struct esp_softc), esp_isa_match, esp_isa_attach sizeof(struct esp_softc), esp_isa_match, esp_isa_attach
}; };
struct cfdriver esp_cd = {
NULL, "esp", DV_DULL
};
struct scsipi_adapter esp_switch = { struct scsipi_adapter esp_switch = {
ncr53c9x_scsi_cmd, ncr53c9x_scsi_cmd,
minphys, /* no max at this level; handled by DMA code */ minphys, /* no max at this level; handled by DMA code */

7
sys/dev/isa/gus.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: gus.c,v 1.48 1997/10/19 07:42:26 augustss Exp $ */ /* $NetBSD: gus.c,v 1.49 1998/01/12 09:43:32 thorpej Exp $ */
/*- /*-
* Copyright (c) 1996 The NetBSD Foundation, Inc. * Copyright (c) 1996 The NetBSD Foundation, Inc.
@ -443,11 +443,6 @@ struct cfattach gus_ca = {
sizeof(struct gus_softc), gusprobe, gusattach, sizeof(struct gus_softc), gusprobe, gusattach,
}; };
struct cfdriver gus_cd = {
NULL, "gus", DV_DULL
};
/* /*
* A mapping from IRQ/DRQ values to the values used in the GUS's internal * A mapping from IRQ/DRQ values to the values used in the GUS's internal
* registers. A zero means that the referenced IRQ/DRQ is invalid * registers. A zero means that the referenced IRQ/DRQ is invalid

6
sys/dev/isa/if_ate.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_ate.c,v 1.19 1998/01/05 07:31:08 perry Exp $ */ /* $NetBSD: if_ate.c,v 1.20 1998/01/12 09:43:37 thorpej Exp $ */
/* /*
* All Rights Reserved, Copyright (C) Fujitsu Limited 1995 * All Rights Reserved, Copyright (C) Fujitsu Limited 1995
@ -245,10 +245,6 @@ struct cfattach fe_ca = {
sizeof(struct fe_softc), feprobe, feattach sizeof(struct fe_softc), feprobe, feattach
}; };
struct cfdriver fe_cd = {
NULL, "fe", DV_IFNET
};
/* Ethernet constants. To be defined in if_ehter.h? FIXME. */ /* Ethernet constants. To be defined in if_ehter.h? FIXME. */
#define ETHER_MIN_LEN 60 /* with header, without CRC. */ #define ETHER_MIN_LEN 60 /* with header, without CRC. */
#define ETHER_MAX_LEN 1514 /* with header, without CRC. */ #define ETHER_MAX_LEN 1514 /* with header, without CRC. */

6
sys/dev/isa/if_ec.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_ec.c,v 1.2 1997/11/02 05:17:32 thorpej Exp $ */ /* $NetBSD: if_ec.c,v 1.3 1998/01/12 09:43:34 thorpej Exp $ */
/*- /*-
* Copyright (c) 1997 The NetBSD Foundation, Inc. * Copyright (c) 1997 The NetBSD Foundation, Inc.
@ -122,10 +122,6 @@ struct cfattach ec_ca = {
sizeof(struct ec_softc), ec_probe, ec_attach sizeof(struct ec_softc), ec_probe, ec_attach
}; };
struct cfdriver ec_cd = {
NULL, "ec", DV_IFNET
};
int ec_set_media __P((struct ec_softc *, int)); int ec_set_media __P((struct ec_softc *, int));
int ec_mediachange __P((struct dp8390_softc *)); int ec_mediachange __P((struct dp8390_softc *));

6
sys/dev/isa/if_eg.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_eg.c,v 1.38 1997/10/19 18:57:04 thorpej Exp $ */ /* $NetBSD: if_eg.c,v 1.39 1998/01/12 09:43:35 thorpej Exp $ */
/* /*
* Copyright (c) 1993 Dean Huxley <dean@fsa.ca> * Copyright (c) 1993 Dean Huxley <dean@fsa.ca>
@ -130,10 +130,6 @@ struct cfattach eg_ca = {
sizeof(struct eg_softc), egprobe, egattach sizeof(struct eg_softc), egprobe, egattach
}; };
struct cfdriver eg_cd = {
NULL, "eg", DV_IFNET
};
int egintr __P((void *)); int egintr __P((void *));
void eginit __P((struct eg_softc *)); void eginit __P((struct eg_softc *));
int egioctl __P((struct ifnet *, u_long, caddr_t)); int egioctl __P((struct ifnet *, u_long, caddr_t));

6
sys/dev/isa/if_el.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_el.c,v 1.50 1997/11/30 15:31:25 drochner Exp $ */ /* $NetBSD: if_el.c,v 1.51 1998/01/12 09:43:36 thorpej Exp $ */
/* /*
* Copyright (c) 1994, Matthew E. Kimmel. Permission is hereby granted * Copyright (c) 1994, Matthew E. Kimmel. Permission is hereby granted
@ -117,10 +117,6 @@ struct cfattach el_ca = {
sizeof(struct el_softc), elprobe, elattach sizeof(struct el_softc), elprobe, elattach
}; };
struct cfdriver el_cd = {
NULL, "el", DV_IFNET
};
/* /*
* Probe routine. * Probe routine.
* *

6
sys/dev/isa/if_fe.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_fe.c,v 1.19 1998/01/05 07:31:08 perry Exp $ */ /* $NetBSD: if_fe.c,v 1.20 1998/01/12 09:43:37 thorpej Exp $ */
/* /*
* All Rights Reserved, Copyright (C) Fujitsu Limited 1995 * All Rights Reserved, Copyright (C) Fujitsu Limited 1995
@ -245,10 +245,6 @@ struct cfattach fe_ca = {
sizeof(struct fe_softc), feprobe, feattach sizeof(struct fe_softc), feprobe, feattach
}; };
struct cfdriver fe_cd = {
NULL, "fe", DV_IFNET
};
/* Ethernet constants. To be defined in if_ehter.h? FIXME. */ /* Ethernet constants. To be defined in if_ehter.h? FIXME. */
#define ETHER_MIN_LEN 60 /* with header, without CRC. */ #define ETHER_MIN_LEN 60 /* with header, without CRC. */
#define ETHER_MAX_LEN 1514 /* with header, without CRC. */ #define ETHER_MAX_LEN 1514 /* with header, without CRC. */

6
sys/dev/isa/if_fmv.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_fmv.c,v 1.19 1998/01/05 07:31:08 perry Exp $ */ /* $NetBSD: if_fmv.c,v 1.20 1998/01/12 09:43:37 thorpej Exp $ */
/* /*
* All Rights Reserved, Copyright (C) Fujitsu Limited 1995 * All Rights Reserved, Copyright (C) Fujitsu Limited 1995
@ -245,10 +245,6 @@ struct cfattach fe_ca = {
sizeof(struct fe_softc), feprobe, feattach sizeof(struct fe_softc), feprobe, feattach
}; };
struct cfdriver fe_cd = {
NULL, "fe", DV_IFNET
};
/* Ethernet constants. To be defined in if_ehter.h? FIXME. */ /* Ethernet constants. To be defined in if_ehter.h? FIXME. */
#define ETHER_MIN_LEN 60 /* with header, without CRC. */ #define ETHER_MIN_LEN 60 /* with header, without CRC. */
#define ETHER_MAX_LEN 1514 /* with header, without CRC. */ #define ETHER_MAX_LEN 1514 /* with header, without CRC. */

6
sys/dev/isa/if_ie.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_ie.c,v 1.62 1997/11/21 10:27:45 bouyer Exp $ */ /* $NetBSD: if_ie.c,v 1.63 1998/01/12 09:43:38 thorpej Exp $ */
/*- /*-
* Copyright (c) 1993, 1994, 1995 Charles Hannum. * Copyright (c) 1993, 1994, 1995 Charles Hannum.
@ -344,10 +344,6 @@ struct cfattach ie_ca = {
sizeof(struct ie_softc), ieprobe, ieattach sizeof(struct ie_softc), ieprobe, ieattach
}; };
struct cfdriver ie_cd = {
NULL, "ie", DV_IFNET
};
#define MK_24(base, ptr) ((caddr_t)((u_long)ptr - (u_long)base)) #define MK_24(base, ptr) ((caddr_t)((u_long)ptr - (u_long)base))
#define MK_16(base, ptr) ((u_short)(u_long)MK_24(base, ptr)) #define MK_16(base, ptr) ((u_short)(u_long)MK_24(base, ptr))

6
sys/dev/isa/if_iy.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_iy.c,v 1.18 1997/12/02 09:34:06 bouyer Exp $ */ /* $NetBSD: if_iy.c,v 1.19 1998/01/12 09:43:39 thorpej Exp $ */
/* #define IYDEBUG */ /* #define IYDEBUG */
/* #define IYMEMDEBUG */ /* #define IYMEMDEBUG */
/*- /*-
@ -179,10 +179,6 @@ struct cfattach iy_ca = {
sizeof(struct iy_softc), iyprobe, iyattach sizeof(struct iy_softc), iyprobe, iyattach
}; };
struct cfdriver iy_cd = {
NULL, "iy", DV_IFNET
};
static u_int8_t eepro_irqmap[] = EEPP_INTMAP; static u_int8_t eepro_irqmap[] = EEPP_INTMAP;
static u_int8_t eepro_revirqmap[] = EEPP_RINTMAP; static u_int8_t eepro_revirqmap[] = EEPP_RINTMAP;

6
sys/dev/isa/if_we.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_we.c,v 1.2 1997/11/08 06:13:53 thorpej Exp $ */ /* $NetBSD: if_we.c,v 1.3 1998/01/12 09:43:40 thorpej Exp $ */
/*- /*-
* Copyright (c) 1997 The NetBSD Foundation, Inc. * Copyright (c) 1997 The NetBSD Foundation, Inc.
@ -131,9 +131,7 @@ struct cfattach we_ca = {
sizeof(struct we_softc), we_probe, we_attach sizeof(struct we_softc), we_probe, we_attach
}; };
struct cfdriver we_cd = { extern struct cfdriver wd_cd;
NULL, "we", DV_IFNET
};
const char *we_params __P((bus_space_tag_t, bus_space_handle_t, u_int8_t *, const char *we_params __P((bus_space_tag_t, bus_space_handle_t, u_int8_t *,
bus_size_t *, int *, int *)); bus_size_t *, int *, int *));

16
sys/dev/isa/isa.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: isa.c,v 1.97 1997/08/26 19:27:22 augustss Exp $ */ /* $NetBSD: isa.c,v 1.98 1998/01/12 09:43:41 thorpej Exp $ */
/*- /*-
* Copyright (c) 1993, 1994 Charles Hannum. All rights reserved. * Copyright (c) 1993, 1994 Charles Hannum. All rights reserved.
@ -54,14 +54,6 @@ struct cfattach isa_ca = {
sizeof(struct isa_softc), isamatch, isaattach sizeof(struct isa_softc), isamatch, isaattach
}; };
struct cfdriver isa_cd = {
#ifdef __BROKEN_INDIRECT_CONFIG
NULL, "isa", DV_DULL, 1
#else
NULL, "isa", DV_DULL
#endif
};
#ifdef __BROKEN_INDIRECT_CONFIG #ifdef __BROKEN_INDIRECT_CONFIG
void isascan __P((struct device *, void *)); void isascan __P((struct device *, void *));
#else #else
@ -103,6 +95,12 @@ isaattach(parent, self, aux)
struct isa_softc *sc = (struct isa_softc *)self; struct isa_softc *sc = (struct isa_softc *)self;
struct isabus_attach_args *iba = aux; struct isabus_attach_args *iba = aux;
#ifdef __BROKEN_INDIRECT_CONFIG
extern struct cfdriver isa_cd;
isa_cd.cd_indirect = 1;
#endif
isa_attach_hook(parent, self, iba); isa_attach_hook(parent, self, iba);
printf("\n"); printf("\n");

6
sys/dev/isa/mcd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mcd.c,v 1.58 1997/11/11 22:43:51 fvdl Exp $ */ /* $NetBSD: mcd.c,v 1.59 1998/01/12 09:43:42 thorpej Exp $ */
/* /*
* Copyright (c) 1993, 1994, 1995 Charles M. Hannum. All rights reserved. * Copyright (c) 1993, 1994, 1995 Charles M. Hannum. All rights reserved.
@ -185,9 +185,7 @@ struct cfattach mcd_ca = {
sizeof(struct mcd_softc), mcdprobe, mcdattach sizeof(struct mcd_softc), mcdprobe, mcdattach
}; };
struct cfdriver mcd_cd = { extern struct cfdriver mcd_cd;
NULL, "mcd", DV_DISK
};
void mcdgetdefaultlabel __P((struct mcd_softc *, struct disklabel *)); void mcdgetdefaultlabel __P((struct mcd_softc *, struct disklabel *));
void mcdgetdisklabel __P((struct mcd_softc *)); void mcdgetdisklabel __P((struct mcd_softc *));

6
sys/dev/isa/pas.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pas.c,v 1.36 1997/10/19 07:42:30 augustss Exp $ */ /* $NetBSD: pas.c,v 1.37 1998/01/12 09:43:43 thorpej Exp $ */
/* /*
* Copyright (c) 1991-1993 Regents of the University of California. * Copyright (c) 1991-1993 Regents of the University of California.
@ -242,10 +242,6 @@ struct cfattach pas_ca = {
sizeof(struct pas_softc), pasprobe, pasattach sizeof(struct pas_softc), pasprobe, pasattach
}; };
struct cfdriver pas_cd = {
NULL, "pas", DV_DULL
};
/* /*
* Probe / attach routines. * Probe / attach routines.
*/ */

18
sys/dev/isa/pss.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pss.c,v 1.37 1997/10/19 07:42:32 augustss Exp $ */ /* $NetBSD: pss.c,v 1.38 1998/01/12 09:43:44 thorpej Exp $ */
/* /*
* Copyright (c) 1994 John Brezak * Copyright (c) 1994 John Brezak
@ -265,34 +265,18 @@ struct cfattach pss_ca = {
sizeof(struct pss_softc), pssprobe, pssattach sizeof(struct pss_softc), pssprobe, pssattach
}; };
struct cfdriver pss_cd = {
NULL, "pss", DV_DULL, 1
};
struct cfattach sp_ca = { struct cfattach sp_ca = {
sizeof(struct ad1848_softc), spprobe, spattach sizeof(struct ad1848_softc), spprobe, spattach
}; };
struct cfdriver sp_cd = {
NULL, "sp", DV_DULL
};
#ifdef notyet #ifdef notyet
struct cfattach mpu_ca = { struct cfattach mpu_ca = {
sizeof(struct mpu_softc), mpuprobe, mpuattach sizeof(struct mpu_softc), mpuprobe, mpuattach
}; };
struct cfdriver mpu_cd = {
NULL, "mpu", DV_DULL
};
struct cfattach pcd_ca = { struct cfattach pcd_ca = {
sizeof(struct pcd_softc), pcdprobe, pcdattach sizeof(struct pcd_softc), pcdprobe, pcdattach
}; };
struct cfdriver pcd_cd = {
NULL, "pcd", DV_DULL
};
#endif #endif
struct audio_device pss_device = { struct audio_device pss_device = {

6
sys/dev/isa/rtfps.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: rtfps.c,v 1.35 1997/10/20 18:43:19 thorpej Exp $ */ /* $NetBSD: rtfps.c,v 1.36 1998/01/12 09:43:44 thorpej Exp $ */
/* /*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved. * Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@ -72,10 +72,6 @@ struct cfattach rtfps_ca = {
sizeof(struct rtfps_softc), rtfpsprobe, rtfpsattach sizeof(struct rtfps_softc), rtfpsprobe, rtfpsattach
}; };
struct cfdriver rtfps_cd = {
NULL, "rtfps", DV_TTY
};
int int
rtfpsprobe(parent, self, aux) rtfpsprobe(parent, self, aux)
struct device *parent; struct device *parent;

7
sys/dev/isa/satlink.c
View File

@ -1,4 +1,5 @@
/* $NetBSD: satlink.c,v 1.3 1997/10/19 09:05:09 thorpej Exp $ */ /* $NetBSD: satlink.c,v 1.4 1998/01/12 09:43:45 thorpej Exp $ */
/*- /*-
* Copyright (c) 1997 The NetBSD Foundation, Inc. * Copyright (c) 1997 The NetBSD Foundation, Inc.
* All rights reserved. * All rights reserved.
@ -107,9 +108,7 @@ struct cfattach satlink_ca = {
sizeof(struct satlink_softc), satlinkprobe, satlinkattach sizeof(struct satlink_softc), satlinkprobe, satlinkattach
}; };
struct cfdriver satlink_cd = { extern struct cfdriver satlink_cd;
NULL, "satlink", DV_DULL
};
cdev_decl(satlink); cdev_decl(satlink);

6
sys/dev/isa/sb.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: sb.c,v 1.56 1997/11/12 20:28:42 augustss Exp $ */ /* $NetBSD: sb.c,v 1.57 1998/01/12 09:43:46 thorpej Exp $ */
/* /*
* Copyright (c) 1991-1993 Regents of the University of California. * Copyright (c) 1991-1993 Regents of the University of California.
@ -57,10 +57,6 @@
#include <dev/isa/sbvar.h> #include <dev/isa/sbvar.h>
#include <dev/isa/sbdspvar.h> #include <dev/isa/sbdspvar.h>
struct cfdriver sb_cd = {
NULL, "sb", DV_DULL
};
struct audio_device sb_device = { struct audio_device sb_device = {
"SoundBlaster", "SoundBlaster",
"x", "x",

6
sys/dev/isa/seagate.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: seagate.c,v 1.24 1998/01/05 07:31:10 perry Exp $ */ /* $NetBSD: seagate.c,v 1.25 1998/01/12 09:43:47 thorpej Exp $ */
/* /*
* ST01/02, Future Domain TMC-885, TMC-950 SCSI driver * ST01/02, Future Domain TMC-885, TMC-950 SCSI driver
@ -312,9 +312,7 @@ struct cfattach sea_ca = {
sizeof(struct sea_softc), seaprobe, seaattach sizeof(struct sea_softc), seaprobe, seaattach
}; };
struct cfdriver sea_cd = { extern struct cfdriver sea_cd;
NULL, "sea", DV_DULL
};
#ifdef SEA_DEBUGQUEUE #ifdef SEA_DEBUGQUEUE
void void

8
sys/dev/isa/wd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: wd.c,v 1.166 1997/10/13 00:47:33 explorer Exp $ */ /* $NetBSD: wd.c,v 1.167 1998/01/12 09:43:49 thorpej Exp $ */
/* /*
* Copyright (c) 1994, 1995 Charles M. Hannum. All rights reserved. * Copyright (c) 1994, 1995 Charles M. Hannum. All rights reserved.
@ -98,9 +98,7 @@ struct cfattach wd_ca = {
sizeof(struct wd_softc), wdprobe, wdattach sizeof(struct wd_softc), wdprobe, wdattach
}; };
struct cfdriver wd_cd = { extern struct cfdriver wd_cd;
NULL, "wd", DV_DISK
};
void wdgetdefaultlabel __P((struct wd_softc *, struct disklabel *)); void wdgetdefaultlabel __P((struct wd_softc *, struct disklabel *));
void wdgetdisklabel __P((struct wd_softc *)); void wdgetdisklabel __P((struct wd_softc *));
@ -128,7 +126,7 @@ wdprobe(parent, match, aux)
struct cfdata *cf = match; struct cfdata *cf = match;
struct wd_link *d_link = aux; struct wd_link *d_link = aux;
int drive; int drive;
if (d_link == NULL) if (d_link == NULL)
return 0; return 0;
if (d_link->type != ATA) if (d_link->type != ATA)

6
sys/dev/isa/wdc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: wdc.c,v 1.10 1998/01/07 08:47:54 mikel Exp $ */ /* $NetBSD: wdc.c,v 1.11 1998/01/12 09:43:50 thorpej Exp $ */
/* /*
* Copyright (c) 1994, 1995 Charles M. Hannum. All rights reserved. * Copyright (c) 1994, 1995 Charles M. Hannum. All rights reserved.
@ -93,10 +93,6 @@ struct cfattach wdc_ca = {
sizeof(struct wdc_softc), wdcprobe, wdcattach sizeof(struct wdc_softc), wdcprobe, wdcattach
}; };
struct cfdriver wdc_cd = {
NULL, "wdc", DV_DULL
};
void wdcstart __P((struct wdc_softc *)); void wdcstart __P((struct wdc_softc *));
int wdcreset __P((struct wdc_softc *, int)); int wdcreset __P((struct wdc_softc *, int));
#define VERBOSE 1 #define VERBOSE 1

6
sys/dev/isa/wds.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: wds.c,v 1.26 1997/11/30 15:24:00 drochner Exp $ */ /* $NetBSD: wds.c,v 1.27 1998/01/12 09:43:52 thorpej Exp $ */
#undef WDSDIAG #undef WDSDIAG
#ifdef DDB #ifdef DDB
@ -230,10 +230,6 @@ struct cfattach wds_ca = {
sizeof(struct wds_softc), wdsprobe, wdsattach sizeof(struct wds_softc), wdsprobe, wdsattach
}; };
struct cfdriver wds_cd = {
NULL, "wds", DV_DULL
};
#define WDS_ABORT_TIMEOUT 2000 /* time to wait for abort (mSec) */ #define WDS_ABORT_TIMEOUT 2000 /* time to wait for abort (mSec) */
/* XXX Should put this in a better place. */ /* XXX Should put this in a better place. */

6
sys/dev/isa/wss.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: wss.c,v 1.40 1997/11/30 15:24:59 drochner Exp $ */ /* $NetBSD: wss.c,v 1.41 1998/01/12 09:43:52 thorpej Exp $ */
/* /*
* Copyright (c) 1994 John Brezak * Copyright (c) 1994 John Brezak
@ -195,10 +195,6 @@ struct cfattach wss_ca = {
sizeof(struct wss_softc), wssprobe, wssattach sizeof(struct wss_softc), wssprobe, wssattach
}; };
struct cfdriver wss_cd = {
NULL, "wss", DV_DULL
};
/* /*
* Probe for the Microsoft Sound System hardware. * Probe for the Microsoft Sound System hardware.
*/ */

6
sys/dev/isa/wt.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: wt.c,v 1.41 1997/10/20 18:43:22 thorpej Exp $ */ /* $NetBSD: wt.c,v 1.42 1998/01/12 09:43:53 thorpej Exp $ */
/* /*
* Streamer tape driver. * Streamer tape driver.
@ -181,9 +181,7 @@ struct cfattach wt_ca = {
sizeof(struct wt_softc), wtprobe, wtattach sizeof(struct wt_softc), wtprobe, wtattach
}; };
struct cfdriver wt_cd = { extern struct cfdriver wt_cd;
NULL, "wt", DV_TAPE
};
/* /*
* Probe for the presence of the device. * Probe for the presence of the device.

16
sys/dev/pci/files.pci
View File

@ -1,4 +1,4 @@
# $NetBSD: files.pci,v 1.31 1997/10/21 05:54:28 bouyer Exp $ # $NetBSD: files.pci,v 1.32 1998/01/12 09:39:57 thorpej Exp $
# #
# Config file and device description for machine-independent PCI code. # Config file and device description for machine-independent PCI code.
# Included by ports that need it. Requires that the SCSI files be # Included by ports that need it. Requires that the SCSI files be
@ -6,7 +6,7 @@
defopt PCIVERBOSE defopt PCIVERBOSE
device pci {[dev = -1], [function = -1]} device pci class dull {[dev = -1], [function = -1]}
attach pci at pcibus attach pci at pcibus
file dev/pci/pci.c pci needs-flag file dev/pci/pci.c pci needs-flag
file dev/pci/pci_map.c pci file dev/pci/pci_map.c pci
@ -29,7 +29,7 @@ attach isp at pci with isp_pci
file dev/pci/isp_pci.c isp_pci file dev/pci/isp_pci.c isp_pci
# Ethernet driver for DC21040-based boards # Ethernet driver for DC21040-based boards
device de: ether, ifnet, arp device de class ifnet: ether, ifnet, arp
attach de at pci attach de at pci
file dev/pci/if_de.c de file dev/pci/if_de.c de
@ -44,7 +44,7 @@ attach ep at pci with ep_pci
file dev/pci/if_ep_pci.c ep_pci file dev/pci/if_ep_pci.c ep_pci
# Digital DEFPA PCI FDDI Controller # Digital DEFPA PCI FDDI Controller
device fpa: pdq, fddi, ifnet, arp device fpa class ifnet: pdq, fddi, ifnet, arp
attach fpa at pci attach fpa at pci
file dev/pci/if_fpa.c fpa file dev/pci/if_fpa.c fpa
@ -54,12 +54,12 @@ attach le at pci with le_pci
file dev/pci/if_le_pci.c le_pci file dev/pci/if_le_pci.c le_pci
# NCR 53c8xx SCSI chips # NCR 53c8xx SCSI chips
device ncr: scsi device ncr class dull: scsi
attach ncr at pci attach ncr at pci
file dev/pci/ncr.c ncr file dev/pci/ncr.c ncr
# PCI-PCI bridge chips # PCI-PCI bridge chips
device ppb: pcibus device ppb class dull: pcibus
attach ppb at pci attach ppb at pci
file dev/pci/ppb.c ppb file dev/pci/ppb.c ppb
@ -68,7 +68,7 @@ attach cy at pci with cy_pci
file dev/pci/cy_pci.c cy_pci file dev/pci/cy_pci.c cy_pci
# Intel EtherExpress PRO 10/100B # Intel EtherExpress PRO 10/100B
device fxp: ether, ifnet, arp device fxp class ifnet: ether, ifnet, arp
attach fxp at pci attach fxp at pci
file dev/pci/if_fxp.c fxp file dev/pci/if_fxp.c fxp
@ -77,6 +77,6 @@ attach ne at pci with ne_pci
file dev/pci/if_ne_pci.c ne_pci file dev/pci/if_ne_pci.c ne_pci
# Texas Instruments ThunderLAN Chip. # Texas Instruments ThunderLAN Chip.
device tl: ether, ifnet, arp, i2c, i2c_eeprom, miibus device tl class ifnet: ether, ifnet, arp, i2c, i2c_eeprom, miibus
attach tl at pci attach tl at pci
file dev/pci/if_tl.c tl file dev/pci/if_tl.c tl

6
sys/dev/pci/if_de.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_de.c,v 1.57 1997/10/27 02:10:07 thorpej Exp $ */ /* $NetBSD: if_de.c,v 1.58 1998/01/12 09:39:58 thorpej Exp $ */
/*- /*-
* Copyright (c) 1994-1997 Matt Thomas (matt@3am-software.com) * Copyright (c) 1994-1997 Matt Thomas (matt@3am-software.com)
@ -5025,10 +5025,6 @@ struct cfattach de_ca = {
sizeof(tulip_softc_t), tulip_pci_probe, tulip_pci_attach sizeof(tulip_softc_t), tulip_pci_probe, tulip_pci_attach
}; };
struct cfdriver de_cd = {
0, "de", DV_IFNET
};
#endif /* __NetBSD__ */ #endif /* __NetBSD__ */
static void static void

6
sys/dev/pci/if_fpa.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_fpa.c,v 1.23 1997/06/09 01:23:20 thorpej Exp $ */ /* $NetBSD: if_fpa.c,v 1.24 1998/01/12 09:40:01 thorpej Exp $ */
/*- /*-
* Copyright (c) 1995, 1996 Matt Thomas <matt@3am-software.com> * Copyright (c) 1995, 1996 Matt Thomas <matt@3am-software.com>
@ -502,8 +502,4 @@ struct cfattach fpa_ca = {
sizeof(pdq_softc_t), pdq_pci_match, pdq_pci_attach sizeof(pdq_softc_t), pdq_pci_match, pdq_pci_attach
}; };
struct cfdriver fpa_cd = {
0, "fpa", DV_IFNET
};
#endif /* __NetBSD__ */ #endif /* __NetBSD__ */

6
sys/dev/pci/if_fxp.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_fxp.c,v 1.6 1997/11/11 06:35:46 thorpej Exp $ */ /* $NetBSD: if_fxp.c,v 1.7 1998/01/12 09:40:03 thorpej Exp $ */
/* /*
* Copyright (c) 1995, David Greenman * Copyright (c) 1995, David Greenman
@ -295,10 +295,6 @@ struct cfattach fxp_ca = {
sizeof(struct fxp_softc), fxp_match, fxp_attach sizeof(struct fxp_softc), fxp_match, fxp_attach
}; };
struct cfdriver fxp_cd = {
NULL, "fxp", DV_IFNET
};
/* /*
* Check if a device is an 82557. * Check if a device is an 82557.
*/ */

6
sys/dev/pci/if_tl.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_tl.c,v 1.7 1997/11/30 15:18:58 drochner Exp $ */ /* $NetBSD: if_tl.c,v 1.8 1998/01/12 09:40:04 thorpej Exp $ */
/* /*
* Copyright (c) 1997 Manuel Bouyer. All rights reserved. * Copyright (c) 1997 Manuel Bouyer. All rights reserved.
@ -234,10 +234,6 @@ struct cfattach tl_ca = {
sizeof(tl_softc_t), tl_pci_match, tl_pci_attach sizeof(tl_softc_t), tl_pci_match, tl_pci_attach
}; };
struct cfdriver tl_cd = {
0, "tl", DV_IFNET
};
struct tl_product_desc { struct tl_product_desc {
u_int32_t tp_product; u_int32_t tp_product;
u_int32_t tp_adapter; u_int32_t tp_adapter;

8
sys/dev/pci/ncr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ncr.c,v 1.63 1997/09/23 02:39:15 perry Exp $ */ /* $NetBSD: ncr.c,v 1.64 1998/01/12 09:40:07 thorpej Exp $ */
/************************************************************************** /**************************************************************************
** **
@ -1440,7 +1440,7 @@ static void ncr_attach (pcici_t tag, int unit);
#if 0 #if 0
static char ident[] = static char ident[] =
"\n$NetBSD: ncr.c,v 1.63 1997/09/23 02:39:15 perry Exp $\n"; "\n$NetBSD: ncr.c,v 1.64 1998/01/12 09:40:07 thorpej Exp $\n";
#endif #endif
static const u_long ncr_version = NCR_VERSION * 11 static const u_long ncr_version = NCR_VERSION * 11
@ -1489,10 +1489,6 @@ struct cfattach ncr_ca = {
sizeof(struct ncb), ncr_probe, ncr_attach sizeof(struct ncb), ncr_probe, ncr_attach
}; };
struct cfdriver ncr_cd = {
NULL, "ncr", DV_DULL
};
#else /* !__NetBSD__ */ #else /* !__NetBSD__ */
static u_long ncr_count; static u_long ncr_count;

6
sys/dev/pci/pci.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pci.c,v 1.29 1997/08/30 06:53:57 mycroft Exp $ */ /* $NetBSD: pci.c,v 1.30 1998/01/12 09:40:11 thorpej Exp $ */
/* /*
* Copyright (c) 1995, 1996, 1997 * Copyright (c) 1995, 1996, 1997
@ -53,10 +53,6 @@ struct cfattach pci_ca = {
sizeof(struct device), pcimatch, pciattach sizeof(struct device), pcimatch, pciattach
}; };
struct cfdriver pci_cd = {
NULL, "pci", DV_DULL
};
int pciprint __P((void *, const char *)); int pciprint __P((void *, const char *));
#ifdef __BROKEN_INDIRECT_CONFIG #ifdef __BROKEN_INDIRECT_CONFIG
int pcisubmatch __P((struct device *, void *, void *)); int pcisubmatch __P((struct device *, void *, void *));

6
sys/dev/pci/ppb.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ppb.c,v 1.15 1997/08/30 06:53:58 mycroft Exp $ */ /* $NetBSD: ppb.c,v 1.16 1998/01/12 09:40:12 thorpej Exp $ */
/* /*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved. * Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@ -60,10 +60,6 @@ struct cfattach ppb_ca = {
sizeof(struct device), ppbmatch, ppbattach sizeof(struct device), ppbmatch, ppbattach
}; };
struct cfdriver ppb_cd = {
NULL, "ppb", DV_DULL
};
int ppbprint __P((void *, const char *pnp)); int ppbprint __P((void *, const char *pnp));
int int