Commit 64b45bea authored by Adrian Bunk's avatar Adrian Bunk Committed by James Bottomley

[PATCH] SCSI qla1280: some firmware files cleanups

- make all this needlessly global code static
- remove the unused firmware_version variables
Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent 1e191ce8
...@@ -28,15 +28,13 @@ ...@@ -28,15 +28,13 @@
* Firmware Version 7.65.00 (14:17 Jul 20, 1999) * Firmware Version 7.65.00 (14:17 Jul 20, 1999)
*/ */
unsigned short risc_code_version = 7*1024+65; static unsigned char firmware_version[] = {7,65,0};
unsigned char firmware_version[] = {7,65,0};
#define FW_VERSION_STRING "7.65.0" #define FW_VERSION_STRING "7.65.0"
unsigned short risc_code_addr01 = 0x1000 ; static unsigned short risc_code_addr01 = 0x1000 ;
unsigned short risc_code01[] = { static unsigned short risc_code01[] = {
0x0078, 0x103a, 0x0000, 0x4057, 0x0000, 0x2043, 0x4f50, 0x5952, 0x0078, 0x103a, 0x0000, 0x4057, 0x0000, 0x2043, 0x4f50, 0x5952,
0x4947, 0x4854, 0x2031, 0x3939, 0x3520, 0x514c, 0x4f47, 0x4943, 0x4947, 0x4854, 0x2031, 0x3939, 0x3520, 0x514c, 0x4f47, 0x4943,
0x2043, 0x4f52, 0x504f, 0x5241, 0x5449, 0x4f4e, 0x2049, 0x5350, 0x2043, 0x4f52, 0x504f, 0x5241, 0x5449, 0x4f4e, 0x2049, 0x5350,
...@@ -2097,5 +2095,5 @@ unsigned short risc_code01[] = { ...@@ -2097,5 +2095,5 @@ unsigned short risc_code01[] = {
0x0014, 0x878e, 0x0016, 0xa21c, 0x1035, 0xa8af, 0xa210, 0x3807, 0x0014, 0x878e, 0x0016, 0xa21c, 0x1035, 0xa8af, 0xa210, 0x3807,
0x300c, 0x817e, 0x872b, 0x8772, 0xa8a8, 0x0000, 0xdf21 0x300c, 0x817e, 0x872b, 0x8772, 0xa8a8, 0x0000, 0xdf21
}; };
unsigned short risc_code_length01 = 0x4057; static unsigned short risc_code_length01 = 0x4057;
...@@ -26,15 +26,9 @@ ...@@ -26,15 +26,9 @@
*/ */
#ifdef UNIQUE_FW_NAME #ifdef UNIQUE_FW_NAME
unsigned short fw12160i_version = 10*1024+4; static unsigned char fw12160i_version_str[] = {10,4,32};
#else #else
unsigned short risc_code_version = 10*1024+4; static unsigned char firmware_version[] = {10,4,32};
#endif
#ifdef UNIQUE_FW_NAME
unsigned char fw12160i_version_str[] = {10,4,32};
#else
unsigned char firmware_version[] = {10,4,32};
#endif #endif
#ifdef UNIQUE_FW_NAME #ifdef UNIQUE_FW_NAME
...@@ -44,15 +38,15 @@ unsigned char firmware_version[] = {10,4,32}; ...@@ -44,15 +38,15 @@ unsigned char firmware_version[] = {10,4,32};
#endif #endif
#ifdef UNIQUE_FW_NAME #ifdef UNIQUE_FW_NAME
unsigned short fw12160i_addr01 = 0x1000; static unsigned short fw12160i_addr01 = 0x1000;
#else #else
unsigned short risc_code_addr01 = 0x1000; static unsigned short risc_code_addr01 = 0x1000;
#endif #endif
#ifdef UNIQUE_FW_NAME #ifdef UNIQUE_FW_NAME
unsigned short fw12160i_code01[] = { static unsigned short fw12160i_code01[] = {
#else #else
unsigned short risc_code01[] = { static unsigned short risc_code01[] = {
#endif #endif
0x0804, 0x1041, 0x0000, 0x35e6, 0x0000, 0x2043, 0x4f50, 0x5952, 0x0804, 0x1041, 0x0000, 0x35e6, 0x0000, 0x2043, 0x4f50, 0x5952,
0x4947, 0x4854, 0x2031, 0x3939, 0x312c, 0x3139, 0x3932, 0x2c31, 0x4947, 0x4854, 0x2031, 0x3939, 0x312c, 0x3139, 0x3932, 0x2c31,
...@@ -1781,7 +1775,7 @@ unsigned short risc_code01[] = { ...@@ -1781,7 +1775,7 @@ unsigned short risc_code01[] = {
0x681f, 0x000c, 0x70a0, 0x70a2, 0x0005, 0x7c12 0x681f, 0x000c, 0x70a0, 0x70a2, 0x0005, 0x7c12
}; };
#ifdef UNIQUE_FW_NAME #ifdef UNIQUE_FW_NAME
unsigned short fw12160i_length01 = 0x35e6; static unsigned short fw12160i_length01 = 0x35e6;
#else #else
unsigned short risc_code_length01 = 0x35e6; static unsigned short risc_code_length01 = 0x35e6;
#endif #endif
...@@ -27,15 +27,9 @@ ...@@ -27,15 +27,9 @@
*/ */
#ifdef UNIQUE_FW_NAME #ifdef UNIQUE_FW_NAME
unsigned short fw1280ei_version = 8*1024+15; static unsigned char fw1280ei_version_str[] = {8,15,0};
#else #else
unsigned short risc_code_version = 8*1024+15; static unsigned char firmware_version[] = {8,15,0};
#endif
#ifdef UNIQUE_FW_NAME
unsigned char fw1280ei_version_str[] = {8,15,0};
#else
unsigned char firmware_version[] = {8,15,0};
#endif #endif
#ifdef UNIQUE_FW_NAME #ifdef UNIQUE_FW_NAME
...@@ -45,15 +39,15 @@ unsigned char firmware_version[] = {8,15,0}; ...@@ -45,15 +39,15 @@ unsigned char firmware_version[] = {8,15,0};
#endif #endif
#ifdef UNIQUE_FW_NAME #ifdef UNIQUE_FW_NAME
unsigned short fw1280ei_addr01 = 0x1000; static unsigned short fw1280ei_addr01 = 0x1000;
#else #else
unsigned short risc_code_addr01 = 0x1000; static unsigned short risc_code_addr01 = 0x1000;
#endif #endif
#ifdef UNIQUE_FW_NAME #ifdef UNIQUE_FW_NAME
unsigned short fw1280ei_code01[] = { static unsigned short fw1280ei_code01[] = {
#else #else
unsigned short risc_code01[] = { static unsigned short risc_code01[] = {
#endif #endif
0x0078, 0x1041, 0x0000, 0x3d3b, 0x0000, 0x2043, 0x4f50, 0x5952, 0x0078, 0x1041, 0x0000, 0x3d3b, 0x0000, 0x2043, 0x4f50, 0x5952,
0x4947, 0x4854, 0x2031, 0x3939, 0x312c, 0x3139, 0x3932, 0x2c31, 0x4947, 0x4854, 0x2031, 0x3939, 0x312c, 0x3139, 0x3932, 0x2c31,
...@@ -2017,7 +2011,7 @@ unsigned short risc_code01[] = { ...@@ -2017,7 +2011,7 @@ unsigned short risc_code01[] = {
0x70a2, 0x007c, 0x205b 0x70a2, 0x007c, 0x205b
}; };
#ifdef UNIQUE_FW_NAME #ifdef UNIQUE_FW_NAME
unsigned short fw1280ei_length01 = 0x3d3b; static unsigned short fw1280ei_length01 = 0x3d3b;
#else #else
unsigned short risc_code_length01 = 0x3d3b; static unsigned short risc_code_length01 = 0x3d3b;
#endif #endif
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment