Deleted Added
full compact
sbp.c (167624) sbp.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/sbp.c 167624 2007-03-16 02:29:36Z simokawa $
34 * $FreeBSD: head/sys/dev/firewire/sbp.c 167630 2007-03-16 05:11:42Z simokawa $
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>

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

1315 splx(s);
1316
1317 microtime(&xfer->tv);
1318
1319 if (new) {
1320 xfer->recv.pay_len = 0;
1321 xfer->send.spd = min(sdev->target->fwdev->speed, max_speed);
1322 xfer->fc = sdev->target->sbp->fd.fc;
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>

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

1315 splx(s);
1316
1317 microtime(&xfer->tv);
1318
1319 if (new) {
1320 xfer->recv.pay_len = 0;
1321 xfer->send.spd = min(sdev->target->fwdev->speed, max_speed);
1322 xfer->fc = sdev->target->sbp->fd.fc;
1323 xfer->retry_req = fw_asybusy;
1324 }
1325
1326 if (tcode == FWTCODE_WREQB)
1327 xfer->send.pay_len = 8;
1328 else
1329 xfer->send.pay_len = 0;
1330
1331 xfer->sc = (caddr_t)sdev;

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

1873 */
1874#if NEED_RESPONSE
1875 xfer->send.off = 0;
1876 sfp = (struct fw_pkt *)xfer->send.buf;
1877 sfp->mode.wres.dst = rfp->mode.wreqb.src;
1878 xfer->dst = sfp->mode.wres.dst;
1879 xfer->spd = min(sdev->target->fwdev->speed, max_speed);
1880 xfer->act.hand = sbp_loginres_callback;
1323 }
1324
1325 if (tcode == FWTCODE_WREQB)
1326 xfer->send.pay_len = 8;
1327 else
1328 xfer->send.pay_len = 0;
1329
1330 xfer->sc = (caddr_t)sdev;

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

1872 */
1873#if NEED_RESPONSE
1874 xfer->send.off = 0;
1875 sfp = (struct fw_pkt *)xfer->send.buf;
1876 sfp->mode.wres.dst = rfp->mode.wreqb.src;
1877 xfer->dst = sfp->mode.wres.dst;
1878 xfer->spd = min(sdev->target->fwdev->speed, max_speed);
1879 xfer->act.hand = sbp_loginres_callback;
1881 xfer->retry_req = fw_asybusy;
1882
1883 sfp->mode.wres.tlrt = rfp->mode.wreqb.tlrt;
1884 sfp->mode.wres.tcode = FWTCODE_WRES;
1885 sfp->mode.wres.rtcode = 0;
1886 sfp->mode.wres.pri = 0;
1887
1888 fw_asyreq(xfer->fc, -1, xfer);
1889#else

--- 1025 unchanged lines hidden ---
1880
1881 sfp->mode.wres.tlrt = rfp->mode.wreqb.tlrt;
1882 sfp->mode.wres.tcode = FWTCODE_WRES;
1883 sfp->mode.wres.rtcode = 0;
1884 sfp->mode.wres.pri = 0;
1885
1886 fw_asyreq(xfer->fc, -1, xfer);
1887#else

--- 1025 unchanged lines hidden ---