From owner-p4-projects@FreeBSD.ORG  Mon Jun 18 23:45:02 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A603F16A468; Mon, 18 Jun 2007 23:45:02 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 7B2B916A400
	for <perforce@freebsd.org>; Mon, 18 Jun 2007 23:45:02 +0000 (UTC)
	(envelope-from scottl@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 6C22B13C468
	for <perforce@freebsd.org>; Mon, 18 Jun 2007 23:45:02 +0000 (UTC)
	(envelope-from scottl@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5INj2e4082251
	for <perforce@freebsd.org>; Mon, 18 Jun 2007 23:45:02 GMT
	(envelope-from scottl@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5INj2xC082235
	for perforce@freebsd.org; Mon, 18 Jun 2007 23:45:02 GMT
	(envelope-from scottl@freebsd.org)
Date: Mon, 18 Jun 2007 23:45:02 GMT
Message-Id: <200706182345.l5INj2xC082235@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	scottl@freebsd.org using -f
From: Scott Long <scottl@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 121950 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 18 Jun 2007 23:45:02 -0000

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);