PERFORCE change 105439 for review

[Matt Jacob]

http://perforce.freebsd.org/chv.cgi?CH=105439

Change 105439 by mjacob at 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 <sys/cdefs.h>
-__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 <dev/isp/isp_freebsd.h>
 #include <sys/unistd.h>
 #include <sys/kthread.h>
@@ -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 <sys/cdefs.h>
-__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 <sys/param.h>
 #include <sys/systm.h>
@@ -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 <sys/cdefs.h>
-__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 <sys/param.h>
 #include <sys/systm.h>
@@ -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