From 1d6abdbc6fcbc68a3e46a8534978560e7e5a6a47 Mon Sep 17 00:00:00 2001 From: "Justin T. Gibbs" Date: Mon, 3 Feb 1997 02:02:04 +0000 Subject: [PATCH] In dma_finish, don't disturb the direction bit in DFCNTRL when turning off host DMAs. The additional test to ensure that the DMA has stopped is also unnecessary since we've already waited for the DMA to complete. Update my copyright for the new year. --- sys/dev/aic7xxx/aic7xxx.seq | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/sys/dev/aic7xxx/aic7xxx.seq b/sys/dev/aic7xxx/aic7xxx.seq index 7d7928b6bd5..0e80af5ea1f 100644 --- a/sys/dev/aic7xxx/aic7xxx.seq +++ b/sys/dev/aic7xxx/aic7xxx.seq @@ -7,7 +7,7 @@ * *FreeBSD, Twin, Wide, 2 command per target support, tagged queuing, *SCB paging and other optimizations: - *Copyright (c) 1994, 1995, 1996, 1997 Justin Gibbs. All rights reserved. + *Copyright (c) 1994, 1995, 1996 Justin Gibbs. All rights reserved. * *Redistribution and use in source and binary forms, with or without *modification, are permitted provided that the following conditions @@ -1093,11 +1093,8 @@ dfdat_out_7: */ dma_finish: test DFSTATUS,HDONE jz dma_finish - /* Turn off DMA preserving WIDEODD */ - and DFCNTRL,WIDEODD -dma_finish2: - test DFCNTRL,HDMAENACK jnz dma_finish2 - ret + /* Turn off DMA */ + and DFCNTRL, 0xf7 ret # ~HDMAEN index_untagged_scb: mov DINDEX, SINDEX