aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/FlashPoint.c
diff options
context:
space:
mode:
authorAlexey Dobriyan <adobriyan@gmail.com>2006-03-08 03:14:31 -0500
committerJames Bottomley <jejb@mulgrave.il.steeleye.com>2006-03-12 10:16:25 -0500
commitf31dc0cde69761dca05687addfd233accd393d1c (patch)
treeac3164043d9d1f822706677ee6b26b884be9aae9 /drivers/scsi/FlashPoint.c
parent7f101662dd55aa16852ff6228ac496f56a259f5e (diff)
[SCSI] drivers/scsi/FlashPoint.c: untypedef struct SCCBMgr_tar_info
* struct SCCBMgr_tar_info => struct sccb_mgr_tar_info * PSCCBMgr_tar_info => struct sccb_mgr_tar_info * * SCCBMGR_TAR_INFO => struct sccb_mgr_tar_info Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/FlashPoint.c')
-rw-r--r--drivers/scsi/FlashPoint.c53
1 files changed, 26 insertions, 27 deletions
diff --git a/drivers/scsi/FlashPoint.c b/drivers/scsi/FlashPoint.c
index 9969fef8fd52..895e4ff7be1d 100644
--- a/drivers/scsi/FlashPoint.c
+++ b/drivers/scsi/FlashPoint.c
@@ -268,10 +268,9 @@ struct sccb {
268#define EE_WIDE_SCSI BIT(7) 268#define EE_WIDE_SCSI BIT(7)
269 269
270 270
271typedef struct SCCBMgr_tar_info *PSCCBMgr_tar_info;
272 271
273 272
274typedef struct SCCBMgr_tar_info { 273struct sccb_mgr_tar_info {
275 274
276 struct sccb * TarSelQ_Head; 275 struct sccb * TarSelQ_Head;
277 struct sccb * TarSelQ_Tail; 276 struct sccb * TarSelQ_Tail;
@@ -284,7 +283,7 @@ typedef struct SCCBMgr_tar_info {
284 unsigned char TarReserved[2]; /* for alignment */ 283 unsigned char TarReserved[2]; /* for alignment */
285 unsigned char LunDiscQ_Idx[MAX_LUN]; 284 unsigned char LunDiscQ_Idx[MAX_LUN];
286 unsigned char TarLUNBusy[MAX_LUN]; 285 unsigned char TarLUNBusy[MAX_LUN];
287} SCCBMGR_TAR_INFO; 286};
288 287
289typedef struct NVRAMInfo { 288typedef struct NVRAMInfo {
290 unsigned char niModel; /* Model No. of card */ 289 unsigned char niModel; /* Model No. of card */
@@ -975,7 +974,7 @@ static void FPT_shandem(unsigned long port, unsigned char p_card,struct sccb *
975static void FPT_stsyncn(unsigned long port, unsigned char p_card); 974static void FPT_stsyncn(unsigned long port, unsigned char p_card);
976static void FPT_sisyncr(unsigned long port,unsigned char sync_pulse, unsigned char offset); 975static void FPT_sisyncr(unsigned long port,unsigned char sync_pulse, unsigned char offset);
977static void FPT_sssyncv(unsigned long p_port, unsigned char p_id, unsigned char p_sync_value, 976static void FPT_sssyncv(unsigned long p_port, unsigned char p_id, unsigned char p_sync_value,
978 PSCCBMgr_tar_info currTar_Info); 977 struct sccb_mgr_tar_info * currTar_Info);
979static void FPT_sresb(unsigned long port, unsigned char p_card); 978static void FPT_sresb(unsigned long port, unsigned char p_card);
980static void FPT_sxfrp(unsigned long p_port, unsigned char p_card); 979static void FPT_sxfrp(unsigned long p_port, unsigned char p_card);
981static void FPT_schkdd(unsigned long port, unsigned char p_card); 980static void FPT_schkdd(unsigned long port, unsigned char p_card);
@@ -1081,7 +1080,7 @@ static void FPT_autoLoadDefaultMap(unsigned long p_port);
1081 1080
1082 1081
1083 1082
1084static SCCBMGR_TAR_INFO FPT_sccbMgrTbl[MAX_CARDS][MAX_SCSI_TAR] = { { { 0 } } }; 1083static struct sccb_mgr_tar_info FPT_sccbMgrTbl[MAX_CARDS][MAX_SCSI_TAR] = { { { 0 } } };
1085static SCCBCARD FPT_BL_Card[MAX_CARDS] = { { 0 } }; 1084static SCCBCARD FPT_BL_Card[MAX_CARDS] = { { 0 } };
1086static SCCBSCAM_INFO FPT_scamInfo[MAX_SCSI_TAR] = { { { 0 } } }; 1085static SCCBSCAM_INFO FPT_scamInfo[MAX_SCSI_TAR] = { { { 0 } } };
1087static NVRAMINFO FPT_nvRamInfo[MAX_MB_CARDS] = { { 0 } }; 1086static NVRAMINFO FPT_nvRamInfo[MAX_MB_CARDS] = { { 0 } };
@@ -1793,7 +1792,7 @@ static int FlashPoint_AbortCCB(unsigned long pCurrCard, struct sccb * p_Sccb)
1793 CALL_BK_FN callback; 1792 CALL_BK_FN callback;
1794 unsigned char TID; 1793 unsigned char TID;
1795 struct sccb * pSaveSCCB; 1794 struct sccb * pSaveSCCB;
1796 PSCCBMgr_tar_info currTar_Info; 1795 struct sccb_mgr_tar_info * currTar_Info;
1797 1796
1798 1797
1799 ioport = ((PSCCBcard) pCurrCard)->ioPort; 1798 ioport = ((PSCCBcard) pCurrCard)->ioPort;
@@ -2161,7 +2160,7 @@ static unsigned char FPT_SccbMgr_bad_isr(unsigned long p_port, unsigned char p_c
2161 PSCCBcard pCurrCard, unsigned short p_int) 2160 PSCCBcard pCurrCard, unsigned short p_int)
2162{ 2161{
2163 unsigned char temp, ScamFlg; 2162 unsigned char temp, ScamFlg;
2164 PSCCBMgr_tar_info currTar_Info; 2163 struct sccb_mgr_tar_info * currTar_Info;
2165 PNVRamInfo pCurrNvRam; 2164 PNVRamInfo pCurrNvRam;
2166 2165
2167 2166
@@ -2373,7 +2372,7 @@ static void FPT_SccbMgrTableInitTarget(unsigned char p_card, unsigned char targe
2373{ 2372{
2374 2373
2375 unsigned char lun, qtag; 2374 unsigned char lun, qtag;
2376 PSCCBMgr_tar_info currTar_Info; 2375 struct sccb_mgr_tar_info * currTar_Info;
2377 2376
2378 currTar_Info = &FPT_sccbMgrTbl[p_card][target]; 2377 currTar_Info = &FPT_sccbMgrTbl[p_card][target];
2379 2378
@@ -2496,7 +2495,7 @@ static void FPT_ssel(unsigned long port, unsigned char p_card)
2496 unsigned long cdb_reg; 2495 unsigned long cdb_reg;
2497 PSCCBcard CurrCard; 2496 PSCCBcard CurrCard;
2498 struct sccb * currSCCB; 2497 struct sccb * currSCCB;
2499 PSCCBMgr_tar_info currTar_Info; 2498 struct sccb_mgr_tar_info * currTar_Info;
2500 unsigned char lastTag, lun; 2499 unsigned char lastTag, lun;
2501 2500
2502 CurrCard = &FPT_BL_Card[p_card]; 2501 CurrCard = &FPT_BL_Card[p_card];
@@ -2805,7 +2804,7 @@ static void FPT_sres(unsigned long port, unsigned char p_card, PSCCBcard pCurrCa
2805 unsigned char our_target, message, lun = 0, tag, msgRetryCount; 2804 unsigned char our_target, message, lun = 0, tag, msgRetryCount;
2806 2805
2807 2806
2808 PSCCBMgr_tar_info currTar_Info; 2807 struct sccb_mgr_tar_info * currTar_Info;
2809 struct sccb * currSCCB; 2808 struct sccb * currSCCB;
2810 2809
2811 2810
@@ -3113,7 +3112,7 @@ static void FPT_sdecm(unsigned char message, unsigned long port, unsigned char p
3113{ 3112{
3114 struct sccb * currSCCB; 3113 struct sccb * currSCCB;
3115 PSCCBcard CurrCard; 3114 PSCCBcard CurrCard;
3116 PSCCBMgr_tar_info currTar_Info; 3115 struct sccb_mgr_tar_info * currTar_Info;
3117 3116
3118 CurrCard = &FPT_BL_Card[p_card]; 3117 CurrCard = &FPT_BL_Card[p_card];
3119 currSCCB = CurrCard->currentSCCB; 3118 currSCCB = CurrCard->currentSCCB;
@@ -3370,7 +3369,7 @@ static void FPT_shandem(unsigned long port, unsigned char p_card, struct sccb *
3370static unsigned char FPT_sisyncn(unsigned long port, unsigned char p_card, unsigned char syncFlag) 3369static unsigned char FPT_sisyncn(unsigned long port, unsigned char p_card, unsigned char syncFlag)
3371{ 3370{
3372 struct sccb * currSCCB; 3371 struct sccb * currSCCB;
3373 PSCCBMgr_tar_info currTar_Info; 3372 struct sccb_mgr_tar_info * currTar_Info;
3374 3373
3375 currSCCB = FPT_BL_Card[p_card].currentSCCB; 3374 currSCCB = FPT_BL_Card[p_card].currentSCCB;
3376 currTar_Info = &FPT_sccbMgrTbl[p_card][currSCCB->TargID]; 3375 currTar_Info = &FPT_sccbMgrTbl[p_card][currSCCB->TargID];
@@ -3446,7 +3445,7 @@ static void FPT_stsyncn(unsigned long port, unsigned char p_card)
3446{ 3445{
3447 unsigned char sync_msg,offset,sync_reg,our_sync_msg; 3446 unsigned char sync_msg,offset,sync_reg,our_sync_msg;
3448 struct sccb * currSCCB; 3447 struct sccb * currSCCB;
3449 PSCCBMgr_tar_info currTar_Info; 3448 struct sccb_mgr_tar_info * currTar_Info;
3450 3449
3451 currSCCB = FPT_BL_Card[p_card].currentSCCB; 3450 currSCCB = FPT_BL_Card[p_card].currentSCCB;
3452 currTar_Info = &FPT_sccbMgrTbl[p_card][currSCCB->TargID]; 3451 currTar_Info = &FPT_sccbMgrTbl[p_card][currSCCB->TargID];
@@ -3608,7 +3607,7 @@ static void FPT_sisyncr(unsigned long port,unsigned char sync_pulse, unsigned ch
3608static unsigned char FPT_siwidn(unsigned long port, unsigned char p_card) 3607static unsigned char FPT_siwidn(unsigned long port, unsigned char p_card)
3609{ 3608{
3610 struct sccb * currSCCB; 3609 struct sccb * currSCCB;
3611 PSCCBMgr_tar_info currTar_Info; 3610 struct sccb_mgr_tar_info * currTar_Info;
3612 3611
3613 currSCCB = FPT_BL_Card[p_card].currentSCCB; 3612 currSCCB = FPT_BL_Card[p_card].currentSCCB;
3614 currTar_Info = &FPT_sccbMgrTbl[p_card][currSCCB->TargID]; 3613 currTar_Info = &FPT_sccbMgrTbl[p_card][currSCCB->TargID];
@@ -3661,7 +3660,7 @@ static void FPT_stwidn(unsigned long port, unsigned char p_card)
3661{ 3660{
3662 unsigned char width; 3661 unsigned char width;
3663 struct sccb * currSCCB; 3662 struct sccb * currSCCB;
3664 PSCCBMgr_tar_info currTar_Info; 3663 struct sccb_mgr_tar_info * currTar_Info;
3665 3664
3666 currSCCB = FPT_BL_Card[p_card].currentSCCB; 3665 currSCCB = FPT_BL_Card[p_card].currentSCCB;
3667 currTar_Info = &FPT_sccbMgrTbl[p_card][currSCCB->TargID]; 3666 currTar_Info = &FPT_sccbMgrTbl[p_card][currSCCB->TargID];
@@ -3767,7 +3766,7 @@ static void FPT_siwidr(unsigned long port, unsigned char width)
3767 * 3766 *
3768 *---------------------------------------------------------------------*/ 3767 *---------------------------------------------------------------------*/
3769static void FPT_sssyncv(unsigned long p_port, unsigned char p_id, unsigned char p_sync_value, 3768static void FPT_sssyncv(unsigned long p_port, unsigned char p_id, unsigned char p_sync_value,
3770 PSCCBMgr_tar_info currTar_Info) 3769 struct sccb_mgr_tar_info * currTar_Info)
3771{ 3770{
3772 unsigned char index; 3771 unsigned char index;
3773 3772
@@ -3842,7 +3841,7 @@ static void FPT_sresb(unsigned long port, unsigned char p_card)
3842{ 3841{
3843 unsigned char scsiID, i; 3842 unsigned char scsiID, i;
3844 3843
3845 PSCCBMgr_tar_info currTar_Info; 3844 struct sccb_mgr_tar_info * currTar_Info;
3846 3845
3847 WR_HARPOON(port+hp_page_ctrl, 3846 WR_HARPOON(port+hp_page_ctrl,
3848 (RD_HARPOON(port+hp_page_ctrl) | G_INT_DISABLE)); 3847 (RD_HARPOON(port+hp_page_ctrl) | G_INT_DISABLE));
@@ -4157,7 +4156,7 @@ static void FPT_schkdd(unsigned long port, unsigned char p_card)
4157 4156
4158static void FPT_sinits(struct sccb * p_sccb, unsigned char p_card) 4157static void FPT_sinits(struct sccb * p_sccb, unsigned char p_card)
4159{ 4158{
4160 PSCCBMgr_tar_info currTar_Info; 4159 struct sccb_mgr_tar_info * currTar_Info;
4161 4160
4162 if((p_sccb->TargID > MAX_SCSI_TAR) || (p_sccb->Lun > MAX_LUN)) 4161 if((p_sccb->TargID > MAX_SCSI_TAR) || (p_sccb->Lun > MAX_LUN))
4163 { 4162 {
@@ -4429,7 +4428,7 @@ static void FPT_phaseMsgOut(unsigned long port, unsigned char p_card)
4429{ 4428{
4430 unsigned char message,scsiID; 4429 unsigned char message,scsiID;
4431 struct sccb * currSCCB; 4430 struct sccb * currSCCB;
4432 PSCCBMgr_tar_info currTar_Info; 4431 struct sccb_mgr_tar_info * currTar_Info;
4433 4432
4434 currSCCB = FPT_BL_Card[p_card].currentSCCB; 4433 currSCCB = FPT_BL_Card[p_card].currentSCCB;
4435 4434
@@ -6936,7 +6935,7 @@ static void FPT_DiagEEPROM(unsigned long p_port)
6936static void FPT_queueSearchSelect(PSCCBcard pCurrCard, unsigned char p_card) 6935static void FPT_queueSearchSelect(PSCCBcard pCurrCard, unsigned char p_card)
6937{ 6936{
6938 unsigned char scan_ptr, lun; 6937 unsigned char scan_ptr, lun;
6939 PSCCBMgr_tar_info currTar_Info; 6938 struct sccb_mgr_tar_info * currTar_Info;
6940 struct sccb * pOldSccb; 6939 struct sccb * pOldSccb;
6941 6940
6942 scan_ptr = pCurrCard->scanIndex; 6941 scan_ptr = pCurrCard->scanIndex;
@@ -7067,7 +7066,7 @@ static void FPT_queueSearchSelect(PSCCBcard pCurrCard, unsigned char p_card)
7067static void FPT_queueSelectFail(PSCCBcard pCurrCard, unsigned char p_card) 7066static void FPT_queueSelectFail(PSCCBcard pCurrCard, unsigned char p_card)
7068{ 7067{
7069 unsigned char thisTarg; 7068 unsigned char thisTarg;
7070 PSCCBMgr_tar_info currTar_Info; 7069 struct sccb_mgr_tar_info * currTar_Info;
7071 7070
7072 if (pCurrCard->currentSCCB != NULL) 7071 if (pCurrCard->currentSCCB != NULL)
7073 { 7072 {
@@ -7109,7 +7108,7 @@ static void FPT_queueCmdComplete(PSCCBcard pCurrCard, struct sccb * p_sccb,
7109 7108
7110 unsigned char i, SCSIcmd; 7109 unsigned char i, SCSIcmd;
7111 CALL_BK_FN callback; 7110 CALL_BK_FN callback;
7112 PSCCBMgr_tar_info currTar_Info; 7111 struct sccb_mgr_tar_info * currTar_Info;
7113 7112
7114 SCSIcmd = p_sccb->Cdb[0]; 7113 SCSIcmd = p_sccb->Cdb[0];
7115 7114
@@ -7207,7 +7206,7 @@ static void FPT_queueCmdComplete(PSCCBcard pCurrCard, struct sccb * p_sccb,
7207 *---------------------------------------------------------------------*/ 7206 *---------------------------------------------------------------------*/
7208static void FPT_queueDisconnect(struct sccb * p_sccb, unsigned char p_card) 7207static void FPT_queueDisconnect(struct sccb * p_sccb, unsigned char p_card)
7209{ 7208{
7210 PSCCBMgr_tar_info currTar_Info; 7209 struct sccb_mgr_tar_info * currTar_Info;
7211 7210
7212 currTar_Info = &FPT_sccbMgrTbl[p_card][p_sccb->TargID]; 7211 currTar_Info = &FPT_sccbMgrTbl[p_card][p_sccb->TargID];
7213 7212
@@ -7244,7 +7243,7 @@ static void FPT_queueFlushSccb(unsigned char p_card, unsigned char error_code)
7244{ 7243{
7245 unsigned char qtag,thisTarg; 7244 unsigned char qtag,thisTarg;
7246 struct sccb * currSCCB; 7245 struct sccb * currSCCB;
7247 PSCCBMgr_tar_info currTar_Info; 7246 struct sccb_mgr_tar_info * currTar_Info;
7248 7247
7249 currSCCB = FPT_BL_Card[p_card].currentSCCB; 7248 currSCCB = FPT_BL_Card[p_card].currentSCCB;
7250 if(currSCCB != NULL) 7249 if(currSCCB != NULL)
@@ -7283,7 +7282,7 @@ static void FPT_queueFlushTargSccb(unsigned char p_card, unsigned char thisTarg
7283 unsigned char error_code) 7282 unsigned char error_code)
7284{ 7283{
7285 unsigned char qtag; 7284 unsigned char qtag;
7286 PSCCBMgr_tar_info currTar_Info; 7285 struct sccb_mgr_tar_info * currTar_Info;
7287 7286
7288 currTar_Info = &FPT_sccbMgrTbl[p_card][thisTarg]; 7287 currTar_Info = &FPT_sccbMgrTbl[p_card][thisTarg];
7289 7288
@@ -7311,7 +7310,7 @@ static void FPT_queueFlushTargSccb(unsigned char p_card, unsigned char thisTarg
7311 7310
7312static void FPT_queueAddSccb(struct sccb * p_SCCB, unsigned char p_card) 7311static void FPT_queueAddSccb(struct sccb * p_SCCB, unsigned char p_card)
7313{ 7312{
7314 PSCCBMgr_tar_info currTar_Info; 7313 struct sccb_mgr_tar_info * currTar_Info;
7315 currTar_Info = &FPT_sccbMgrTbl[p_card][p_SCCB->TargID]; 7314 currTar_Info = &FPT_sccbMgrTbl[p_card][p_SCCB->TargID];
7316 7315
7317 p_SCCB->Sccb_forwardlink = NULL; 7316 p_SCCB->Sccb_forwardlink = NULL;
@@ -7346,7 +7345,7 @@ static void FPT_queueAddSccb(struct sccb * p_SCCB, unsigned char p_card)
7346static unsigned char FPT_queueFindSccb(struct sccb * p_SCCB, unsigned char p_card) 7345static unsigned char FPT_queueFindSccb(struct sccb * p_SCCB, unsigned char p_card)
7347{ 7346{
7348 struct sccb * q_ptr; 7347 struct sccb * q_ptr;
7349 PSCCBMgr_tar_info currTar_Info; 7348 struct sccb_mgr_tar_info * currTar_Info;
7350 7349
7351 currTar_Info = &FPT_sccbMgrTbl[p_card][p_SCCB->TargID]; 7350 currTar_Info = &FPT_sccbMgrTbl[p_card][p_SCCB->TargID];
7352 7351