diff options
| author | sos <sos@FreeBSD.org> | 1997-09-04 18:49:53 +0000 |
|---|---|---|
| committer | sos <sos@FreeBSD.org> | 1997-09-04 18:49:53 +0000 |
| commit | 4d6dd4fc2d4b7a4112c261c7c34037dbe9de3e56 (patch) | |
| tree | d9d1bc4feef0cf975d010ef759400307cbbd7302 /sys/i386/isa/wdreg.h | |
| parent | fb633824a1760e5b18d4ec464cabc4e5e9c28cbf (diff) | |
| download | FreeBSD-src-4d6dd4fc2d4b7a4112c261c7c34037dbe9de3e56.zip FreeBSD-src-4d6dd4fc2d4b7a4112c261c7c34037dbe9de3e56.tar.gz | |
Upgrade of EIDE DMA support, Johns comments:
* lots of fixes to error handling-- mostly works now
* improve DMA timing config for Triton chipsets-- PIIX4 and UDMA drive
still untested
* generally improve DMA config in many ways-- mostly cleanup
* clean up boot-time messages
* rewrite PRD generation algorithm
* first wd timeout is now longer, to handle drive spinup
Submitted by: John Hood <cgull@smoke.marlboro.vt.us>
Diffstat (limited to 'sys/i386/isa/wdreg.h')
| -rw-r--r-- | sys/i386/isa/wdreg.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sys/i386/isa/wdreg.h b/sys/i386/isa/wdreg.h index f7dfa488..9bb2f9b 100644 --- a/sys/i386/isa/wdreg.h +++ b/sys/i386/isa/wdreg.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)wdreg.h 7.1 (Berkeley) 5/9/91 - * $Id: wdreg.h,v 1.17 1997/02/22 09:37:27 peter Exp $ + * $Id: wdreg.h,v 1.12.2.3 1997/01/14 17:32:07 bde Exp $ */ /* @@ -284,10 +284,11 @@ struct wddma { #define WDDS_ERROR 0x0002 #define WDDS_INTERRUPT 0x0004 -#if 0 -/* XXX are these now useless? */ -/* local defines for ATA timing modes */ -#define WDDMA_GRPMASK 0xf0 +#define WDDS_BITS "\20\4interrupt\2error\1active" + +/* defines for ATA timing modes */ +#define WDDMA_GRPMASK 0xf8 +#define WDDMA_MODEMASK 0x07 /* flow-controlled PIO modes */ #define WDDMA_PIO 0x10 #define WDDMA_PIO3 0x10 @@ -299,11 +300,10 @@ struct wddma { #define WDDMA_MDMA2 0x22 /* Ultra DMA timing modes */ -#define WDDMA_UDMA 0x30 -#define WDDMA_UDMA0 0x30 -#define WDDMA_UDMA1 0x31 -#define WDDMA_UDMA2 0x32 -#endif +#define WDDMA_UDMA 0x40 +#define WDDMA_UDMA0 0x40 +#define WDDMA_UDMA1 0x41 +#define WDDMA_UDMA2 0x42 extern struct wddma wddma; |
