diff options
Diffstat (limited to 'sys/dev/pci/pciide_apollo_reg.h')
| -rw-r--r-- | sys/dev/pci/pciide_apollo_reg.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sys/dev/pci/pciide_apollo_reg.h b/sys/dev/pci/pciide_apollo_reg.h index 6191d57f74e..07bbad4b104 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.4 2001/04/04 07:02:54 csapuntz Exp $ */ +/* $OpenBSD: pciide_apollo_reg.h,v 1.5 2001/07/20 05:56:25 csapuntz Exp $ */ /* $NetBSD: pciide_apollo_reg.h,v 1.8 2001/01/05 18:04:43 bouyer Exp $ */ /* @@ -88,7 +88,7 @@ /* UltraDMA control (586A/B and higher only) */ #define APO_UDMA 0x50 #define APO_UDMA_MASK(channel) (0xffff << ((1 - (channel)) << 4)) -#define APO_UDMA_TIME(channel, drive, x) (((x) & 0x3) << \ +#define APO_UDMA_TIME(channel, drive, x) (((x) & 0xf) << \ (((1 - (channel)) << 4) + ((1 - (drive)) << 3))) #define APO_UDMA_PIO_MODE(channel, drive) (0x20 << \ (((1 - (channel)) << 4) + ((1 - (drive)) << 3))) @@ -98,6 +98,8 @@ (((1 - (channel)) << 4) + ((1 - (drive)) << 3))) #define APO_UDMA_CLK66(channel) (0x08 << ((1 - (channel)) << 4)) -static int8_t apollo_udma_tim[] = {0x03, 0x02, 0x00, 0x02, 0x00}; +static int8_t apollo_udma100_tim[] = {0x0f, 0x07, 0x04, 0x02, 0x01, 0x00}; +static int8_t apollo_udma66_tim[] = {0x03, 0x03, 0x02, 0x01, 0x00}; +static int8_t apollo_udma33_tim[] = {0x03, 0x02, 0x00}; static int8_t apollo_pio_set[] = {0x0a, 0x0a, 0x0a, 0x02, 0x02}; static int8_t apollo_pio_rec[] = {0x08, 0x08, 0x08, 0x02, 0x00}; |