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

Merged from sys/isa/fd.c revisions 1.234, 1.235 and 1.236.

Browse Source
This commit is contained in:
nyan 2002-09-16 07:39:47 +00:00
parent fc49a6c708
commit 649a100d88
2 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2148,7 +2148,7 @@ fdstrategy(struct bio *bp)
}
bp->bio_bcount = (nblocks - blknum) * fdblk;
}
bp->bio_pblkno = bp->bio_blkno;
bp->bio_pblkno = blknum;
s = splbio();
bioqdisksort(&fdc->head, bp);
untimeout(fd_turnoff, fd, fd->toffhandle); /* a good idea */
@ -3103,6 +3103,7 @@ fdmisccmd(dev_t dev, u_int cmd, void *data)
struct fd_formb *finfo;
struct fdc_readid *idfield;
size_t fdblk;
int error;
fdu = FDUNIT(minor(dev));
fd = devclass_get_softc(fd_devclass, fdu);
@ -3138,17 +3139,12 @@ fdmisccmd(dev_t dev, u_int cmd, void *data)
bp->bio_done = fdbiodone;
bp->bio_flags = 0;
/*
* Now run the command. The wait loop is a version of bufwait()
* adapted for struct bio instead of struct buf and specialized
* for the current context.
*/
/* Now run the command. */
fdstrategy(bp);
while ((bp->bio_flags & BIO_DONE) == 0)
tsleep(bp, PRIBIO, "fdcmd", 0);
error = biowait(bp, "fdcmd");
free(bp, M_TEMP);
return (bp->bio_flags & BIO_ERROR ? bp->bio_error : 0);
return (error);
}
static int

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

@ -2148,7 +2148,7 @@ fdstrategy(struct bio *bp)
}
bp->bio_bcount = (nblocks - blknum) * fdblk;
}
bp->bio_pblkno = bp->bio_blkno;
bp->bio_pblkno = blknum;
s = splbio();
bioqdisksort(&fdc->head, bp);
untimeout(fd_turnoff, fd, fd->toffhandle); /* a good idea */
@ -3103,6 +3103,7 @@ fdmisccmd(dev_t dev, u_int cmd, void *data)
struct fd_formb *finfo;
struct fdc_readid *idfield;
size_t fdblk;
int error;
fdu = FDUNIT(minor(dev));
fd = devclass_get_softc(fd_devclass, fdu);
@ -3138,17 +3139,12 @@ fdmisccmd(dev_t dev, u_int cmd, void *data)
bp->bio_done = fdbiodone;
bp->bio_flags = 0;
/*
* Now run the command. The wait loop is a version of bufwait()
* adapted for struct bio instead of struct buf and specialized
* for the current context.
*/
/* Now run the command. */
fdstrategy(bp);
while ((bp->bio_flags & BIO_DONE) == 0)
tsleep(bp, PRIBIO, "fdcmd", 0);
error = biowait(bp, "fdcmd");
free(bp, M_TEMP);
return (bp->bio_flags & BIO_ERROR ? bp->bio_error : 0);
return (error);
}
static int