From owner-p4-projects@FreeBSD.ORG Fri Sep 1 05:09:18 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4A01616A54E; Fri, 1 Sep 2006 05:08:51 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6BD1616B4F1 for ; Fri, 1 Sep 2006 05:08:23 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0074D43D49 for ; Fri, 1 Sep 2006 05:08:22 +0000 (GMT) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8158MtJ049967 for ; Fri, 1 Sep 2006 05:08:22 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8158MkZ049964 for perforce@freebsd.org; Fri, 1 Sep 2006 05:08:22 GMT (envelope-from mjacob@freebsd.org) Date: Fri, 1 Sep 2006 05:08:22 GMT Message-Id: <200609010508.k8158MkZ049964@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 105439 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Sep 2006 05:09:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=105439 Change 105439 by mjacob@newisp on 2006/09/01 05:08:20 sync with head. Affected files ... .. //depot/projects/newisp/dev/isp/isp_freebsd.c#4 integrate .. //depot/projects/newisp/dev/isp/isp_freebsd.h#3 integrate .. //depot/projects/newisp/dev/isp/isp_pci.c#7 integrate .. //depot/projects/newisp/dev/isp/isp_sbus.c#3 integrate Differences ... ==== //depot/projects/newisp/dev/isp/isp_freebsd.c#4 (text+ko) ==== @@ -29,7 +29,7 @@ * Platform (FreeBSD) dependent common attachment code for Qlogic adapters. */ #include -__FBSDID("$FreeBSD: src/sys/dev/isp/isp_freebsd.c,v 1.121 2006/08/04 20:13:27 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/isp/isp_freebsd.c,v 1.122 2006/09/01 04:57:14 mjacob Exp $"); #include #include #include @@ -52,6 +52,9 @@ static void isp_kthread(void *); static void isp_action(struct cam_sim *, union ccb *); +#if __FreeBSD_version < 700000 +ispfwfunc *isp_get_firmware_p = NULL; +#endif #if __FreeBSD_version < 500000 #define ISP_CDEV_MAJOR 248 ==== //depot/projects/newisp/dev/isp/isp_freebsd.h#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/isp/isp_freebsd.h,v 1.91 2006/07/09 17:50:17 mjacob Exp $ */ +/* $FreeBSD: src/sys/dev/isp/isp_freebsd.h,v 1.92 2006/09/01 05:03:42 mjacob Exp $ */ /*- * Qlogic ISP SCSI Host Adapter FreeBSD Wrapper Definitions * @@ -97,6 +97,10 @@ #endif #endif +#if __FreeBSD_version < 700000 +typedef void ispfwfunc(int, int, int, uint16_t **); +#endif + #ifdef ISP_TARGET_MODE #define ISP_TARGET_FUNCTIONS 1 #define ATPDPSIZE 256 ==== //depot/projects/newisp/dev/isp/isp_pci.c#7 (text+ko) ==== @@ -30,7 +30,7 @@ * FreeBSD Version. */ #include -__FBSDID("$FreeBSD: src/sys/dev/isp/isp_pci.c,v 1.120 2006/08/21 00:46:10 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/isp/isp_pci.c,v 1.121 2006/09/01 05:03:42 mjacob Exp $"); #include #include @@ -356,7 +356,6 @@ MODULE_DEPEND(isp, ispfw, 1, 1, 1); MODULE_DEPEND(isp, firmware, 1, 1, 1); #else -typedef void ispfwfunc(int, int, int, uint32_t **); extern ispfwfunc *isp_get_firmware_p; #endif ==== //depot/projects/newisp/dev/isp/isp_sbus.c#3 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/isp/isp_sbus.c,v 1.21 2006/07/16 20:11:49 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/isp/isp_sbus.c,v 1.22 2006/09/01 05:03:42 mjacob Exp $"); #include #include @@ -114,7 +114,6 @@ #if __FreeBSD_version >= 700000 MODULE_DEPEND(isp, firmware, 1, 1, 1); #else -typedef void ispfwfunc(int, int, int, uint16_t **); extern ispfwfunc *isp_get_firmware_p; #endif