diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1996-11-28 23:33:10 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1996-11-28 23:33:10 +0000 |
| commit | 22d35c6b496718de60c740eab6f843bb546513b3 (patch) | |
| tree | 766206f156d7508bb8ca05d72b64b008be886abc /sys/arch/amiga/isa/crossreg.h | |
| parent | 1c7998136960f5cd78adc56dff1c8f9352da3445 (diff) | |
Adaption to new bus.h from NetBSD. Various driver has been updated to
NetBSD 961107 state. Other has not, partly because sometimes the bus.h
changes was coupled with other changes.
Diffstat (limited to 'sys/arch/amiga/isa/crossreg.h')
| -rw-r--r-- | sys/arch/amiga/isa/crossreg.h | 46 |
1 files changed, 24 insertions, 22 deletions
diff --git a/sys/arch/amiga/isa/crossreg.h b/sys/arch/amiga/isa/crossreg.h index 46a0d483b2a..d4de90635ce 100644 --- a/sys/arch/amiga/isa/crossreg.h +++ b/sys/arch/amiga/isa/crossreg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: crossreg.h,v 1.3 1996/06/04 13:40:13 niklas Exp $ */ +/* $OpenBSD: crossreg.h,v 1.4 1996/11/28 23:33:07 niklas Exp $ */ /* * Copyright (c) 1994, 1996 Niklas Hallqvist, Carsten Hammer @@ -100,36 +100,38 @@ /* hardware offsets from config address */ -#define CROSS_XL_ROM 0x8000 -#define CROSS_XL_MEM 0x4000 -#define CROSS_XL_IO 0x0000 +#define CROSS_XL_ROM 0x8000 +#define CROSS_XL_MEM 0x4000 +#define CROSS_XL_IO 0x0000 -#define CROSS_XLP_INTSTAT 0 -#define CROSS_XLP_INTABLE 0 -#define CROSS_XLP_LATCH 2 +#define CROSS_BANK_SIZE (CROSS_XL_ROM - CROSS_XL_MEM) + +#define CROSS_XLP_INTSTAT 0 +#define CROSS_XLP_INTABLE 0 +#define CROSS_XLP_LATCH 2 #define CROSS_HANDLE_TO_XLP_LATCH(va) \ ((volatile u_int16_t *)(((va) & 0xffff) | CROSS_XLP_LATCH)) -#define CROSS_MEMORY_OFFSET (CROSS_XL_MEM - 2 * 0x90000) -#define CROSS_SBHE 0x40 +#define CROSS_MEMORY_OFFSET (CROSS_XL_MEM - 2 * 0x90000) +#define CROSS_SBHE 0x40 #define CROSS_STATUS_ADDR(va) \ ((volatile u_int16_t *)((va) + CROSS_XLP_INTSTAT)) -#define CROSS_MASTER 5 +#define CROSS_MASTER 5 -#define CROSS_IRQ9 10 /* IRQ9 is an alias of IRQ2 */ -#define CROSS_IRQ3 11 -#define CROSS_IRQ4 12 -#define CROSS_IRQ5 13 -#define CROSS_IRQ6 14 -#define CROSS_IRQ7 15 -#define CROSS_IRQ10 2 -#define CROSS_IRQ11 3 -#define CROSS_IRQ12 4 -#define CROSS_IRQ14 6 -#define CROSS_IRQ15 7 -#define CROSS_IRQMASK 0xfcdc +#define CROSS_IRQ9 10 /* IRQ9 is an alias of IRQ2 */ +#define CROSS_IRQ3 11 +#define CROSS_IRQ4 12 +#define CROSS_IRQ5 13 +#define CROSS_IRQ6 14 +#define CROSS_IRQ7 15 +#define CROSS_IRQ10 2 +#define CROSS_IRQ11 3 +#define CROSS_IRQ12 4 +#define CROSS_IRQ14 6 +#define CROSS_IRQ15 7 +#define CROSS_IRQMASK 0xfcdc #define CROSS_GET_INT_STATUS(va) (CROSS_GET_STATUS(va) & CROSS_IRQMASK) #define CROSS_ENABLE_INTS(va, ints) \ |