Deleted Added
full compact
fwohci.c (219543) fwohci.c (223353)
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 219543 2011-03-11 22:19:49Z marius $
34 * $FreeBSD: head/sys/dev/firewire/fwohci.c 223353 2011-06-21 03:07:59Z imp $
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

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

2067static int
2068fwohci_check_stat(struct fwohci_softc *sc)
2069{
2070 uint32_t stat, irstat, itstat;
2071
2072 FW_GLOCK_ASSERT(&sc->fc);
2073 stat = OREAD(sc, FWOHCI_INTSTAT);
2074 if (stat == 0xffffffff) {
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

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

2067static int
2068fwohci_check_stat(struct fwohci_softc *sc)
2069{
2070 uint32_t stat, irstat, itstat;
2071
2072 FW_GLOCK_ASSERT(&sc->fc);
2073 stat = OREAD(sc, FWOHCI_INTSTAT);
2074 if (stat == 0xffffffff) {
2075 device_printf(sc->fc.dev,
2076 "device physically ejected?\n");
2075 if (!bus_child_present(sc->fc.dev))
2076 return (FILTER_HANDLED);
2077 device_printf(sc->fc.dev, "device physically ejected?\n");
2077 return (FILTER_STRAY);
2078 }
2079 if (stat)
2080 OWRITE(sc, FWOHCI_INTSTATCLR, stat & ~OHCI_INT_PHY_BUS_R);
2081
2082 stat &= sc->intmask;
2083 if (stat == 0)
2084 return (FILTER_STRAY);

--- 904 unchanged lines hidden ---
2078 return (FILTER_STRAY);
2079 }
2080 if (stat)
2081 OWRITE(sc, FWOHCI_INTSTATCLR, stat & ~OHCI_INT_PHY_BUS_R);
2082
2083 stat &= sc->intmask;
2084 if (stat == 0)
2085 return (FILTER_STRAY);

--- 904 unchanged lines hidden ---