diff options
| author | gibbs <gibbs@FreeBSD.org> | 1995-08-05 17:32:55 +0000 |
|---|---|---|
| committer | gibbs <gibbs@FreeBSD.org> | 1995-08-05 17:32:55 +0000 |
| commit | 8ef6697e87e448edbe28065fecdc3312b40c9b71 (patch) | |
| tree | dd331f456b83f595c3997a738e64d218cf0a09da /sys | |
| parent | 93a197827acd9c51555404741545204d026fed2c (diff) | |
| download | FreeBSD-src-8ef6697e87e448edbe28065fecdc3312b40c9b71.zip FreeBSD-src-8ef6697e87e448edbe28065fecdc3312b40c9b71.tar.gz | |
Update the SCB controll byte bit definitions to match new SCB_DISCENB bit.
Remove "#ifdef NOT_YET"s since the features they pertain too are committed
now.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/i386/scsi/aic7xxx.c | 6 | ||||
| -rw-r--r-- | sys/i386/scsi/aic7xxx.h | 17 |
2 files changed, 10 insertions, 13 deletions
diff --git a/sys/i386/scsi/aic7xxx.c b/sys/i386/scsi/aic7xxx.c index ec4e987..a8aac24 100644 --- a/sys/i386/scsi/aic7xxx.c +++ b/sys/i386/scsi/aic7xxx.c @@ -24,7 +24,7 @@ * * commenced: Sun Sep 27 18:14:01 PDT 1992 * - * $Id: aic7xxx.c,v 1.32 1995/07/17 23:35:16 gibbs Exp $ + * $Id: aic7xxx.c,v 1.33 1995/07/31 08:25:36 gibbs Exp $ */ /* * TODO: @@ -1308,9 +1308,7 @@ ahcintr(unit) } #endif bzero(scb, SCB_DOWN_SIZE); -#ifdef NOT_YET scb->control |= control & SCB_DISCENB; -#endif scb->flags |= SCB_SENSE; sc->op_code = REQUEST_SENSE; sc->byte2 = xs->sc_link->lun << 5; @@ -2178,10 +2176,8 @@ ahc_scsi_cmd(xs) if(ahc->tagenable & mask) scb->control |= SCB_TE; -#ifdef NOT_YET if(ahc->discenable & mask) scb->control |= SCB_DISCENB; -#endif if((ahc->needwdtr & mask) && !(ahc->wdtrpending & mask)) { scb->control |= SCB_NEEDWDTR; diff --git a/sys/i386/scsi/aic7xxx.h b/sys/i386/scsi/aic7xxx.h index 104530a..6d96f74 100644 --- a/sys/i386/scsi/aic7xxx.h +++ b/sys/i386/scsi/aic7xxx.h @@ -20,7 +20,7 @@ * 4. Modifications may be freely made to this file if the above conditions * are met. * - * $Id: aic7xxx.h,v 1.10 1995/06/11 19:31:31 rgrimes Exp $ + * $Id: aic7xxx.h,v 1.11 1995/07/04 21:14:45 gibbs Exp $ */ #ifndef _AIC7XXX_H_ @@ -73,14 +73,15 @@ struct scb { /* ------------ Begin hardware supported fields ---------------- */ /*1*/ u_char control; #define SCB_NEEDWDTR 0x80 /* Initiate Wide Negotiation */ -#define SCB_NEEDSDTR 0x40 /* Initiate Sync Negotiation */ +#define SCB_DISCENB 0x40 /* Disconnection Enable */ #define SCB_TE 0x20 /* Tag enable */ +#define SCB_NEEDSDTR 0x10 /* Initiate Sync Negotiation */ #define SCB_NEEDDMA 0x08 /* Refresh SCB from host ram */ -#define SCB_DIS 0x04 -#define SCB_TAG_TYPE 0x3 -#define SIMPLE_QUEUE 0x0 -#define HEAD_QUEUE 0x1 -#define OR_QUEUE 0x2 +#define SCB_DIS 0x04 +#define SCB_TAG_TYPE 0x03 +#define SIMPLE_QUEUE 0x00 +#define HEAD_QUEUE 0x01 +#define OR_QUEUE 0x02 /*2*/ u_char target_channel_lun; /* 4/1/3 bits */ /*3*/ u_char SG_segment_count; /*7*/ physaddr SG_list_pointer __attribute__ ((packed)); @@ -90,9 +91,9 @@ struct scb { /*15*/ u_char target_status; /*18*/ u_char residual_data_count[3]; /*19*/ u_char residual_SG_segment_count; -#define SCB_DOWN_SIZE 26 /* amount to actually download */ /*23*/ physaddr data __attribute__ ((packed)); /*26*/ u_char datalen[3]; +#define SCB_DOWN_SIZE 26 /* amount to actually download */ #define SCB_UP_SIZE 26 /* * amount we need to upload to perform * a request sense. |
