aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/FlashPoint.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/scsi/FlashPoint.c')
-rw-r--r--drivers/scsi/FlashPoint.c27
1 files changed, 13 insertions, 14 deletions
diff --git a/drivers/scsi/FlashPoint.c b/drivers/scsi/FlashPoint.c
index 895e4ff7be1d..696f31c5df76 100644
--- a/drivers/scsi/FlashPoint.c
+++ b/drivers/scsi/FlashPoint.c
@@ -285,7 +285,7 @@ struct sccb_mgr_tar_info {
285 unsigned char TarLUNBusy[MAX_LUN]; 285 unsigned char TarLUNBusy[MAX_LUN];
286}; 286};
287 287
288typedef struct NVRAMInfo { 288struct nvram_info {
289 unsigned char niModel; /* Model No. of card */ 289 unsigned char niModel; /* Model No. of card */
290 unsigned char niCardNo; /* Card no. */ 290 unsigned char niCardNo; /* Card no. */
291 unsigned long niBaseAddr; /* Port Address of card */ 291 unsigned long niBaseAddr; /* Port Address of card */
@@ -295,9 +295,8 @@ typedef struct NVRAMInfo {
295 unsigned char niAdapId; /* Host Adapter ID - Byte 24 of eerpom map */ 295 unsigned char niAdapId; /* Host Adapter ID - Byte 24 of eerpom map */
296 unsigned char niSyncTbl[MAX_SCSI_TAR / 2]; /* Sync/Wide byte of targets */ 296 unsigned char niSyncTbl[MAX_SCSI_TAR / 2]; /* Sync/Wide byte of targets */
297 unsigned char niScamTbl[MAX_SCSI_TAR][4]; /* Compressed Scam name string of Targets */ 297 unsigned char niScamTbl[MAX_SCSI_TAR][4]; /* Compressed Scam name string of Targets */
298}NVRAMINFO; 298};
299 299
300typedef NVRAMINFO *PNVRamInfo;
301 300
302#define MODEL_LT 1 301#define MODEL_LT 1
303#define MODEL_DL 2 302#define MODEL_DL 2
@@ -318,7 +317,7 @@ typedef struct SCCBcard {
318 unsigned char scanIndex; 317 unsigned char scanIndex;
319 unsigned char globalFlags; 318 unsigned char globalFlags;
320 unsigned char ourId; 319 unsigned char ourId;
321 PNVRamInfo pNvRamInfo; 320 struct nvram_info * pNvRamInfo;
322 struct sccb * discQ_Tbl[QUEUE_DEPTH]; 321 struct sccb * discQ_Tbl[QUEUE_DEPTH];
323 322
324}SCCBCARD; 323}SCCBCARD;
@@ -987,7 +986,7 @@ static void FPT_queueFlushTargSccb(unsigned char p_card, unsigned char thisTarg
987 unsigned char error_code); 986 unsigned char error_code);
988 987
989static void FPT_sinits(struct sccb * p_sccb, unsigned char p_card); 988static void FPT_sinits(struct sccb * p_sccb, unsigned char p_card);
990static void FPT_RNVRamData(PNVRamInfo pNvRamInfo); 989static void FPT_RNVRamData(struct nvram_info * pNvRamInfo);
991 990
992static unsigned char FPT_siwidn(unsigned long port, unsigned char p_card); 991static unsigned char FPT_siwidn(unsigned long port, unsigned char p_card);
993static void FPT_stwidn(unsigned long port, unsigned char p_card); 992static void FPT_stwidn(unsigned long port, unsigned char p_card);
@@ -1083,7 +1082,7 @@ static void FPT_autoLoadDefaultMap(unsigned long p_port);
1083static struct sccb_mgr_tar_info FPT_sccbMgrTbl[MAX_CARDS][MAX_SCSI_TAR] = { { { 0 } } }; 1082static struct sccb_mgr_tar_info FPT_sccbMgrTbl[MAX_CARDS][MAX_SCSI_TAR] = { { { 0 } } };
1084static SCCBCARD FPT_BL_Card[MAX_CARDS] = { { 0 } }; 1083static SCCBCARD FPT_BL_Card[MAX_CARDS] = { { 0 } };
1085static SCCBSCAM_INFO FPT_scamInfo[MAX_SCSI_TAR] = { { { 0 } } }; 1084static SCCBSCAM_INFO FPT_scamInfo[MAX_SCSI_TAR] = { { { 0 } } };
1086static NVRAMINFO FPT_nvRamInfo[MAX_MB_CARDS] = { { 0 } }; 1085static struct nvram_info FPT_nvRamInfo[MAX_MB_CARDS] = { { 0 } };
1087 1086
1088 1087
1089static unsigned char FPT_mbCards = 0; 1088static unsigned char FPT_mbCards = 0;
@@ -1113,7 +1112,7 @@ static int FlashPoint_ProbeHostAdapter(struct sccb_mgr_info * pCardInfo)
1113 unsigned char i,j,id,ScamFlg; 1112 unsigned char i,j,id,ScamFlg;
1114 unsigned short temp,temp2,temp3,temp4,temp5,temp6; 1113 unsigned short temp,temp2,temp3,temp4,temp5,temp6;
1115 unsigned long ioport; 1114 unsigned long ioport;
1116 PNVRamInfo pCurrNvRam; 1115 struct nvram_info * pCurrNvRam;
1117 1116
1118 ioport = pCardInfo->si_baseaddr; 1117 ioport = pCardInfo->si_baseaddr;
1119 1118
@@ -1387,7 +1386,7 @@ static int FlashPoint_ProbeHostAdapter(struct sccb_mgr_info * pCardInfo)
1387static unsigned long FlashPoint_HardwareResetHostAdapter(struct sccb_mgr_info * pCardInfo) 1386static unsigned long FlashPoint_HardwareResetHostAdapter(struct sccb_mgr_info * pCardInfo)
1388{ 1387{
1389 PSCCBcard CurrCard = NULL; 1388 PSCCBcard CurrCard = NULL;
1390 PNVRamInfo pCurrNvRam; 1389 struct nvram_info * pCurrNvRam;
1391 unsigned char i,j,thisCard, ScamFlg; 1390 unsigned char i,j,thisCard, ScamFlg;
1392 unsigned short temp,sync_bit_map,id; 1391 unsigned short temp,sync_bit_map,id;
1393 unsigned long ioport; 1392 unsigned long ioport;
@@ -1572,7 +1571,7 @@ static void FlashPoint_ReleaseHostAdapter(unsigned long pCurrCard)
1572 unsigned long regOffset; 1571 unsigned long regOffset;
1573 unsigned long scamData; 1572 unsigned long scamData;
1574 unsigned long *pScamTbl; 1573 unsigned long *pScamTbl;
1575 PNVRamInfo pCurrNvRam; 1574 struct nvram_info * pCurrNvRam;
1576 1575
1577 pCurrNvRam = ((PSCCBcard)pCurrCard)->pNvRamInfo; 1576 pCurrNvRam = ((PSCCBcard)pCurrCard)->pNvRamInfo;
1578 1577
@@ -1601,7 +1600,7 @@ static void FlashPoint_ReleaseHostAdapter(unsigned long pCurrCard)
1601} 1600}
1602 1601
1603 1602
1604static void FPT_RNVRamData(PNVRamInfo pNvRamInfo) 1603static void FPT_RNVRamData(struct nvram_info * pNvRamInfo)
1605{ 1604{
1606 unsigned char i; 1605 unsigned char i;
1607 unsigned long portBase; 1606 unsigned long portBase;
@@ -2161,7 +2160,7 @@ static unsigned char FPT_SccbMgr_bad_isr(unsigned long p_port, unsigned char p_c
2161{ 2160{
2162 unsigned char temp, ScamFlg; 2161 unsigned char temp, ScamFlg;
2163 struct sccb_mgr_tar_info * currTar_Info; 2162 struct sccb_mgr_tar_info * currTar_Info;
2164 PNVRamInfo pCurrNvRam; 2163 struct nvram_info * pCurrNvRam;
2165 2164
2166 2165
2167 if (RD_HARPOON(p_port+hp_ext_status) & 2166 if (RD_HARPOON(p_port+hp_ext_status) &
@@ -5701,7 +5700,7 @@ static void FPT_scini(unsigned char p_card, unsigned char p_our_id, unsigned cha
5701 5700
5702 unsigned char i,k,ScamFlg ; 5701 unsigned char i,k,ScamFlg ;
5703 PSCCBcard currCard; 5702 PSCCBcard currCard;
5704 PNVRamInfo pCurrNvRam; 5703 struct nvram_info * pCurrNvRam;
5705 5704
5706 currCard = &FPT_BL_Card[p_card]; 5705 currCard = &FPT_BL_Card[p_card];
5707 p_port = currCard->ioPort; 5706 p_port = currCard->ioPort;
@@ -5992,7 +5991,7 @@ static void FPT_scasid(unsigned char p_card, unsigned long p_port)
5992 5991
5993 unsigned char i,k,scam_id; 5992 unsigned char i,k,scam_id;
5994 unsigned char crcBytes[3]; 5993 unsigned char crcBytes[3];
5995 PNVRamInfo pCurrNvRam; 5994 struct nvram_info * pCurrNvRam;
5996 unsigned short * pCrcBytes; 5995 unsigned short * pCrcBytes;
5997 5996
5998 pCurrNvRam = FPT_BL_Card[p_card].pNvRamInfo; 5997 pCurrNvRam = FPT_BL_Card[p_card].pNvRamInfo;
@@ -6453,7 +6452,7 @@ static void FPT_inisci(unsigned char p_card, unsigned long p_port, unsigned char
6453{ 6452{
6454 unsigned char i,k,max_id; 6453 unsigned char i,k,max_id;
6455 unsigned short ee_data; 6454 unsigned short ee_data;
6456 PNVRamInfo pCurrNvRam; 6455 struct nvram_info * pCurrNvRam;
6457 6456
6458 pCurrNvRam = FPT_BL_Card[p_card].pNvRamInfo; 6457 pCurrNvRam = FPT_BL_Card[p_card].pNvRamInfo;
6459 6458