diff options
| author | nsouch <nsouch@FreeBSD.org> | 1999-01-30 15:35:39 +0000 |
|---|---|---|
| committer | nsouch <nsouch@FreeBSD.org> | 1999-01-30 15:35:39 +0000 |
| commit | 10ef2b8422913dafa8c05f64b5d0c07a3d2ad9c0 (patch) | |
| tree | 40df97b8849853b739d2d4fdbd234d29a62ee63a /sys/dev/ppc/ppcreg.h | |
| parent | c9bc4bf0090c71bd80805b53e37129f6052a7407 (diff) | |
| download | FreeBSD-src-10ef2b8422913dafa8c05f64b5d0c07a3d2ad9c0.zip FreeBSD-src-10ef2b8422913dafa8c05f64b5d0c07a3d2ad9c0.tar.gz | |
Distinguish EPP address/data register. Add EPP address register access to ppi.
Change microseq offsets. Previously, offsets of the program counter where
added to the index of the current microinstruction. Make them rely on the
index of the next executed microinstruction.
Suggested by: Luigi Rizzo <luigi@labinfo.iet.unipi.it>
Diffstat (limited to 'sys/dev/ppc/ppcreg.h')
| -rw-r--r-- | sys/dev/ppc/ppcreg.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sys/dev/ppc/ppcreg.h b/sys/dev/ppc/ppcreg.h index c847e6c..3a61ae7 100644 --- a/sys/dev/ppc/ppcreg.h +++ b/sys/dev/ppc/ppcreg.h @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: ppcreg.h,v 1.6 1999/01/10 12:04:53 nsouch Exp $ + * $Id: ppcreg.h,v 1.7 1999/01/10 16:41:13 nsouch Exp $ * */ #ifndef __PPCREG_H @@ -102,6 +102,7 @@ struct ppc_data { #define PPC_ECP_A_FIFO 0 /* ECP Address fifo register */ #define PPC_SPP_STR 1 /* SPP status register */ #define PPC_SPP_CTR 2 /* SPP control register */ +#define PPC_EPP_ADDR 3 /* EPP address register (8 bit) */ #define PPC_EPP_DATA 4 /* EPP data register (8, 16 or 32 bit) */ #define PPC_ECP_D_FIFO 0x400 /* ECP Data fifo register */ #define PPC_ECP_CNFGA 0x400 /* Configuration register A */ @@ -125,7 +126,8 @@ struct ppc_data { #define r_dtr(ppc) (inb((ppc)->ppc_base + PPC_SPP_DTR)) #define r_str(ppc) (inb((ppc)->ppc_base + PPC_SPP_STR)) #define r_ctr(ppc) (inb((ppc)->ppc_base + PPC_SPP_CTR)) -#define r_epp(ppc) (inb((ppc)->ppc_base + PPC_EPP_DATA)) +#define r_epp_A(ppc) (inb((ppc)->ppc_base + PPC_EPP_ADDR)) +#define r_epp_D(ppc) (inb((ppc)->ppc_base + PPC_EPP_DATA)) #define r_cnfgA(ppc) (inb((ppc)->ppc_base + PPC_ECP_CNFGA)) #define r_cnfgB(ppc) (inb((ppc)->ppc_base + PPC_ECP_CNFGB)) #define r_ecr(ppc) (inb((ppc)->ppc_base + PPC_ECP_ECR)) @@ -134,7 +136,8 @@ struct ppc_data { #define w_dtr(ppc,byte) outb((ppc)->ppc_base + PPC_SPP_DTR, byte) #define w_str(ppc,byte) outb((ppc)->ppc_base + PPC_SPP_STR, byte) #define w_ctr(ppc,byte) outb((ppc)->ppc_base + PPC_SPP_CTR, byte) -#define w_epp(ppc,byte) outb((ppc)->ppc_base + PPC_EPP_DATA, byte) +#define w_epp_A(ppc,byte) outb((ppc)->ppc_base + PPC_EPP_ADDR, byte) +#define w_epp_D(ppc,byte) outb((ppc)->ppc_base + PPC_EPP_DATA, byte) #define w_ecr(ppc,byte) outb((ppc)->ppc_base + PPC_ECP_ECR, byte) #define w_fifo(ppc,byte) outb((ppc)->ppc_base + PPC_ECP_D_FIFO, byte) |
