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

Adjust for changes in config.

Browse Source
This commit is contained in:
thorpej 1998-01-12 09:51:28 +00:00
parent 93f26b5f40
commit 19feaef2b4
9 changed files with 22 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/dev/tc/asc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: asc.c,v 1.42 1997/11/28 18:23:38 mhitch Exp $ */ /* $NetBSD: asc.c,v 1.43 1998/01/12 09:51:28 thorpej Exp $ */
/*- /*-
* Copyright (c) 1992, 1993 * Copyright (c) 1992, 1993
@ -411,12 +411,6 @@ static void asc_reset __P((asc_softc_t asc, asc_regmap_t *regs));
static void asc_startcmd __P((asc_softc_t asc, int target)); static void asc_startcmd __P((asc_softc_t asc, int target));
static void asc_timeout __P((void *arg)); static void asc_timeout __P((void *arg));
extern struct cfdriver asc_cd;
struct cfdriver asc_cd = {
NULL, "asc", DV_DULL
};
#ifdef USE_NEW_SCSI #ifdef USE_NEW_SCSI
/* Glue to the machine-independent scsi */ /* Glue to the machine-independent scsi */
struct scsipi_adapter asc_switch = { struct scsipi_adapter asc_switch = {
@ -445,6 +439,7 @@ struct pmax_driver ascdriver = {
void asc_minphys __P((struct buf *bp)); void asc_minphys __P((struct buf *bp));
extern struct cfdriver asc_cd;
/* /*
* bus-parent shared attach function * bus-parent shared attach function

6
sys/dev/tc/asc_ioasic.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: asc_ioasic.c,v 1.11 1997/07/28 19:39:25 mhitch Exp $ */ /* $NetBSD: asc_ioasic.c,v 1.12 1998/01/12 09:51:30 thorpej Exp $ */
/* /*
* Copyright 1996 The Board of Trustees of The Leland Stanford * Copyright 1996 The Board of Trustees of The Leland Stanford
@ -49,6 +49,10 @@ struct cfattach asc_ioasic_ca = {
sizeof(struct asc_softc), asc_ioasic_match, asc_ioasic_attach sizeof(struct asc_softc), asc_ioasic_match, asc_ioasic_attach
}; };
#ifdef notdef
extern struct cfdriver asc_cd;
#endif
/* /*
* DMA callback declarations * DMA callback declarations
*/ */

12
sys/dev/tc/files.tc
View File

@ -1,16 +1,16 @@
# $NetBSD: files.tc,v 1.10 1997/11/08 07:27:52 jonathan Exp $ # $NetBSD: files.tc,v 1.11 1998/01/12 09:51:30 thorpej Exp $
# #
# Config file and device description for machine-independent # Config file and device description for machine-independent
# TurboChannel code. Included by ports that need it. # TurboChannel code. Included by ports that need it.
defopt TCVERBOSE defopt TCVERBOSE
device tc {[slot = -1], [offset = -1]} device tc class dull {[slot = -1], [offset = -1]}
#attach tc at tcbus #attach tc at tcbus
file dev/tc/tc.c tc needs-flag file dev/tc/tc.c tc needs-flag
# The TurboChannel IOCTL ASIC # The TurboChannel IOCTL ASIC
device ioasic { offset = -1 } device ioasic class dull { offset = -1 }
attach ioasic at tc attach ioasic at tc
# LANCE attachments. # LANCE attachments.
@ -25,7 +25,7 @@ file dev/tc/if_le_tc.c le_tc
# DEC DEFTA TC FDDI Controller # DEC DEFTA TC FDDI Controller
device fta: pdq, fddi, ifnet, arp device fta class ifnet: pdq, fddi, ifnet, arp
attach fta at tc attach fta at tc
file dev/tc/if_fta.c fta file dev/tc/if_fta.c fta
@ -34,11 +34,11 @@ define stic
file dev/tc/stic.c stic file dev/tc/stic.c stic
# DEC PMAG-C 2-D pixelstamp graphics board # DEC PMAG-C 2-D pixelstamp graphics board
device px device px class dull
attach px at tc: stic attach px at tc: stic
file dev/tc/px.c px file dev/tc/px.c px
# DEC PMAG-D/E/F 3-D pixelstamp+i860 8,24-plane,z-buffer graphics board # DEC PMAG-D/E/F 3-D pixelstamp+i860 8,24-plane,z-buffer graphics board
device pxg: stic device pxg class dull: stic
attach pxg at tc attach pxg at tc

3
sys/dev/tc/if_fta.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_fta.c,v 1.12 1997/07/22 03:44:29 jonathan Exp $ */ /* $NetBSD: if_fta.c,v 1.13 1998/01/12 09:51:31 thorpej Exp $ */
/*- /*-
* Copyright (c) 1996 Matt Thomas <matt@3am-software.com> * Copyright (c) 1996 Matt Thomas <matt@3am-software.com>
@ -120,4 +120,3 @@ pdq_tc_attach(
} }
struct cfattach fta_ca = { sizeof(pdq_softc_t), pdq_tc_match, pdq_tc_attach }; struct cfattach fta_ca = { sizeof(pdq_softc_t), pdq_tc_match, pdq_tc_attach };
struct cfdriver fta_cd = { 0, "fta", DV_IFNET };

7
sys/dev/tc/if_le_ibus.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_le_ibus.c,v 1.7 1997/07/21 05:39:06 jonathan Exp $ */ /* $NetBSD: if_le_ibus.c,v 1.8 1998/01/12 09:51:32 thorpej Exp $ */
/* /*
* Copyright 1996 The Board of Trustees of The Leland Stanford * Copyright 1996 The Board of Trustees of The Leland Stanford
@ -44,8 +44,6 @@
#include <pmax/pmax/kn01.h> #include <pmax/pmax/kn01.h>
#include <pmax/pmax/kn01var.h> #include <pmax/pmax/kn01var.h>
extern struct cfdriver mainbus_cd; /* should be in header but where? */
extern void le_dec_copytobuf_gap2 __P((struct am7990_softc *, void *, extern void le_dec_copytobuf_gap2 __P((struct am7990_softc *, void *,
int, int)); int, int));
extern void le_dec_copyfrombuf_gap2 __P((struct am7990_softc *, void *, extern void le_dec_copyfrombuf_gap2 __P((struct am7990_softc *, void *,
@ -61,13 +59,14 @@ struct cfattach le_pmax_ca = {
sizeof(struct le_softc), le_pmax_match, le_pmax_attach sizeof(struct le_softc), le_pmax_match, le_pmax_attach
}; };
int int
le_pmax_match(parent, match, aux) le_pmax_match(parent, match, aux)
struct device *parent; struct device *parent;
struct cfdata *match; struct cfdata *match;
void *aux; void *aux;
{ {
extern struct cfdriver mainbus_cd;
if (parent->dv_cfdata->cf_driver == &mainbus_cd) { if (parent->dv_cfdata->cf_driver == &mainbus_cd) {
struct confargs *d = aux; struct confargs *d = aux;
if (strcmp("lance", d->ca_name) == 0) if (strcmp("lance", d->ca_name) == 0)

9
sys/dev/tc/ioasicvar.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: ioasicvar.h,v 1.3 1997/07/17 01:12:41 jtk Exp $ */ /* $NetBSD: ioasicvar.h,v 1.4 1998/01/12 09:51:32 thorpej Exp $ */
/* /*
* Copyright (c) 1995 Carnegie-Mellon University. * Copyright (c) 1995 Carnegie-Mellon University.
@ -45,13 +45,6 @@ struct ioasicdev_attach_args {
#define IOASIC_OFFSET_UNKNOWN IOASICCF_OFFSET_DEFAULT #define IOASIC_OFFSET_UNKNOWN IOASICCF_OFFSET_DEFAULT
/*
* The IOASIC (bus) cfdriver, so that subdevices can more
* easily tell what bus they're on.
*/
extern struct cfdriver ioasic_cd;
/* /*
* XXX Some drivers need direct access to IOASIC registers. * XXX Some drivers need direct access to IOASIC registers.
*/ */

8
sys/dev/tc/px.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: px.c,v 1.1 1997/11/08 07:27:49 jonathan Exp $ */ /* $NetBSD: px.c,v 1.2 1998/01/12 09:51:33 thorpej Exp $ */
/* /*
* Copyright (c) 1997 Jonathan Stone * Copyright (c) 1997 Jonathan Stone
@ -32,7 +32,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: px.c,v 1.1 1997/11/08 07:27:49 jonathan Exp $"); __KERNEL_RCSID(0, "$NetBSD: px.c,v 1.2 1998/01/12 09:51:33 thorpej Exp $");
/* /*
* px.c: placebo driver for the DEC TURBOchannel 2-d and 3-d * px.c: placebo driver for the DEC TURBOchannel 2-d and 3-d
@ -81,10 +81,6 @@ struct cfattach px_ca = {
sizeof (struct px_softc), px_match, px_attach, sizeof (struct px_softc), px_match, px_attach,
}; };
struct cfdriver px_cd = {
NULL, "px", DV_DULL
};
/* /*
* Match a PMAG-C pixelstamp board. * Match a PMAG-C pixelstamp board.
*/ */

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

@ -1,4 +1,4 @@
/* $NetBSD: tc.c,v 1.23 1997/09/13 08:52:24 enami Exp $ */ /* $NetBSD: tc.c,v 1.24 1998/01/12 09:51:34 thorpej Exp $ */
/* /*
* Copyright (c) 1994, 1995 Carnegie-Mellon University. * Copyright (c) 1994, 1995 Carnegie-Mellon University.
@ -57,10 +57,6 @@ struct cfattach tc_ca = {
sizeof(struct tc_softc), tcmatch, tcattach sizeof(struct tc_softc), tcmatch, tcattach
}; };
struct cfdriver tc_cd = {
NULL, "tc", DV_DULL
};
int tcprint __P((void *, const char *)); int tcprint __P((void *, const char *));
int tcsubmatch __P((struct device *, struct cfdata *, void *)); int tcsubmatch __P((struct device *, struct cfdata *, void *));
int tc_checkslot __P((tc_addr_t, char *)); int tc_checkslot __P((tc_addr_t, char *));

8
sys/dev/tc/tcvar.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: tcvar.h,v 1.9 1997/09/01 08:09:28 jonathan Exp $ */ /* $NetBSD: tcvar.h,v 1.10 1998/01/12 09:51:34 thorpej Exp $ */
/* /*
* Copyright (c) 1995 Carnegie-Mellon University. * Copyright (c) 1995 Carnegie-Mellon University.
@ -163,10 +163,4 @@ void tc_intr_disestablish __P((struct device *, void *));
#define TC_SPEED_12_5_MHZ 0 /* 12.5MHz TC bus */ #define TC_SPEED_12_5_MHZ 0 /* 12.5MHz TC bus */
#define TC_SPEED_25_MHZ 1 /* 25MHz TC bus */ #define TC_SPEED_25_MHZ 1 /* 25MHz TC bus */
/*
* The TurboChannel bus cfdriver, so that subdevices can more
* easily tell what bus they're on.
*/
extern struct cfdriver tc_cd;
#endif /* __DEV_TC_TCVAR_H__ */ #endif /* __DEV_TC_TCVAR_H__ */