30c30
< __FBSDID("$FreeBSD: head/sys/dev/mlx/mlx_disk.c 119418 2003-08-24 17:55:58Z obrien $");
---
> __FBSDID("$FreeBSD: head/sys/dev/mlx/mlx_disk.c 125975 2004-02-18 21:36:53Z phk $");
222,231c222,234
< sc->mlxd_disk.d_open = mlxd_open;
< sc->mlxd_disk.d_close = mlxd_close;
< sc->mlxd_disk.d_ioctl = mlxd_ioctl;
< sc->mlxd_disk.d_strategy = mlxd_strategy;
< sc->mlxd_disk.d_name = "mlxd";
< sc->mlxd_disk.d_drv1 = sc;
< sc->mlxd_disk.d_sectorsize = MLX_BLKSIZE;
< sc->mlxd_disk.d_mediasize = MLX_BLKSIZE * (off_t)sc->mlxd_drive->ms_size;
< sc->mlxd_disk.d_fwsectors = sc->mlxd_drive->ms_sectors;
< sc->mlxd_disk.d_fwheads = sc->mlxd_drive->ms_heads;
---
> sc->mlxd_disk = disk_alloc();
> sc->mlxd_disk->d_open = mlxd_open;
> sc->mlxd_disk->d_close = mlxd_close;
> sc->mlxd_disk->d_ioctl = mlxd_ioctl;
> sc->mlxd_disk->d_strategy = mlxd_strategy;
> sc->mlxd_disk->d_name = "mlxd";
> sc->mlxd_disk->d_unit = sc->mlxd_unit;
> sc->mlxd_disk->d_drv1 = sc;
> sc->mlxd_disk->d_sectorsize = MLX_BLKSIZE;
> sc->mlxd_disk->d_mediasize = MLX_BLKSIZE * (off_t)sc->mlxd_drive->ms_size;
> sc->mlxd_disk->d_fwsectors = sc->mlxd_drive->ms_sectors;
> sc->mlxd_disk->d_fwheads = sc->mlxd_drive->ms_heads;
> sc->mlxd_disk->d_flags = DISKFLAG_NEEDSGIANT;
238c241
< sc->mlxd_disk.d_maxsize = 8 * PAGE_SIZE;
---
> sc->mlxd_disk->d_maxsize = 8 * PAGE_SIZE;
242c245
< sc->mlxd_disk.d_maxsize = imin(s1, s2);
---
> sc->mlxd_disk->d_maxsize = imin(s1, s2);
245c248
< disk_create(sc->mlxd_unit, &sc->mlxd_disk, 0, NULL, NULL);
---
> disk_create(sc->mlxd_disk, DISK_VERSION);
257c260
< disk_destroy(&sc->mlxd_disk);
---
> disk_destroy(sc->mlxd_disk);