Deleted Added
full compact
fwohci.c (167629) fwohci.c (167630)
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 167629 2007-03-16 04:26:58Z simokawa $
34 * $FreeBSD: head/sys/dev/firewire/fwohci.c 167630 2007-03-16 05:11:42Z 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

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

1120 printf("already rcvd\n");
1121#endif
1122 fw_xfer_done(xfer);
1123 } else {
1124 xfer->state = FWXF_SENT;
1125 if (err == EBUSY && fc->status != FWBUSRESET) {
1126 xfer->state = FWXF_BUSY;
1127 xfer->resp = err;
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

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

1120 printf("already rcvd\n");
1121#endif
1122 fw_xfer_done(xfer);
1123 } else {
1124 xfer->state = FWXF_SENT;
1125 if (err == EBUSY && fc->status != FWBUSRESET) {
1126 xfer->state = FWXF_BUSY;
1127 xfer->resp = err;
1128 if (xfer->retry_req != NULL)
1129 xfer->retry_req(xfer);
1130 else {
1131 xfer->recv.pay_len = 0;
1132 fw_xfer_done(xfer);
1133 }
1128 xfer->recv.pay_len = 0;
1129 fw_xfer_done(xfer);
1134 } else if (stat != FWOHCIEV_ACKPEND) {
1135 if (stat != FWOHCIEV_ACKCOMPL)
1136 xfer->state = FWXF_SENTERR;
1137 xfer->resp = err;
1138 xfer->recv.pay_len = 0;
1139 fw_xfer_done(xfer);
1140 }
1141 }

--- 1781 unchanged lines hidden ---
1130 } else if (stat != FWOHCIEV_ACKPEND) {
1131 if (stat != FWOHCIEV_ACKCOMPL)
1132 xfer->state = FWXF_SENTERR;
1133 xfer->resp = err;
1134 xfer->recv.pay_len = 0;
1135 fw_xfer_done(xfer);
1136 }
1137 }

--- 1781 unchanged lines hidden ---