diff options
Diffstat (limited to 'drivers/staging/keucr/smilsub.c')
| -rw-r--r-- | drivers/staging/keucr/smilsub.c | 66 |
1 files changed, 32 insertions, 34 deletions
diff --git a/drivers/staging/keucr/smilsub.c b/drivers/staging/keucr/smilsub.c index 4fe47422eb79..b315d5f8e197 100644 --- a/drivers/staging/keucr/smilsub.c +++ b/drivers/staging/keucr/smilsub.c @@ -42,10 +42,8 @@ struct SSFDCTYPE Ssfdc; struct ADDRESS Media; struct CIS_AREA CisArea; -BYTE EccBuf[6]; +static BYTE EccBuf[6]; extern PBYTE SMHostAddr; -extern BYTE IsSSFDCCompliance; -extern BYTE IsXDCompliance; extern DWORD ErrXDCode; extern WORD ReadBlock; @@ -67,7 +65,7 @@ int Check_D_DataBlank(BYTE *redundant) if (*redundant++!=0xFF) return(ERROR); - return(SUCCESS); + return(SMSUCCESS); } //----- Check_D_FailBlock() -------------------------------------------- @@ -76,13 +74,13 @@ int Check_D_FailBlock(BYTE *redundant) redundant+=REDT_BLOCK; if (*redundant==0xFF) - return(SUCCESS); + return(SMSUCCESS); if (!*redundant) return(ERROR); if (hweight8(*redundant)<7) return(ERROR); - return(SUCCESS); + return(SMSUCCESS); } //----- Check_D_DataStatus() ------------------------------------------- @@ -91,7 +89,7 @@ int Check_D_DataStatus(BYTE *redundant) redundant+=REDT_DATA; if (*redundant==0xFF) - return(SUCCESS); + return(SMSUCCESS); if (!*redundant) { ErrXDCode = ERR_DataStatus; @@ -103,7 +101,7 @@ int Check_D_DataStatus(BYTE *redundant) if (hweight8(*redundant)<5) return(ERROR); - return(SUCCESS); + return(SMSUCCESS); } //----- Load_D_LogBlockAddr() ------------------------------------------ @@ -118,17 +116,17 @@ int Load_D_LogBlockAddr(BYTE *redundant) if (addr1==addr2) if ((addr1 &0xF000)==0x1000) - { Media.LogBlock=(addr1 &0x0FFF)/2; return(SUCCESS); } + { Media.LogBlock=(addr1 &0x0FFF)/2; return(SMSUCCESS); } if (hweight16((WORD)(addr1^addr2))!=0x01) return(ERROR); if ((addr1 &0xF000)==0x1000) if (!(hweight16(addr1) &0x01)) - { Media.LogBlock=(addr1 &0x0FFF)/2; return(SUCCESS); } + { Media.LogBlock=(addr1 &0x0FFF)/2; return(SMSUCCESS); } if ((addr2 &0xF000)==0x1000) if (!(hweight16(addr2) &0x01)) - { Media.LogBlock=(addr2 &0x0FFF)/2; return(SUCCESS); } + { Media.LogBlock=(addr2 &0x0FFF)/2; return(SMSUCCESS); } return(ERROR); } @@ -222,7 +220,7 @@ int Ssfdc_D_ReadCisSect(struct us_data *us, BYTE *buf,BYTE *redundant) } Media.Zone=zone; Media.PhyBlock=block; Media.Sector=sector; - return(SUCCESS); + return(SMSUCCESS); } /* ////----- Ssfdc_D_WriteRedtMode() ---------------------------------------- @@ -428,7 +426,7 @@ int Ssfdc_D_ReadBlock(struct us_data *us, WORD count, BYTE *buf,BYTE *redundant) // // if (!_Hw_D_ChkCardIn()) // return(ERROR); -// return(SUCCESS); +// return(SMSUCCESS); //} // ////----- Ssfdc_D_ReadSect_PIO() --------------------------------------------- @@ -451,7 +449,7 @@ int Ssfdc_D_ReadBlock(struct us_data *us, WORD count, BYTE *buf,BYTE *redundant) // // _Calc_D_ECCdata(buf); // _Set_D_SsfdcRdStandby(); -// return(SUCCESS); +// return(SMSUCCESS); //} // 6250 CMD 3 @@ -509,7 +507,7 @@ int Ssfdc_D_WriteSect(PFDO_DEVICE_EXTENSION fdoExt, BYTE *buf,BYTE *redundant) // ENE_Print("Error\n"); // } - return(SUCCESS); + return(SMSUCCESS); } */ //----- Ssfdc_D_CopyBlock() -------------------------------------------- @@ -614,7 +612,7 @@ int Ssfdc_D_WriteBlock(PFDO_DEVICE_EXTENSION fdoExt, WORD count, BYTE *buf,BYTE // ENE_Print("Error\n"); // } - return(SUCCESS); + return(SMSUCCESS); } // ////----- Ssfdc_D_WriteSect_DMA() -------------------------------------------- @@ -704,7 +702,7 @@ int Ssfdc_D_WriteBlock(PFDO_DEVICE_EXTENSION fdoExt, WORD count, BYTE *buf,BYTE // if (!_Hw_D_ChkCardIn()) // return(ERROR); // -// return(SUCCESS); +// return(SMSUCCESS); //} // ////----- Ssfdc_D_WriteSect_PIO() -------------------------------------------- @@ -729,7 +727,7 @@ int Ssfdc_D_WriteBlock(PFDO_DEVICE_EXTENSION fdoExt, WORD count, BYTE *buf,BYTE // // _Set_D_SsfdcWrStandby(); // _Set_D_SsfdcRdStandby(); -// return(SUCCESS); +// return(SMSUCCESS); //} */ //----- Ssfdc_D_WriteSectForCopy() ------------------------------------- @@ -893,14 +891,14 @@ int Ssfdc_D_WriteRedtData(struct us_data *us, BYTE *redundant) int Ssfdc_D_CheckStatus(void) { // Driver ¤£°µ - return(SUCCESS); + return(SMSUCCESS); //_Set_D_SsfdcRdCmd(RDSTATUS); // //if (_Check_D_SsfdcStatus()) //{ _Set_D_SsfdcRdStandby(); return(ERROR); } // //_Set_D_SsfdcRdStandby(); - //return(SUCCESS); + //return(SMSUCCESS); } /* ////NAND Memory (SmartMedia) Control Subroutine for Read Data @@ -1095,7 +1093,7 @@ int Ssfdc_D_CheckStatus(void) // // do { // if (!_Hw_D_ChkBusy()) -// return(SUCCESS); +// return(SMSUCCESS); // EDelay(100); // count++; // } while (count<=time); @@ -1109,7 +1107,7 @@ int Ssfdc_D_CheckStatus(void) // if (_Hw_D_InData() & WR_FAIL) // return(ERROR); // -// return(SUCCESS); +// return(SMSUCCESS); //} // //// For 712 @@ -1339,7 +1337,7 @@ int Set_D_SsfdcModel(BYTE dcode) return(ERROR); } - return(SUCCESS); + return(SMSUCCESS); } //----- _Check_D_DevCode() --------------------------------------------- @@ -1388,7 +1386,7 @@ BYTE _Check_D_DevCode(BYTE dcode) // if (_Hw_D_ChkPower()) // { // _Hw_D_EnableOB(); // Set SM_REG_CTRL_5 Reg. to 0x83 -// return(SUCCESS); +// return(SMSUCCESS); // } // // _Hw_D_SetVccOff(); @@ -1419,7 +1417,7 @@ BYTE _Check_D_DevCode(BYTE dcode) //int Check_D_CntPower(void) //{ // if (_Hw_D_ChkPower()) -// return(SUCCESS); // Power On +// return(SMSUCCESS); // Power On // // return(ERROR); // Power Off //} @@ -1431,7 +1429,7 @@ BYTE _Check_D_DevCode(BYTE dcode) // // if (!_Hw_D_ChkStatus()) // Not Status Change // if (_Hw_D_ChkCardIn()) -// return(SUCCESS); // Card exist in Slot +// return(SMSUCCESS); // Card exist in Slot // // for(i=0,j=0,k=0; i<16; i++) { // if (_Hw_D_ChkCardIn()) // Status Change @@ -1444,7 +1442,7 @@ BYTE _Check_D_DevCode(BYTE dcode) // } // // if (j>3) -// return(SUCCESS); // Card exist in Slot +// return(SMSUCCESS); // Card exist in Slot // if (k>3) // return(ERROR); // NO Card exist in Slot // @@ -1460,12 +1458,12 @@ BYTE _Check_D_DevCode(BYTE dcode) // if (_Hw_D_ChkStatus()) // return(ERROR); // Status Change // -// return(SUCCESS); // Not Status Change +// return(SMSUCCESS); // Not Status Change //} // ////----- Check_D_SsfdcWP() ---------------------------------------------- //int Check_D_SsfdcWP(void) -//{ // ERROR: WP, SUCCESS: Not WP +//{ // ERROR: WP, SMSUCCESS: Not WP // char i; // // for(i=0; i<8; i++) { @@ -1474,7 +1472,7 @@ BYTE _Check_D_DevCode(BYTE dcode) // _Wait_D_Timer(TIME_WPCHK); // } // -// return(SUCCESS); +// return(SMSUCCESS); //} // */ @@ -1482,13 +1480,13 @@ BYTE _Check_D_DevCode(BYTE dcode) //----- Check_D_ReadError() ---------------------------------------------- int Check_D_ReadError(BYTE *redundant) { - return SUCCESS; + return SMSUCCESS; } //----- Check_D_Correct() ---------------------------------------------- int Check_D_Correct(BYTE *buf,BYTE *redundant) { - return SUCCESS; + return SMSUCCESS; } //----- Check_D_CISdata() ---------------------------------------------- @@ -1500,7 +1498,7 @@ int Check_D_CISdata(BYTE *buf, BYTE *redundant) int cis_len = sizeof(cis); if (!IsSSFDCCompliance && !IsXDCompliance) - return SUCCESS; + return SMSUCCESS; if (!memcmp(redundant + 0x0D, EccBuf, 3)) return memcmp(buf, cis, cis_len); @@ -1599,5 +1597,5 @@ int SM_ReadBlock(PFDO_DEVICE_EXTENSION fdoExt, BYTE *buf,BYTE *redundant) if (!NT_SUCCESS(ntStatus)) return(ERROR); - return(SUCCESS); + return(SMSUCCESS); }*/ |