From 454c976639636d3ddbc834f9d9f0dd5f906137b0 Mon Sep 17 00:00:00 2001 From: Alexey Dobriyan Date: Wed, 8 Mar 2006 00:14:30 -0800 Subject: [PATCH] --- yaml --- r: 22607 b: refs/heads/master c: 7f101662dd55aa16852ff6228ac496f56a259f5e h: refs/heads/master i: 22605: 50d91a93def6516a68eeb4b74c7344a29026b136 22603: 1300d19406a8679e20a25e80680b56f97e28f4ae 22599: 3bdee5670adc408d337e6bd977f0e144a9c572d6 22591: 84e09fe2473fb85a3f8ff7d592a1244d8f60fdbd v: v3 --- [refs] | 2 +- trunk/drivers/scsi/FlashPoint.c | 15 +++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 276f2aa24162..cb76a44447b3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 69eb2ea47793366f59bfbc6e3c655b9c5047badd +refs/heads/master: 7f101662dd55aa16852ff6228ac496f56a259f5e diff --git a/trunk/drivers/scsi/FlashPoint.c b/trunk/drivers/scsi/FlashPoint.c index 88b7da371399..9969fef8fd52 100644 --- a/trunk/drivers/scsi/FlashPoint.c +++ b/trunk/drivers/scsi/FlashPoint.c @@ -57,7 +57,7 @@ struct sccb; typedef void (*CALL_BK_FN)(struct sccb *); -typedef struct SCCBMgr_info { +struct sccb_mgr_info { unsigned long si_baseaddr; unsigned char si_present; unsigned char si_intvect; @@ -79,9 +79,8 @@ typedef struct SCCBMgr_info { unsigned char si_XlatInfo[4]; unsigned long si_reserved2[5]; unsigned long si_secondary_range; -} SCCBMGR_INFO; +}; -typedef SCCBMGR_INFO * PSCCBMGR_INFO; #define SCSI_PARITY_ENA 0x0001 @@ -309,7 +308,7 @@ typedef NVRAMINFO *PNVRamInfo; typedef struct SCCBcard { struct sccb * currentSCCB; - PSCCBMGR_INFO cardInfo; + struct sccb_mgr_info * cardInfo; unsigned long ioPort; @@ -1108,7 +1107,7 @@ static void (*FPT_s_PhaseTbl[8]) (unsigned long, unsigned char)= { 0 }; * *---------------------------------------------------------------------*/ -static int FlashPoint_ProbeHostAdapter(PSCCBMGR_INFO pCardInfo) +static int FlashPoint_ProbeHostAdapter(struct sccb_mgr_info * pCardInfo) { static unsigned char first_time = 1; @@ -1386,7 +1385,7 @@ static int FlashPoint_ProbeHostAdapter(PSCCBMGR_INFO pCardInfo) * *---------------------------------------------------------------------*/ -static unsigned long FlashPoint_HardwareResetHostAdapter(PSCCBMGR_INFO pCardInfo) +static unsigned long FlashPoint_HardwareResetHostAdapter(struct sccb_mgr_info * pCardInfo) { PSCCBcard CurrCard = NULL; PNVRamInfo pCurrNvRam; @@ -7788,14 +7787,14 @@ static unsigned char FPT_CalcLrc(unsigned char buffer[]) static inline unsigned char FlashPoint__ProbeHostAdapter(struct FlashPoint_Info *FlashPointInfo) { - return FlashPoint_ProbeHostAdapter((PSCCBMGR_INFO) FlashPointInfo); + return FlashPoint_ProbeHostAdapter((struct sccb_mgr_info *) FlashPointInfo); } static inline FlashPoint_CardHandle_T FlashPoint__HardwareResetHostAdapter(struct FlashPoint_Info *FlashPointInfo) { - return FlashPoint_HardwareResetHostAdapter((PSCCBMGR_INFO) FlashPointInfo); + return FlashPoint_HardwareResetHostAdapter((struct sccb_mgr_info *) FlashPointInfo); } static inline void