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

Sync with sys/i386/isa/fd.c and wd.c revisions 1.117 and 1.172,

Browse Source 
respectively.
This commit is contained in:
KATO Takenori 1998-07-13 09:29:25 +00:00
parent ad27f8d9a5
commit 6baa65474d
3 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/pc98/cbus/fdc.c
View File

@ -43,7 +43,7 @@
* SUCH DAMAGE.
*
* from: @(#)fd.c 7.4 (Berkeley) 5/25/91
* $Id: fd.c,v 1.33 1998/07/06 10:09:37 kato Exp $
* $Id: fd.c,v 1.34 1998/07/11 17:02:07 kato Exp $
*
*/
@ -1055,7 +1055,6 @@ fdattach(struct isa_device *dev)
&fd->subdevs[0],
&fd->subdevs[0].limit,
&fd->subdevs[0].slice,
NULL,
namebuf);
/* Allow full probing */
fd->subdevs[0].slice->probeinfo.typespecific = NULL;
@ -1145,7 +1144,6 @@ fdattach(struct isa_device *dev)
&fd->subdevs[i],
&fd->subdevs[i].limit,
&fd->subdevs[i].slice,
NULL,
namebuf);
/* Allow full probing */
fd->subdevs[i].slice->probeinfo.typespecific = NULL;
@ -1198,10 +1196,9 @@ fdsinit(void *arg)
struct subdev *sd = arg;
sh_p tp;
if ((tp = slice_probeall(sd->slice)) != NULL) {
(*tp->constructor)(sd->slice);
}
slice_start_probe(sd->slice);
config_intrhook_disestablish(&sd->drive->ich);
DELAY(2000000); /* XXX */
}
#endif /* SLICE */

9
sys/pc98/pc98/fd.c
View File

@ -43,7 +43,7 @@
* SUCH DAMAGE.
*
* from: @(#)fd.c 7.4 (Berkeley) 5/25/91
* $Id: fd.c,v 1.33 1998/07/06 10:09:37 kato Exp $
* $Id: fd.c,v 1.34 1998/07/11 17:02:07 kato Exp $
*
*/
@ -1055,7 +1055,6 @@ fdattach(struct isa_device *dev)
&fd->subdevs[0],
&fd->subdevs[0].limit,
&fd->subdevs[0].slice,
NULL,
namebuf);
/* Allow full probing */
fd->subdevs[0].slice->probeinfo.typespecific = NULL;
@ -1145,7 +1144,6 @@ fdattach(struct isa_device *dev)
&fd->subdevs[i],
&fd->subdevs[i].limit,
&fd->subdevs[i].slice,
NULL,
namebuf);
/* Allow full probing */
fd->subdevs[i].slice->probeinfo.typespecific = NULL;
@ -1198,10 +1196,9 @@ fdsinit(void *arg)
struct subdev *sd = arg;
sh_p tp;
if ((tp = slice_probeall(sd->slice)) != NULL) {
(*tp->constructor)(sd->slice);
}
slice_start_probe(sd->slice);
config_intrhook_disestablish(&sd->drive->ich);
DELAY(2000000); /* XXX */
}
#endif /* SLICE */

8
sys/pc98/pc98/wd.c
View File

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)wd.c 7.2 (Berkeley) 5/9/91
* $Id: wd.c,v 1.57 1998/07/06 10:09:42 kato Exp $
* $Id: wd.c,v 1.58 1998/07/11 17:02:48 kato Exp $
*/
/* TODO:
@ -671,7 +671,6 @@ wdattach(struct isa_device *dvp)
du,
&du->limit,
&du->slice,
NULL,
namebuf);
/* Allow full probing */
du->slice->probeinfo.typespecific = NULL;
@ -788,10 +787,9 @@ wds_init(void *arg)
}
}
#endif
if ((tp = slice_probeall(du->slice)) != NULL) {
(*tp->constructor)(du->slice);
}
slice_start_probe(du->slice);
config_intrhook_disestablish(&du->ich);
DELAY(2000000); /* XXX */
#if 0
wdsclose(du, 0, 0, curproc);
#else