X-Git-Url: https://gitweb.dragonflybsd.org/~tuxillo/dragonfly.git/blobdiff_plain/0abb3638d857bc7bf8fad2069b1599d33a8fb3b0..c67c071b06ef9d4cc7c6ccffca2f5a27f0037c8d:/sys/dev/disk/aic/aic.c diff --git a/sys/dev/disk/aic/aic.c b/sys/dev/disk/aic/aic.c index 0bb02f5183..bcaaf261c3 100644 --- a/sys/dev/disk/aic/aic.c +++ b/sys/dev/disk/aic/aic.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/aic/aic.c,v 1.8 2000/01/14 23:42:35 imp Exp $ + * $FreeBSD: src/sys/dev/aic/aic.c,v 1.28 2009/05/13 22:31:25 des Exp $ */ #include @@ -43,26 +43,26 @@ #include "aic6360reg.h" #include "aicvar.h" -static void aic_action (struct cam_sim *sim, union ccb *ccb); -static void aic_execute_scb (void *arg, bus_dma_segment_t *dm_segs, +static void aic_action(struct cam_sim *sim, union ccb *ccb); +static void aic_execute_scb(void *arg, bus_dma_segment_t *dm_segs, int nseg, int error); -static void aic_start (struct aic_softc *aic); -static void aic_select (struct aic_softc *aic); -static void aic_selected (struct aic_softc *aic); -static void aic_reselected (struct aic_softc *aic); -static void aic_reconnect (struct aic_softc *aic, int tag); -static void aic_cmd (struct aic_softc *aic); -static void aic_msgin (struct aic_softc *aic); -static void aic_handle_msgin (struct aic_softc *aic); -static void aic_msgout (struct aic_softc *aic); -static void aic_datain (struct aic_softc *aic); -static void aic_dataout (struct aic_softc *aic); -static void aic_done (struct aic_softc *aic, struct aic_scb *scb); -static void aic_poll (struct cam_sim *sim); -static void aic_timeout (void *arg); -static void aic_scsi_reset (struct aic_softc *aic); -static void aic_chip_reset (struct aic_softc *aic); -static void aic_reset (struct aic_softc *aic, int initiate_reset); +static void aic_start(struct aic_softc *aic); +static void aic_select(struct aic_softc *aic); +static void aic_selected(struct aic_softc *aic); +static void aic_reselected(struct aic_softc *aic); +static void aic_reconnect(struct aic_softc *aic, int tag); +static void aic_cmd(struct aic_softc *aic); +static void aic_msgin(struct aic_softc *aic); +static void aic_handle_msgin(struct aic_softc *aic); +static void aic_msgout(struct aic_softc *aic); +static void aic_datain(struct aic_softc *aic); +static void aic_dataout(struct aic_softc *aic); +static void aic_done(struct aic_softc *aic, struct aic_scb *scb); +static void aic_poll(struct cam_sim *sim); +static void aic_timeout(void *arg); +static void aic_scsi_reset(struct aic_softc *aic); +static void aic_chip_reset(struct aic_softc *aic); +static void aic_reset(struct aic_softc *aic, int initiate_reset); devclass_t aic_devclass; @@ -167,7 +167,7 @@ aic_action(struct cam_sim *sim, union ccb *ccb) } case XPT_SET_TRAN_SETTINGS: { - struct ccb_trans_settings *cts = cts = &ccb->cts; + struct ccb_trans_settings *cts = &ccb->cts; struct aic_tinfo *ti = &aic->tinfo[ccb->ccb_h.target_id]; struct ccb_trans_settings_scsi *scsi = &cts->proto_specific.scsi;