Deleted Added
full compact
fwohci.c (170425) fwohci.c (170427)
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/fwohci.c 170425 2007-06-08 07:53:59Z simokawa $
34 * $FreeBSD: head/sys/dev/firewire/fwohci.c 170427 2007-06-08 09:04:30Z simokawa $
35 *
36 */
37
38#define ATRQ_CH 0
39#define ATRS_CH 1
40#define ARRQ_CH 2
41#define ARRS_CH 3
42#define ITX_CH 4

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

1154 xfer = tr->xfer;
1155 if (xfer->flag & FWXF_RCVD) {
1156#if 0
1157 if (firewire_debug)
1158 printf("already rcvd\n");
1159#endif
1160 fw_xfer_done(xfer);
1161 } else {
35 *
36 */
37
38#define ATRQ_CH 0
39#define ATRS_CH 1
40#define ARRQ_CH 2
41#define ARRS_CH 3
42#define ITX_CH 4

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

1154 xfer = tr->xfer;
1155 if (xfer->flag & FWXF_RCVD) {
1156#if 0
1157 if (firewire_debug)
1158 printf("already rcvd\n");
1159#endif
1160 fw_xfer_done(xfer);
1161 } else {
1162 microtime(&xfer->tv);
1162 xfer->flag = FWXF_SENT;
1163 if (err == EBUSY) {
1164 xfer->flag = FWXF_BUSY;
1165 xfer->resp = err;
1166 xfer->recv.pay_len = 0;
1167 fw_xfer_done(xfer);
1168 } else if (stat != FWOHCIEV_ACKPEND) {
1169 if (stat != FWOHCIEV_ACKCOMPL)

--- 1810 unchanged lines hidden ---
1163 xfer->flag = FWXF_SENT;
1164 if (err == EBUSY) {
1165 xfer->flag = FWXF_BUSY;
1166 xfer->resp = err;
1167 xfer->recv.pay_len = 0;
1168 fw_xfer_done(xfer);
1169 } else if (stat != FWOHCIEV_ACKPEND) {
1170 if (stat != FWOHCIEV_ACKCOMPL)

--- 1810 unchanged lines hidden ---