Deleted Added
full compact
ida_disk.c (92820) ida_disk.c (93496)
1/*-
2 * Copyright (c) 1999,2000 Jonathan Lemon
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

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

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

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

18 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
19 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 *
26 * $FreeBSD: head/sys/dev/ida/ida_disk.c 92820 2002-03-20 19:13:13Z imp $
26 * $FreeBSD: head/sys/dev/ida/ida_disk.c 93496 2002-03-31 22:37:00Z phk $
27 */
28
29/*
30 * Disk driver for Compaq SMART RAID adapters.
31 */
32
33#include <sys/param.h>
34#include <sys/systm.h>

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

181 * Correctly set the buf to indicate a completed transfer
182 */
183 bp->bio_resid = bp->bio_bcount;
184 biodone(bp);
185 return;
186}
187
188static int
27 */
28
29/*
30 * Disk driver for Compaq SMART RAID adapters.
31 */
32
33#include <sys/param.h>
34#include <sys/systm.h>

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

181 * Correctly set the buf to indicate a completed transfer
182 */
183 bp->bio_resid = bp->bio_bcount;
184 biodone(bp);
185 return;
186}
187
188static int
189idad_dump(dev_t dev)
189idad_dump(dev_t dev, void *virtual, vm_offset_t physical, off_t offset, size_t length)
190{
190{
191
192 /* This needs modified to the new dump API */
193 return (ENXIO);
194#if 0
191 struct idad_softc *drv;
192 u_int count, blkno, secsize;
193 long blkcnt;
194 int i, error, dumppages;
195 caddr_t va;
196 vm_offset_t addr, a;
197
198 if ((error = disk_dumpcheck(dev, &count, &blkno, &secsize)))

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

226 if (dumpstatus(addr, (off_t)count * DEV_BSIZE) < 0)
227 return (EINTR);
228
229 blkno += blkcnt * dumppages;
230 count -= blkcnt * dumppages;
231 addr += PAGE_SIZE * dumppages;
232 }
233 return (0);
195 struct idad_softc *drv;
196 u_int count, blkno, secsize;
197 long blkcnt;
198 int i, error, dumppages;
199 caddr_t va;
200 vm_offset_t addr, a;
201
202 if ((error = disk_dumpcheck(dev, &count, &blkno, &secsize)))

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

230 if (dumpstatus(addr, (off_t)count * DEV_BSIZE) < 0)
231 return (EINTR);
232
233 blkno += blkcnt * dumppages;
234 count -= blkcnt * dumppages;
235 addr += PAGE_SIZE * dumppages;
236 }
237 return (0);
238#endif
234}
235
236void
237idad_intr(struct bio *bp)
238{
239 struct idad_softc *drv = (struct idad_softc *)bp->bio_driver1;
240
241 if (bp->bio_flags & BIO_ERROR)

--- 78 unchanged lines hidden ---
239}
240
241void
242idad_intr(struct bio *bp)
243{
244 struct idad_softc *drv = (struct idad_softc *)bp->bio_driver1;
245
246 if (bp->bio_flags & BIO_ERROR)

--- 78 unchanged lines hidden ---