17c17
< * the GNU Public License ("GPL").
---
> * GNU Public License ("GPL").
31c31
< * $FreeBSD: head/sys/dev/aic7xxx/aic7xxx.reg 58258 2000-03-18 22:28:20Z gibbs $
---
> * $FreeBSD: head/sys/dev/aic7xxx/aic7xxx.reg 63457 2000-07-18 20:12:14Z gibbs $
174a175,176
> mask TWIN_TID 0x70
> bit TWIN_CHNLB 0x80
707d708
< mask HOST_REQ_INT 0x10
749c750
< * Gate one of the four SCBs into the SCBARRAY window.
---
> * Gate one of the SCBs into the SCBARRAY window.
771c772
< mask UPDATE_TMSG_REQ 0x60|SEQINT /* Update TMSG_REQ values */
---
> mask IGN_WIDE_RES 0x40|SEQINT /* Complex IGN Wide Res Msg */
774c775
< mask TRACE_POINT 0x90|SEQINT
---
> mask TRACEPOINT2 0x90|SEQINT
790,794d790
< mask MSGIN_PHASEMIS 0xe0|SEQINT /*
< * Target changed phase on us
< * when we were expecting
< * another msgin byte.
< */
965,971c961,967
< bit TARGET_SCB 0x80
< bit DISCENB 0x40
< bit TAG_ENB 0x20
< bit MK_MESSAGE 0x10
< bit ULTRAENB 0x08
< bit DISCONNECTED 0x04
< mask SCB_TAG_TYPE 0x03
---
> bit TARGET_SCB 0x80
> bit DISCENB 0x40
> bit TAG_ENB 0x20
> bit MK_MESSAGE 0x10
> bit ULTRAENB 0x08
> bit DISCONNECTED 0x04
> mask SCB_TAG_TYPE 0x03
973c969
< SCB_TCL {
---
> SCB_SCSIID {
975,977c971,974
< bit SELBUSB 0x08
< mask TID 0xf0
< mask LID 0x07
---
> bit TWIN_CHNLB 0x80
> mask TWIN_TID 0x70
> mask TID 0xf0
> mask OID 0x0f
979c976,977
< SCB_TARGET_STATUS {
---
> SCB_LUN {
> mask LID 0xff
982c980
< SCB_SGCOUNT {
---
> SCB_CDB_LEN {
985c983
< SCB_SGPTR {
---
> SCB_CDB_PTR {
986a985,987
> alias SCB_RESIDUAL_DATACNT
> alias SCB_CDB_STORE
> alias SCB_TARGET_INFO
988c989,992
< SCB_RESID_SGCNT {
---
> SCB_RESIDUAL_SGPTR {
> size 4
> }
> SCB_SCSI_STATUS {
991c995
< SCB_RESID_DCNT {
---
> SCB_CDB_STORE_PAD {
999,1000c1003,1004
< * Really only 3 bytes, but padded to make
< * the kernel's job easier.
---
> * The last byte is really the high address bits for
> * the data address.
1002a1007,1008
> bit SG_LAST_SEG 0x80 /* In the fourth byte */
> mask SG_HIGH_ADDR_BITS 0x7F /* In the fourth byte */
1004,1006c1010
< SCB_CMDPTR {
< alias SCB_TARGET_PHASES
< bit TARGET_DATA_IN 0x1 /* In the second byte */
---
> SCB_SGPTR {
1007a1012,1014
> bit SG_RESID_VALID 0x04 /* In the first byte */
> bit SG_FULL_RESID 0x02 /* In the first byte */
> bit SG_LIST_NULL 0x01 /* In the first byte */
1009,1012d1015
< SCB_CMDLEN {
< alias SCB_INITIATOR_TAG
< size 1
< }
1016,1018d1018
< SCB_NEXT {
< size 1
< }
1025,1026c1025,1026
< SCB_SPARE {
< size 3
---
> SCB_NEXT {
> size 1
1028c1028
< SCB_CMDSTORE {
---
> SCB_64_BTT {
1031,1032c1031,1032
< SCB_CMDSTORE_BUSADDR {
< size 4
---
> SCB_64_SPARE {
> size 16
1034,1036d1033
< SCB_64BYTE_SPARE {
< size 12
< }
1039,1040c1036,1037
< const SCB_32BYTE_SIZE 28
< const SCB_64BYTE_SIZE 48
---
> const SCB_32BYTE_SIZE 30 /* Cards supporting 32byte scbs */
> const SCB_64BYTE_SIZE 32 /* Cards supporting 64byte scbs */
1086c1083
< bit FLAG 0x02
---
> bit SG_FETCH_NEEDED 0x02 /* Bit used for software state */
1167,1168c1164,1165
< register SG_CACHEPTR {
< access_mode RW
---
> register SG_CACHE_PRE {
> access_mode WO
1170c1167,1168
< mask SG_USER_DATA 0xfc
---
> mask SG_ADDR_MASK 0xf8
> bit ODD_SEG 0x04
1174a1173,1180
> register SG_CACHE_SHADOW {
> access_mode RO
> address 0x0fc
> mask SG_ADDR_MASK 0xf8
> bit ODD_SEG 0x04
> bit LAST_SEG 0x02
> bit LAST_SEG_DONE 0x01
> }
1196,1197c1202,1206
< TARG_SCSIRATE {
< alias CMDSIZE_TABLE
---
> CMDSIZE_TABLE {
> alias TARG_SCSIRATE
> size 8
> }
> BUSY_TARGETS {
1236a1246
> bit TARGET_CMD_IS_TAGGED 0x40
1250c1260
< SAVED_TCL {
---
> SAVED_SCSIID {
1253,1254c1263
< /* Working value of the number of SG segments left */
< SG_COUNT {
---
> SAVED_LUN {
1257,1260d1265
< /* Working value of SG pointer */
< SG_NEXT {
< size 4
< }
1307,1308c1312,1314
< * Address of the 256 byte array storing the SCBID of outstanding
< * untagged SCBs indexed by TCL.
---
> * Base address of our shared data with the kernel driver in host
> * memory. This includes the qinfifo, qoutfifo, and target mode
> * incoming command queue.
1310c1316
< SCBID_ADDR {
---
> SHARED_DATA_ADDR {
1313,1319d1318
< /*
< * Address of the array of command descriptors used to store
< * information about incoming selections.
< */
< TMODE_CMDADDR {
< size 4
< }
1364,1371d1362
< * Number of times we have filled the CCSGRAM with prefetched
< * SG elements.
< */
< PREFETCH_CNT {
< size 1
< }
<
< /*
1443a1435
> const TID_SHIFT 4
1450,1454d1441
< /* Offsets into the SCBID array where different data is stored */
< const QOUTFIFO_OFFSET 0
< const QINFIFO_OFFSET 1
< const UNTAGGEDSCB_OFFSET 2
<
1469,1470d1455
< const TCL_TARGET_SHIFT 4
<
1472c1457,1462
< const STATUS_QUEUE_FULL 0x28
---
> const STATUS_QUEUE_FULL 0x28
> const SCB_TARGET_PHASES 0
> const SCB_TARGET_DATA_DIR 1
> const SCB_TARGET_STATUS 2
> const SCB_INITIATOR_TAG 3
> const TARGET_DATA_IN 1
1477,1483c1467,1469
<
< /*
< * Number of command descriptors in the command descriptor array.
< * No longer used, but left here as an example for how downloaded
< * constantants can be defined.
< const TMODE_NUMCMDS download
< */
---
> /* Offsets into the SCBID array where different data is stored */
> const QOUTFIFO_OFFSET download
> const QINFIFO_OFFSET download
< * the GNU Public License ("GPL").
---
> * GNU Public License ("GPL").
31c31
< * $FreeBSD: head/sys/dev/aic7xxx/aic7xxx.reg 58258 2000-03-18 22:28:20Z gibbs $
---
> * $FreeBSD: head/sys/dev/aic7xxx/aic7xxx.reg 63457 2000-07-18 20:12:14Z gibbs $
174a175,176
> mask TWIN_TID 0x70
> bit TWIN_CHNLB 0x80
707d708
< mask HOST_REQ_INT 0x10
749c750
< * Gate one of the four SCBs into the SCBARRAY window.
---
> * Gate one of the SCBs into the SCBARRAY window.
771c772
< mask UPDATE_TMSG_REQ 0x60|SEQINT /* Update TMSG_REQ values */
---
> mask IGN_WIDE_RES 0x40|SEQINT /* Complex IGN Wide Res Msg */
774c775
< mask TRACE_POINT 0x90|SEQINT
---
> mask TRACEPOINT2 0x90|SEQINT
790,794d790
< mask MSGIN_PHASEMIS 0xe0|SEQINT /*
< * Target changed phase on us
< * when we were expecting
< * another msgin byte.
< */
965,971c961,967
< bit TARGET_SCB 0x80
< bit DISCENB 0x40
< bit TAG_ENB 0x20
< bit MK_MESSAGE 0x10
< bit ULTRAENB 0x08
< bit DISCONNECTED 0x04
< mask SCB_TAG_TYPE 0x03
---
> bit TARGET_SCB 0x80
> bit DISCENB 0x40
> bit TAG_ENB 0x20
> bit MK_MESSAGE 0x10
> bit ULTRAENB 0x08
> bit DISCONNECTED 0x04
> mask SCB_TAG_TYPE 0x03
973c969
< SCB_TCL {
---
> SCB_SCSIID {
975,977c971,974
< bit SELBUSB 0x08
< mask TID 0xf0
< mask LID 0x07
---
> bit TWIN_CHNLB 0x80
> mask TWIN_TID 0x70
> mask TID 0xf0
> mask OID 0x0f
979c976,977
< SCB_TARGET_STATUS {
---
> SCB_LUN {
> mask LID 0xff
982c980
< SCB_SGCOUNT {
---
> SCB_CDB_LEN {
985c983
< SCB_SGPTR {
---
> SCB_CDB_PTR {
986a985,987
> alias SCB_RESIDUAL_DATACNT
> alias SCB_CDB_STORE
> alias SCB_TARGET_INFO
988c989,992
< SCB_RESID_SGCNT {
---
> SCB_RESIDUAL_SGPTR {
> size 4
> }
> SCB_SCSI_STATUS {
991c995
< SCB_RESID_DCNT {
---
> SCB_CDB_STORE_PAD {
999,1000c1003,1004
< * Really only 3 bytes, but padded to make
< * the kernel's job easier.
---
> * The last byte is really the high address bits for
> * the data address.
1002a1007,1008
> bit SG_LAST_SEG 0x80 /* In the fourth byte */
> mask SG_HIGH_ADDR_BITS 0x7F /* In the fourth byte */
1004,1006c1010
< SCB_CMDPTR {
< alias SCB_TARGET_PHASES
< bit TARGET_DATA_IN 0x1 /* In the second byte */
---
> SCB_SGPTR {
1007a1012,1014
> bit SG_RESID_VALID 0x04 /* In the first byte */
> bit SG_FULL_RESID 0x02 /* In the first byte */
> bit SG_LIST_NULL 0x01 /* In the first byte */
1009,1012d1015
< SCB_CMDLEN {
< alias SCB_INITIATOR_TAG
< size 1
< }
1016,1018d1018
< SCB_NEXT {
< size 1
< }
1025,1026c1025,1026
< SCB_SPARE {
< size 3
---
> SCB_NEXT {
> size 1
1028c1028
< SCB_CMDSTORE {
---
> SCB_64_BTT {
1031,1032c1031,1032
< SCB_CMDSTORE_BUSADDR {
< size 4
---
> SCB_64_SPARE {
> size 16
1034,1036d1033
< SCB_64BYTE_SPARE {
< size 12
< }
1039,1040c1036,1037
< const SCB_32BYTE_SIZE 28
< const SCB_64BYTE_SIZE 48
---
> const SCB_32BYTE_SIZE 30 /* Cards supporting 32byte scbs */
> const SCB_64BYTE_SIZE 32 /* Cards supporting 64byte scbs */
1086c1083
< bit FLAG 0x02
---
> bit SG_FETCH_NEEDED 0x02 /* Bit used for software state */
1167,1168c1164,1165
< register SG_CACHEPTR {
< access_mode RW
---
> register SG_CACHE_PRE {
> access_mode WO
1170c1167,1168
< mask SG_USER_DATA 0xfc
---
> mask SG_ADDR_MASK 0xf8
> bit ODD_SEG 0x04
1174a1173,1180
> register SG_CACHE_SHADOW {
> access_mode RO
> address 0x0fc
> mask SG_ADDR_MASK 0xf8
> bit ODD_SEG 0x04
> bit LAST_SEG 0x02
> bit LAST_SEG_DONE 0x01
> }
1196,1197c1202,1206
< TARG_SCSIRATE {
< alias CMDSIZE_TABLE
---
> CMDSIZE_TABLE {
> alias TARG_SCSIRATE
> size 8
> }
> BUSY_TARGETS {
1236a1246
> bit TARGET_CMD_IS_TAGGED 0x40
1250c1260
< SAVED_TCL {
---
> SAVED_SCSIID {
1253,1254c1263
< /* Working value of the number of SG segments left */
< SG_COUNT {
---
> SAVED_LUN {
1257,1260d1265
< /* Working value of SG pointer */
< SG_NEXT {
< size 4
< }
1307,1308c1312,1314
< * Address of the 256 byte array storing the SCBID of outstanding
< * untagged SCBs indexed by TCL.
---
> * Base address of our shared data with the kernel driver in host
> * memory. This includes the qinfifo, qoutfifo, and target mode
> * incoming command queue.
1310c1316
< SCBID_ADDR {
---
> SHARED_DATA_ADDR {
1313,1319d1318
< /*
< * Address of the array of command descriptors used to store
< * information about incoming selections.
< */
< TMODE_CMDADDR {
< size 4
< }
1364,1371d1362
< * Number of times we have filled the CCSGRAM with prefetched
< * SG elements.
< */
< PREFETCH_CNT {
< size 1
< }
<
< /*
1443a1435
> const TID_SHIFT 4
1450,1454d1441
< /* Offsets into the SCBID array where different data is stored */
< const QOUTFIFO_OFFSET 0
< const QINFIFO_OFFSET 1
< const UNTAGGEDSCB_OFFSET 2
<
1469,1470d1455
< const TCL_TARGET_SHIFT 4
<
1472c1457,1462
< const STATUS_QUEUE_FULL 0x28
---
> const STATUS_QUEUE_FULL 0x28
> const SCB_TARGET_PHASES 0
> const SCB_TARGET_DATA_DIR 1
> const SCB_TARGET_STATUS 2
> const SCB_INITIATOR_TAG 3
> const TARGET_DATA_IN 1
1477,1483c1467,1469
<
< /*
< * Number of command descriptors in the command descriptor array.
< * No longer used, but left here as an example for how downloaded
< * constantants can be defined.
< const TMODE_NUMCMDS download
< */
---
> /* Offsets into the SCBID array where different data is stored */
> const QOUTFIFO_OFFSET download
> const QINFIFO_OFFSET download