diff options
| author | gibbs <gibbs@FreeBSD.org> | 1996-05-10 16:11:03 +0000 |
|---|---|---|
| committer | gibbs <gibbs@FreeBSD.org> | 1996-05-10 16:11:03 +0000 |
| commit | eb170f09f59937486548d2434d26099ba6d7d61e (patch) | |
| tree | 1e071b29b9790403293312a3a243bd2269ab4ea3 /sys/dev | |
| parent | 0051725c48e0f4450ff9b5d78cce3f373066b48a (diff) | |
| download | FreeBSD-src-eb170f09f59937486548d2434d26099ba6d7d61e.zip FreeBSD-src-eb170f09f59937486548d2434d26099ba6d7d61e.tar.gz | |
aic7xxx.seq:
Change #ifdef linux to #ifdef __linux__
aic7xxx_reg.h:
Remove unneeded BOFF_60BCLOCKS
define CHIPRSTACK to be the same as CHIPRST
define RESET_SCSI and CHANNEL_B_PRIMARY bits
All of these aer used during the setup of adapters.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/aic7xxx/aic7xxx.seq | 4 | ||||
| -rw-r--r-- | sys/dev/aic7xxx/aic7xxx_reg.h | 7 |
2 files changed, 7 insertions, 4 deletions
diff --git a/sys/dev/aic7xxx/aic7xxx.seq b/sys/dev/aic7xxx/aic7xxx.seq index 10e97af..5a92ca2 100644 --- a/sys/dev/aic7xxx/aic7xxx.seq +++ b/sys/dev/aic7xxx/aic7xxx.seq @@ -39,7 +39,7 @@ * *-M************************************************************************/ -VERSION AIC7XXX_SEQ_VER "$Id: aic7xxx.seq,v 1.32 1996/03/31 03:02:33 gibbs Exp $" +VERSION AIC7XXX_SEQ_VER "$Id: aic7xxx.seq,v 1.33 1996/04/20 21:20:29 gibbs Exp $" #include "../../dev/aic7xxx/aic7xxx_reg.h" @@ -393,7 +393,7 @@ dma_finish2: * For Linux, we must throw away four bytes since there is a 32bit gap * in the middle of a struct scatterlist. */ -#ifdef linux +#ifdef __linux__ mov NONE,DFDAT mov NONE,DFDAT mov NONE,DFDAT diff --git a/sys/dev/aic7xxx/aic7xxx_reg.h b/sys/dev/aic7xxx/aic7xxx_reg.h index a0155da..aa5b008 100644 --- a/sys/dev/aic7xxx/aic7xxx_reg.h +++ b/sys/dev/aic7xxx/aic7xxx_reg.h @@ -28,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: aic7xxx_reg.h,v 1.7 1996/03/31 03:02:37 gibbs Exp $ + * $Id: aic7xxx_reg.h,v 1.8 1996/04/20 21:20:31 gibbs Exp $ */ /* @@ -372,7 +372,6 @@ #define BUSTIME 0x085 #define BOFF 0xf0 #define BON 0x0f -#define BOFF_60BCLKS 0xf0 /* * Bus Speed (p. 3-45) @@ -396,6 +395,7 @@ #define PAUSE 0x04 #define INTEN 0x02 #define CHIPRST 0x01 +#define CHIPRSTACK 0x01 /* * Interrupt Status (p. 3-50) @@ -741,11 +741,14 @@ #define SAVED_SCBPTR 0x051 #define SCSICONF 0x05a +#define RESET_SCSI 0x40 + #define HOSTCONF 0x05d #define HA_274_BIOSCTRL 0x05f #define BIOSMODE 0x30 #define BIOSDISABLED 0x30 +#define CHANNEL_B_PRIMARY 0x08 /* Message codes */ #define MSG_EXTENDED 0x01 |
