From f3ef306520a2b5a60f534fdf248d447a93e21106 Mon Sep 17 00:00:00 2001 From: niklas Date: Mon, 13 Jan 1997 23:38:27 +0000 Subject: [PATCH] preliminary support for the Apollo 060 accelerator Thanks a lot, Michael van Elst --- sys/arch/amiga/dev/ahscreg.h | 9 +++++++++ sys/arch/amiga/dev/sbicreg.h | 10 +++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) 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; -- 2.20.1