Skip to content

L
linux
Commit 69eb2ea4 authored by Alexey Dobriyan's avatar Alexey Dobriyan Committed by James Bottomley
Browse files
Options

[SCSI] drivers/scsi/FlashPoint.c: untypedef struct _SCCB 

* struct _SCCB => struct sccb
* PSCCB => struct sccb *
* SCCB => struct sccb
Signed-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent ad0e1d9f
Show whitespace changes
Inline Side-by-side
Showing with 71 additions and 72 deletions
drivers/scsi/FlashPoint.c
View file @ 69eb2ea4
...@@ -53,9 +53,8 @@ ...@@ -53,9 +53,8 @@
struct sccb;
typedef struct _SCCB *PSCCB; typedef void (*CALL_BK_FN)(struct sccb *);
typedef void (*CALL_BK_FN)(PSCCB);
typedef struct SCCBMgr_info { typedef struct SCCBMgr_info {
...@@ -110,7 +109,7 @@ typedef SCCBMGR_INFO * PSCCBMGR_INFO; ...@@ -110,7 +109,7 @@ typedef SCCBMGR_INFO * PSCCBMGR_INFO;
#pragma pack(1) #pragma pack(1)
typedef struct _SCCB { struct sccb {
unsigned char OperationCode; unsigned char OperationCode;
unsigned char ControlByte; unsigned char ControlByte;
unsigned char CdbLength; unsigned char CdbLength;
...@@ -146,14 +145,14 @@ typedef struct _SCCB { ...@@ -146,14 +145,14 @@ typedef struct _SCCB {
unsigned char Sccb_tag; unsigned char Sccb_tag;
unsigned char Sccb_scsistat; unsigned char Sccb_scsistat;
unsigned char Sccb_idmsg; /* image of last msg in */ unsigned char Sccb_idmsg; /* image of last msg in */
PSCCB Sccb_forwardlink; struct sccb * Sccb_forwardlink;
PSCCB Sccb_backlink; struct sccb * Sccb_backlink;
unsigned long Sccb_savedATC; unsigned long Sccb_savedATC;
unsigned char Save_Cdb[6]; unsigned char Save_Cdb[6];
unsigned char Save_CdbLen; unsigned char Save_CdbLen;
unsigned char Sccb_XferState; unsigned char Sccb_XferState;
unsigned long Sccb_SGoffset; unsigned long Sccb_SGoffset;
} SCCB; };
#pragma pack() #pragma pack()
...@@ -275,8 +274,8 @@ typedef struct SCCBMgr_tar_info *PSCCBMgr_tar_info; ...@@ -275,8 +274,8 @@ typedef struct SCCBMgr_tar_info *PSCCBMgr_tar_info;
typedef struct SCCBMgr_tar_info { typedef struct SCCBMgr_tar_info {
PSCCB TarSelQ_Head; struct sccb * TarSelQ_Head;
PSCCB TarSelQ_Tail; struct sccb * TarSelQ_Tail;
unsigned char TarLUN_CA; /*Contingent Allgiance */ unsigned char TarLUN_CA; /*Contingent Allgiance */
unsigned char TarTagQ_Cnt; unsigned char TarTagQ_Cnt;
unsigned char TarSelQ_Cnt; unsigned char TarSelQ_Cnt;
...@@ -309,7 +308,7 @@ typedef NVRAMINFO *PNVRamInfo; ...@@ -309,7 +308,7 @@ typedef NVRAMINFO *PNVRamInfo;
typedef struct SCCBcard { typedef struct SCCBcard {
PSCCB currentSCCB; struct sccb * currentSCCB;
PSCCBMGR_INFO cardInfo; PSCCBMGR_INFO cardInfo;
unsigned long ioPort; unsigned long ioPort;
...@@ -322,7 +321,7 @@ typedef struct SCCBcard { ...@@ -322,7 +321,7 @@ typedef struct SCCBcard {
unsigned char globalFlags; unsigned char globalFlags;
unsigned char ourId; unsigned char ourId;
PNVRamInfo pNvRamInfo; PNVRamInfo pNvRamInfo;
PSCCB discQ_Tbl[QUEUE_DEPTH]; struct sccb * discQ_Tbl[QUEUE_DEPTH];
}SCCBCARD; }SCCBCARD;
...@@ -973,7 +972,7 @@ typedef struct SCCBscam_info { ...@@ -973,7 +972,7 @@ typedef struct SCCBscam_info {
static unsigned char FPT_sisyncn(unsigned long port, unsigned char p_card, unsigned char syncFlag); static unsigned char FPT_sisyncn(unsigned long port, unsigned char p_card, unsigned char syncFlag);
static void FPT_ssel(unsigned long port, unsigned char p_card); static void FPT_ssel(unsigned long port, unsigned char p_card);
static void FPT_sres(unsigned long port, unsigned char p_card, PSCCBcard pCurrCard); static void FPT_sres(unsigned long port, unsigned char p_card, PSCCBcard pCurrCard);
static void FPT_shandem(unsigned long port, unsigned char p_card,PSCCB pCurrSCCB); static void FPT_shandem(unsigned long port, unsigned char p_card,struct sccb * pCurrSCCB);
static void FPT_stsyncn(unsigned long port, unsigned char p_card); static void FPT_stsyncn(unsigned long port, unsigned char p_card);
static void FPT_sisyncr(unsigned long port,unsigned char sync_pulse, unsigned char offset); static void FPT_sisyncr(unsigned long port,unsigned char sync_pulse, unsigned char offset);
static void FPT_sssyncv(unsigned long p_port, unsigned char p_id, unsigned char p_sync_value, static 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); ...@@ -989,7 +988,7 @@ static void FPT_SendMsg(unsigned long port, unsigned char message);
static void FPT_queueFlushTargSccb(unsigned char p_card, unsigned char thisTarg, static void FPT_queueFlushTargSccb(unsigned char p_card, unsigned char thisTarg,
unsigned char error_code); unsigned char error_code);
static void FPT_sinits(PSCCB p_sccb, unsigned char p_card); static void FPT_sinits(struct sccb * p_sccb, unsigned char p_card);
static void FPT_RNVRamData(PNVRamInfo pNvRamInfo); static void FPT_RNVRamData(PNVRamInfo pNvRamInfo);
static unsigned char FPT_siwidn(unsigned long port, unsigned char p_card); static 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,14 +997,14 @@ static void FPT_siwidr(unsigned long port, unsigned char width);
static void FPT_queueSelectFail(PSCCBcard pCurrCard, unsigned char p_card); static void FPT_queueSelectFail(PSCCBcard pCurrCard, unsigned char p_card);
static void FPT_queueDisconnect(PSCCB p_SCCB, unsigned char p_card); static void FPT_queueDisconnect(struct sccb * p_SCCB, unsigned char p_card);
static void FPT_queueCmdComplete(PSCCBcard pCurrCard, PSCCB p_SCCB, static void FPT_queueCmdComplete(PSCCBcard pCurrCard, struct sccb * p_SCCB,
unsigned char p_card); unsigned char p_card);
static void FPT_queueSearchSelect(PSCCBcard pCurrCard, unsigned char p_card); static void FPT_queueSearchSelect(PSCCBcard pCurrCard, unsigned char p_card);
static void FPT_queueFlushSccb(unsigned char p_card, unsigned char error_code); static void FPT_queueFlushSccb(unsigned char p_card, unsigned char error_code);
static void FPT_queueAddSccb(PSCCB p_SCCB, unsigned char card); static void FPT_queueAddSccb(struct sccb * p_SCCB, unsigned char card);
static unsigned char FPT_queueFindSccb(PSCCB p_SCCB, unsigned char p_card); static unsigned char FPT_queueFindSccb(struct sccb * p_SCCB, unsigned char p_card);
static void FPT_utilUpdateResidual(PSCCB p_SCCB); static void FPT_utilUpdateResidual(struct sccb * p_SCCB);
static unsigned short FPT_CalcCrc16(unsigned char buffer[]); static unsigned short FPT_CalcCrc16(unsigned char buffer[]);
static unsigned char FPT_CalcLrc(unsigned char buffer[]); static unsigned char FPT_CalcLrc(unsigned char buffer[]);
...@@ -1043,10 +1042,10 @@ static void FPT_DiagEEPROM(unsigned long p_port); ...@@ -1043,10 +1042,10 @@ static void FPT_DiagEEPROM(unsigned long p_port);
static void FPT_dataXferProcessor(unsigned long port, PSCCBcard pCurrCard); static void FPT_dataXferProcessor(unsigned long port, PSCCBcard pCurrCard);
static void FPT_busMstrSGDataXferStart(unsigned long port, PSCCB pCurrSCCB); static void FPT_busMstrSGDataXferStart(unsigned long port, struct sccb * pCurrSCCB);
static void FPT_busMstrDataXferStart(unsigned long port, PSCCB pCurrSCCB); static void FPT_busMstrDataXferStart(unsigned long port, struct sccb * pCurrSCCB);
static void FPT_hostDataXferAbort(unsigned long port, unsigned char p_card, PSCCB pCurrSCCB); static void FPT_hostDataXferAbort(unsigned long port, unsigned char p_card, struct sccb * pCurrSCCB);
static void FPT_hostDataXferRestart(PSCCB currSCCB); static void FPT_hostDataXferRestart(struct sccb * currSCCB);
static unsigned char FPT_SccbMgr_bad_isr(unsigned long p_port, unsigned char p_card, static 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,11 +1666,11 @@ static unsigned char FPT_ChkIfChipInitialized(unsigned long ioPort)
* callback function. * callback function.
* *
*---------------------------------------------------------------------*/ *---------------------------------------------------------------------*/
static void FlashPoint_StartCCB(unsigned long pCurrCard, PSCCB p_Sccb) static void FlashPoint_StartCCB(unsigned long pCurrCard, struct sccb * p_Sccb)
{ {
unsigned long ioport; unsigned long ioport;
unsigned char thisCard, lun; unsigned char thisCard, lun;
PSCCB pSaveSccb; struct sccb * pSaveSccb;
CALL_BK_FN callback; CALL_BK_FN callback;
thisCard = ((PSCCBcard) pCurrCard)->cardIndex; thisCard = ((PSCCBcard) pCurrCard)->cardIndex;
...@@ -1787,14 +1786,14 @@ static void FlashPoint_StartCCB(unsigned long pCurrCard, PSCCB p_Sccb) ...@@ -1787,14 +1786,14 @@ static void FlashPoint_StartCCB(unsigned long pCurrCard, PSCCB p_Sccb)
* callback function. * callback function.
* *
*---------------------------------------------------------------------*/ *---------------------------------------------------------------------*/
static int FlashPoint_AbortCCB(unsigned long pCurrCard, PSCCB p_Sccb) static int FlashPoint_AbortCCB(unsigned long pCurrCard, struct sccb * p_Sccb)
{ {
unsigned long ioport; unsigned long ioport;
unsigned char thisCard; unsigned char thisCard;
CALL_BK_FN callback; CALL_BK_FN callback;
unsigned char TID; unsigned char TID;
PSCCB pSaveSCCB; struct sccb * pSaveSCCB;
PSCCBMgr_tar_info currTar_Info; PSCCBMgr_tar_info currTar_Info;
...@@ -1916,7 +1915,7 @@ static unsigned char FlashPoint_InterruptPending(unsigned long pCurrCard) ...@@ -1916,7 +1915,7 @@ static unsigned char FlashPoint_InterruptPending(unsigned long pCurrCard)
*---------------------------------------------------------------------*/ *---------------------------------------------------------------------*/
static int FlashPoint_HandleInterrupt(unsigned long pCurrCard) static int FlashPoint_HandleInterrupt(unsigned long pCurrCard)
{ {
PSCCB currSCCB; struct sccb * currSCCB;
unsigned char thisCard,result,bm_status, bm_int_st; unsigned char thisCard,result,bm_status, bm_int_st;
unsigned short hp_int; unsigned short hp_int;
unsigned char i, target; unsigned char i, target;
...@@ -2417,7 +2416,7 @@ static void FPT_SccbMgrTableInitTarget(unsigned char p_card, unsigned char targe ...@@ -2417,7 +2416,7 @@ static void FPT_SccbMgrTableInitTarget(unsigned char p_card, unsigned char targe
* *
*---------------------------------------------------------------------*/ *---------------------------------------------------------------------*/
static unsigned char FPT_sfm(unsigned long port, PSCCB pCurrSCCB) static unsigned char FPT_sfm(unsigned long port, struct sccb * pCurrSCCB)
{ {
unsigned char message; unsigned char message;
unsigned short TimeOutLoop; unsigned short TimeOutLoop;
...@@ -2497,7 +2496,7 @@ static void FPT_ssel(unsigned long port, unsigned char p_card) ...@@ -2497,7 +2496,7 @@ static void FPT_ssel(unsigned long port, unsigned char p_card)
unsigned long cdb_reg; unsigned long cdb_reg;
PSCCBcard CurrCard; PSCCBcard CurrCard;
PSCCB currSCCB; struct sccb * currSCCB;
PSCCBMgr_tar_info currTar_Info; PSCCBMgr_tar_info currTar_Info;
unsigned char lastTag, lun; unsigned char lastTag, lun;
...@@ -2808,7 +2807,7 @@ static void FPT_sres(unsigned long port, unsigned char p_card, PSCCBcard pCurrCa ...@@ -2808,7 +2807,7 @@ static void FPT_sres(unsigned long port, unsigned char p_card, PSCCBcard pCurrCa
PSCCBMgr_tar_info currTar_Info; PSCCBMgr_tar_info currTar_Info;
PSCCB currSCCB; struct sccb * currSCCB;
...@@ -3113,7 +3112,7 @@ static void FPT_SendMsg(unsigned long port, unsigned char message) ...@@ -3113,7 +3112,7 @@ static void FPT_SendMsg(unsigned long port, unsigned char message)
*---------------------------------------------------------------------*/ *---------------------------------------------------------------------*/
static void FPT_sdecm(unsigned char message, unsigned long port, unsigned char p_card) static void FPT_sdecm(unsigned char message, unsigned long port, unsigned char p_card)
{ {
PSCCB currSCCB; struct sccb * currSCCB;
PSCCBcard CurrCard; PSCCBcard CurrCard;
PSCCBMgr_tar_info currTar_Info; PSCCBMgr_tar_info currTar_Info;
...@@ -3290,7 +3289,7 @@ static void FPT_sdecm(unsigned char message, unsigned long port, unsigned char p ...@@ -3290,7 +3289,7 @@ static void FPT_sdecm(unsigned char message, unsigned long port, unsigned char p
* Description: Decide what to do with the extended message. * Description: Decide what to do with the extended message.
* *
*---------------------------------------------------------------------*/ *---------------------------------------------------------------------*/
static void FPT_shandem(unsigned long port, unsigned char p_card, PSCCB pCurrSCCB) static void FPT_shandem(unsigned long port, unsigned char p_card, struct sccb * pCurrSCCB)
{ {
unsigned char length,message; unsigned char length,message;
...@@ -3371,7 +3370,7 @@ static void FPT_shandem(unsigned long port, unsigned char p_card, PSCCB pCurrSCC ...@@ -3371,7 +3370,7 @@ static void FPT_shandem(unsigned long port, unsigned char p_card, PSCCB pCurrSCC
static unsigned char FPT_sisyncn(unsigned long port, unsigned char p_card, unsigned char syncFlag) static unsigned char FPT_sisyncn(unsigned long port, unsigned char p_card, unsigned char syncFlag)
{ {
PSCCB currSCCB; struct sccb * currSCCB;
PSCCBMgr_tar_info currTar_Info; PSCCBMgr_tar_info currTar_Info;
currSCCB = FPT_BL_Card[p_card].currentSCCB; currSCCB = FPT_BL_Card[p_card].currentSCCB;
...@@ -3447,7 +3446,7 @@ static unsigned char FPT_sisyncn(unsigned long port, unsigned char p_card, unsig ...@@ -3447,7 +3446,7 @@ static unsigned char FPT_sisyncn(unsigned long port, unsigned char p_card, unsig
static void FPT_stsyncn(unsigned long port, unsigned char p_card) static void FPT_stsyncn(unsigned long port, unsigned char p_card)
{ {
unsigned char sync_msg,offset,sync_reg,our_sync_msg; unsigned char sync_msg,offset,sync_reg,our_sync_msg;
PSCCB currSCCB; struct sccb * currSCCB;
PSCCBMgr_tar_info currTar_Info; PSCCBMgr_tar_info currTar_Info;
currSCCB = FPT_BL_Card[p_card].currentSCCB; 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,7 +3608,7 @@ static void FPT_sisyncr(unsigned long port,unsigned char sync_pulse, unsigned ch
static unsigned char FPT_siwidn(unsigned long port, unsigned char p_card) static unsigned char FPT_siwidn(unsigned long port, unsigned char p_card)
{ {
PSCCB currSCCB; struct sccb * currSCCB;
PSCCBMgr_tar_info currTar_Info; PSCCBMgr_tar_info currTar_Info;
currSCCB = FPT_BL_Card[p_card].currentSCCB; currSCCB = FPT_BL_Card[p_card].currentSCCB;
...@@ -3662,7 +3661,7 @@ static unsigned char FPT_siwidn(unsigned long port, unsigned char p_card) ...@@ -3662,7 +3661,7 @@ static unsigned char FPT_siwidn(unsigned long port, unsigned char p_card)
static void FPT_stwidn(unsigned long port, unsigned char p_card) static void FPT_stwidn(unsigned long port, unsigned char p_card)
{ {
unsigned char width; unsigned char width;
PSCCB currSCCB; struct sccb * currSCCB;
PSCCBMgr_tar_info currTar_Info; PSCCBMgr_tar_info currTar_Info;
currSCCB = FPT_BL_Card[p_card].currentSCCB; currSCCB = FPT_BL_Card[p_card].currentSCCB;
...@@ -3916,7 +3915,7 @@ static void FPT_sresb(unsigned long port, unsigned char p_card) ...@@ -3916,7 +3915,7 @@ static void FPT_sresb(unsigned long port, unsigned char p_card)
static void FPT_ssenss(PSCCBcard pCurrCard) static void FPT_ssenss(PSCCBcard pCurrCard)
{ {
unsigned char i; unsigned char i;
PSCCB currSCCB; struct sccb * currSCCB;
currSCCB = pCurrCard->currentSCCB; currSCCB = pCurrCard->currentSCCB;
...@@ -4049,7 +4048,7 @@ static void FPT_schkdd(unsigned long port, unsigned char p_card) ...@@ -4049,7 +4048,7 @@ static void FPT_schkdd(unsigned long port, unsigned char p_card)
unsigned short TimeOutLoop; unsigned short TimeOutLoop;
unsigned char sPhase; unsigned char sPhase;
PSCCB currSCCB; struct sccb * currSCCB;
currSCCB = FPT_BL_Card[p_card].currentSCCB; currSCCB = FPT_BL_Card[p_card].currentSCCB;
...@@ -4157,7 +4156,7 @@ static void FPT_schkdd(unsigned long port, unsigned char p_card) ...@@ -4157,7 +4156,7 @@ static void FPT_schkdd(unsigned long port, unsigned char p_card)
* *
*---------------------------------------------------------------------*/ *---------------------------------------------------------------------*/
static void FPT_sinits(PSCCB p_sccb, unsigned char p_card) static void FPT_sinits(struct sccb * p_sccb, unsigned char p_card)
{ {
PSCCBMgr_tar_info currTar_Info; PSCCBMgr_tar_info currTar_Info;
...@@ -4265,7 +4264,7 @@ static void FPT_phaseDecode(unsigned long p_port, unsigned char p_card) ...@@ -4265,7 +4264,7 @@ static void FPT_phaseDecode(unsigned long p_port, unsigned char p_card)
static void FPT_phaseDataOut(unsigned long port, unsigned char p_card) static void FPT_phaseDataOut(unsigned long port, unsigned char p_card)
{ {
PSCCB currSCCB; struct sccb * currSCCB;
currSCCB = FPT_BL_Card[p_card].currentSCCB; currSCCB = FPT_BL_Card[p_card].currentSCCB;
if (currSCCB == NULL) if (currSCCB == NULL)
...@@ -4309,7 +4308,7 @@ static void FPT_phaseDataOut(unsigned long port, unsigned char p_card) ...@@ -4309,7 +4308,7 @@ static void FPT_phaseDataOut(unsigned long port, unsigned char p_card)
static void FPT_phaseDataIn(unsigned long port, unsigned char p_card) static void FPT_phaseDataIn(unsigned long port, unsigned char p_card)
{ {
PSCCB currSCCB; struct sccb * currSCCB;
currSCCB = FPT_BL_Card[p_card].currentSCCB; currSCCB = FPT_BL_Card[p_card].currentSCCB;
...@@ -4355,7 +4354,7 @@ static void FPT_phaseDataIn(unsigned long port, unsigned char p_card) ...@@ -4355,7 +4354,7 @@ static void FPT_phaseDataIn(unsigned long port, unsigned char p_card)
static void FPT_phaseCommand(unsigned long p_port, unsigned char p_card) static void FPT_phaseCommand(unsigned long p_port, unsigned char p_card)
{ {
PSCCB currSCCB; struct sccb * currSCCB;
unsigned long cdb_reg; unsigned long cdb_reg;
unsigned char i; unsigned char i;
...@@ -4430,7 +4429,7 @@ static void FPT_phaseStatus(unsigned long port, unsigned char p_card) ...@@ -4430,7 +4429,7 @@ static void FPT_phaseStatus(unsigned long port, unsigned char p_card)
static void FPT_phaseMsgOut(unsigned long port, unsigned char p_card) static void FPT_phaseMsgOut(unsigned long port, unsigned char p_card)
{ {
unsigned char message,scsiID; unsigned char message,scsiID;
PSCCB currSCCB; struct sccb * currSCCB;
PSCCBMgr_tar_info currTar_Info; PSCCBMgr_tar_info currTar_Info;
currSCCB = FPT_BL_Card[p_card].currentSCCB; currSCCB = FPT_BL_Card[p_card].currentSCCB;
...@@ -4578,7 +4577,7 @@ static void FPT_phaseMsgOut(unsigned long port, unsigned char p_card) ...@@ -4578,7 +4577,7 @@ static void FPT_phaseMsgOut(unsigned long port, unsigned char p_card)
static void FPT_phaseMsgIn(unsigned long port, unsigned char p_card) static void FPT_phaseMsgIn(unsigned long port, unsigned char p_card)
{ {
unsigned char message; unsigned char message;
PSCCB currSCCB; struct sccb * currSCCB;
currSCCB = FPT_BL_Card[p_card].currentSCCB; currSCCB = FPT_BL_Card[p_card].currentSCCB;
...@@ -4630,7 +4629,7 @@ static void FPT_phaseMsgIn(unsigned long port, unsigned char p_card) ...@@ -4630,7 +4629,7 @@ static void FPT_phaseMsgIn(unsigned long port, unsigned char p_card)
static void FPT_phaseIllegal(unsigned long port, unsigned char p_card) static void FPT_phaseIllegal(unsigned long port, unsigned char p_card)
{ {
PSCCB currSCCB; struct sccb * currSCCB;
currSCCB = FPT_BL_Card[p_card].currentSCCB; currSCCB = FPT_BL_Card[p_card].currentSCCB;
...@@ -4659,7 +4658,7 @@ static void FPT_phaseIllegal(unsigned long port, unsigned char p_card) ...@@ -4659,7 +4658,7 @@ static void FPT_phaseIllegal(unsigned long port, unsigned char p_card)
static void FPT_phaseChkFifo(unsigned long port, unsigned char p_card) static void FPT_phaseChkFifo(unsigned long port, unsigned char p_card)
{ {
unsigned long xfercnt; unsigned long xfercnt;
PSCCB currSCCB; struct sccb * currSCCB;
currSCCB = FPT_BL_Card[p_card].currentSCCB; currSCCB = FPT_BL_Card[p_card].currentSCCB;
...@@ -4736,7 +4735,7 @@ static void FPT_phaseChkFifo(unsigned long port, unsigned char p_card) ...@@ -4736,7 +4735,7 @@ static void FPT_phaseChkFifo(unsigned long port, unsigned char p_card)
*---------------------------------------------------------------------*/ *---------------------------------------------------------------------*/
static void FPT_phaseBusFree(unsigned long port, unsigned char p_card) static void FPT_phaseBusFree(unsigned long port, unsigned char p_card)
{ {
PSCCB currSCCB; struct sccb * currSCCB;
currSCCB = FPT_BL_Card[p_card].currentSCCB; currSCCB = FPT_BL_Card[p_card].currentSCCB;
...@@ -4942,7 +4941,7 @@ static void FPT_autoLoadDefaultMap(unsigned long p_port) ...@@ -4942,7 +4941,7 @@ static void FPT_autoLoadDefaultMap(unsigned long p_port)
static void FPT_autoCmdCmplt(unsigned long p_port, unsigned char p_card) static void FPT_autoCmdCmplt(unsigned long p_port, unsigned char p_card)
{ {
PSCCB currSCCB; struct sccb * currSCCB;
unsigned char status_byte; unsigned char status_byte;
currSCCB = FPT_BL_Card[p_card].currentSCCB; currSCCB = FPT_BL_Card[p_card].currentSCCB;
...@@ -5157,7 +5156,7 @@ static void FPT_autoCmdCmplt(unsigned long p_port, unsigned char p_card) ...@@ -5157,7 +5156,7 @@ static void FPT_autoCmdCmplt(unsigned long p_port, unsigned char p_card)
static void FPT_dataXferProcessor(unsigned long port, PSCCBcard pCurrCard) static void FPT_dataXferProcessor(unsigned long port, PSCCBcard pCurrCard)
{ {
PSCCB currSCCB; struct sccb * currSCCB;
currSCCB = pCurrCard->currentSCCB; currSCCB = pCurrCard->currentSCCB;
...@@ -5193,7 +5192,7 @@ static void FPT_dataXferProcessor(unsigned long port, PSCCBcard pCurrCard) ...@@ -5193,7 +5192,7 @@ static void FPT_dataXferProcessor(unsigned long port, PSCCBcard pCurrCard)
* Description: * Description:
* *
*---------------------------------------------------------------------*/ *---------------------------------------------------------------------*/
static void FPT_busMstrSGDataXferStart(unsigned long p_port, PSCCB pcurrSCCB) static void FPT_busMstrSGDataXferStart(unsigned long p_port, struct sccb * pcurrSCCB)
{ {
unsigned long count,addr,tmpSGCnt; unsigned long count,addr,tmpSGCnt;
unsigned int sg_index; unsigned int sg_index;
...@@ -5298,7 +5297,7 @@ static void FPT_busMstrSGDataXferStart(unsigned long p_port, PSCCB pcurrSCCB) ...@@ -5298,7 +5297,7 @@ static void FPT_busMstrSGDataXferStart(unsigned long p_port, PSCCB pcurrSCCB)
* Description: * Description:
* *
*---------------------------------------------------------------------*/ *---------------------------------------------------------------------*/
static void FPT_busMstrDataXferStart(unsigned long p_port, PSCCB pcurrSCCB) static void FPT_busMstrDataXferStart(unsigned long p_port, struct sccb * pcurrSCCB)
{ {
unsigned long addr,count; unsigned long addr,count;
...@@ -5389,7 +5388,7 @@ static unsigned char FPT_busMstrTimeOut(unsigned long p_port) ...@@ -5389,7 +5388,7 @@ static unsigned char FPT_busMstrTimeOut(unsigned long p_port)
* Description: Abort any in progress transfer. * Description: Abort any in progress transfer.
* *
*---------------------------------------------------------------------*/ *---------------------------------------------------------------------*/
static void FPT_hostDataXferAbort(unsigned long port, unsigned char p_card, PSCCB pCurrSCCB) static void FPT_hostDataXferAbort(unsigned long port, unsigned char p_card, struct sccb * pCurrSCCB)
{ {
unsigned long timeout; unsigned long timeout;
...@@ -5647,7 +5646,7 @@ static void FPT_hostDataXferAbort(unsigned long port, unsigned char p_card, PSCC ...@@ -5647,7 +5646,7 @@ static void FPT_hostDataXferAbort(unsigned long port, unsigned char p_card, PSCC
* pointers message. * pointers message.
* *
*---------------------------------------------------------------------*/ *---------------------------------------------------------------------*/
static void FPT_hostDataXferRestart(PSCCB currSCCB) static void FPT_hostDataXferRestart(struct sccb * currSCCB)
{ {
unsigned long data_count; unsigned long data_count;
unsigned int sg_index; unsigned int sg_index;
...@@ -6939,7 +6938,7 @@ static void FPT_queueSearchSelect(PSCCBcard pCurrCard, unsigned char p_card) ...@@ -6939,7 +6938,7 @@ static void FPT_queueSearchSelect(PSCCBcard pCurrCard, unsigned char p_card)
{ {
unsigned char scan_ptr, lun; unsigned char scan_ptr, lun;
PSCCBMgr_tar_info currTar_Info; PSCCBMgr_tar_info currTar_Info;
PSCCB pOldSccb; struct sccb * pOldSccb;
scan_ptr = pCurrCard->scanIndex; scan_ptr = pCurrCard->scanIndex;
do do
...@@ -6967,22 +6966,22 @@ static void FPT_queueSearchSelect(PSCCBcard pCurrCard, unsigned char p_card) ...@@ -6967,22 +6966,22 @@ static void FPT_queueSearchSelect(PSCCBcard pCurrCard, unsigned char p_card)
(lun != pCurrCard->currentSCCB->Lun)) (lun != pCurrCard->currentSCCB->Lun))
{ {
pOldSccb = pCurrCard->currentSCCB; pOldSccb = pCurrCard->currentSCCB;
pCurrCard->currentSCCB = (PSCCB)(pCurrCard->currentSCCB)-> pCurrCard->currentSCCB = (struct sccb *)(pCurrCard->currentSCCB)->
Sccb_forwardlink; Sccb_forwardlink;
} }
if(pCurrCard->currentSCCB == NULL) if(pCurrCard->currentSCCB == NULL)
continue; continue;
if(pOldSccb != NULL) if(pOldSccb != NULL)
{ {
pOldSccb->Sccb_forwardlink = (PSCCB)(pCurrCard->currentSCCB)-> pOldSccb->Sccb_forwardlink = (struct sccb *)(pCurrCard->currentSCCB)->
Sccb_forwardlink; Sccb_forwardlink;
pOldSccb->Sccb_backlink = (PSCCB)(pCurrCard->currentSCCB)-> pOldSccb->Sccb_backlink = (struct sccb *)(pCurrCard->currentSCCB)->
Sccb_backlink; Sccb_backlink;
currTar_Info->TarSelQ_Cnt--; currTar_Info->TarSelQ_Cnt--;
} }
else else
{ {
currTar_Info->TarSelQ_Head = (PSCCB)(pCurrCard->currentSCCB)->Sccb_forwardlink; currTar_Info->TarSelQ_Head = (struct sccb *)(pCurrCard->currentSCCB)->Sccb_forwardlink;
if (currTar_Info->TarSelQ_Head == NULL) if (currTar_Info->TarSelQ_Head == NULL)
{ {
...@@ -6992,7 +6991,7 @@ static void FPT_queueSearchSelect(PSCCBcard pCurrCard, unsigned char p_card) ...@@ -6992,7 +6991,7 @@ static void FPT_queueSearchSelect(PSCCBcard pCurrCard, unsigned char p_card)
else else
{ {
currTar_Info->TarSelQ_Cnt--; currTar_Info->TarSelQ_Cnt--;
currTar_Info->TarSelQ_Head->Sccb_backlink = (PSCCB)NULL; currTar_Info->TarSelQ_Head->Sccb_backlink = (struct sccb *)NULL;
} }
} }
pCurrCard->scanIndex = scan_ptr; pCurrCard->scanIndex = scan_ptr;
...@@ -7021,7 +7020,7 @@ static void FPT_queueSearchSelect(PSCCBcard pCurrCard, unsigned char p_card) ...@@ -7021,7 +7020,7 @@ static void FPT_queueSearchSelect(PSCCBcard pCurrCard, unsigned char p_card)
pCurrCard->currentSCCB = currTar_Info->TarSelQ_Head; pCurrCard->currentSCCB = currTar_Info->TarSelQ_Head;
currTar_Info->TarSelQ_Head = (PSCCB)(pCurrCard->currentSCCB)->Sccb_forwardlink; currTar_Info->TarSelQ_Head = (struct sccb *)(pCurrCard->currentSCCB)->Sccb_forwardlink;
if (currTar_Info->TarSelQ_Head == NULL) if (currTar_Info->TarSelQ_Head == NULL)
{ {
...@@ -7031,7 +7030,7 @@ static void FPT_queueSearchSelect(PSCCBcard pCurrCard, unsigned char p_card) ...@@ -7031,7 +7030,7 @@ static void FPT_queueSearchSelect(PSCCBcard pCurrCard, unsigned char p_card)
else else
{ {
currTar_Info->TarSelQ_Cnt--; currTar_Info->TarSelQ_Cnt--;
currTar_Info->TarSelQ_Head->Sccb_backlink = (PSCCB)NULL; currTar_Info->TarSelQ_Head->Sccb_backlink = (struct sccb *)NULL;
} }
scan_ptr++; scan_ptr++;
...@@ -7073,10 +7072,10 @@ static void FPT_queueSelectFail(PSCCBcard pCurrCard, unsigned char p_card) ...@@ -7073,10 +7072,10 @@ static void FPT_queueSelectFail(PSCCBcard pCurrCard, unsigned char p_card)
if (pCurrCard->currentSCCB != NULL) if (pCurrCard->currentSCCB != NULL)
{ {
thisTarg = (unsigned char)(((PSCCB)(pCurrCard->currentSCCB))->TargID); thisTarg = (unsigned char)(((struct sccb *)(pCurrCard->currentSCCB))->TargID);
currTar_Info = &FPT_sccbMgrTbl[p_card][thisTarg]; currTar_Info = &FPT_sccbMgrTbl[p_card][thisTarg];
pCurrCard->currentSCCB->Sccb_backlink = (PSCCB)NULL; pCurrCard->currentSCCB->Sccb_backlink = (struct sccb *)NULL;
pCurrCard->currentSCCB->Sccb_forwardlink = currTar_Info->TarSelQ_Head; pCurrCard->currentSCCB->Sccb_forwardlink = currTar_Info->TarSelQ_Head;
...@@ -7105,7 +7104,7 @@ static void FPT_queueSelectFail(PSCCBcard pCurrCard, unsigned char p_card) ...@@ -7105,7 +7104,7 @@ static void FPT_queueSelectFail(PSCCBcard pCurrCard, unsigned char p_card)
* *
*---------------------------------------------------------------------*/ *---------------------------------------------------------------------*/
static void FPT_queueCmdComplete(PSCCBcard pCurrCard, PSCCB p_sccb, static void FPT_queueCmdComplete(PSCCBcard pCurrCard, struct sccb * p_sccb,
unsigned char p_card) unsigned char p_card)
{ {
...@@ -7207,7 +7206,7 @@ static void FPT_queueCmdComplete(PSCCBcard pCurrCard, PSCCB p_sccb, ...@@ -7207,7 +7206,7 @@ static void FPT_queueCmdComplete(PSCCBcard pCurrCard, PSCCB p_sccb,
* Description: Add SCCB to our disconnect array. * Description: Add SCCB to our disconnect array.
* *
*---------------------------------------------------------------------*/ *---------------------------------------------------------------------*/
static void FPT_queueDisconnect(PSCCB p_sccb, unsigned char p_card) static void FPT_queueDisconnect(struct sccb * p_sccb, unsigned char p_card)
{ {
PSCCBMgr_tar_info currTar_Info; PSCCBMgr_tar_info currTar_Info;
...@@ -7245,7 +7244,7 @@ static void FPT_queueDisconnect(PSCCB p_sccb, unsigned char p_card) ...@@ -7245,7 +7244,7 @@ static void FPT_queueDisconnect(PSCCB p_sccb, unsigned char p_card)
static void FPT_queueFlushSccb(unsigned char p_card, unsigned char error_code) static void FPT_queueFlushSccb(unsigned char p_card, unsigned char error_code)
{ {
unsigned char qtag,thisTarg; unsigned char qtag,thisTarg;
PSCCB currSCCB; struct sccb * currSCCB;
PSCCBMgr_tar_info currTar_Info; PSCCBMgr_tar_info currTar_Info;
currSCCB = FPT_BL_Card[p_card].currentSCCB; currSCCB = FPT_BL_Card[p_card].currentSCCB;
...@@ -7311,7 +7310,7 @@ static void FPT_queueFlushTargSccb(unsigned char p_card, unsigned char thisTarg ...@@ -7311,7 +7310,7 @@ static void FPT_queueFlushTargSccb(unsigned char p_card, unsigned char thisTarg
static void FPT_queueAddSccb(PSCCB p_SCCB, unsigned char p_card) static void FPT_queueAddSccb(struct sccb * p_SCCB, unsigned char p_card)
{ {
PSCCBMgr_tar_info currTar_Info; PSCCBMgr_tar_info currTar_Info;
currTar_Info = &FPT_sccbMgrTbl[p_card][p_SCCB->TargID]; 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,9 +7344,9 @@ static void FPT_queueAddSccb(PSCCB p_SCCB, unsigned char p_card)
* *
*---------------------------------------------------------------------*/ *---------------------------------------------------------------------*/
static unsigned char FPT_queueFindSccb(PSCCB p_SCCB, unsigned char p_card) static unsigned char FPT_queueFindSccb(struct sccb * p_SCCB, unsigned char p_card)
{ {
PSCCB q_ptr; struct sccb * q_ptr;
PSCCBMgr_tar_info currTar_Info; PSCCBMgr_tar_info currTar_Info;
currTar_Info = &FPT_sccbMgrTbl[p_card][p_SCCB->TargID]; 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,7 +7405,7 @@ static unsigned char FPT_queueFindSccb(PSCCB p_SCCB, unsigned char p_card)
* *
*---------------------------------------------------------------------*/ *---------------------------------------------------------------------*/
static void FPT_utilUpdateResidual(PSCCB p_SCCB) static void FPT_utilUpdateResidual(struct sccb * p_SCCB)
{ {
unsigned long partial_cnt; unsigned long partial_cnt;
unsigned int sg_index; unsigned int sg_index;
...@@ -7809,14 +7808,14 @@ FlashPoint__ReleaseHostAdapter(FlashPoint_CardHandle_T CardHandle) ...@@ -7809,14 +7808,14 @@ FlashPoint__ReleaseHostAdapter(FlashPoint_CardHandle_T CardHandle)
static inline void static inline void
FlashPoint__StartCCB(FlashPoint_CardHandle_T CardHandle, struct BusLogic_CCB *CCB) FlashPoint__StartCCB(FlashPoint_CardHandle_T CardHandle, struct BusLogic_CCB *CCB)
{ {
FlashPoint_StartCCB(CardHandle, (PSCCB) CCB); FlashPoint_StartCCB(CardHandle, (struct sccb *) CCB);
} }
static inline void static inline void
FlashPoint__AbortCCB(FlashPoint_CardHandle_T CardHandle, struct BusLogic_CCB *CCB) FlashPoint__AbortCCB(FlashPoint_CardHandle_T CardHandle, struct BusLogic_CCB *CCB)
{ {
FlashPoint_AbortCCB(CardHandle, (PSCCB) CCB); FlashPoint_AbortCCB(CardHandle, (struct sccb *) CCB);
} }
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7