[PATCH 1/2] staging: keucr: Use memcmp() instaed of custom StringCmp() and some style cleanups
Javier Martinez Canillas
martinez.javier at gmail.com
Fri Dec 31 19:28:29 UTC 2010
Signed-off-by: Javier Martinez Canillas <martinez.javier at gmail.com>
---
drivers/staging/keucr/smilsub.c | 65 ++++++++++++++++++++------------------
1 files changed, 34 insertions(+), 31 deletions(-)
diff --git a/drivers/staging/keucr/smilsub.c b/drivers/staging/keucr/smilsub.c
index ce10cf2..8256fad 100644
--- a/drivers/staging/keucr/smilsub.c
+++ b/drivers/staging/keucr/smilsub.c
@@ -1482,54 +1482,57 @@ BYTE _Check_D_DevCode(BYTE dcode)
//----- Check_D_ReadError() ----------------------------------------------
int Check_D_ReadError(BYTE *redundant)
{
- // Driver ¤£°µ ECC Check
- return(SUCCESS);
- if (!StringCmp((char *)(redundant+0x0D),(char *)EccBuf,3))
- if (!StringCmp((char *)(redundant+0x08),(char *)(EccBuf+0x03),3))
- return(SUCCESS);
+ /* Driver ECC Check */
+ return SUCCESS;
+ if (!memcmp(redundant+0x0D, EccBuf, 3))
+ if (!memcmp(redundant+0x08, EccBuf+0x03, 3))
+ return SUCCESS;
- return(ERROR);
+ return ERROR;
}
//----- Check_D_Correct() ----------------------------------------------
int Check_D_Correct(BYTE *buf,BYTE *redundant)
{
- // Driver ¤£°µ ECC Check
- return(SUCCESS);
- if (StringCmp((char *)(redundant+0x0D),(char *)EccBuf,3))
- if (_Correct_D_SwECC(buf,redundant+0x0D,EccBuf))
- return(ERROR);
-
- buf+=0x100;
- if (StringCmp((char *)(redundant+0x08),(char *)(EccBuf+0x03),3))
- if (_Correct_D_SwECC(buf,redundant+0x08,EccBuf+0x03))
- return(ERROR);
-
- return(SUCCESS);
+ /* Driver ECC Check */
+ return SUCCESS;
+ if (memcmp(redundant+0x0D, EccBuf, 3))
+ if (_Correct_D_SwECC(buf, redundant+0x0D, EccBuf))
+ return ERROR;
+
+ buf += 0x100;
+ if (memcmp(redundant+0x08, EccBuf+0x03, 3))
+ if (_Correct_D_SwECC(buf, redundant+0x08, EccBuf+0x03))
+ return ERROR;
+
+ return SUCCESS;
}
//----- Check_D_CISdata() ----------------------------------------------
int Check_D_CISdata(BYTE *buf, BYTE *redundant)
{
- BYTE cis[]={0x01,0x03,0xD9,0x01,0xFF,0x18,0x02,0xDF,0x01,0x20};
+ BYTE cis[] = {0x01, 0x03, 0xD9, 0x01, 0xFF, 0x18, 0x02,
+ 0xDF, 0x01, 0x20};
+
+ int cis_len = sizeof(cis);
- if (!IsSSFDCCompliance && !IsXDCompliance)
- return(SUCCESS); // ¥Ø«e¬°±j¨î SUCCESS [Arnold 02-08-23] SSFDC ´ú¸Õ, ¤£¯à±j¨î SUCCESS
+ if (!IsSSFDCCompliance && !IsXDCompliance)
+ return SUCCESS;
- if (!StringCmp((char *)(redundant+0x0D),(char *)EccBuf,3))
- return(StringCmp((char *)buf,(char *)cis,10));
+ if (!memcmp(redundant+0x0D, EccBuf, 3))
+ return memcmp(buf, cis, cis_len);
- if (!_Correct_D_SwECC(buf,redundant+0x0D,EccBuf))
- return(StringCmp((char *)buf,(char *)cis,10));
+ if (!_Correct_D_SwECC(buf, redundant+0x0D, EccBuf))
+ return memcmp(buf, cis, cis_len);
- buf+=0x100;
- if (!StringCmp((char *)(redundant+0x08),(char *)(EccBuf+0x03),3))
- return(StringCmp((char *)buf,(char *)cis,10));
+ buf += 0x100;
+ if (!memcmp(redundant+0x08, EccBuf+0x03, 3))
+ return memcmp(buf, cis, cis_len);
- if (!_Correct_D_SwECC(buf,redundant+0x08,EccBuf+0x03))
- return(StringCmp((char *)buf,(char *)cis,10));
+ if (!_Correct_D_SwECC(buf, redundant+0x08, EccBuf+0x03))
+ return memcmp(buf, cis, cis_len);
- return(ERROR);
+ return ERROR;
}
//----- Set_D_RightECC() ----------------------------------------------
--
1.7.0.4
More information about the devel
mailing list