d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add back shutdown support, this time using the at_shutdown() mechanism.

Browse Source
This commit is contained in:
David Greenman 1996-09-20 04:35:15 +00:00
parent b70db4c5d5
commit 3163485ccc
2 changed files with 22 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sys/dev/de/if_de.c
View File

@ -21,7 +21,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* *
* $Id: if_de.c,v 1.50 1996/09/06 23:08:50 phk Exp $ * $Id: if_de.c,v 1.51 1996/09/18 14:44:31 davidg Exp $
* *
*/ */
@ -3886,19 +3886,15 @@ static const int tulip_eisa_irqs[4] = { IRQ5, IRQ9, IRQ10, IRQ11 };
#define TULIP_PCI_ATTACH_ARGS pcici_t config_id, int unit #define TULIP_PCI_ATTACH_ARGS pcici_t config_id, int unit
static int static void
tulip_pci_shutdown( tulip_shutdown(
int unit, int howto,
int force) void *sc)
{ {
tulip_softc_t * const sc = TULIP_UNIT_TO_SOFTC(unit); TULIP_CSR_WRITE((tulip_softc_t *) sc, csr_busmode, TULIP_BUSMODE_SWRESET);
if (sc != NULL) {
TULIP_CSR_WRITE(sc, csr_busmode, TULIP_BUSMODE_SWRESET);
DELAY(10); /* Wait 10 microseconds (actually 50 PCI cycles but at DELAY(10); /* Wait 10 microseconds (actually 50 PCI cycles but at
33MHz that comes to two microseconds but wait a 33MHz that comes to two microseconds but wait a
bit longer anyways) */ bit longer anyways) */
}
return 0;
} }
static char* static char*
@ -3931,7 +3927,7 @@ struct pci_device dedevice = {
tulip_pci_probe, tulip_pci_probe,
tulip_pci_attach, tulip_pci_attach,
&tulip_pci_count, &tulip_pci_count,
tulip_pci_shutdown, NULL
}; };
DATA_SET (pcidevice_set, dedevice); DATA_SET (pcidevice_set, dedevice);
@ -4362,6 +4358,7 @@ tulip_pci_attach(
return; return;
} }
} }
at_shutdown(tulip_shutdown, sc, SHUTDOWN_POST_SYNC);
#endif #endif
#if defined(__bsdi__) #if defined(__bsdi__)
if ((sc->tulip_flags & TULIP_SLAVEDINTR) == 0) { if ((sc->tulip_flags & TULIP_SLAVEDINTR) == 0) {

19
sys/pci/if_de.c
View File

@ -21,7 +21,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* *
* $Id: if_de.c,v 1.50 1996/09/06 23:08:50 phk Exp $ * $Id: if_de.c,v 1.51 1996/09/18 14:44:31 davidg Exp $
* *
*/ */
@ -3886,19 +3886,15 @@ static const int tulip_eisa_irqs[4] = { IRQ5, IRQ9, IRQ10, IRQ11 };
#define TULIP_PCI_ATTACH_ARGS pcici_t config_id, int unit #define TULIP_PCI_ATTACH_ARGS pcici_t config_id, int unit
static int static void
tulip_pci_shutdown( tulip_shutdown(
int unit, int howto,
int force) void *sc)
{ {
tulip_softc_t * const sc = TULIP_UNIT_TO_SOFTC(unit); TULIP_CSR_WRITE((tulip_softc_t *) sc, csr_busmode, TULIP_BUSMODE_SWRESET);
if (sc != NULL) {
TULIP_CSR_WRITE(sc, csr_busmode, TULIP_BUSMODE_SWRESET);
DELAY(10); /* Wait 10 microseconds (actually 50 PCI cycles but at DELAY(10); /* Wait 10 microseconds (actually 50 PCI cycles but at
33MHz that comes to two microseconds but wait a 33MHz that comes to two microseconds but wait a
bit longer anyways) */ bit longer anyways) */
}
return 0;
} }
static char* static char*
@ -3931,7 +3927,7 @@ struct pci_device dedevice = {
tulip_pci_probe, tulip_pci_probe,
tulip_pci_attach, tulip_pci_attach,
&tulip_pci_count, &tulip_pci_count,
tulip_pci_shutdown, NULL
}; };
DATA_SET (pcidevice_set, dedevice); DATA_SET (pcidevice_set, dedevice);
@ -4362,6 +4358,7 @@ tulip_pci_attach(
return; return;
} }
} }
at_shutdown(tulip_shutdown, sc, SHUTDOWN_POST_SYNC);
#endif #endif
#if defined(__bsdi__) #if defined(__bsdi__)
if ((sc->tulip_flags & TULIP_SLAVEDINTR) == 0) { if ((sc->tulip_flags & TULIP_SLAVEDINTR) == 0) {