Date: Sat, 26 Aug 2006 18:42:24 GMT From: Matt Jacob <mjacob@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 105128 for review Message-ID: <200608261842.k7QIgOsj001148@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=105128 Change 105128 by mjacob@newisp on 2006/08/26 18:41:53 Pick 2400 f/w. Affected files ... .. //depot/projects/newisp/dev/ispfw/asm_2400.h#1 branch .. //depot/projects/newisp/dev/ispfw/ispfw.c#2 integrate .. //depot/projects/newisp/modules/ispfw/Makefile#2 integrate .. //depot/projects/newisp/modules/ispfw/isp_2400/Makefile#1 branch Differences ... ==== //depot/projects/newisp/dev/ispfw/ispfw.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ispfw/ispfw.c,v 1.17 2006/07/09 17:50:18 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ispfw/ispfw.c,v 1.18 2006/08/26 18:39:18 mjacob Exp $"); #include <sys/param.h> #include <sys/kernel.h> @@ -48,6 +48,7 @@ #define ISP_2200 1 #define ISP_2300 1 #define ISP_2322 1 +#define ISP_2400 1 #ifdef __sparc64__ #define ISP_1000 1 #endif @@ -75,6 +76,9 @@ #if defined(ISP_2322) #include <dev/ispfw/asm_2322.h> #endif +#if defined(ISP_2400) +#include <dev/ispfw/asm_2400.h> +#endif #if defined(ISP_1000) #include <dev/ispfw/asm_1000.h> #endif @@ -82,7 +86,8 @@ #define ISPFW_VERSION 1 #define RMACRO(token) \ if (firmware_register(#token, token##_risc_code, \ - token##_risc_code [3] << 1, ISPFW_VERSION, NULL) == NULL) { \ + token##_risc_code [3] * sizeof token##_risc_code [3], \ + ISPFW_VERSION, NULL) == NULL) { \ printf("unable to register firmware '%s'\n", #token); \ } else { \ printf("registered firmware set <%s>\n", #token); \ @@ -128,6 +133,9 @@ #if defined(ISP_2322) RMACRO(isp_2322); #endif +#if defined(ISP_2400) + RMACRO(isp_2400); +#endif return (0); } @@ -156,6 +164,8 @@ UMACRO(isp_2300); #elif defined(ISP_2322) UMACRO(isp_2322); +#elif defined(ISP_2400) + UMACRO(isp_2400); #endif return (0); } @@ -205,5 +215,7 @@ DECLARE_MODULE(isp_2300, ispfw_mod, SI_SUB_DRIVERS, SI_ORDER_THIRD); #elif defined(ISP_2322) DECLARE_MODULE(isp_2322, ispfw_mod, SI_SUB_DRIVERS, SI_ORDER_THIRD); +#elif defined(ISP_2400) +DECLARE_MODULE(isp_2400, ispfw_mod, SI_SUB_DRIVERS, SI_ORDER_THIRD); #endif #endif ==== //depot/projects/newisp/modules/ispfw/Makefile#2 (text+ko) ==== @@ -24,7 +24,7 @@ # SUCH DAMAGE. # -# $FreeBSD: src/sys/modules/ispfw/Makefile,v 1.3 2006/07/09 17:50:18 mjacob Exp $ +# $FreeBSD: src/sys/modules/ispfw/Makefile,v 1.4 2006/08/26 18:40:25 mjacob Exp $ SUBDIR = ispfw @@ -38,6 +38,7 @@ SUBDIR += isp_2200 SUBDIR += isp_2300 SUBDIR += isp_2322 +SUBDIR += isp_2400 .if ${MACHINE_ARCH} == "sparc64" SUBDIR += isp_1000 .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200608261842.k7QIgOsj001148>