Deleted Added
full compact
firewire.c (129879) firewire.c (130460)
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 129879 2004-05-30 20:08:47Z phk $
34 * $FreeBSD: head/sys/dev/firewire/firewire.c 130460 2004-06-14 09:34:20Z dfr $
35 *
36 */
37
38#include <sys/param.h>
39#include <sys/systm.h>
40#include <sys/types.h>
41
42#include <sys/kernel.h>

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

243 }
244 if(!(xferq->queued < xferq->maxq)){
245 device_printf(fc->bdev, "Discard a packet (queued=%d)\n",
246 xferq->queued);
247 return EINVAL;
248 }
249
250 if (info->flag & FWTI_TLABEL) {
35 *
36 */
37
38#include <sys/param.h>
39#include <sys/systm.h>
40#include <sys/types.h>
41
42#include <sys/kernel.h>

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

243 }
244 if(!(xferq->queued < xferq->maxq)){
245 device_printf(fc->bdev, "Discard a packet (queued=%d)\n",
246 xferq->queued);
247 return EINVAL;
248 }
249
250 if (info->flag & FWTI_TLABEL) {
251 if((tl = fw_get_tlabel(fc, xfer)) == -1 )
252 return EIO;
251 if ((tl = fw_get_tlabel(fc, xfer)) == -1)
252 return EAGAIN;
253 fp->mode.hdr.tlrt = tl << 2;
254 }
255
256 xfer->tl = tl;
257 xfer->resp = 0;
258 xfer->fc = fc;
259 xfer->q = xferq;
260 xfer->retry_req = fw_asybusy;

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

1734 if (firewire_debug > 1)
1735 printf("fw_get_tlabel: dst=%d tl=%d\n",
1736 xfer->send.hdr.mode.hdr.dst, label);
1737 return(label);
1738 }
1739 }
1740 splx(s);
1741
253 fp->mode.hdr.tlrt = tl << 2;
254 }
255
256 xfer->tl = tl;
257 xfer->resp = 0;
258 xfer->fc = fc;
259 xfer->q = xferq;
260 xfer->retry_req = fw_asybusy;

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

1734 if (firewire_debug > 1)
1735 printf("fw_get_tlabel: dst=%d tl=%d\n",
1736 xfer->send.hdr.mode.hdr.dst, label);
1737 return(label);
1738 }
1739 }
1740 splx(s);
1741
1742 printf("fw_get_tlabel: no free tlabel\n");
1742 if (firewire_debug > 1)
1743 printf("fw_get_tlabel: no free tlabel\n");
1743 return(-1);
1744}
1745
1746static void
1747fw_rcv_copy(struct fw_rcv_buf *rb)
1748{
1749 struct fw_pkt *pkt;
1750 u_char *p;

--- 534 unchanged lines hidden ---
1744 return(-1);
1745}
1746
1747static void
1748fw_rcv_copy(struct fw_rcv_buf *rb)
1749{
1750 struct fw_pkt *pkt;
1751 u_char *p;

--- 534 unchanged lines hidden ---