Actually, do the ID reset in elink_reset().
This commit is contained in:
mycroft
parent
dcb3f5a8b8
commit
06b0414491
|
|
@ -1,7 +1,7 @@
|
|||
/* $NetBSD: elink.c,v 1.5 1995/01/06 21:41:31 mycroft Exp $ */
|
||||
/* $NetBSD: elink.c,v 1.6 1995/01/07 21:37:54 mycroft Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1994 Charles Hannum. All rights reserved.
|
||||
* Copyright (c) 1994, 1995 Charles Hannum. All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
|
|
@ -38,9 +38,9 @@
|
|||
#include <i386/isa/elink.h>
|
||||
|
||||
/*
|
||||
* Issue a `global reset' to all cards. We have to be careful to do this only
|
||||
* once during autoconfig, to prevent resetting boards that have already been
|
||||
* configured.
|
||||
* Issue a `global reset' to all cards, and reset the ID state machines. We
|
||||
* have to be careful to do the global reset only once during autoconfig, to
|
||||
* prevent resetting boards that have already been configured.
|
||||
*/
|
||||
void
|
||||
elink_reset()
|
||||
|
|
@ -51,6 +51,8 @@ elink_reset()
|
|||
x = 1;
|
||||
outb(ELINK_ID_PORT, ELINK_RESET);
|
||||
}
|
||||
outb(ELINK_ID_PORT, 0x00);
|
||||
outb(ELINK_ID_PORT, 0x00);
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: if_ep.c,v 1.66 1995/01/06 21:41:26 mycroft Exp $ */
|
||||
/* $NetBSD: if_ep.c,v 1.67 1995/01/07 21:37:56 mycroft Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1994 Herb Peyerl <hpeyerl@novatel.ca>
|
||||
|
|
@ -199,14 +199,8 @@ epprobe(parent, match, aux)
|
|||
epaddcard(iobase, k2, 1);
|
||||
}
|
||||
|
||||
/* find all isa cards */
|
||||
delay(1000);
|
||||
elink_reset(); /* global reset to ELINK_ID_PORT */
|
||||
delay(1000);
|
||||
|
||||
for (slot = 0; slot < 10; slot++) {
|
||||
outb(ELINK_ID_PORT, 0x00);
|
||||
outb(ELINK_ID_PORT, 0x00);
|
||||
elink_reset();
|
||||
elink_idseq(ELINK_509_POLY);
|
||||
delay(1000);
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
/* $NetBSD: if_ie.c,v 1.27 1995/01/06 21:41:29 mycroft Exp $ */
|
||||
/* $NetBSD: if_ie.c,v 1.28 1995/01/07 21:37:59 mycroft Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1993, 1994 Charles Hannum.
|
||||
* Copyright (c) 1993, 1994, 1995 Charles Hannum.
|
||||
* Copyright (c) 1992, 1993, University of Vermont and State
|
||||
* Agricultural College.
|
||||
* Copyright (c) 1992, 1993, Garrett A. Wollman.
|
||||
|
|
@ -425,8 +425,6 @@ el_probe(sc, ia)
|
|||
|
||||
/* Reset and put card in CONFIG state without changing address. */
|
||||
elink_reset();
|
||||
outb(ELINK_ID_PORT, 0x00);
|
||||
outb(ELINK_ID_PORT, 0x00);
|
||||
elink_idseq(ELINK_507_POLY);
|
||||
elink_idseq(ELINK_507_POLY);
|
||||
outb(ELINK_ID_PORT, 0xff);
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
/* $NetBSD: elink.c,v 1.5 1995/01/06 21:41:31 mycroft Exp $ */
|
||||
/* $NetBSD: elink.c,v 1.6 1995/01/07 21:37:54 mycroft Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1994 Charles Hannum. All rights reserved.
|
||||
* Copyright (c) 1994, 1995 Charles Hannum. All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
|
|
@ -38,9 +38,9 @@
|
|||
#include <i386/isa/elink.h>
|
||||
|
||||
/*
|
||||
* Issue a `global reset' to all cards. We have to be careful to do this only
|
||||
* once during autoconfig, to prevent resetting boards that have already been
|
||||
* configured.
|
||||
* Issue a `global reset' to all cards, and reset the ID state machines. We
|
||||
* have to be careful to do the global reset only once during autoconfig, to
|
||||
* prevent resetting boards that have already been configured.
|
||||
*/
|
||||
void
|
||||
elink_reset()
|
||||
|
|
@ -51,6 +51,8 @@ elink_reset()
|
|||
x = 1;
|
||||
outb(ELINK_ID_PORT, ELINK_RESET);
|
||||
}
|
||||
outb(ELINK_ID_PORT, 0x00);
|
||||
outb(ELINK_ID_PORT, 0x00);
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: if_ep.c,v 1.66 1995/01/06 21:41:26 mycroft Exp $ */
|
||||
/* $NetBSD: if_ep.c,v 1.67 1995/01/07 21:37:56 mycroft Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1994 Herb Peyerl <hpeyerl@novatel.ca>
|
||||
|
|
@ -199,14 +199,8 @@ epprobe(parent, match, aux)
|
|||
epaddcard(iobase, k2, 1);
|
||||
}
|
||||
|
||||
/* find all isa cards */
|
||||
delay(1000);
|
||||
elink_reset(); /* global reset to ELINK_ID_PORT */
|
||||
delay(1000);
|
||||
|
||||
for (slot = 0; slot < 10; slot++) {
|
||||
outb(ELINK_ID_PORT, 0x00);
|
||||
outb(ELINK_ID_PORT, 0x00);
|
||||
elink_reset();
|
||||
elink_idseq(ELINK_509_POLY);
|
||||
delay(1000);
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
/* $NetBSD: if_ie.c,v 1.27 1995/01/06 21:41:29 mycroft Exp $ */
|
||||
/* $NetBSD: if_ie.c,v 1.28 1995/01/07 21:37:59 mycroft Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1993, 1994 Charles Hannum.
|
||||
* Copyright (c) 1993, 1994, 1995 Charles Hannum.
|
||||
* Copyright (c) 1992, 1993, University of Vermont and State
|
||||
* Agricultural College.
|
||||
* Copyright (c) 1992, 1993, Garrett A. Wollman.
|
||||
|
|
@ -425,8 +425,6 @@ el_probe(sc, ia)
|
|||
|
||||
/* Reset and put card in CONFIG state without changing address. */
|
||||
elink_reset();
|
||||
outb(ELINK_ID_PORT, 0x00);
|
||||
outb(ELINK_ID_PORT, 0x00);
|
||||
elink_idseq(ELINK_507_POLY);
|
||||
elink_idseq(ELINK_507_POLY);
|
||||
outb(ELINK_ID_PORT, 0xff);
|
||||
|
|
|
|||
Loading…
Reference in New Issue