Date: Mon, 18 Jun 2007 23:45:02 GMT From: Scott Long <scottl@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 121950 for review Message-ID: <200706182345.l5INj2xC082235@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=121950 Change 121950 by scottl@scottl-deimos on 2007/06/18 23:44:02 Track rev 1.189 of cam_xpt.c Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#70 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_xpt.h#3 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#70 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.188 2007/06/04 18:25:02 dwmalone Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.189 2007/06/17 05:55:53 scottl Exp $"); #include <sys/param.h> #include <sys/bus.h> @@ -967,7 +967,7 @@ xpt_sim->max_ccbs = 16; mtx_lock(&xsoftc.xpt_lock); - if ((status = xpt_bus_register(xpt_sim, /*bus #*/0)) != CAM_SUCCESS) { + if ((status = xpt_bus_register(xpt_sim, NULL, 0)) != CAM_SUCCESS) { printf("xpt_attach: xpt_bus_register failed with status %#x," " failing attach\n", status); return (EINVAL); @@ -3789,7 +3789,7 @@ * availible, the bus will be probed. */ int32_t -xpt_bus_register(struct cam_sim *sim, u_int32_t bus) +xpt_bus_register(struct cam_sim *sim, device_t parent, u_int32_t bus) { struct cam_eb *new_bus; struct cam_eb *old_bus; ==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_xpt.h#3 (text+ko) ==== @@ -112,6 +112,7 @@ struct timeval last_reset; u_int32_t refcount; u_int generation; + device_t parent_dev; }; void xpt_find_quirk(struct cam_ed *device);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200706182345.l5INj2xC082235>