Deleted Added
full compact
ata-all.c (214016) ata-all.c (214988)
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/ata-all.c 214016 2010-10-18 11:30:13Z mav $");
28__FBSDID("$FreeBSD: head/sys/dev/ata/ata-all.c 214988 2010-11-08 15:36:15Z mav $");
29
30#include "opt_ata.h"
31#include <sys/param.h>
32#include <sys/systm.h>
33#include <sys/ata.h>
34#include <sys/kernel.h>
35#include <sys/module.h>
36#include <sys/endian.h>

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

1512 res->lba_high = request->u.ata.lba >> 16;
1513 res->device = request->u.ata.lba >> 24;
1514 res->lba_low_exp = request->u.ata.lba >> 24;
1515 res->lba_mid_exp = request->u.ata.lba >> 32;
1516 res->lba_high_exp = request->u.ata.lba >> 40;
1517 res->sector_count = request->u.ata.count;
1518 res->sector_count_exp = request->u.ata.count >> 8;
1519 }
29
30#include "opt_ata.h"
31#include <sys/param.h>
32#include <sys/systm.h>
33#include <sys/ata.h>
34#include <sys/kernel.h>
35#include <sys/module.h>
36#include <sys/endian.h>

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

1512 res->lba_high = request->u.ata.lba >> 16;
1513 res->device = request->u.ata.lba >> 24;
1514 res->lba_low_exp = request->u.ata.lba >> 24;
1515 res->lba_mid_exp = request->u.ata.lba >> 32;
1516 res->lba_high_exp = request->u.ata.lba >> 40;
1517 res->sector_count = request->u.ata.count;
1518 res->sector_count_exp = request->u.ata.count >> 8;
1519 }
1520 if ((ccb->ccb_h.flags & CAM_DIR_MASK) != CAM_DIR_NONE) {
1521 if (ccb->ccb_h.func_code == XPT_ATA_IO) {
1522 ccb->ataio.resid =
1523 ccb->ataio.dxfer_len - request->donecount;
1524 } else {
1525 ccb->csio.resid =
1526 ccb->csio.dxfer_len - request->donecount;
1527 }
1528 }
1520 ata_free_request(request);
1521 xpt_done(ccb);
1522 /* Do error recovery if needed. */
1523 if (fatalerr)
1524 ata_reinit(dev);
1525}
1526
1527static int

--- 296 unchanged lines hidden ---
1529 ata_free_request(request);
1530 xpt_done(ccb);
1531 /* Do error recovery if needed. */
1532 if (fatalerr)
1533 ata_reinit(dev);
1534}
1535
1536static int

--- 296 unchanged lines hidden ---