amrvar.h (120988) | amrvar.h (125975) |
---|---|
1/*- 2 * Copyright (c) 1999,2000 Michael Smith 3 * Copyright (c) 2000 BSDi 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: --- 39 unchanged lines hidden (view full) --- 48 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 49 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 50 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 51 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 52 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 53 * SUCH DAMAGE. 54 * 55 * | 1/*- 2 * Copyright (c) 1999,2000 Michael Smith 3 * Copyright (c) 2000 BSDi 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: --- 39 unchanged lines hidden (view full) --- 48 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 49 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 50 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 51 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 52 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 53 * SUCH DAMAGE. 54 * 55 * |
56 * $FreeBSD: head/sys/dev/amr/amrvar.h 120988 2003-10-10 22:49:40Z ps $ | 56 * $FreeBSD: head/sys/dev/amr/amrvar.h 125975 2004-02-18 21:36:53Z phk $ |
57 */ 58 59#if __FreeBSD_version >= 500005 60# include <sys/taskqueue.h> 61# include <geom/geom_disk.h> 62#endif 63 64#ifdef AMR_DEBUG --- 183 unchanged lines hidden (view full) --- 248/* 249 * MegaRAID logical disk driver 250 */ 251struct amrd_softc 252{ 253 device_t amrd_dev; 254 struct amr_softc *amrd_controller; 255 struct amr_logdrive *amrd_drive; | 57 */ 58 59#if __FreeBSD_version >= 500005 60# include <sys/taskqueue.h> 61# include <geom/geom_disk.h> 62#endif 63 64#ifdef AMR_DEBUG --- 183 unchanged lines hidden (view full) --- 248/* 249 * MegaRAID logical disk driver 250 */ 251struct amrd_softc 252{ 253 device_t amrd_dev; 254 struct amr_softc *amrd_controller; 255 struct amr_logdrive *amrd_drive; |
256 struct disk amrd_disk; | 256 struct disk *amrd_disk; |
257 int amrd_unit; 258}; 259 260/* 261 * Interface between driver core and disk driver (should be using a bus?) 262 */ 263extern int amr_submit_bio(struct amr_softc *sc, struct bio *bio); 264extern int amr_dump_blocks(struct amr_softc *sc, int unit, u_int32_t lba, void *data, int blks); --- 106 unchanged lines hidden --- | 257 int amrd_unit; 258}; 259 260/* 261 * Interface between driver core and disk driver (should be using a bus?) 262 */ 263extern int amr_submit_bio(struct amr_softc *sc, struct bio *bio); 264extern int amr_dump_blocks(struct amr_softc *sc, int unit, u_int32_t lba, void *data, int blks); --- 106 unchanged lines hidden --- |