diff options
author | Poul-Henning Kamp <phk@FreeBSD.org> | 1996-09-06 23:09:20 +0000 |
---|---|---|
committer | Poul-Henning Kamp <phk@FreeBSD.org> | 1996-09-06 23:09:20 +0000 |
commit | bfbb029d8745290a139bf3b15d942717e986fd9f (patch) | |
tree | 35dad08bf59366e84921fd4aad9718c2f9426a1b /sys/dev/sr/if_sr_isa.c | |
parent | cb3c44d7878864912ded33f7f1c468863ae4b43d (diff) | |
download | src-test2-bfbb029d8745290a139bf3b15d942717e986fd9f.tar.gz src-test2-bfbb029d8745290a139bf3b15d942717e986fd9f.zip |
Notes
Diffstat (limited to 'sys/dev/sr/if_sr_isa.c')
-rw-r--r-- | sys/dev/sr/if_sr_isa.c | 69 |
1 files changed, 1 insertions, 68 deletions
diff --git a/sys/dev/sr/if_sr_isa.c b/sys/dev/sr/if_sr_isa.c index bf1cdd1135e1..9d16b6b80600 100644 --- a/sys/dev/sr/if_sr_isa.c +++ b/sys/dev/sr/if_sr_isa.c @@ -28,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: if_sr.c,v 1.1 1996/07/05 18:49:21 jhay Exp $ */ /* @@ -71,7 +71,6 @@ #include <net/bpfdesc.h> #endif -#include <sys/devconf.h> #include <machine/clock.h> #include <machine/md_var.h> @@ -118,7 +117,6 @@ static struct sr_hardc { sca_regs *sca; - struct kern_devconf kdc; }sr_hardc[NSR]; struct sr_softc { @@ -151,7 +149,6 @@ struct sr_softc { int scachan; - struct kern_devconf kdc; }; static int srprobe(struct isa_device *id); @@ -181,28 +178,6 @@ static int sr_irqtable[16] = { struct isa_driver srdriver = {srprobe, srattach, "src"}; -static struct kern_devconf kdc_sr_template = { - 0, 0, 0, - "sr", 0, { MDDT_ISA, 0, "net" }, - isa_generic_externalize, 0, 0, ISA_EXTERNALLEN, - &kdc_isa0, - 0, - DC_UNCONFIGURED, - "SDL Riscom/N2 Port", - DC_CLS_NETIF -}; - -static struct kern_devconf kdc_src_template = { - 0, 0, 0, - "src", 0, { MDDT_ISA, 0, "net" }, - isa_generic_externalize, 0, 0, ISA_EXTERNALLEN, - &kdc_isa0, - 0, - DC_UNCONFIGURED, - "SDL Riscom/N2 Adapter", - DC_CLS_NETIF -}; - static void sr_xmit(struct sr_softc *sc); static void srstart(struct ifnet *ifp); static int srioctl(struct ifnet *ifp, int cmd, caddr_t data); @@ -223,33 +198,6 @@ static void sr_dmac_intr(struct sr_hardc *hc, u_char isr); static void sr_msci_intr(struct sr_hardc *hc, u_char isr); static void sr_timer_intr(struct sr_hardc *hc, u_char isr); -static inline void -sr_registerdev(int ctlr, int unit) -{ - struct sr_softc *sc; - - sc = &sr_hardc[ctlr].sc[unit]; - sc->kdc = kdc_sr_template; - - sc->kdc.kdc_unit = sr_hardc[ctlr].startunit + unit; - sc->kdc.kdc_parentdata = &sr_hardc[ctlr].kdc; - dev_attach(&sc->kdc); -} - -static inline void -src_registerdev(struct isa_device *dvp) -{ - int unit = dvp->id_unit; - struct sr_hardc *hc = &sr_hardc[dvp->id_unit]; - - hc->kdc = kdc_src_template; - - hc->kdc.kdc_unit = unit; - hc->kdc.kdc_parentdata = dvp; - dev_attach(&hc->kdc); -} - - /* * Register the Adapter. * Probe to see if it is there. @@ -266,11 +214,6 @@ srprobe(struct isa_device *id) sca_regs *sca = 0; /* - * Register the card. - */ - src_registerdev(id); - - /* * Now see if the card is realy there. * * If it is there, size its memory. @@ -438,8 +381,6 @@ srattach(struct isa_device *id) hc->memsize/1024, hc->numports); - hc->kdc.kdc_state = DC_BUSY; - src_init(id); sc = hc->sc; @@ -455,8 +396,6 @@ srattach(struct isa_device *id) sc->unit = hc->startunit + unit; sc->scachan = unit%NCHAN; - sr_registerdev(id->id_unit, unit); - sr_init_rx_dmac(sc); sr_init_tx_dmac(sc); sr_init_msci(sc); @@ -474,8 +413,6 @@ srattach(struct isa_device *id) sc->ifsppp.pp_flags = PP_KEEPALIVE; - sc->kdc.kdc_state = DC_IDLE; - printf("sr%d: Adapter %d, port %d.\n", sc->unit, hc->cunit, @@ -796,8 +733,6 @@ sr_up(struct sr_softc *sc) sca_regs *sca = sc->hc->sca; msci_channel *msci = &sca->msci[sc->scachan]; - sc->kdc.kdc_state = DC_BUSY; - /* * Enable transmitter and receiver. * Raise DTR and RTS. @@ -840,8 +775,6 @@ sr_down(struct sr_softc *sc) sca_regs *sca = sc->hc->sca; msci_channel *msci = &sca->msci[sc->scachan]; - sc->kdc.kdc_state = DC_IDLE; - /* * Disable transmitter and receiver. * Lower DTR and RTS. |