From: Sascha Wildner Date: Mon, 22 Aug 2011 16:38:26 +0000 (+0200) Subject: mly(4): Reduce diffs with FreeBSD and update CVS IDs. X-Git-Tag: v2.12.0~133 X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/61dde7e02813346b589ee3ad4f6667794e5e939f mly(4): Reduce diffs with FreeBSD and update CVS IDs. --- diff --git a/share/man/man4/mly.4 b/share/man/man4/mly.4 index d1cf39c48e..c2735d578e 100644 --- a/share/man/man4/mly.4 +++ b/share/man/man4/mly.4 @@ -23,7 +23,6 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .\" $FreeBSD: src/share/man/man4/mly.4,v 1.10 2006/05/20 09:39:28 brueffer Exp $ -.\" $DragonFly: src/share/man/man4/mly.4,v 1.4 2008/01/21 02:40:30 pavalos Exp $ .\" .Dd August 10, 2004 .Dt MLY 4 diff --git a/sys/dev/raid/mly/Makefile b/sys/dev/raid/mly/Makefile index 87214f2610..34aa88aa8c 100644 --- a/sys/dev/raid/mly/Makefile +++ b/sys/dev/raid/mly/Makefile @@ -1,9 +1,9 @@ -# $FreeBSD: src/sys/modules/mly/Makefile,v 1.1.2.1 2000/10/27 10:07:02 msmith Exp $ +# $FreeBSD: src/sys/modules/mly/Makefile,v 1.3 2001/07/14 00:12:23 msmith Exp $ -KMOD = mly -SRCS = mly.c -SRCS += opt_scsi.h opt_cam.h -SRCS += device_if.h bus_if.h pci_if.h +KMOD= mly +SRCS= mly.c +SRCS+= opt_scsi.h opt_cam.h +SRCS+= device_if.h bus_if.h pci_if.h #CFLAGS+= -DMLY_DEBUG=3 diff --git a/sys/dev/raid/mly/mly.c b/sys/dev/raid/mly/mly.c index 6d9622b51c..38d6e1fd7b 100644 --- a/sys/dev/raid/mly/mly.c +++ b/sys/dev/raid/mly/mly.c @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/mly/mly.c,v 1.3.2.3 2001/03/05 20:17:24 msmith Exp $ + * $FreeBSD: src/sys/dev/mly/mly.c,v 1.50 2010/01/28 08:41:30 mav Exp $ */ #include @@ -43,6 +43,7 @@ #include #include #include +#include #include #include #include @@ -50,10 +51,10 @@ #include #include -#include "mlyreg.h" -#include "mlyio.h" -#include "mlyvar.h" -#include "mly_tables.h" +#include +#include +#include +#include static int mly_probe(device_t dev); static int mly_attach(device_t dev); @@ -2002,15 +2003,18 @@ mly_cam_rescan_btl(struct mly_softc *sc, int bus, int target) debug_called(1); - ccb = kmalloc(sizeof(union ccb), M_TEMP, M_WAITOK | M_ZERO); - - if (xpt_create_path(&sc->mly_cam_path, xpt_periph, + if ((ccb = xpt_alloc_ccb()) == NULL) { + mly_printf(sc, "rescan failed (can't allocate CCB)\n"); + return; + } + if (xpt_create_path(&ccb->ccb_h.path, xpt_periph, cam_sim_path(sc->mly_cam_sim[bus]), target, 0) != CAM_REQ_CMP) { mly_printf(sc, "rescan failed (can't create path)\n"); - kfree(ccb, M_TEMP); + xpt_free_ccb(ccb); return; } - xpt_setup_ccb(&ccb->ccb_h, sc->mly_cam_path, 5/*priority (low)*/); + + xpt_setup_ccb(&ccb->ccb_h, ccb->ccb_h.path, 5/*priority (low)*/); ccb->ccb_h.func_code = XPT_SCAN_LUN; ccb->ccb_h.cbfcnp = mly_cam_rescan_callback; ccb->crcn.flags = CAM_FLAG_NONE; @@ -2814,7 +2818,7 @@ mly_print_controller(int controller) static int mly_user_open(struct dev_open_args *ap) { - cdev_t dev = ap->a_head.a_dev; + cdev_t dev = ap->a_head.a_dev; int unit = minor(dev); struct mly_softc *sc = devclass_get_softc(devclass_find("mly"), unit); @@ -2828,7 +2832,7 @@ mly_user_open(struct dev_open_args *ap) static int mly_user_close(struct dev_close_args *ap) { - cdev_t dev = ap->a_head.a_dev; + cdev_t dev = ap->a_head.a_dev; int unit = minor(dev); struct mly_softc *sc = devclass_get_softc(devclass_find("mly"), unit); @@ -2842,12 +2846,14 @@ mly_user_close(struct dev_close_args *ap) static int mly_user_ioctl(struct dev_ioctl_args *ap) { - cdev_t dev = ap->a_head.a_dev; + cdev_t dev = ap->a_head.a_dev; + caddr_t addr = ap->a_data; + u_long cmd = ap->a_cmd; struct mly_softc *sc = (struct mly_softc *)dev->si_drv1; - struct mly_user_command *uc = (struct mly_user_command *)ap->a_data; - struct mly_user_health *uh = (struct mly_user_health *)ap->a_data; + struct mly_user_command *uc = (struct mly_user_command *)addr; + struct mly_user_health *uh = (struct mly_user_health *)addr; - switch(ap->a_cmd) { + switch(cmd) { case MLYIO_COMMAND: return(mly_user_command(sc, uc)); case MLYIO_HEALTH: diff --git a/sys/dev/raid/mly/mly_tables.h b/sys/dev/raid/mly/mly_tables.h index ba0578ffab..2f04c87c1f 100644 --- a/sys/dev/raid/mly/mly_tables.h +++ b/sys/dev/raid/mly/mly_tables.h @@ -24,8 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/mly/mly_tables.h,v 1.1.2.1 2000/10/27 10:06:56 msmith Exp $ - * $DragonFly: src/sys/dev/raid/mly/mly_tables.h,v 1.3 2008/01/21 02:27:37 pavalos Exp $ + * $FreeBSD: src/sys/dev/mly/mly_tables.h,v 1.3 2002/02/27 23:57:18 peter Exp $ */ /* diff --git a/sys/dev/raid/mly/mlyio.h b/sys/dev/raid/mly/mlyio.h index e29fbcd712..2852afd10d 100644 --- a/sys/dev/raid/mly/mlyio.h +++ b/sys/dev/raid/mly/mlyio.h @@ -23,8 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/mly/mlyio.h,v 1.1.2.1 2001/03/05 20:17:24 msmith Exp $ - * $DragonFly: src/sys/dev/raid/mly/mlyio.h,v 1.3 2008/01/21 02:27:37 pavalos Exp $ + * $FreeBSD: src/sys/dev/mly/mlyio.h,v 1.2 2001/07/14 00:12:22 msmith Exp $ */ #include diff --git a/sys/dev/raid/mly/mlyreg.h b/sys/dev/raid/mly/mlyreg.h index 650e4304ad..944998eb9e 100644 --- a/sys/dev/raid/mly/mlyreg.h +++ b/sys/dev/raid/mly/mlyreg.h @@ -24,8 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/mly/mlyreg.h,v 1.1.2.1 2000/10/27 10:06:56 msmith Exp $ - * $DragonFly: src/sys/dev/raid/mly/mlyreg.h,v 1.3 2008/01/21 02:27:37 pavalos Exp $ + * $FreeBSD: src/sys/dev/mly/mlyreg.h,v 1.2 2002/09/23 18:54:30 alfred Exp $ */ /* diff --git a/sys/dev/raid/mly/mlyvar.h b/sys/dev/raid/mly/mlyvar.h index 0c28cef6e8..d1d96c035d 100644 --- a/sys/dev/raid/mly/mlyvar.h +++ b/sys/dev/raid/mly/mlyvar.h @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/mly/mlyvar.h,v 1.1.2.2 2001/03/05 20:17:24 msmith Exp $ + * $FreeBSD: src/sys/dev/mly/mlyvar.h,v 1.7 2005/08/08 12:23:27 scottl Exp $ */ #include @@ -226,7 +226,6 @@ struct mly_softc { /* CAM connection */ struct cam_devq *mly_cam_devq; /* CAM device queue */ struct cam_sim *mly_cam_sim[MLY_MAX_CHANNELS]; /* CAM SIMs */ - struct cam_path *mly_cam_path; /* rescan path */ int mly_cam_channels; /* total channel count */ /* command-completion task */