Deleted Added
full compact
ata-siliconimage.c (212146) ata-siliconimage.c (213047)
1/*-
2 * Copyright (c) 1998 - 2008 S�ren Schmidt <sos@FreeBSD.org>
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

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

20 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
21 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
22 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
24 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25 */
26
27#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 1998 - 2008 S�ren Schmidt <sos@FreeBSD.org>
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

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

20 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
21 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
22 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
24 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25 */
26
27#include <sys/cdefs.h>
28__FBSDID("$FreeBSD: head/sys/dev/ata/chipsets/ata-siliconimage.c 212146 2010-09-02 12:32:29Z mav $");
28__FBSDID("$FreeBSD: head/sys/dev/ata/chipsets/ata-siliconimage.c 213047 2010-09-23 05:17:36Z jchandra $");
29
30#include "opt_ata.h"
31#include <sys/param.h>
32#include <sys/module.h>
33#include <sys/systm.h>
34#include <sys/kernel.h>
35#include <sys/ata.h>
36#include <sys/bus.h>

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

644 ((u_int64_t)prb->fis[10] << 40);
645 else
646 request->u.ata.lba |= ((u_int64_t)(prb->fis[7] & 0x0f) << 24);
647 }
648
649 /* update progress */
650 if (!(request->status & ATA_S_ERROR) && !(request->flags & ATA_R_TIMEOUT)) {
651 if (request->flags & ATA_R_READ)
29
30#include "opt_ata.h"
31#include <sys/param.h>
32#include <sys/module.h>
33#include <sys/systm.h>
34#include <sys/kernel.h>
35#include <sys/ata.h>
36#include <sys/bus.h>

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

644 ((u_int64_t)prb->fis[10] << 40);
645 else
646 request->u.ata.lba |= ((u_int64_t)(prb->fis[7] & 0x0f) << 24);
647 }
648
649 /* update progress */
650 if (!(request->status & ATA_S_ERROR) && !(request->flags & ATA_R_TIMEOUT)) {
651 if (request->flags & ATA_R_READ)
652 request->donecount = prb->transfer_count;
652 request->donecount = le32toh(prb->transfer_count);
653 else
654 request->donecount = request->bytecount;
655 }
656
657 /* release SG list etc */
658 ch->dma.unload(request);
659
660 return ATA_OP_FINISHED;

--- 227 unchanged lines hidden ---
653 else
654 request->donecount = request->bytecount;
655 }
656
657 /* release SG list etc */
658 ch->dma.unload(request);
659
660 return ATA_OP_FINISHED;

--- 227 unchanged lines hidden ---