aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/scsi/FlashPoint.c143
1 files changed, 71 insertions, 72 deletions
diff --git a/drivers/scsi/FlashPoint.c b/drivers/scsi/FlashPoint.c
index 022a4c0da7e1..88b7da371399 100644
--- a/drivers/scsi/FlashPoint.c
+++ b/drivers/scsi/FlashPoint.c
@@ -53,9 +53,8 @@
53 53
54 54
55 55
56 56struct sccb;
57typedef struct _SCCB *PSCCB; 57typedef void (*CALL_BK_FN)(struct sccb *);
58typedef void (*CALL_BK_FN)(PSCCB);
59 58
60 59
61typedef struct SCCBMgr_info { 60typedef struct SCCBMgr_info {
@@ -110,7 +109,7 @@ typedef SCCBMGR_INFO * PSCCBMGR_INFO;
110 109
111 110
112#pragma pack(1) 111#pragma pack(1)
113typedef struct _SCCB { 112struct sccb {
114 unsigned char OperationCode; 113 unsigned char OperationCode;
115 unsigned char ControlByte; 114 unsigned char ControlByte;
116 unsigned char CdbLength; 115 unsigned char CdbLength;
@@ -146,14 +145,14 @@ typedef struct _SCCB {
146 unsigned char Sccb_tag; 145 unsigned char Sccb_tag;
147 unsigned char Sccb_scsistat; 146 unsigned char Sccb_scsistat;
148 unsigned char Sccb_idmsg; /* image of last msg in */ 147 unsigned char Sccb_idmsg; /* image of last msg in */
149 PSCCB Sccb_forwardlink; 148 struct sccb * Sccb_forwardlink;
150 PSCCB Sccb_backlink; 149 struct sccb * Sccb_backlink;
151 unsigned long Sccb_savedATC; 150 unsigned long Sccb_savedATC;
152 unsigned char Save_Cdb[6]; 151 unsigned char Save_Cdb[6];
153 unsigned char Save_CdbLen; 152 unsigned char Save_CdbLen;
154 unsigned char Sccb_XferState; 153 unsigned char Sccb_XferState;
155 unsigned long Sccb_SGoffset; 154 unsigned long Sccb_SGoffset;
156 } SCCB; 155 };
157 156
158 157
159#pragma pack() 158#pragma pack()
@@ -275,8 +274,8 @@ typedef struct SCCBMgr_tar_info *PSCCBMgr_tar_info;
275 274
276typedef struct SCCBMgr_tar_info { 275typedef struct SCCBMgr_tar_info {
277 276
278 PSCCB TarSelQ_Head; 277 struct sccb * TarSelQ_Head;
279 PSCCB TarSelQ_Tail; 278 struct sccb * TarSelQ_Tail;
280 unsigned char TarLUN_CA; /*Contingent Allgiance */ 279 unsigned char TarLUN_CA; /*Contingent Allgiance */
281 unsigned char TarTagQ_Cnt; 280 unsigned char TarTagQ_Cnt;
282 unsigned char TarSelQ_Cnt; 281 unsigned char TarSelQ_Cnt;
@@ -309,7 +308,7 @@ typedef NVRAMINFO *PNVRamInfo;
309 308
310 309
311typedef struct SCCBcard { 310typedef struct SCCBcard {
312 PSCCB currentSCCB; 311 struct sccb * currentSCCB;
313 PSCCBMGR_INFO cardInfo; 312 PSCCBMGR_INFO cardInfo;
314 313
315 unsigned long ioPort; 314 unsigned long ioPort;
@@ -322,7 +321,7 @@ typedef struct SCCBcard {
322 unsigned char globalFlags; 321 unsigned char globalFlags;
323 unsigned char ourId; 322 unsigned char ourId;
324 PNVRamInfo pNvRamInfo; 323 PNVRamInfo pNvRamInfo;
325 PSCCB discQ_Tbl[QUEUE_DEPTH]; 324 struct sccb * discQ_Tbl[QUEUE_DEPTH];
326 325
327}SCCBCARD; 326}SCCBCARD;
328 327
@@ -973,7 +972,7 @@ typedef struct SCCBscam_info {
973static unsigned char FPT_sisyncn(unsigned long port, unsigned char p_card, unsigned char syncFlag); 972static unsigned char FPT_sisyncn(unsigned long port, unsigned char p_card, unsigned char syncFlag);
974static void FPT_ssel(unsigned long port, unsigned char p_card); 973static void FPT_ssel(unsigned long port, unsigned char p_card);
975static void FPT_sres(unsigned long port, unsigned char p_card, PSCCBcard pCurrCard); 974static void FPT_sres(unsigned long port, unsigned char p_card, PSCCBcard pCurrCard);
976static void FPT_shandem(unsigned long port, unsigned char p_card,PSCCB pCurrSCCB); 975static void FPT_shandem(unsigned long port, unsigned char p_card,struct sccb * pCurrSCCB);
977static void FPT_stsyncn(unsigned long port, unsigned char p_card); 976static void FPT_stsyncn(unsigned long port, unsigned char p_card);
978static void FPT_sisyncr(unsigned long port,unsigned char sync_pulse, unsigned char offset); 977static void FPT_sisyncr(unsigned long port,unsigned char sync_pulse, unsigned char offset);
979static void FPT_sssyncv(unsigned long p_port, unsigned char p_id, unsigned char p_sync_value, 978static void FPT_sssyncv(unsigned long p_port, unsigned char p_id, unsigned char p_sync_value,
@@ -989,7 +988,7 @@ static void FPT_SendMsg(unsigned long port, unsigned char message);
989static void FPT_queueFlushTargSccb(unsigned char p_card, unsigned char thisTarg, 988static void FPT_queueFlushTargSccb(unsigned char p_card, unsigned char thisTarg,
990 unsigned char error_code); 989 unsigned char error_code);
991 990
992static void FPT_sinits(PSCCB p_sccb, unsigned char p_card); 991static void FPT_sinits(struct sccb * p_sccb, unsigned char p_card);
993static void FPT_RNVRamData(PNVRamInfo pNvRamInfo); 992static void FPT_RNVRamData(PNVRamInfo pNvRamInfo);
994 993
995static unsigned char FPT_siwidn(unsigned long port, unsigned char p_card); 994static unsigned char FPT_siwidn(unsigned long port, unsigned char p_card);
@@ -998,14 +997,14 @@ static void FPT_siwidr(unsigned long port, unsigned char width);
998 997
999 998
1000static void FPT_queueSelectFail(PSCCBcard pCurrCard, unsigned char p_card); 999static void FPT_queueSelectFail(PSCCBcard pCurrCard, unsigned char p_card);
1001static void FPT_queueDisconnect(PSCCB p_SCCB, unsigned char p_card); 1000static void FPT_queueDisconnect(struct sccb * p_SCCB, unsigned char p_card);
1002static void FPT_queueCmdComplete(PSCCBcard pCurrCard, PSCCB p_SCCB, 1001static void FPT_queueCmdComplete(PSCCBcard pCurrCard, struct sccb * p_SCCB,
1003 unsigned char p_card); 1002 unsigned char p_card);
1004static void FPT_queueSearchSelect(PSCCBcard pCurrCard, unsigned char p_card); 1003static void FPT_queueSearchSelect(PSCCBcard pCurrCard, unsigned char p_card);
1005static void FPT_queueFlushSccb(unsigned char p_card, unsigned char error_code); 1004static void FPT_queueFlushSccb(unsigned char p_card, unsigned char error_code);
1006static void FPT_queueAddSccb(PSCCB p_SCCB, unsigned char card); 1005static void FPT_queueAddSccb(struct sccb * p_SCCB, unsigned char card);
1007static unsigned char FPT_queueFindSccb(PSCCB p_SCCB, unsigned char p_card); 1006static unsigned char FPT_queueFindSccb(struct sccb * p_SCCB, unsigned char p_card);
1008static void FPT_utilUpdateResidual(PSCCB p_SCCB); 1007static void FPT_utilUpdateResidual(struct sccb * p_SCCB);
1009static unsigned short FPT_CalcCrc16(unsigned char buffer[]); 1008static unsigned short FPT_CalcCrc16(unsigned char buffer[]);
1010static unsigned char FPT_CalcLrc(unsigned char buffer[]); 1009static unsigned char FPT_CalcLrc(unsigned char buffer[]);
1011 1010
@@ -1043,10 +1042,10 @@ static void FPT_DiagEEPROM(unsigned long p_port);
1043 1042
1044 1043
1045static void FPT_dataXferProcessor(unsigned long port, PSCCBcard pCurrCard); 1044static void FPT_dataXferProcessor(unsigned long port, PSCCBcard pCurrCard);
1046static void FPT_busMstrSGDataXferStart(unsigned long port, PSCCB pCurrSCCB); 1045static void FPT_busMstrSGDataXferStart(unsigned long port, struct sccb * pCurrSCCB);
1047static void FPT_busMstrDataXferStart(unsigned long port, PSCCB pCurrSCCB); 1046static void FPT_busMstrDataXferStart(unsigned long port, struct sccb * pCurrSCCB);
1048static void FPT_hostDataXferAbort(unsigned long port, unsigned char p_card, PSCCB pCurrSCCB); 1047static void FPT_hostDataXferAbort(unsigned long port, unsigned char p_card, struct sccb * pCurrSCCB);
1049static void FPT_hostDataXferRestart(PSCCB currSCCB); 1048static void FPT_hostDataXferRestart(struct sccb * currSCCB);
1050 1049
1051 1050
1052static unsigned char FPT_SccbMgr_bad_isr(unsigned long p_port, unsigned char p_card, 1051static unsigned char FPT_SccbMgr_bad_isr(unsigned long p_port, unsigned char p_card,
@@ -1667,11 +1666,11 @@ static unsigned char FPT_ChkIfChipInitialized(unsigned long ioPort)
1667 * callback function. 1666 * callback function.
1668 * 1667 *
1669 *---------------------------------------------------------------------*/ 1668 *---------------------------------------------------------------------*/
1670static void FlashPoint_StartCCB(unsigned long pCurrCard, PSCCB p_Sccb) 1669static void FlashPoint_StartCCB(unsigned long pCurrCard, struct sccb * p_Sccb)
1671{ 1670{
1672 unsigned long ioport; 1671 unsigned long ioport;
1673 unsigned char thisCard, lun; 1672 unsigned char thisCard, lun;
1674 PSCCB pSaveSccb; 1673 struct sccb * pSaveSccb;
1675 CALL_BK_FN callback; 1674 CALL_BK_FN callback;
1676 1675
1677 thisCard = ((PSCCBcard) pCurrCard)->cardIndex; 1676 thisCard = ((PSCCBcard) pCurrCard)->cardIndex;
@@ -1787,14 +1786,14 @@ static void FlashPoint_StartCCB(unsigned long pCurrCard, PSCCB p_Sccb)
1787 * callback function. 1786 * callback function.
1788 * 1787 *
1789 *---------------------------------------------------------------------*/ 1788 *---------------------------------------------------------------------*/
1790static int FlashPoint_AbortCCB(unsigned long pCurrCard, PSCCB p_Sccb) 1789static int FlashPoint_AbortCCB(unsigned long pCurrCard, struct sccb * p_Sccb)
1791{ 1790{
1792 unsigned long ioport; 1791 unsigned long ioport;
1793 1792
1794 unsigned char thisCard; 1793 unsigned char thisCard;
1795 CALL_BK_FN callback; 1794 CALL_BK_FN callback;
1796 unsigned char TID; 1795 unsigned char TID;
1797 PSCCB pSaveSCCB; 1796 struct sccb * pSaveSCCB;
1798 PSCCBMgr_tar_info currTar_Info; 1797 PSCCBMgr_tar_info currTar_Info;
1799 1798
1800 1799
@@ -1916,7 +1915,7 @@ static unsigned char FlashPoint_InterruptPending(unsigned long pCurrCard)
1916 *---------------------------------------------------------------------*/ 1915 *---------------------------------------------------------------------*/
1917static int FlashPoint_HandleInterrupt(unsigned long pCurrCard) 1916static int FlashPoint_HandleInterrupt(unsigned long pCurrCard)
1918{ 1917{
1919 PSCCB currSCCB; 1918 struct sccb * currSCCB;
1920 unsigned char thisCard,result,bm_status, bm_int_st; 1919 unsigned char thisCard,result,bm_status, bm_int_st;
1921 unsigned short hp_int; 1920 unsigned short hp_int;
1922 unsigned char i, target; 1921 unsigned char i, target;
@@ -2417,7 +2416,7 @@ static void FPT_SccbMgrTableInitTarget(unsigned char p_card, unsigned char targe
2417 * 2416 *
2418 *---------------------------------------------------------------------*/ 2417 *---------------------------------------------------------------------*/
2419 2418
2420static unsigned char FPT_sfm(unsigned long port, PSCCB pCurrSCCB) 2419static unsigned char FPT_sfm(unsigned long port, struct sccb * pCurrSCCB)
2421{ 2420{
2422 unsigned char message; 2421 unsigned char message;
2423 unsigned short TimeOutLoop; 2422 unsigned short TimeOutLoop;
@@ -2497,7 +2496,7 @@ static void FPT_ssel(unsigned long port, unsigned char p_card)
2497 2496
2498 unsigned long cdb_reg; 2497 unsigned long cdb_reg;
2499 PSCCBcard CurrCard; 2498 PSCCBcard CurrCard;
2500 PSCCB currSCCB; 2499 struct sccb * currSCCB;
2501 PSCCBMgr_tar_info currTar_Info; 2500 PSCCBMgr_tar_info currTar_Info;
2502 unsigned char lastTag, lun; 2501 unsigned char lastTag, lun;
2503 2502
@@ -2808,7 +2807,7 @@ static void FPT_sres(unsigned long port, unsigned char p_card, PSCCBcard pCurrCa
2808 2807
2809 2808
2810 PSCCBMgr_tar_info currTar_Info; 2809 PSCCBMgr_tar_info currTar_Info;
2811 PSCCB currSCCB; 2810 struct sccb * currSCCB;
2812 2811
2813 2812
2814 2813
@@ -3113,7 +3112,7 @@ static void FPT_SendMsg(unsigned long port, unsigned char message)
3113 *---------------------------------------------------------------------*/ 3112 *---------------------------------------------------------------------*/
3114static void FPT_sdecm(unsigned char message, unsigned long port, unsigned char p_card) 3113static void FPT_sdecm(unsigned char message, unsigned long port, unsigned char p_card)
3115{ 3114{
3116 PSCCB currSCCB; 3115 struct sccb * currSCCB;
3117 PSCCBcard CurrCard; 3116 PSCCBcard CurrCard;
3118 PSCCBMgr_tar_info currTar_Info; 3117 PSCCBMgr_tar_info currTar_Info;
3119 3118
@@ -3290,7 +3289,7 @@ static void FPT_sdecm(unsigned char message, unsigned long port, unsigned char p
3290 * Description: Decide what to do with the extended message. 3289 * Description: Decide what to do with the extended message.
3291 * 3290 *
3292 *---------------------------------------------------------------------*/ 3291 *---------------------------------------------------------------------*/
3293static void FPT_shandem(unsigned long port, unsigned char p_card, PSCCB pCurrSCCB) 3292static void FPT_shandem(unsigned long port, unsigned char p_card, struct sccb * pCurrSCCB)
3294{ 3293{
3295 unsigned char length,message; 3294 unsigned char length,message;
3296 3295
@@ -3371,7 +3370,7 @@ static void FPT_shandem(unsigned long port, unsigned char p_card, PSCCB pCurrSCC
3371 3370
3372static unsigned char FPT_sisyncn(unsigned long port, unsigned char p_card, unsigned char syncFlag) 3371static unsigned char FPT_sisyncn(unsigned long port, unsigned char p_card, unsigned char syncFlag)
3373{ 3372{
3374 PSCCB currSCCB; 3373 struct sccb * currSCCB;
3375 PSCCBMgr_tar_info currTar_Info; 3374 PSCCBMgr_tar_info currTar_Info;
3376 3375
3377 currSCCB = FPT_BL_Card[p_card].currentSCCB; 3376 currSCCB = FPT_BL_Card[p_card].currentSCCB;
@@ -3447,7 +3446,7 @@ static unsigned char FPT_sisyncn(unsigned long port, unsigned char p_card, unsig
3447static void FPT_stsyncn(unsigned long port, unsigned char p_card) 3446static void FPT_stsyncn(unsigned long port, unsigned char p_card)
3448{ 3447{
3449 unsigned char sync_msg,offset,sync_reg,our_sync_msg; 3448 unsigned char sync_msg,offset,sync_reg,our_sync_msg;
3450 PSCCB currSCCB; 3449 struct sccb * currSCCB;
3451 PSCCBMgr_tar_info currTar_Info; 3450 PSCCBMgr_tar_info currTar_Info;
3452 3451
3453 currSCCB = FPT_BL_Card[p_card].currentSCCB; 3452 currSCCB = FPT_BL_Card[p_card].currentSCCB;
@@ -3609,7 +3608,7 @@ static void FPT_sisyncr(unsigned long port,unsigned char sync_pulse, unsigned ch
3609 3608
3610static unsigned char FPT_siwidn(unsigned long port, unsigned char p_card) 3609static unsigned char FPT_siwidn(unsigned long port, unsigned char p_card)
3611{ 3610{
3612 PSCCB currSCCB; 3611 struct sccb * currSCCB;
3613 PSCCBMgr_tar_info currTar_Info; 3612 PSCCBMgr_tar_info currTar_Info;
3614 3613
3615 currSCCB = FPT_BL_Card[p_card].currentSCCB; 3614 currSCCB = FPT_BL_Card[p_card].currentSCCB;
@@ -3662,7 +3661,7 @@ static unsigned char FPT_siwidn(unsigned long port, unsigned char p_card)
3662static void FPT_stwidn(unsigned long port, unsigned char p_card) 3661static void FPT_stwidn(unsigned long port, unsigned char p_card)
3663{ 3662{
3664 unsigned char width; 3663 unsigned char width;
3665 PSCCB currSCCB; 3664 struct sccb * currSCCB;
3666 PSCCBMgr_tar_info currTar_Info; 3665 PSCCBMgr_tar_info currTar_Info;
3667 3666
3668 currSCCB = FPT_BL_Card[p_card].currentSCCB; 3667 currSCCB = FPT_BL_Card[p_card].currentSCCB;
@@ -3916,7 +3915,7 @@ static void FPT_sresb(unsigned long port, unsigned char p_card)
3916static void FPT_ssenss(PSCCBcard pCurrCard) 3915static void FPT_ssenss(PSCCBcard pCurrCard)
3917{ 3916{
3918 unsigned char i; 3917 unsigned char i;
3919 PSCCB currSCCB; 3918 struct sccb * currSCCB;
3920 3919
3921 currSCCB = pCurrCard->currentSCCB; 3920 currSCCB = pCurrCard->currentSCCB;
3922 3921
@@ -4049,7 +4048,7 @@ static void FPT_schkdd(unsigned long port, unsigned char p_card)
4049 unsigned short TimeOutLoop; 4048 unsigned short TimeOutLoop;
4050 unsigned char sPhase; 4049 unsigned char sPhase;
4051 4050
4052 PSCCB currSCCB; 4051 struct sccb * currSCCB;
4053 4052
4054 currSCCB = FPT_BL_Card[p_card].currentSCCB; 4053 currSCCB = FPT_BL_Card[p_card].currentSCCB;
4055 4054
@@ -4157,7 +4156,7 @@ static void FPT_schkdd(unsigned long port, unsigned char p_card)
4157 * 4156 *
4158 *---------------------------------------------------------------------*/ 4157 *---------------------------------------------------------------------*/
4159 4158
4160static void FPT_sinits(PSCCB p_sccb, unsigned char p_card) 4159static void FPT_sinits(struct sccb * p_sccb, unsigned char p_card)
4161{ 4160{
4162 PSCCBMgr_tar_info currTar_Info; 4161 PSCCBMgr_tar_info currTar_Info;
4163 4162
@@ -4265,7 +4264,7 @@ static void FPT_phaseDecode(unsigned long p_port, unsigned char p_card)
4265static void FPT_phaseDataOut(unsigned long port, unsigned char p_card) 4264static void FPT_phaseDataOut(unsigned long port, unsigned char p_card)
4266{ 4265{
4267 4266
4268 PSCCB currSCCB; 4267 struct sccb * currSCCB;
4269 4268
4270 currSCCB = FPT_BL_Card[p_card].currentSCCB; 4269 currSCCB = FPT_BL_Card[p_card].currentSCCB;
4271 if (currSCCB == NULL) 4270 if (currSCCB == NULL)
@@ -4309,7 +4308,7 @@ static void FPT_phaseDataOut(unsigned long port, unsigned char p_card)
4309static void FPT_phaseDataIn(unsigned long port, unsigned char p_card) 4308static void FPT_phaseDataIn(unsigned long port, unsigned char p_card)
4310{ 4309{
4311 4310
4312 PSCCB currSCCB; 4311 struct sccb * currSCCB;
4313 4312
4314 currSCCB = FPT_BL_Card[p_card].currentSCCB; 4313 currSCCB = FPT_BL_Card[p_card].currentSCCB;
4315 4314
@@ -4355,7 +4354,7 @@ static void FPT_phaseDataIn(unsigned long port, unsigned char p_card)
4355 4354
4356static void FPT_phaseCommand(unsigned long p_port, unsigned char p_card) 4355static void FPT_phaseCommand(unsigned long p_port, unsigned char p_card)
4357{ 4356{
4358 PSCCB currSCCB; 4357 struct sccb * currSCCB;
4359 unsigned long cdb_reg; 4358 unsigned long cdb_reg;
4360 unsigned char i; 4359 unsigned char i;
4361 4360
@@ -4430,7 +4429,7 @@ static void FPT_phaseStatus(unsigned long port, unsigned char p_card)
4430static void FPT_phaseMsgOut(unsigned long port, unsigned char p_card) 4429static void FPT_phaseMsgOut(unsigned long port, unsigned char p_card)
4431{ 4430{
4432 unsigned char message,scsiID; 4431 unsigned char message,scsiID;
4433 PSCCB currSCCB; 4432 struct sccb * currSCCB;
4434 PSCCBMgr_tar_info currTar_Info; 4433 PSCCBMgr_tar_info currTar_Info;
4435 4434
4436 currSCCB = FPT_BL_Card[p_card].currentSCCB; 4435 currSCCB = FPT_BL_Card[p_card].currentSCCB;
@@ -4578,7 +4577,7 @@ static void FPT_phaseMsgOut(unsigned long port, unsigned char p_card)
4578static void FPT_phaseMsgIn(unsigned long port, unsigned char p_card) 4577static void FPT_phaseMsgIn(unsigned long port, unsigned char p_card)
4579{ 4578{
4580 unsigned char message; 4579 unsigned char message;
4581 PSCCB currSCCB; 4580 struct sccb * currSCCB;
4582 4581
4583 currSCCB = FPT_BL_Card[p_card].currentSCCB; 4582 currSCCB = FPT_BL_Card[p_card].currentSCCB;
4584 4583
@@ -4630,7 +4629,7 @@ static void FPT_phaseMsgIn(unsigned long port, unsigned char p_card)
4630 4629
4631static void FPT_phaseIllegal(unsigned long port, unsigned char p_card) 4630static void FPT_phaseIllegal(unsigned long port, unsigned char p_card)
4632{ 4631{
4633 PSCCB currSCCB; 4632 struct sccb * currSCCB;
4634 4633
4635 currSCCB = FPT_BL_Card[p_card].currentSCCB; 4634 currSCCB = FPT_BL_Card[p_card].currentSCCB;
4636 4635
@@ -4659,7 +4658,7 @@ static void FPT_phaseIllegal(unsigned long port, unsigned char p_card)
4659static void FPT_phaseChkFifo(unsigned long port, unsigned char p_card) 4658static void FPT_phaseChkFifo(unsigned long port, unsigned char p_card)
4660{ 4659{
4661 unsigned long xfercnt; 4660 unsigned long xfercnt;
4662 PSCCB currSCCB; 4661 struct sccb * currSCCB;
4663 4662
4664 currSCCB = FPT_BL_Card[p_card].currentSCCB; 4663 currSCCB = FPT_BL_Card[p_card].currentSCCB;
4665 4664
@@ -4736,7 +4735,7 @@ static void FPT_phaseChkFifo(unsigned long port, unsigned char p_card)
4736 *---------------------------------------------------------------------*/ 4735 *---------------------------------------------------------------------*/
4737static void FPT_phaseBusFree(unsigned long port, unsigned char p_card) 4736static void FPT_phaseBusFree(unsigned long port, unsigned char p_card)
4738{ 4737{
4739 PSCCB currSCCB; 4738 struct sccb * currSCCB;
4740 4739
4741 currSCCB = FPT_BL_Card[p_card].currentSCCB; 4740 currSCCB = FPT_BL_Card[p_card].currentSCCB;
4742 4741
@@ -4942,7 +4941,7 @@ static void FPT_autoLoadDefaultMap(unsigned long p_port)
4942 4941
4943static void FPT_autoCmdCmplt(unsigned long p_port, unsigned char p_card) 4942static void FPT_autoCmdCmplt(unsigned long p_port, unsigned char p_card)
4944{ 4943{
4945 PSCCB currSCCB; 4944 struct sccb * currSCCB;
4946 unsigned char status_byte; 4945 unsigned char status_byte;
4947 4946
4948 currSCCB = FPT_BL_Card[p_card].currentSCCB; 4947 currSCCB = FPT_BL_Card[p_card].currentSCCB;
@@ -5157,7 +5156,7 @@ static void FPT_autoCmdCmplt(unsigned long p_port, unsigned char p_card)
5157 5156
5158static void FPT_dataXferProcessor(unsigned long port, PSCCBcard pCurrCard) 5157static void FPT_dataXferProcessor(unsigned long port, PSCCBcard pCurrCard)
5159{ 5158{
5160 PSCCB currSCCB; 5159 struct sccb * currSCCB;
5161 5160
5162 currSCCB = pCurrCard->currentSCCB; 5161 currSCCB = pCurrCard->currentSCCB;
5163 5162
@@ -5193,7 +5192,7 @@ static void FPT_dataXferProcessor(unsigned long port, PSCCBcard pCurrCard)
5193 * Description: 5192 * Description:
5194 * 5193 *
5195 *---------------------------------------------------------------------*/ 5194 *---------------------------------------------------------------------*/
5196static void FPT_busMstrSGDataXferStart(unsigned long p_port, PSCCB pcurrSCCB) 5195static void FPT_busMstrSGDataXferStart(unsigned long p_port, struct sccb * pcurrSCCB)
5197{ 5196{
5198 unsigned long count,addr,tmpSGCnt; 5197 unsigned long count,addr,tmpSGCnt;
5199 unsigned int sg_index; 5198 unsigned int sg_index;
@@ -5298,7 +5297,7 @@ static void FPT_busMstrSGDataXferStart(unsigned long p_port, PSCCB pcurrSCCB)
5298 * Description: 5297 * Description:
5299 * 5298 *
5300 *---------------------------------------------------------------------*/ 5299 *---------------------------------------------------------------------*/
5301static void FPT_busMstrDataXferStart(unsigned long p_port, PSCCB pcurrSCCB) 5300static void FPT_busMstrDataXferStart(unsigned long p_port, struct sccb * pcurrSCCB)
5302{ 5301{
5303 unsigned long addr,count; 5302 unsigned long addr,count;
5304 5303
@@ -5389,7 +5388,7 @@ static unsigned char FPT_busMstrTimeOut(unsigned long p_port)
5389 * Description: Abort any in progress transfer. 5388 * Description: Abort any in progress transfer.
5390 * 5389 *
5391 *---------------------------------------------------------------------*/ 5390 *---------------------------------------------------------------------*/
5392static void FPT_hostDataXferAbort(unsigned long port, unsigned char p_card, PSCCB pCurrSCCB) 5391static void FPT_hostDataXferAbort(unsigned long port, unsigned char p_card, struct sccb * pCurrSCCB)
5393{ 5392{
5394 5393
5395 unsigned long timeout; 5394 unsigned long timeout;
@@ -5647,7 +5646,7 @@ static void FPT_hostDataXferAbort(unsigned long port, unsigned char p_card, PSCC
5647 * pointers message. 5646 * pointers message.
5648 * 5647 *
5649 *---------------------------------------------------------------------*/ 5648 *---------------------------------------------------------------------*/
5650static void FPT_hostDataXferRestart(PSCCB currSCCB) 5649static void FPT_hostDataXferRestart(struct sccb * currSCCB)
5651{ 5650{
5652 unsigned long data_count; 5651 unsigned long data_count;
5653 unsigned int sg_index; 5652 unsigned int sg_index;
@@ -6939,7 +6938,7 @@ static void FPT_queueSearchSelect(PSCCBcard pCurrCard, unsigned char p_card)
6939{ 6938{
6940 unsigned char scan_ptr, lun; 6939 unsigned char scan_ptr, lun;
6941 PSCCBMgr_tar_info currTar_Info; 6940 PSCCBMgr_tar_info currTar_Info;
6942 PSCCB pOldSccb; 6941 struct sccb * pOldSccb;
6943 6942
6944 scan_ptr = pCurrCard->scanIndex; 6943 scan_ptr = pCurrCard->scanIndex;
6945 do 6944 do
@@ -6967,22 +6966,22 @@ static void FPT_queueSearchSelect(PSCCBcard pCurrCard, unsigned char p_card)
6967 (lun != pCurrCard->currentSCCB->Lun)) 6966 (lun != pCurrCard->currentSCCB->Lun))
6968 { 6967 {
6969 pOldSccb = pCurrCard->currentSCCB; 6968 pOldSccb = pCurrCard->currentSCCB;
6970 pCurrCard->currentSCCB = (PSCCB)(pCurrCard->currentSCCB)-> 6969 pCurrCard->currentSCCB = (struct sccb *)(pCurrCard->currentSCCB)->
6971 Sccb_forwardlink; 6970 Sccb_forwardlink;
6972 } 6971 }
6973 if(pCurrCard->currentSCCB == NULL) 6972 if(pCurrCard->currentSCCB == NULL)
6974 continue; 6973 continue;
6975 if(pOldSccb != NULL) 6974 if(pOldSccb != NULL)
6976 { 6975 {
6977 pOldSccb->Sccb_forwardlink = (PSCCB)(pCurrCard->currentSCCB)-> 6976 pOldSccb->Sccb_forwardlink = (struct sccb *)(pCurrCard->currentSCCB)->
6978 Sccb_forwardlink; 6977 Sccb_forwardlink;
6979 pOldSccb->Sccb_backlink = (PSCCB)(pCurrCard->currentSCCB)-> 6978 pOldSccb->Sccb_backlink = (struct sccb *)(pCurrCard->currentSCCB)->
6980 Sccb_backlink; 6979 Sccb_backlink;
6981 currTar_Info->TarSelQ_Cnt--; 6980 currTar_Info->TarSelQ_Cnt--;
6982 } 6981 }
6983 else 6982 else
6984 { 6983 {
6985 currTar_Info->TarSelQ_Head = (PSCCB)(pCurrCard->currentSCCB)->Sccb_forwardlink; 6984 currTar_Info->TarSelQ_Head = (struct sccb *)(pCurrCard->currentSCCB)->Sccb_forwardlink;
6986 6985
6987 if (currTar_Info->TarSelQ_Head == NULL) 6986 if (currTar_Info->TarSelQ_Head == NULL)
6988 { 6987 {
@@ -6992,7 +6991,7 @@ static void FPT_queueSearchSelect(PSCCBcard pCurrCard, unsigned char p_card)
6992 else 6991 else
6993 { 6992 {
6994 currTar_Info->TarSelQ_Cnt--; 6993 currTar_Info->TarSelQ_Cnt--;
6995 currTar_Info->TarSelQ_Head->Sccb_backlink = (PSCCB)NULL; 6994 currTar_Info->TarSelQ_Head->Sccb_backlink = (struct sccb *)NULL;
6996 } 6995 }
6997 } 6996 }
6998 pCurrCard->scanIndex = scan_ptr; 6997 pCurrCard->scanIndex = scan_ptr;
@@ -7021,7 +7020,7 @@ static void FPT_queueSearchSelect(PSCCBcard pCurrCard, unsigned char p_card)
7021 7020
7022 pCurrCard->currentSCCB = currTar_Info->TarSelQ_Head; 7021 pCurrCard->currentSCCB = currTar_Info->TarSelQ_Head;
7023 7022
7024 currTar_Info->TarSelQ_Head = (PSCCB)(pCurrCard->currentSCCB)->Sccb_forwardlink; 7023 currTar_Info->TarSelQ_Head = (struct sccb *)(pCurrCard->currentSCCB)->Sccb_forwardlink;
7025 7024
7026 if (currTar_Info->TarSelQ_Head == NULL) 7025 if (currTar_Info->TarSelQ_Head == NULL)
7027 { 7026 {
@@ -7031,7 +7030,7 @@ static void FPT_queueSearchSelect(PSCCBcard pCurrCard, unsigned char p_card)
7031 else 7030 else
7032 { 7031 {
7033 currTar_Info->TarSelQ_Cnt--; 7032 currTar_Info->TarSelQ_Cnt--;
7034 currTar_Info->TarSelQ_Head->Sccb_backlink = (PSCCB)NULL; 7033 currTar_Info->TarSelQ_Head->Sccb_backlink = (struct sccb *)NULL;
7035 } 7034 }
7036 7035
7037 scan_ptr++; 7036 scan_ptr++;
@@ -7073,10 +7072,10 @@ static void FPT_queueSelectFail(PSCCBcard pCurrCard, unsigned char p_card)
7073 7072
7074 if (pCurrCard->currentSCCB != NULL) 7073 if (pCurrCard->currentSCCB != NULL)
7075 { 7074 {
7076 thisTarg = (unsigned char)(((PSCCB)(pCurrCard->currentSCCB))->TargID); 7075 thisTarg = (unsigned char)(((struct sccb *)(pCurrCard->currentSCCB))->TargID);
7077 currTar_Info = &FPT_sccbMgrTbl[p_card][thisTarg]; 7076 currTar_Info = &FPT_sccbMgrTbl[p_card][thisTarg];
7078 7077
7079 pCurrCard->currentSCCB->Sccb_backlink = (PSCCB)NULL; 7078 pCurrCard->currentSCCB->Sccb_backlink = (struct sccb *)NULL;
7080 7079
7081 pCurrCard->currentSCCB->Sccb_forwardlink = currTar_Info->TarSelQ_Head; 7080 pCurrCard->currentSCCB->Sccb_forwardlink = currTar_Info->TarSelQ_Head;
7082 7081
@@ -7105,7 +7104,7 @@ static void FPT_queueSelectFail(PSCCBcard pCurrCard, unsigned char p_card)
7105 * 7104 *
7106 *---------------------------------------------------------------------*/ 7105 *---------------------------------------------------------------------*/
7107 7106
7108static void FPT_queueCmdComplete(PSCCBcard pCurrCard, PSCCB p_sccb, 7107static void FPT_queueCmdComplete(PSCCBcard pCurrCard, struct sccb * p_sccb,
7109 unsigned char p_card) 7108 unsigned char p_card)
7110{ 7109{
7111 7110
@@ -7207,7 +7206,7 @@ static void FPT_queueCmdComplete(PSCCBcard pCurrCard, PSCCB p_sccb,
7207 * Description: Add SCCB to our disconnect array. 7206 * Description: Add SCCB to our disconnect array.
7208 * 7207 *
7209 *---------------------------------------------------------------------*/ 7208 *---------------------------------------------------------------------*/
7210static void FPT_queueDisconnect(PSCCB p_sccb, unsigned char p_card) 7209static void FPT_queueDisconnect(struct sccb * p_sccb, unsigned char p_card)
7211{ 7210{
7212 PSCCBMgr_tar_info currTar_Info; 7211 PSCCBMgr_tar_info currTar_Info;
7213 7212
@@ -7245,7 +7244,7 @@ static void FPT_queueDisconnect(PSCCB p_sccb, unsigned char p_card)
7245static void FPT_queueFlushSccb(unsigned char p_card, unsigned char error_code) 7244static void FPT_queueFlushSccb(unsigned char p_card, unsigned char error_code)
7246{ 7245{
7247 unsigned char qtag,thisTarg; 7246 unsigned char qtag,thisTarg;
7248 PSCCB currSCCB; 7247 struct sccb * currSCCB;
7249 PSCCBMgr_tar_info currTar_Info; 7248 PSCCBMgr_tar_info currTar_Info;
7250 7249
7251 currSCCB = FPT_BL_Card[p_card].currentSCCB; 7250 currSCCB = FPT_BL_Card[p_card].currentSCCB;
@@ -7311,7 +7310,7 @@ static void FPT_queueFlushTargSccb(unsigned char p_card, unsigned char thisTarg
7311 7310
7312 7311
7313 7312
7314static void FPT_queueAddSccb(PSCCB p_SCCB, unsigned char p_card) 7313static void FPT_queueAddSccb(struct sccb * p_SCCB, unsigned char p_card)
7315{ 7314{
7316 PSCCBMgr_tar_info currTar_Info; 7315 PSCCBMgr_tar_info currTar_Info;
7317 currTar_Info = &FPT_sccbMgrTbl[p_card][p_SCCB->TargID]; 7316 currTar_Info = &FPT_sccbMgrTbl[p_card][p_SCCB->TargID];
@@ -7345,9 +7344,9 @@ static void FPT_queueAddSccb(PSCCB p_SCCB, unsigned char p_card)
7345 * 7344 *
7346 *---------------------------------------------------------------------*/ 7345 *---------------------------------------------------------------------*/
7347 7346
7348static unsigned char FPT_queueFindSccb(PSCCB p_SCCB, unsigned char p_card) 7347static unsigned char FPT_queueFindSccb(struct sccb * p_SCCB, unsigned char p_card)
7349{ 7348{
7350 PSCCB q_ptr; 7349 struct sccb * q_ptr;
7351 PSCCBMgr_tar_info currTar_Info; 7350 PSCCBMgr_tar_info currTar_Info;
7352 7351
7353 currTar_Info = &FPT_sccbMgrTbl[p_card][p_SCCB->TargID]; 7352 currTar_Info = &FPT_sccbMgrTbl[p_card][p_SCCB->TargID];
@@ -7406,7 +7405,7 @@ static unsigned char FPT_queueFindSccb(PSCCB p_SCCB, unsigned char p_card)
7406 * 7405 *
7407 *---------------------------------------------------------------------*/ 7406 *---------------------------------------------------------------------*/
7408 7407
7409static void FPT_utilUpdateResidual(PSCCB p_SCCB) 7408static void FPT_utilUpdateResidual(struct sccb * p_SCCB)
7410{ 7409{
7411 unsigned long partial_cnt; 7410 unsigned long partial_cnt;
7412 unsigned int sg_index; 7411 unsigned int sg_index;
@@ -7809,14 +7808,14 @@ FlashPoint__ReleaseHostAdapter(FlashPoint_CardHandle_T CardHandle)
7809static inline void 7808static inline void
7810FlashPoint__StartCCB(FlashPoint_CardHandle_T CardHandle, struct BusLogic_CCB *CCB) 7809FlashPoint__StartCCB(FlashPoint_CardHandle_T CardHandle, struct BusLogic_CCB *CCB)
7811{ 7810{
7812 FlashPoint_StartCCB(CardHandle, (PSCCB) CCB); 7811 FlashPoint_StartCCB(CardHandle, (struct sccb *) CCB);
7813} 7812}
7814 7813
7815 7814
7816static inline void 7815static inline void
7817FlashPoint__AbortCCB(FlashPoint_CardHandle_T CardHandle, struct BusLogic_CCB *CCB) 7816FlashPoint__AbortCCB(FlashPoint_CardHandle_T CardHandle, struct BusLogic_CCB *CCB)
7818{ 7817{
7819 FlashPoint_AbortCCB(CardHandle, (PSCCB) CCB); 7818 FlashPoint_AbortCCB(CardHandle, (struct sccb *) CCB);
7820} 7819}
7821 7820
7822 7821