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

In fdcattach() reset the controller before moving on as some probes (ala pnpbios) may not have reset during match

This commit is contained in:
jmc 2000-12-17 07:37:31 +00:00
parent 519aef8cf4
commit 2967c3fac3
1 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
sys/dev/isa/fd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: fd.c,v 1.9 2000/11/27 21:51:02 matt Exp $ */
/* $NetBSD: fd.c,v 1.10 2000/12/17 07:37:31 jmc Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -304,10 +304,14 @@ fdcattach(fdc)
struct fdc_softc *fdc;
{
struct fdc_attach_args fa;
bus_space_tag_t iot;
bus_space_handle_t ioh;
#if defined(i386)
int type;
#endif
iot = fdc->sc_iot;
ioh = fdc->sc_ioh;
callout_init(&fdc->sc_timo_ch);
callout_init(&fdc->sc_intr_ch);
@ -323,6 +327,26 @@ fdcattach(fdc)
return;
}
/*
* Reset the controller to get it into a known state. Not all
* probes necessarily need do this to discover the controller up
* front, so don't assume anything.
*/
bus_space_write_1(iot, ioh, fdout, 0);
delay(100);
bus_space_write_1(iot, ioh, fdout, FDO_FRST);
/* see if it can handle a command */
if (out_fdc(iot, ioh, NE7CMD_SPECIFY) < 0) {
printf ("%s: can't reset controller\n",
fdc->sc_dev.dv_xname);
return;
}
out_fdc(iot, ioh, 0xdf);
out_fdc(iot, ioh, 2);
#if defined(i386)
/*
* The NVRAM info only tells us about the first two disks on the