 @@ -1,14 +1,14 @@
-/*	$NetBSD: aic7xxx_osm.c,v 1.28 2009/05/05 09:51:24 cegger Exp $	*/
+/*	$NetBSD: aic7xxx_osm.c,v 1.29 2009/05/07 13:06:11 rjs Exp $	*/
 /*
  * Bus independent FreeBSD shim for the aic7xxx based adaptec SCSI controllers
+ *
  * Copyright (c) 1994-2001 Justin T. Gibbs.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions, and the following disclaimer,
  *    without modification.
 @@ -29,27 +29,27 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  * //depot/aic7xxx/freebsd/dev/aic7xxx/aic7xxx_osm.c#12 $
+ *
  * $FreeBSD: src/sys/dev/aic7xxx/aic7xxx_osm.c,v 1.31 2002/11/30 19:08:58 scottl Exp $
  */
 /*
  * Ported from FreeBSD by Pascal Renauld, Network Storage Solutions, Inc. - April 2003
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aic7xxx_osm.c,v 1.28 2009/05/05 09:51:24 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aic7xxx_osm.c,v 1.29 2009/05/07 13:06:11 rjs Exp $");
 #include <dev/ic/aic7xxx_osm.h>
 #include <dev/ic/aic7xxx_inline.h>
 #ifndef AHC_TMODE_ENABLE
 #define AHC_TMODE_ENABLE 0
 #endif
 static void	ahc_action(struct scsipi_channel *chan, scsipi_adapter_req_t req, void *arg);
 static void	ahc_execute_scb(void *arg, bus_dma_segment_t *dm_segs, int nsegments);
 static int	ahc_poll(struct ahc_softc *ahc, int wait);
 static void	ahc_setup_data(struct ahc_softc *ahc,
 @@ -236,53 +236,53 @@ ahc_done(struct ahc_softc *ahc, struct s
+	}
 	ahc_lock(ahc, &s);
 	ahc_free_scb(ahc, scb);
 	ahc_unlock(ahc, &s);
 	scsipi_done(xs);
+}
 static int
 ahc_ioctl(struct scsipi_channel *channel, u_long cmd, void *addr,
     int flag, struct proc *p)
+{
-	struct ahc_softc *ahc = (void *)channel->chan_adapter->adapt_dev;
+	struct ahc_softc *ahc = device_private(channel->chan_adapter->adapt_dev);
 	int s, ret = ENOTTY;
 	switch (cmd) {
 	case SCBUSIORESET:
 		s = splbio();
 		ahc_reset_channel(ahc, channel->chan_channel == 1 ? 'B' : 'A',
 		    TRUE);
 		splx(s);
 		ret = 0;
 		break;
 	default:
 		break;
+	}
 	return ret;
+}
 static void
 ahc_action(struct scsipi_channel *chan, scsipi_adapter_req_t req, void *arg)
+{
 	struct ahc_softc *ahc;
 	int s;
 	struct ahc_initiator_tinfo *tinfo;
 	struct ahc_tmode_tstate *tstate;
-	ahc  = (void *)chan->chan_adapter->adapt_dev;
+	ahc  = device_private(chan->chan_adapter->adapt_dev);
 	switch (req) {
 	case ADAPTER_REQ_RUN_XFER:
+	  {
 		struct scsipi_xfer *xs;
 		struct scsipi_periph *periph;
 		struct scb *scb;
 		struct hardware_scb *hscb;
 		u_int target_id;
 		u_int our_id;
 		u_long ss;
 @@ -465,27 +465,27 @@ ahc_execute_scb(void *arg, bus_dma_segme
 	struct scsipi_xfer *xs;
 	struct	ahc_softc *ahc;
 	struct	ahc_initiator_tinfo *tinfo;
 	struct	ahc_tmode_tstate *tstate;
 	u_int	mask;
 	long	s;
 	scb = (struct scb *)arg;
 	xs = scb->xs;
 	xs->error = 0;
 	xs->status = 0;
 	xs->xs_status = 0;
-	ahc = (void *)xs->xs_periph->periph_channel->chan_adapter->adapt_dev;
+	ahc = device_private(xs->xs_periph->periph_channel->chan_adapter->adapt_dev);
 	if (nsegments != 0) {
 		struct ahc_dma_seg *sg;
 		bus_dma_segment_t *end_seg;
 		int op;
 		end_seg = dm_segs + nsegments;
 		/* Copy the segments into our SG list */
 		sg = scb->sg_list;
 		while (dm_segs < end_seg) {
 			uint32_t len;