diff options
| author | Federico G. Schwindt <fgsch@cvs.openbsd.org> | 2003-08-12 22:47:03 +0000 |
|---|---|---|
| committer | Federico G. Schwindt <fgsch@cvs.openbsd.org> | 2003-08-12 22:47:03 +0000 |
| commit | da70f85173972ae4ba2a4263fe4796f13c657f5d (patch) | |
| tree | bae9f74bd182e47fca78b0c6cfd374348b4aa23c | |
| parent | 568838183f256537350bea763cc7cca652390424 (diff) | |
fix after mickey breakage; reported by grange@.
| -rw-r--r-- | sys/dev/ic/aic7xxx.c | 30 |
1 files changed, 3 insertions, 27 deletions
diff --git a/sys/dev/ic/aic7xxx.c b/sys/dev/ic/aic7xxx.c index 4e55f981b69..dd11127d2a6 100644 --- a/sys/dev/ic/aic7xxx.c +++ b/sys/dev/ic/aic7xxx.c @@ -28,10 +28,10 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: aic7xxx.c,v 1.48 2003/08/12 20:27:03 mickey Exp $ + * $Id: aic7xxx.c,v 1.49 2003/08/12 22:47:02 fgsch Exp $ * * $FreeBSD: src/sys/dev/aic7xxx/aic7xxx.c,v 1.80 2001/12/16 17:38:30 gibbs Exp $ - * $OpenBSD: aic7xxx.c,v 1.48 2003/08/12 20:27:03 mickey Exp $ + * $OpenBSD: aic7xxx.c,v 1.49 2003/08/12 22:47:02 fgsch Exp $ */ #ifdef __OpenBSD__ @@ -562,22 +562,6 @@ ahc_handle_seqint(struct ahc_softc *ahc, u_int intstat) hscb->datacnt = sg->len; hscb->sgptr = scb->sg_list_phys | SG_FULL_RESID; hscb->sgptr = ahc_htole32(hscb->sgptr); -#ifdef __OpenBSD__ - bus_dmamap_sync(ahc->scb_data->sense_dmat, - ahc->scb_data->sense_dmamap, - (scb - ahc->scb_data->scbarray) * - sizeof(struct scsi_sense_data), - sizeof(struct scsi_sense_data), - BUS_DMASYNC_PREREAD); - bus_dmamap_sync(ahc->scb_data->sg_dmat, - scb->sg_map->sg_dmamap, - 0, scb->sg_map->sg_dmamap->dm_mapsize, - BUS_DMASYNC_PREWRITE); - bus_dmamap_sync(ahc->scb_data->hscb_dmat, - ahc->scb_data->hscb_dmamap, - 0, ahc->scb_data->hscb_dmamap->dm_mapsize, - BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); -#endif scb->sg_count = 1; scb->flags |= SCB_SENSE; ahc_qinfifo_requeue_tail(ahc, scb); @@ -4593,8 +4577,6 @@ ahc_init(struct ahc_softc *ahc) for (i = 0; i < 256; i++) ahc->qinfifo[i] = SCB_LIST_NULL; - ahc_sync_qinfifo(ahc, BUS_DMASYNC_PREWRITE); - if ((ahc->features & AHC_MULTI_TID) != 0) { ahc_outb(ahc, TARGID, 0); ahc_outb(ahc, TARGID + 1, 0); @@ -5062,11 +5044,7 @@ ahc_qinfifo_requeue(struct ahc_softc *ahc, struct scb *prev_scb, ahc_sync_scb(ahc, prev_scb, BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE); } - ahc->qinfifo[ahc->qinfifonext] = scb->hscb->tag; - ahc_dmamap_sync(ahc, ahc->shared_data_dmat, ahc->shared_data_dmamap, - /*offset*/ahc->qinfifonext+256, /*len*/1, - BUS_DMASYNC_PREWRITE); - ahc->qinfifonext++; + ahc->qinfifo[ahc->qinfifonext++] = scb->hscb->tag; scb->hscb->next = ahc->next_queued_scb->hscb->tag; ahc_sync_scb(ahc, scb, BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE); } @@ -5103,8 +5081,6 @@ ahc_search_qinfifo(struct ahc_softc *ahc, int target, char channel, int i; int have_qregs; - ahc_sync_qinfifo(ahc, BUS_DMASYNC_POSTWRITE); - qintail = ahc->qinfifonext; have_qregs = (ahc->features & AHC_QUEUE_REGS) != 0; if (have_qregs) { |