diff options
| author | mjacob <mjacob@FreeBSD.org> | 2009-08-01 00:57:34 +0000 |
|---|---|---|
| committer | mjacob <mjacob@FreeBSD.org> | 2009-08-01 00:57:34 +0000 |
| commit | 8cd95c9b5850387fecf5b9901ef05d9c08489a4c (patch) | |
| tree | bd2049e53ce7418f1492a78d100e8390b29f2d69 /sys/dev/ispfw/ispfw.c | |
| parent | 8d5758f2a0ff26008e509fb5c93b966ada4b7bc0 (diff) | |
| download | FreeBSD-src-8cd95c9b5850387fecf5b9901ef05d9c08489a4c.zip FreeBSD-src-8cd95c9b5850387fecf5b9901ef05d9c08489a4c.tar.gz | |
Add 8Gb card firmware. Update some 2Gb and 4Gb f/w sets.
Split 4Gb and 8Gb into pieces that can be either multi_id
capable or not.
Reviewed by: scottl, ken
Approved by: re
Diffstat (limited to 'sys/dev/ispfw/ispfw.c')
| -rw-r--r-- | sys/dev/ispfw/ispfw.c | 41 |
1 files changed, 40 insertions, 1 deletions
diff --git a/sys/dev/ispfw/ispfw.c b/sys/dev/ispfw/ispfw.c index 143aad8..9fe8031 100644 --- a/sys/dev/ispfw/ispfw.c +++ b/sys/dev/ispfw/ispfw.c @@ -51,6 +51,9 @@ __FBSDID("$FreeBSD$"); #define ISP_2300 1 #define ISP_2322 1 #define ISP_2400 1 +#define ISP_2400_MULTI 1 +#define ISP_2500 1 +#define ISP_2500_MULTI 1 #endif #ifndef MODULE_NAME @@ -85,9 +88,12 @@ __FBSDID("$FreeBSD$"); #if defined(ISP_2322) #include <dev/ispfw/asm_2322.h> #endif -#if defined(ISP_2400) +#if defined(ISP_2400) || defined(ISP_2400_MULTI) #include <dev/ispfw/asm_2400.h> #endif +#if defined(ISP_2500) || defined(ISP_2500_MULTI) +#include <dev/ispfw/asm_2500.h> +#endif #if defined(ISP_1000) static int isp_1000_loaded; @@ -125,6 +131,15 @@ static int isp_2322_loaded; #if defined(ISP_2400) static int isp_2400_loaded; #endif +#if defined(ISP_2400_MULTI) +static int isp_2400_multi_loaded; +#endif +#if defined(ISP_2500) +static int isp_2500_loaded; +#endif +#if defined(ISP_2500_MULTI) +static int isp_2500_multi_loaded; +#endif #define ISPFW_VERSION 1 #define RMACRO(token) do { \ @@ -193,6 +208,15 @@ do_load_fw(void) #if defined(ISP_2400) RMACRO(isp_2400); #endif +#if defined(ISP_2400_MULTI) + RMACRO(isp_2400_multi); +#endif +#if defined(ISP_2500) + RMACRO(isp_2500); +#endif +#if defined(ISP_2500_MULTI) + RMACRO(isp_2500_multi); +#endif } static void @@ -235,6 +259,15 @@ do_unload_fw(void) #if defined(ISP_2400) UMACRO(isp_2400); #endif +#if defined(ISP_2400_MULTI) + UMACRO(isp_2400_multi); +#endif +#if defined(ISP_2500) + UMACRO(isp_2500); +#endif +#if defined(ISP_2500_MULTI) + UMACRO(isp_2500_multi); +#endif } static int @@ -284,6 +317,12 @@ DECLARE_MODULE(isp_2300, ispfw_mod, SI_SUB_DRIVERS, SI_ORDER_THIRD); 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); +#elif defined(ISP_2400_MULTI) +DECLARE_MODULE(isp_2400_multi, ispfw_mod, SI_SUB_DRIVERS, SI_ORDER_THIRD); +#elif defined(ISP_2500) +DECLARE_MODULE(isp_2500, ispfw_mod, SI_SUB_DRIVERS, SI_ORDER_THIRD); +#elif defined(ISP_2500_MULTI) +DECLARE_MODULE(isp_2500_multi, ispfw_mod, SI_SUB_DRIVERS, SI_ORDER_THIRD); #else #error "firmware not specified" #endif |
