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

DECstation now provides bus_space and bus_dma data structures to us.

This commit is contained in:
thorpej 1998-05-22 21:15:48 +00:00
parent c8092e5d3b
commit 86f256633d
2 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
/* $NetBSD: tc.c,v 1.25 1998/01/19 02:50:58 thorpej Exp $ */ /* $NetBSD: tc.c,v 1.26 1998/05/22 21:15:48 thorpej Exp $ */
/* /*
* Copyright (c) 1994, 1995 Carnegie-Mellon University. * Copyright (c) 1994, 1995 Carnegie-Mellon University.
@ -47,9 +47,7 @@ struct tc_softc {
void (*sc_intr_establish) __P((struct device *, void *, void (*sc_intr_establish) __P((struct device *, void *,
tc_intrlevel_t, int (*)(void *), void *)); tc_intrlevel_t, int (*)(void *), void *));
void (*sc_intr_disestablish) __P((struct device *, void *)); void (*sc_intr_disestablish) __P((struct device *, void *));
#ifdef __alpha__
bus_dma_tag_t (*sc_get_dma_tag) __P((int)); bus_dma_tag_t (*sc_get_dma_tag) __P((int));
#endif
}; };
/* Definition of the driver for autoconfig. */ /* Definition of the driver for autoconfig. */
@ -104,9 +102,7 @@ tcattach(parent, self, aux)
sc->sc_slots = tba->tba_slots; sc->sc_slots = tba->tba_slots;
sc->sc_intr_establish = tba->tba_intr_establish; sc->sc_intr_establish = tba->tba_intr_establish;
sc->sc_intr_disestablish = tba->tba_intr_disestablish; sc->sc_intr_disestablish = tba->tba_intr_disestablish;
#ifdef __alpha__
sc->sc_get_dma_tag = tba->tba_get_dma_tag; sc->sc_get_dma_tag = tba->tba_get_dma_tag;
#endif
/* /*
* Try to configure each built-in device * Try to configure each built-in device
@ -131,10 +127,8 @@ tcattach(parent, self, aux)
* Set up the device attachment information. * Set up the device attachment information.
*/ */
strncpy(ta.ta_modname, builtin->tcb_modname, TC_ROM_LLEN); strncpy(ta.ta_modname, builtin->tcb_modname, TC_ROM_LLEN);
#ifdef __alpha__ /* XXX */
ta.ta_memt = tba->tba_memt; ta.ta_memt = tba->tba_memt;
ta.ta_dmat = (*sc->sc_get_dma_tag)(builtin->tcb_slot); ta.ta_dmat = (*sc->sc_get_dma_tag)(builtin->tcb_slot);
#endif
ta.ta_modname[TC_ROM_LLEN] = '\0'; ta.ta_modname[TC_ROM_LLEN] = '\0';
ta.ta_slot = builtin->tcb_slot; ta.ta_slot = builtin->tcb_slot;
ta.ta_offset = builtin->tcb_offset; ta.ta_offset = builtin->tcb_offset;
@ -175,10 +169,8 @@ tcattach(parent, self, aux)
/* /*
* Set up the rest of the attachment information. * Set up the rest of the attachment information.
*/ */
#ifdef __alpha__ /* XXX */
ta.ta_memt = tba->tba_memt; ta.ta_memt = tba->tba_memt;
ta.ta_dmat = (*sc->sc_get_dma_tag)(i); ta.ta_dmat = (*sc->sc_get_dma_tag)(i);
#endif
ta.ta_slot = i; ta.ta_slot = i;
ta.ta_offset = 0; ta.ta_offset = 0;
ta.ta_addr = tcaddr; ta.ta_addr = tcaddr;

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

@ -1,4 +1,4 @@
/* $NetBSD: tcvar.h,v 1.12 1998/04/19 13:04:24 jonathan Exp $ */ /* $NetBSD: tcvar.h,v 1.13 1998/05/22 21:15:48 thorpej Exp $ */
/* /*
* Copyright (c) 1995 Carnegie-Mellon University. * Copyright (c) 1995 Carnegie-Mellon University.
@ -90,9 +90,7 @@ struct tcbus_attach_args {
void (*tba_intr_establish) __P((struct device *, void *, void (*tba_intr_establish) __P((struct device *, void *,
tc_intrlevel_t, int (*)(void *), void *)); tc_intrlevel_t, int (*)(void *), void *));
void (*tba_intr_disestablish) __P((struct device *, void *)); void (*tba_intr_disestablish) __P((struct device *, void *));
#ifdef __alpha__
bus_dma_tag_t (*tba_get_dma_tag) __P((int)); bus_dma_tag_t (*tba_get_dma_tag) __P((int));
#endif
}; };
/* /*
@ -100,9 +98,7 @@ struct tcbus_attach_args {
*/ */
struct tc_attach_args { struct tc_attach_args {
bus_space_tag_t ta_memt; bus_space_tag_t ta_memt;
#ifdef __alpha__
bus_dma_tag_t ta_dmat; bus_dma_tag_t ta_dmat;
#endif
char ta_modname[TC_ROM_LLEN+1]; char ta_modname[TC_ROM_LLEN+1];
u_int ta_slot; u_int ta_slot;