Deleted Added
full compact
fwohci.c (167685) fwohci.c (169117)
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 167685 2007-03-19 03:35:45Z simokawa $
34 * $FreeBSD: head/sys/dev/firewire/fwohci.c 169117 2007-04-30 10:50:53Z 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

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

1805 OWRITE(sc, OHCI_ATQCTLCLR, OHCI_CNTL_DMA_RUN);
1806 sc->atrq.xferq.flag &= ~FWXFERQ_RUNNING;
1807 OWRITE(sc, OHCI_ATSCTLCLR, OHCI_CNTL_DMA_RUN);
1808 sc->atrs.xferq.flag &= ~FWXFERQ_RUNNING;
1809
1810#ifndef ACK_ALL
1811 OWRITE(sc, FWOHCI_INTSTATCLR, OHCI_INT_PHY_BUS_R);
1812#endif
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

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

1805 OWRITE(sc, OHCI_ATQCTLCLR, OHCI_CNTL_DMA_RUN);
1806 sc->atrq.xferq.flag &= ~FWXFERQ_RUNNING;
1807 OWRITE(sc, OHCI_ATSCTLCLR, OHCI_CNTL_DMA_RUN);
1808 sc->atrs.xferq.flag &= ~FWXFERQ_RUNNING;
1809
1810#ifndef ACK_ALL
1811 OWRITE(sc, FWOHCI_INTSTATCLR, OHCI_INT_PHY_BUS_R);
1812#endif
1813 fw_busreset(fc);
1813 fw_busreset(fc, FWBUSRESET);
1814 OWRITE(sc, OHCI_CROMHDR, ntohl(sc->fc.config_rom[0]));
1815 OWRITE(sc, OHCI_BUS_OPT, ntohl(sc->fc.config_rom[2]));
1816 }
1817busresetout:
1818 if((stat & OHCI_INT_DMA_IR )){
1819#ifndef ACK_ALL
1820 OWRITE(sc, FWOHCI_INTSTATCLR, OHCI_INT_DMA_IR);
1821#endif

--- 1099 unchanged lines hidden ---
1814 OWRITE(sc, OHCI_CROMHDR, ntohl(sc->fc.config_rom[0]));
1815 OWRITE(sc, OHCI_BUS_OPT, ntohl(sc->fc.config_rom[2]));
1816 }
1817busresetout:
1818 if((stat & OHCI_INT_DMA_IR )){
1819#ifndef ACK_ALL
1820 OWRITE(sc, FWOHCI_INTSTATCLR, OHCI_INT_DMA_IR);
1821#endif

--- 1099 unchanged lines hidden ---