diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 1997-03-03 00:25:05 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 1997-03-03 00:25:05 +0000 |
| commit | 9fa1bac5dc7ddac9616341845d4ff5a3147885df (patch) | |
| tree | e7c37d9c02f2c111b5e987700d1abb8174fbd807 /sys/dev/pci/ncr_reg.h | |
| parent | e516a54a925181933c9f41012fd91250b1b683b7 (diff) | |
Sync with NetBSD which is syncing with FreeBSD, whee!
OpenBSD-specific changes are surrounded by #ifdef __OpenBSD__
or #ifndef __OpenBSD__
Diffstat (limited to 'sys/dev/pci/ncr_reg.h')
| -rw-r--r-- | sys/dev/pci/ncr_reg.h | 27 |
1 files changed, 22 insertions, 5 deletions
diff --git a/sys/dev/pci/ncr_reg.h b/sys/dev/pci/ncr_reg.h index a5d62688ff8..543f1988c3e 100644 --- a/sys/dev/pci/ncr_reg.h +++ b/sys/dev/pci/ncr_reg.h @@ -1,11 +1,11 @@ -/* $OpenBSD: ncr_reg.h,v 1.4 1996/10/13 20:36:16 downsj Exp $ */ -/* $NetBSD: ncr_reg.h,v 1.8 1996/03/11 23:06:04 cgd Exp $ */ +/* $OpenBSD: ncr_reg.h,v 1.5 1997/03/03 00:25:04 millert Exp $ */ +/* $NetBSD: ncr_reg.h,v 1.10 1997/01/10 05:57:14 perry Exp $ */ /************************************************************************** ** ** Device driver for the NCR 53C810 PCI-SCSI-Controller. ** -** 386bsd / FreeBSD / NetBSD / OpenBSD +** FreeBSD / NetBSD / OpenBSD ** **------------------------------------------------------------------------- ** @@ -173,12 +173,18 @@ struct ncr_reg { #define CSIGP 0x40 /*1b*/ U_INT8 nc_ctest3; - #define CLF 0x04 /* clear scsi fifo */ + #define FLF 0x08 /* cmd: flush dma fifo */ + #define CLF 0x04 /* cmd: clear dma fifo */ + #define FM 0x02 /* mod: fetch pin mode */ + #define WRIE 0x01 /* mod: write and invalidate enable */ /*1c*/ U_INT32 nc_temp; /* ### Temporary stack */ /*20*/ U_INT8 nc_dfifo; /*21*/ U_INT8 nc_ctest4; + #define BDIS 0x80 /* mod: burst disable */ + #define MPEE 0x08 /* mod: master parity error enable */ + /*22*/ U_INT8 nc_ctest5; /*23*/ U_INT8 nc_ctest6; @@ -189,12 +195,23 @@ struct ncr_reg { /*34*/ U_INT32 nc_scratcha; /* ??? Temporary register a */ /*38*/ U_INT8 nc_dmode; + #define BL_2 0x80 /* mod: burst length shift value +2 */ + #define BL_1 0x40 /* mod: burst length shift value +1 */ + #define ERL 0x08 /* mod: enable read line */ + #define ERMP 0x04 /* mod: enable read multiple */ + #define BOF 0x02 /* mod: burst op code fetch */ + /*39*/ U_INT8 nc_dien; /*3a*/ U_INT8 nc_dwt; /*3b*/ U_INT8 nc_dcntl; /* --> Script execution control */ + #define CLSE 0x80 /* mod: cache line size enable */ + #define PFF 0x40 /* cmd: pre-fetch flush */ + #define PFEN 0x20 /* mod: pre-fetch enable */ #define SSM 0x10 /* mod: single step mode */ + #define IRQM 0x08 /* mod: irq mode (1 = totem pole !) */ #define STD 0x04 /* cmd: start dma mode */ + #define IRQD 0x02 /* mod: irq disable */ #define NOCOM 0x01 /* cmd: protect sfbr while reselect */ /*3c*/ U_INT32 nc_adder; @@ -585,7 +602,7 @@ struct scr_tblsel { #define M_X_MODIFY_DP (0x00) #define M_X_SYNC_REQ (0x01) #define M_X_WIDE_REQ (0x03) -#endif +#endif /* __NetBSD__ || __OpenBSD__ */ /* |