firewire.c (132199) | firewire.c (132771) |
---|---|
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/firewire.c 132199 2004-07-15 08:26:07Z phk $ | 34 * $FreeBSD: head/sys/dev/firewire/firewire.c 132771 2004-07-28 06:21:53Z kan $ |
35 * 36 */ 37 38#include <sys/param.h> 39#include <sys/systm.h> 40#include <sys/types.h> 41 42#include <sys/kernel.h> --- 1712 unchanged lines hidden (view full) --- 1755 rb->xfer->recv.spd -= rb->spd; 1756 1757 pkt = (struct fw_pkt *)rb->vec->iov_base; 1758 tinfo = &rb->fc->tcode[pkt->mode.hdr.tcode]; 1759 1760 /* Copy header */ 1761 p = (u_char *)&rb->xfer->recv.hdr; 1762 bcopy(rb->vec->iov_base, p, tinfo->hdr_len); | 35 * 36 */ 37 38#include <sys/param.h> 39#include <sys/systm.h> 40#include <sys/types.h> 41 42#include <sys/kernel.h> --- 1712 unchanged lines hidden (view full) --- 1755 rb->xfer->recv.spd -= rb->spd; 1756 1757 pkt = (struct fw_pkt *)rb->vec->iov_base; 1758 tinfo = &rb->fc->tcode[pkt->mode.hdr.tcode]; 1759 1760 /* Copy header */ 1761 p = (u_char *)&rb->xfer->recv.hdr; 1762 bcopy(rb->vec->iov_base, p, tinfo->hdr_len); |
1763 (u_char *)rb->vec->iov_base += tinfo->hdr_len; | 1763 rb->vec->iov_base = (u_char *)rb->vec->iov_base + tinfo->hdr_len; |
1764 rb->vec->iov_len -= tinfo->hdr_len; 1765 1766 /* Copy payload */ 1767 p = (u_char *)rb->xfer->recv.payload; 1768 res = rb->xfer->recv.pay_len; 1769 1770 /* special handling for RRESQ */ 1771 if (pkt->mode.hdr.tcode == FWTCODE_RRESQ && --- 516 unchanged lines hidden --- | 1764 rb->vec->iov_len -= tinfo->hdr_len; 1765 1766 /* Copy payload */ 1767 p = (u_char *)rb->xfer->recv.payload; 1768 res = rb->xfer->recv.pay_len; 1769 1770 /* special handling for RRESQ */ 1771 if (pkt->mode.hdr.tcode == FWTCODE_RRESQ && --- 516 unchanged lines hidden --- |