33c33
< * $FreeBSD: head/sys/dev/firewire/fwohci.c 108530 2003-01-01 08:25:32Z simokawa $
---
> * $FreeBSD: head/sys/dev/firewire/fwohci.c 108642 2003-01-04 06:40:57Z simokawa $
530c530
< OWRITE(sc, OHCI_SID_BUF, vtophys(sc->fc.sid_buf));
---
> OWRITE(sc, OHCI_SID_BUF, vtophys(sc->fc.sid_buf));
535a536,539
>
> /* force to start rx dma */
> sc->arrq.xferq.flag &= ~FWXFERQ_RUNNING;
> sc->arrs.xferq.flag &= ~FWXFERQ_RUNNING;
1108a1113,1117
>
>
> if ((dbch->flags & FWOHCI_DBCH_INIT) != 0)
> goto out;
>
1111,1116d1119
< dbch->frag.buf = NULL;
< dbch->frag.len = 0;
< dbch->frag.plen = 0;
< dbch->xferq.queued = 0;
< dbch->pdb_tr = NULL;
<
1122c1125
< printf("fwochi_db_init: malloc failed\n");
---
> printf("fwohci_db_init: malloc failed\n");
1129c1132
< printf("fwochi_db_init: contigmalloc failed\n");
---
> printf("fwohci_db_init: contigmalloc failed\n");
1152a1156,1161
> out:
> dbch->frag.buf = NULL;
> dbch->frag.len = 0;
> dbch->frag.plen = 0;
> dbch->xferq.queued = 0;
> dbch->pdb_tr = NULL;
1329a1339
> dbch->top = STAILQ_FIRST(&dbch->db_trq);
1529c1539
< fwohci_shutdown(device_t dev)
---
> fwohci_shutdown(struct fwohci_softc *sc, device_t dev)
1532d1541
< struct fwohci_softc *sc = device_get_softc(dev);
1555a1565
> /* XXX Link down? Bus reset? */
1558a1569,1589
> int
> fwohci_resume(struct fwohci_softc *sc, device_t dev)
> {
> int i;
>
> fwohci_reset(sc, dev);
> /* XXX resume isochronus receive automatically. (how about TX?) */
> for(i = 0; i < sc->fc.nisodma; i ++) {
> if((sc->ir[i].xferq.flag & FWXFERQ_RUNNING) != 0) {
> device_printf(sc->fc.dev,
> "resume iso receive ch: %d\n", i);
> sc->ir[i].xferq.flag &= ~FWXFERQ_RUNNING;
> sc->fc.irx_enable(&sc->fc, i);
> }
> }
>
> bus_generic_resume(dev);
> sc->fc.ibr(&sc->fc);
> return 0;
> }
>
1817c1848
< device_printf(sc->fc.dev, "fwochi_set_intr: %d\n", enable);
---
> device_printf(sc->fc.dev, "fwohci_set_intr: %d\n", enable);