diff options
| author | mav <mav@FreeBSD.org> | 2015-10-20 12:27:59 +0000 |
|---|---|---|
| committer | mav <mav@FreeBSD.org> | 2015-10-20 12:27:59 +0000 |
| commit | c16d00e3f367b725bd8a36d5bc6f1d8f1e6c3c99 (patch) | |
| tree | e814900e271fe2ed4d36083120152bc59daca152 /sys/dev/ispfw/ispfw.c | |
| parent | a038e15ff55126399732e2c80c02180d1619422a (diff) | |
| download | FreeBSD-src-c16d00e3f367b725bd8a36d5bc6f1d8f1e6c3c99.zip FreeBSD-src-c16d00e3f367b725bd8a36d5bc6f1d8f1e6c3c99.tar.gz | |
Update firmware images for Qlogic 24xx/25xx from 5.5.0 to 7.3.0.
This also removes separate "_multi" images, since this funcationality is
now in base, and there is simply no new images without it for years.
Diffstat (limited to 'sys/dev/ispfw/ispfw.c')
| -rw-r--r-- | sys/dev/ispfw/ispfw.c | 28 |
1 files changed, 2 insertions, 26 deletions
diff --git a/sys/dev/ispfw/ispfw.c b/sys/dev/ispfw/ispfw.c index b351aee..6da0769 100644 --- a/sys/dev/ispfw/ispfw.c +++ b/sys/dev/ispfw/ispfw.c @@ -51,9 +51,7 @@ __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 @@ -88,10 +86,10 @@ __FBSDID("$FreeBSD$"); #if defined(ISP_2322) #include <dev/ispfw/asm_2322.h> #endif -#if defined(ISP_2400) || defined(ISP_2400_MULTI) +#if defined(ISP_2400) #include <dev/ispfw/asm_2400.h> #endif -#if defined(ISP_2500) || defined(ISP_2500_MULTI) +#if defined(ISP_2500) #include <dev/ispfw/asm_2500.h> #endif @@ -131,15 +129,9 @@ 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 @@ -219,15 +211,9 @@ 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 @@ -270,15 +256,9 @@ 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 @@ -328,12 +308,8 @@ 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 |
