diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1997-01-13 23:38:29 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1997-01-13 23:38:29 +0000 |
| commit | 25565935f360e25b81e549859be0ee4ae735de51 (patch) | |
| tree | 0d95cddf49735970f99839944e09fdd1abd8dc28 /sys/arch/amiga/dev | |
| parent | 517cb32d6b50cbbf573a47f2113ed06921e1319c (diff) | |
preliminary support for the Apollo 060 accelerator
Thanks a lot, Michael van Elst <mlelstv@serpens.swb.de>
Diffstat (limited to 'sys/arch/amiga/dev')
| -rw-r--r-- | sys/arch/amiga/dev/ahscreg.h | 9 | ||||
| -rw-r--r-- | sys/arch/amiga/dev/sbicreg.h | 10 |
2 files changed, 18 insertions, 1 deletions
diff --git a/sys/arch/amiga/dev/ahscreg.h b/sys/arch/amiga/dev/ahscreg.h index 5ff349050ea..81bcab615c9 100644 --- a/sys/arch/amiga/dev/ahscreg.h +++ b/sys/arch/amiga/dev/ahscreg.h @@ -68,10 +68,19 @@ struct sdmac { int pad6[7]; short pad7; vu_short SP_DMA; /* Stop DMA Transfers RW-Strobe */ +#ifndef APOLLO char pad8; vu_char SASR; /* sbic asr */ char pad9; vu_char SCMD; /* sbic data */ +#else + short pad8; + char pad9; + vu_char SASR; /* sbic asr */ + short pad10; + char pad11; + vu_char SCMD; /* sbic data */ +#endif }; /* diff --git a/sys/arch/amiga/dev/sbicreg.h b/sys/arch/amiga/dev/sbicreg.h index 6d0e49523a5..088d3e3177a 100644 --- a/sys/arch/amiga/dev/sbicreg.h +++ b/sys/arch/amiga/dev/sbicreg.h @@ -310,9 +310,17 @@ #define SBIC_MACHINE_DMA_MODE SBIC_CTL_DMA typedef struct { +#ifdef APOLLO + PAD(pad1); + PAD(pad2); +#endif volatile unsigned char sbic_asr; /* r : Aux Status Register */ #define sbic_address sbic_asr /* w : desired register no */ - PAD(pad1); + PAD(pad3); +#ifdef APOLLO + PAD(pad4); + PAD(pad5); +#endif volatile unsigned char sbic_value; /* rw: register value */ } sbic_padded_ind_regmap_t; typedef volatile sbic_padded_ind_regmap_t *sbic_regmap_p; |