Deleted Added
full compact
mlx_disk.c (54279) mlx_disk.c (54419)
1/*-
2 * Copyright (c) 1999 Jonathan Lemon
3 * Copyright (c) 1999 Michael Smith
4 * All rights reserved.
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:

--- 10 unchanged lines hidden (view full) ---

19 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
20 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
21 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
22 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
23 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
24 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
25 * SUCH DAMAGE.
26 *
1/*-
2 * Copyright (c) 1999 Jonathan Lemon
3 * Copyright (c) 1999 Michael Smith
4 * All rights reserved.
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:

--- 10 unchanged lines hidden (view full) ---

19 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
20 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
21 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
22 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
23 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
24 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
25 * SUCH DAMAGE.
26 *
27 * $FreeBSD: head/sys/dev/mlx/mlx_disk.c 54279 1999-12-08 04:45:23Z ken $
27 * $FreeBSD: head/sys/dev/mlx/mlx_disk.c 54419 1999-12-11 00:00:13Z msmith $
28 */
29
30/*
31 * Disk driver for Mylex DAC960 RAID adapters.
32 */
33
34#include <sys/param.h>
35#include <sys/systm.h>

--- 236 unchanged lines hidden (view full) ---

272 sc->mlxd_drive->ms_size, sc->mlxd_drive->ms_raidlevel, state);
273
274 devstat_add_entry(&sc->mlxd_stats, "mlxd", sc->mlxd_unit, MLX_BLKSIZE,
275 DEVSTAT_NO_ORDERED_TAGS,
276 DEVSTAT_TYPE_STORARRAY | DEVSTAT_TYPE_IF_OTHER,
277 DEVSTAT_PRIORITY_ARRAY);
278
279 dsk = disk_create(sc->mlxd_unit, &sc->mlxd_disk, 0, &mlxd_cdevsw, &mlxddisk_cdevsw);
28 */
29
30/*
31 * Disk driver for Mylex DAC960 RAID adapters.
32 */
33
34#include <sys/param.h>
35#include <sys/systm.h>

--- 236 unchanged lines hidden (view full) ---

272 sc->mlxd_drive->ms_size, sc->mlxd_drive->ms_raidlevel, state);
273
274 devstat_add_entry(&sc->mlxd_stats, "mlxd", sc->mlxd_unit, MLX_BLKSIZE,
275 DEVSTAT_NO_ORDERED_TAGS,
276 DEVSTAT_TYPE_STORARRAY | DEVSTAT_TYPE_IF_OTHER,
277 DEVSTAT_PRIORITY_ARRAY);
278
279 dsk = disk_create(sc->mlxd_unit, &sc->mlxd_disk, 0, &mlxd_cdevsw, &mlxddisk_cdevsw);
280 dsk->si_drv1 = sc;
280 disks_registered++;
281
282 /* set maximum I/O size */
283 dsk->si_iosize_max = sc->mlxd_controller->mlx_maxiosize * MLX_BLKSIZE;
281 disks_registered++;
282
283 /* set maximum I/O size */
284 dsk->si_iosize_max = sc->mlxd_controller->mlx_maxiosize * MLX_BLKSIZE;
284 dsk->si_drv1 = sc;
285
286 return (0);
287}
288
289static int
290mlxd_detach(device_t dev)
291{
292 struct mlxd_softc *sc = (struct mlxd_softc *)device_get_softc(dev);

--- 12 unchanged lines hidden ---
285
286 return (0);
287}
288
289static int
290mlxd_detach(device_t dev)
291{
292 struct mlxd_softc *sc = (struct mlxd_softc *)device_get_softc(dev);

--- 12 unchanged lines hidden ---