69c69
< /* $FreeBSD: head/sys/dev/esp/ncr53c9xvar.h 180692 2008-07-22 13:51:21Z marius $ */
---
> /* $FreeBSD: head/sys/dev/esp/ncr53c9xvar.h 182876 2008-09-08 20:20:44Z marius $ */
113,115c113,115
< * the scsipi_xfer struct (except do the expected updating of return values).
< * We'll generally update: xs->{flags,resid,error,sense,status} and
< * occasionally xs->retries.
---
> * the ccb union (except do the expected updating of return values).
> * We'll generally update: ccb->ccb_h.status and ccb->csio.{resid,
> * scsi_status,sense_data}.
132a133
> struct callout ch;
182a184,189
> struct ncr53c9x_xinfo {
> u_char period;
> u_char offset;
> u_char width;
> };
>
190,201c197,203
< #define T_NEGOTIATE 0x02 /* (Re)Negotiate synchronous options */
< #define T_SYNCMODE 0x08 /* SYNC mode has been negotiated */
< #define T_SYNCHOFF 0x10 /* SYNC mode for is permanently off */
< #define T_RSELECTOFF 0x20 /* RE-SELECT mode is off */
< #define T_TAG 0x40 /* Turn on TAG QUEUEs */
< #define T_WIDE 0x80 /* Negotiate wide options */
< #define T_WDTRSENT 0x04 /* WDTR message has been sent to */
< u_char period; /* Period suggestion */
< u_char offset; /* Offset suggestion */
< u_char cfg3; /* per target config 3 */
< u_char nextag; /* Next available tag */
< u_char width; /* width suggesion */
---
> #define T_SYNCHOFF 0x01 /* SYNC mode is permanently off */
> #define T_RSELECTOFF 0x02 /* RE-SELECT mode is off */
> #define T_TAG 0x04 /* Turn on TAG QUEUEs */
> #define T_SDTRSENT 0x08 /* SDTR message has been sent to */
> #define T_WDTRSENT 0x10 /* WDTR message has been sent to */
> struct ncr53c9x_xinfo curr;
> struct ncr53c9x_xinfo goal;
355d356
< int sc_maxsync; /* Maximum sync period */
380,385c381,384
< #define NCR_DOINGDMA 0x04 /* The FIFO data path is active! */
< #define NCR_SYNCHNEGO 0x08 /* Synch negotiation in progress. */
< #define NCR_ICCS 0x10 /* Expect status phase results */
< #define NCR_WAITI 0x20 /* Waiting for non-DMA data to arrive */
< #define NCR_ATN 0x40 /* ATN asserted */
< #define NCR_EXPECT_ILLCMD 0x80 /* Expect Illegal Command Interrupt */
---
> #define NCR_ICCS 0x04 /* Expect status phase results */
> #define NCR_WAITI 0x08 /* Waiting for non-DMA data to arrive */
> #define NCR_ATN 0x10 /* ATN asserted */
> #define NCR_EXPECT_ILLCMD 0x20 /* Expect Illegal Command Interrupt */
400,402c399,401
< #define SEND_WDTR 0x0040
< #define SEND_SDTR 0x0080
< #define SEND_TAG 0x0100
---
> #define SEND_TAG 0x0040
> #define SEND_WDTR 0x0080
> #define SEND_SDTR 0x0100
446a446,456
> * Macros for locking
> */
> #define NCR_LOCK_INIT(_sc) \
> mtx_init(&(_sc)->sc_lock, "ncr", "ncr53c9x lock", MTX_DEF);
> #define NCR_LOCK_INITIALIZED(_sc) mtx_initialized(&(_sc)->sc_lock)
> #define NCR_LOCK(_sc) mtx_lock(&(_sc)->sc_lock)
> #define NCR_UNLOCK(_sc) mtx_unlock(&(_sc)->sc_lock)
> #define NCR_LOCK_ASSERT(_sc, _what) mtx_assert(&(_sc)->sc_lock, (_what))
> #define NCR_LOCK_DESTROY(_sc) mtx_destroy(&(_sc)->sc_lock)
>
> /*
454a465
> #define NCRDMA_STOP(sc) (*(sc)->sc_glue->gl_dma_stop)((sc))
466,467d476
< void ncr53c9x_action(struct cam_sim *sim, union ccb *ccb);
< void ncr53c9x_reset(struct ncr53c9x_softc *sc);
469d477
< void ncr53c9x_init(struct ncr53c9x_softc *sc, int doreset);