Deleted Added
full compact
sbp.c (170378) sbp.c (170400)
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 170378 2007-06-06 18:33:38Z gallatin $
34 * $FreeBSD: head/sys/dev/firewire/sbp.c 170400 2007-06-07 13:20:48Z 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>

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

819 struct sbp_softc *sbp = (struct sbp_softc *)arg;
820 struct sbp_target *target;
821 struct fw_device *fwdev;
822 int i, alive;
823
824SBP_DEBUG(0)
825 printf("sbp_post_explore (sbp_cold=%d)\n", sbp_cold);
826END_DEBUG
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>

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

819 struct sbp_softc *sbp = (struct sbp_softc *)arg;
820 struct sbp_target *target;
821 struct fw_device *fwdev;
822 int i, alive;
823
824SBP_DEBUG(0)
825 printf("sbp_post_explore (sbp_cold=%d)\n", sbp_cold);
826END_DEBUG
827 /* We need physical access */
828 if (!firewire_phydma_enable)
829 return;
830
827 if (sbp_cold > 0)
828 sbp_cold --;
829
830#if 0
831 /*
832 * XXX don't let CAM the bus rest.
833 * CAM tries to do something with freezed (DEV_RETRY) devices.
834 */

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

1941 struct firewire_comm *fc;
1942 int i, s, error;
1943
1944 if (DFLTPHYS > SBP_MAXPHYS)
1945 device_printf(dev, "Warning, DFLTPHYS(%dKB) is larger than "
1946 "SBP_MAXPHYS(%dKB).\n", DFLTPHYS / 1024,
1947 SBP_MAXPHYS / 1024);
1948
831 if (sbp_cold > 0)
832 sbp_cold --;
833
834#if 0
835 /*
836 * XXX don't let CAM the bus rest.
837 * CAM tries to do something with freezed (DEV_RETRY) devices.
838 */

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

1945 struct firewire_comm *fc;
1946 int i, s, error;
1947
1948 if (DFLTPHYS > SBP_MAXPHYS)
1949 device_printf(dev, "Warning, DFLTPHYS(%dKB) is larger than "
1950 "SBP_MAXPHYS(%dKB).\n", DFLTPHYS / 1024,
1951 SBP_MAXPHYS / 1024);
1952
1953 if (!firewire_phydma_enable)
1954 device_printf(dev, "Warning, hw.firewire.phydma_enable must be 1 "
1955 "for SBP over FireWire.\n");
1949SBP_DEBUG(0)
1950 printf("sbp_attach (cold=%d)\n", cold);
1951END_DEBUG
1952
1953 if (cold)
1954 sbp_cold ++;
1955 sbp = ((struct sbp_softc *)device_get_softc(dev));
1956 bzero(sbp, sizeof(struct sbp_softc));

--- 998 unchanged lines hidden ---
1956SBP_DEBUG(0)
1957 printf("sbp_attach (cold=%d)\n", cold);
1958END_DEBUG
1959
1960 if (cold)
1961 sbp_cold ++;
1962 sbp = ((struct sbp_softc *)device_get_softc(dev));
1963 bzero(sbp, sizeof(struct sbp_softc));

--- 998 unchanged lines hidden ---