diff options
| author | Jeremy Evans <jeremy@cvs.openbsd.org> | 2001-01-08 19:54:10 +0000 |
|---|---|---|
| committer | Jeremy Evans <jeremy@cvs.openbsd.org> | 2001-01-08 19:54:10 +0000 |
| commit | 47456a8059452b0a97d33183f0d8e196a3faf46a (patch) | |
| tree | 4e9f725e0a12e2f6dc5560a204f762c1a06f8e74 /sys/dev/pci/pciide_apollo_reg.h | |
| parent | e27d378827369ac4f61095b082ff159bf33845ec (diff) | |
From chris@
Partial sync w/NetBSD
-Support Ultra/100 on Intel ICH2 (Tomokazu HARADA)
-Support Ultra/66 on VIA Apollo (Manuel Bouyer)
-Disable 16bit io-space limitation on Promise (Charles Hannum)
Diffstat (limited to 'sys/dev/pci/pciide_apollo_reg.h')
| -rw-r--r-- | sys/dev/pci/pciide_apollo_reg.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sys/dev/pci/pciide_apollo_reg.h b/sys/dev/pci/pciide_apollo_reg.h index 7464142bbda..89738b61206 100644 --- a/sys/dev/pci/pciide_apollo_reg.h +++ b/sys/dev/pci/pciide_apollo_reg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pciide_apollo_reg.h,v 1.2 2000/06/05 09:18:10 chris Exp $ */ +/* $OpenBSD: pciide_apollo_reg.h,v 1.3 2001/01/08 19:54:09 jeremy Exp $ */ /* $NetBSD: pciide_apollo_reg.h,v 1.4 1998/12/16 12:48:46 bouyer Exp $ */ /* @@ -86,7 +86,7 @@ /* misc timings control */ #define APO_MISCTIM 0x4c -/* Ultra-DMA/33 control (586A/B only) */ +/* UltraDMA control (586A/B and higher only) */ #define APO_UDMA 0x50 #define AP0_UDMA_MASK(channel) (0xffff << ((1 - (channel)) << 4)) #define APO_UDMA_TIME(channel, drive, x) (((x) & 0x3) << \ @@ -97,7 +97,8 @@ (((1 - (channel)) << 4) + ((1 - (drive)) << 3))) #define APO_UDMA_EN_MTH(channel, drive) (0x80 << \ (((1 - (channel)) << 4) + ((1 - (drive)) << 3))) +#define APO_UDMA_CLK66(channel) (0x08 << ((1 - (channel)) << 4)) -static int8_t apollo_udma_tim[] = {0x03, 0x02, 0x00}; +static int8_t apollo_udma_tim[] = {0x03, 0x02, 0x00, 0x02, 0x00}; static int8_t apollo_pio_set[] = {0x0a, 0x0a, 0x0a, 0x02, 0x02}; static int8_t apollo_pio_rec[] = {0x08, 0x08, 0x08, 0x02, 0x00}; |