Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 22608
b: refs/heads/master
c: f31dc0c
h: refs/heads/master
v: v3
  • Loading branch information
Alexey Dobriyan authored and James Bottomley committed Mar 12, 2006
1 parent 454c976 commit 867b5d6
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 28 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 7f101662dd55aa16852ff6228ac496f56a259f5e
refs/heads/master: f31dc0cde69761dca05687addfd233accd393d1c
53 changes: 26 additions & 27 deletions trunk/drivers/scsi/FlashPoint.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -268,10 +268,9 @@ struct sccb {
#define EE_WIDE_SCSI BIT(7)


typedef struct SCCBMgr_tar_info *PSCCBMgr_tar_info;


typedef struct SCCBMgr_tar_info {
struct sccb_mgr_tar_info {

struct sccb * TarSelQ_Head;
struct sccb * TarSelQ_Tail;
Expand All @@ -284,7 +283,7 @@ typedef struct SCCBMgr_tar_info {
unsigned char TarReserved[2]; /* for alignment */
unsigned char LunDiscQ_Idx[MAX_LUN];
unsigned char TarLUNBusy[MAX_LUN];
} SCCBMGR_TAR_INFO;
};

typedef struct NVRAMInfo {
unsigned char niModel; /* Model No. of card */
Expand Down Expand Up @@ -975,7 +974,7 @@ static void FPT_shandem(unsigned long port, unsigned char p_card,struct sccb *
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_sssyncv(unsigned long p_port, unsigned char p_id, unsigned char p_sync_value,
PSCCBMgr_tar_info currTar_Info);
struct sccb_mgr_tar_info * currTar_Info);
static void FPT_sresb(unsigned long port, unsigned char p_card);
static void FPT_sxfrp(unsigned long p_port, unsigned char p_card);
static void FPT_schkdd(unsigned long port, unsigned char p_card);
Expand Down Expand Up @@ -1081,7 +1080,7 @@ static void FPT_autoLoadDefaultMap(unsigned long p_port);



static SCCBMGR_TAR_INFO FPT_sccbMgrTbl[MAX_CARDS][MAX_SCSI_TAR] = { { { 0 } } };
static struct sccb_mgr_tar_info FPT_sccbMgrTbl[MAX_CARDS][MAX_SCSI_TAR] = { { { 0 } } };
static SCCBCARD FPT_BL_Card[MAX_CARDS] = { { 0 } };
static SCCBSCAM_INFO FPT_scamInfo[MAX_SCSI_TAR] = { { { 0 } } };
static NVRAMINFO FPT_nvRamInfo[MAX_MB_CARDS] = { { 0 } };
Expand Down Expand Up @@ -1793,7 +1792,7 @@ static int FlashPoint_AbortCCB(unsigned long pCurrCard, struct sccb * p_Sccb)
CALL_BK_FN callback;
unsigned char TID;
struct sccb * pSaveSCCB;
PSCCBMgr_tar_info currTar_Info;
struct sccb_mgr_tar_info * currTar_Info;


ioport = ((PSCCBcard) pCurrCard)->ioPort;
Expand Down Expand Up @@ -2161,7 +2160,7 @@ static unsigned char FPT_SccbMgr_bad_isr(unsigned long p_port, unsigned char p_c
PSCCBcard pCurrCard, unsigned short p_int)
{
unsigned char temp, ScamFlg;
PSCCBMgr_tar_info currTar_Info;
struct sccb_mgr_tar_info * currTar_Info;
PNVRamInfo pCurrNvRam;


Expand Down Expand Up @@ -2373,7 +2372,7 @@ static void FPT_SccbMgrTableInitTarget(unsigned char p_card, unsigned char targe
{

unsigned char lun, qtag;
PSCCBMgr_tar_info currTar_Info;
struct sccb_mgr_tar_info * currTar_Info;

currTar_Info = &FPT_sccbMgrTbl[p_card][target];

Expand Down Expand Up @@ -2496,7 +2495,7 @@ static void FPT_ssel(unsigned long port, unsigned char p_card)
unsigned long cdb_reg;
PSCCBcard CurrCard;
struct sccb * currSCCB;
PSCCBMgr_tar_info currTar_Info;
struct sccb_mgr_tar_info * currTar_Info;
unsigned char lastTag, lun;

CurrCard = &FPT_BL_Card[p_card];
Expand Down Expand Up @@ -2805,7 +2804,7 @@ static void FPT_sres(unsigned long port, unsigned char p_card, PSCCBcard pCurrCa
unsigned char our_target, message, lun = 0, tag, msgRetryCount;


PSCCBMgr_tar_info currTar_Info;
struct sccb_mgr_tar_info * currTar_Info;
struct sccb * currSCCB;


Expand Down Expand Up @@ -3113,7 +3112,7 @@ static void FPT_sdecm(unsigned char message, unsigned long port, unsigned char p
{
struct sccb * currSCCB;
PSCCBcard CurrCard;
PSCCBMgr_tar_info currTar_Info;
struct sccb_mgr_tar_info * currTar_Info;

CurrCard = &FPT_BL_Card[p_card];
currSCCB = CurrCard->currentSCCB;
Expand Down Expand Up @@ -3370,7 +3369,7 @@ static void FPT_shandem(unsigned long port, unsigned char p_card, struct sccb *
static unsigned char FPT_sisyncn(unsigned long port, unsigned char p_card, unsigned char syncFlag)
{
struct sccb * currSCCB;
PSCCBMgr_tar_info currTar_Info;
struct sccb_mgr_tar_info * currTar_Info;

currSCCB = FPT_BL_Card[p_card].currentSCCB;
currTar_Info = &FPT_sccbMgrTbl[p_card][currSCCB->TargID];
Expand Down Expand Up @@ -3446,7 +3445,7 @@ static void FPT_stsyncn(unsigned long port, unsigned char p_card)
{
unsigned char sync_msg,offset,sync_reg,our_sync_msg;
struct sccb * currSCCB;
PSCCBMgr_tar_info currTar_Info;
struct sccb_mgr_tar_info * currTar_Info;

currSCCB = FPT_BL_Card[p_card].currentSCCB;
currTar_Info = &FPT_sccbMgrTbl[p_card][currSCCB->TargID];
Expand Down Expand Up @@ -3608,7 +3607,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)
{
struct sccb * currSCCB;
PSCCBMgr_tar_info currTar_Info;
struct sccb_mgr_tar_info * currTar_Info;

currSCCB = FPT_BL_Card[p_card].currentSCCB;
currTar_Info = &FPT_sccbMgrTbl[p_card][currSCCB->TargID];
Expand Down Expand Up @@ -3661,7 +3660,7 @@ static void FPT_stwidn(unsigned long port, unsigned char p_card)
{
unsigned char width;
struct sccb * currSCCB;
PSCCBMgr_tar_info currTar_Info;
struct sccb_mgr_tar_info * currTar_Info;

currSCCB = FPT_BL_Card[p_card].currentSCCB;
currTar_Info = &FPT_sccbMgrTbl[p_card][currSCCB->TargID];
Expand Down Expand Up @@ -3767,7 +3766,7 @@ static void FPT_siwidr(unsigned long port, unsigned char width)
*
*---------------------------------------------------------------------*/
static void FPT_sssyncv(unsigned long p_port, unsigned char p_id, unsigned char p_sync_value,
PSCCBMgr_tar_info currTar_Info)
struct sccb_mgr_tar_info * currTar_Info)
{
unsigned char index;

Expand Down Expand Up @@ -3842,7 +3841,7 @@ static void FPT_sresb(unsigned long port, unsigned char p_card)
{
unsigned char scsiID, i;

PSCCBMgr_tar_info currTar_Info;
struct sccb_mgr_tar_info * currTar_Info;

WR_HARPOON(port+hp_page_ctrl,
(RD_HARPOON(port+hp_page_ctrl) | G_INT_DISABLE));
Expand Down Expand Up @@ -4157,7 +4156,7 @@ static void FPT_schkdd(unsigned long port, unsigned char p_card)

static void FPT_sinits(struct sccb * p_sccb, unsigned char p_card)
{
PSCCBMgr_tar_info currTar_Info;
struct sccb_mgr_tar_info * currTar_Info;

if((p_sccb->TargID > MAX_SCSI_TAR) || (p_sccb->Lun > MAX_LUN))
{
Expand Down Expand Up @@ -4429,7 +4428,7 @@ static void FPT_phaseMsgOut(unsigned long port, unsigned char p_card)
{
unsigned char message,scsiID;
struct sccb * currSCCB;
PSCCBMgr_tar_info currTar_Info;
struct sccb_mgr_tar_info * currTar_Info;

currSCCB = FPT_BL_Card[p_card].currentSCCB;

Expand Down Expand Up @@ -6936,7 +6935,7 @@ static void FPT_DiagEEPROM(unsigned long p_port)
static void FPT_queueSearchSelect(PSCCBcard pCurrCard, unsigned char p_card)
{
unsigned char scan_ptr, lun;
PSCCBMgr_tar_info currTar_Info;
struct sccb_mgr_tar_info * currTar_Info;
struct sccb * pOldSccb;

scan_ptr = pCurrCard->scanIndex;
Expand Down Expand Up @@ -7067,7 +7066,7 @@ static void FPT_queueSearchSelect(PSCCBcard pCurrCard, unsigned char p_card)
static void FPT_queueSelectFail(PSCCBcard pCurrCard, unsigned char p_card)
{
unsigned char thisTarg;
PSCCBMgr_tar_info currTar_Info;
struct sccb_mgr_tar_info * currTar_Info;

if (pCurrCard->currentSCCB != NULL)
{
Expand Down Expand Up @@ -7109,7 +7108,7 @@ static void FPT_queueCmdComplete(PSCCBcard pCurrCard, struct sccb * p_sccb,

unsigned char i, SCSIcmd;
CALL_BK_FN callback;
PSCCBMgr_tar_info currTar_Info;
struct sccb_mgr_tar_info * currTar_Info;

SCSIcmd = p_sccb->Cdb[0];

Expand Down Expand Up @@ -7207,7 +7206,7 @@ static void FPT_queueCmdComplete(PSCCBcard pCurrCard, struct sccb * p_sccb,
*---------------------------------------------------------------------*/
static void FPT_queueDisconnect(struct sccb * p_sccb, unsigned char p_card)
{
PSCCBMgr_tar_info currTar_Info;
struct sccb_mgr_tar_info * currTar_Info;

currTar_Info = &FPT_sccbMgrTbl[p_card][p_sccb->TargID];

Expand Down Expand Up @@ -7244,7 +7243,7 @@ static void FPT_queueFlushSccb(unsigned char p_card, unsigned char error_code)
{
unsigned char qtag,thisTarg;
struct sccb * currSCCB;
PSCCBMgr_tar_info currTar_Info;
struct sccb_mgr_tar_info * currTar_Info;

currSCCB = FPT_BL_Card[p_card].currentSCCB;
if(currSCCB != NULL)
Expand Down Expand Up @@ -7283,7 +7282,7 @@ static void FPT_queueFlushTargSccb(unsigned char p_card, unsigned char thisTarg
unsigned char error_code)
{
unsigned char qtag;
PSCCBMgr_tar_info currTar_Info;
struct sccb_mgr_tar_info * currTar_Info;

currTar_Info = &FPT_sccbMgrTbl[p_card][thisTarg];

Expand Down Expand Up @@ -7311,7 +7310,7 @@ static void FPT_queueFlushTargSccb(unsigned char p_card, unsigned char thisTarg

static void FPT_queueAddSccb(struct sccb * p_SCCB, unsigned char p_card)
{
PSCCBMgr_tar_info currTar_Info;
struct sccb_mgr_tar_info * currTar_Info;
currTar_Info = &FPT_sccbMgrTbl[p_card][p_SCCB->TargID];

p_SCCB->Sccb_forwardlink = NULL;
Expand Down Expand Up @@ -7346,7 +7345,7 @@ static void FPT_queueAddSccb(struct sccb * p_SCCB, unsigned char p_card)
static unsigned char FPT_queueFindSccb(struct sccb * p_SCCB, unsigned char p_card)
{
struct sccb * q_ptr;
PSCCBMgr_tar_info currTar_Info;
struct sccb_mgr_tar_info * currTar_Info;

currTar_Info = &FPT_sccbMgrTbl[p_card][p_SCCB->TargID];

Expand Down

0 comments on commit 867b5d6

Please sign in to comment.