26c26
< * $FreeBSD: head/sys/dev/amr/amr.c 58934 2000-04-02 15:24:56Z phk $
---
> * $FreeBSD: head/sys/dev/amr/amr.c 59249 2000-04-15 05:54:02Z phk $
340c340
< bufq_init(&sc->amr_bufq);
---
> bioq_init(&sc->amr_bioq);
506c506
< * Note that we can assume that the bufq on the controller is empty, as we won't
---
> * Note that we can assume that the bioq on the controller is empty, as we won't
611c611
< amr_submit_buf(struct amr_softc *sc, struct buf *bp)
---
> amr_submit_buf(struct amr_softc *sc, struct bio *bp)
618c618
< bufq_insert_tail(&sc->amr_bufq, bp);
---
> bioq_insert_tail(&sc->amr_bioq, bp);
887c887
< struct buf *bp;
---
> struct bio *bp;
902c902
< if ((bp = bufq_first(&sc->amr_bufq)) == NULL)
---
> if ((bp = bioq_first(&sc->amr_bioq)) == NULL)
913c913
< bufq_remove(&sc->amr_bufq, bp);
---
> bioq_remove(&sc->amr_bioq, bp);
920,922c920,922
< ac->ac_data = bp->b_data;
< ac->ac_length = bp->b_bcount;
< if (bp->b_iocmd == BIO_READ) {
---
> ac->ac_data = bp->bio_data;
> ac->ac_length = bp->bio_bcount;
> if (bp->bio_cmd == BIO_READ) {
934c934
< amrd = (struct amrd_softc *)bp->b_dev->si_drv1;
---
> amrd = (struct amrd_softc *)bp->bio_dev->si_drv1;
936c936
< blkcount = (bp->b_bcount + AMR_BLKSIZE - 1) / AMR_BLKSIZE;
---
> blkcount = (bp->bio_bcount + AMR_BLKSIZE - 1) / AMR_BLKSIZE;
938c938
< if ((bp->b_pblkno + blkcount) > sc->amr_drive[driveno].al_size)
---
> if ((bp->bio_pblkno + blkcount) > sc->amr_drive[driveno].al_size)
940c940
< bp->b_pblkno, blkcount, sc->amr_drive[driveno].al_size);
---
> bp->bio_pblkno, blkcount, sc->amr_drive[driveno].al_size);
947c947
< ac->ac_mailbox.mb_lba = bp->b_pblkno;
---
> ac->ac_mailbox.mb_lba = bp->bio_pblkno;
971c971
< struct buf *bp = (struct buf *)ac->ac_private;
---
> struct bio *bp = (struct bio *)ac->ac_private;
978,979c978,979
< bp->b_error = EIO;
< bp->b_ioflags |= BIO_ERROR;
---
> bp->bio_error = EIO;
> bp->bio_flags |= BIO_ERROR;