summaryrefslogtreecommitdiffstats
path: root/sys/dev/aic7xxx
diff options
context:
space:
mode:
authorgibbs <gibbs@FreeBSD.org>1997-02-03 02:02:04 +0000
committergibbs <gibbs@FreeBSD.org>1997-02-03 02:02:04 +0000
commit7ee6b3a7026d6cc577df454bad2ccc122e691e35 (patch)
tree14b3a3a75e3fbccc4200e54d3528f934e12766ae /sys/dev/aic7xxx
parentb373023b8930aac96dfa23246e7efc8f1c9416ff (diff)
downloadFreeBSD-src-7ee6b3a7026d6cc577df454bad2ccc122e691e35.zip
FreeBSD-src-7ee6b3a7026d6cc577df454bad2ccc122e691e35.tar.gz
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.
Diffstat (limited to 'sys/dev/aic7xxx')
-rw-r--r--sys/dev/aic7xxx/aic7xxx.seq9
1 files changed, 3 insertions, 6 deletions
diff --git a/sys/dev/aic7xxx/aic7xxx.seq b/sys/dev/aic7xxx/aic7xxx.seq
index 7d7928b..0e80af5 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
OpenPOWER on IntegriCloud