26c26
< * $FreeBSD: head/sys/dev/mlx/mlx.c 59136 2000-04-11 02:52:46Z msmith $
---
> * $FreeBSD: head/sys/dev/mlx/mlx.c 59249 2000-04-15 05:54:02Z phk $
292c292
< bufq_init(&sc->mlx_bufq);
---
> bioq_init(&sc->mlx_bioq);
590c590
< * 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
689c689
< mlx_submit_buf(struct mlx_softc *sc, struct buf *bp)
---
> mlx_submit_buf(struct mlx_softc *sc, struct bio *bp)
696c696
< bufq_insert_tail(&sc->mlx_bufq, bp);
---
> bioq_insert_tail(&sc->mlx_bioq, bp);
1704c1704
< * reentry or activity on the bufq.
---
> * reentry or activity on the bioq.
1711c1711
< struct buf *bp;
---
> struct bio *bp;
1726c1726
< if ((bp = bufq_first(&sc->mlx_bufq)) == NULL)
---
> if ((bp = bioq_first(&sc->mlx_bioq)) == NULL)
1737c1737
< bufq_remove(&sc->mlx_bufq, bp);
---
> bioq_remove(&sc->mlx_bioq, bp);
1744,1746c1744,1746
< mc->mc_data = bp->b_data;
< mc->mc_length = bp->b_bcount;
< if (bp->b_iocmd == BIO_READ) {
---
> mc->mc_data = bp->bio_data;
> mc->mc_length = bp->bio_bcount;
> if (bp->bio_cmd == BIO_READ) {
1758c1758
< mlxd = (struct mlxd_softc *)bp->b_dev->si_drv1;
---
> mlxd = (struct mlxd_softc *)bp->bio_dev->si_drv1;
1760c1760
< blkcount = (bp->b_bcount + MLX_BLKSIZE - 1) / MLX_BLKSIZE;
---
> blkcount = (bp->bio_bcount + MLX_BLKSIZE - 1) / MLX_BLKSIZE;
1762c1762
< if ((bp->b_pblkno + blkcount) > sc->mlx_sysdrive[driveno].ms_size)
---
> if ((bp->bio_pblkno + blkcount) > sc->mlx_sysdrive[driveno].ms_size)
1764c1764
< bp->b_pblkno, blkcount, sc->mlx_sysdrive[driveno].ms_size);
---
> bp->bio_pblkno, blkcount, sc->mlx_sysdrive[driveno].ms_size);
1773c1773
< bp->b_pblkno, /* physical block number */
---
> bp->bio_pblkno, /* physical block number */
1781c1781
< bp->b_pblkno, /* physical block number */
---
> bp->bio_pblkno, /* physical block number */
1805,1806c1805,1806
< struct buf *bp = (struct buf *)mc->mc_private;
< struct mlxd_softc *mlxd = (struct mlxd_softc *)bp->b_dev->si_drv1;
---
> struct bio *bp = (struct bio *)mc->mc_private;
> struct mlxd_softc *mlxd = (struct mlxd_softc *)bp->bio_dev->si_drv1;
1809,1810c1809,1810
< bp->b_error = EIO;
< bp->b_ioflags |= BIO_ERROR;
---
> bp->bio_error = EIO;
> bp->bio_flags |= BIO_ERROR;
1823c1823
< bp->b_bcount, bp->b_bcount / MLX_BLKSIZE, bp->b_pblkno);
---
> bp->bio_bcount, bp->bio_bcount / MLX_BLKSIZE, bp->bio_pblkno);