Deleted Added
full compact
sbp.c (205842) sbp.c (219543)
1/*-
2 * Copyright (c) 2003 Hidetoshi Shimokawa
3 * Copyright (c) 1998-2002 Katsushi Kobayashi and Hidetoshi Shimokawa
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:

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

26 * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
27 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
28 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
29 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
30 * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
31 * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
32 * POSSIBILITY OF SUCH DAMAGE.
33 *
1/*-
2 * Copyright (c) 2003 Hidetoshi Shimokawa
3 * Copyright (c) 1998-2002 Katsushi Kobayashi and Hidetoshi Shimokawa
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:

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

26 * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
27 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
28 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
29 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
30 * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
31 * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
32 * POSSIBILITY OF SUCH DAMAGE.
33 *
34 * $FreeBSD: head/sys/dev/firewire/sbp.c 205842 2010-03-29 17:24:23Z imp $
34 * $FreeBSD: head/sys/dev/firewire/sbp.c 219543 2011-03-11 22:19:49Z marius $
35 *
36 */
37
38#include <sys/param.h>
39#include <sys/systm.h>
40#include <sys/module.h>
41#include <sys/bus.h>
42#include <sys/kernel.h>

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

557 sdev->flags |= VALID_LUN;
558 sdev->type = (reg->val & 0xff0000) >> 16;
559
560 if (new == 0)
561 goto next;
562
563 fwdma_malloc(sbp->fd.fc,
564 /* alignment */ sizeof(uint32_t),
35 *
36 */
37
38#include <sys/param.h>
39#include <sys/systm.h>
40#include <sys/module.h>
41#include <sys/bus.h>
42#include <sys/kernel.h>

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

557 sdev->flags |= VALID_LUN;
558 sdev->type = (reg->val & 0xff0000) >> 16;
559
560 if (new == 0)
561 goto next;
562
563 fwdma_malloc(sbp->fd.fc,
564 /* alignment */ sizeof(uint32_t),
565 SBP_DMA_SIZE, &sdev->dma, BUS_DMA_NOWAIT);
565 SBP_DMA_SIZE, &sdev->dma, BUS_DMA_NOWAIT |
566 BUS_DMA_COHERENT);
566 if (sdev->dma.v_addr == NULL) {
567 printf("%s: dma space allocation failed\n",
568 __func__);
569 free(sdev, M_SBP);
570 target->luns[lun] = NULL;
571 goto next;
572 }
573 sdev->login = (struct sbp_login_res *) sdev->dma.v_addr;

--- 2426 unchanged lines hidden ---
567 if (sdev->dma.v_addr == NULL) {
568 printf("%s: dma space allocation failed\n",
569 __func__);
570 free(sdev, M_SBP);
571 target->luns[lun] = NULL;
572 goto next;
573 }
574 sdev->login = (struct sbp_login_res *) sdev->dma.v_addr;

--- 2426 unchanged lines hidden ---