aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRandy Dunlap <randy.dunlap@oracle.com>2011-05-09 13:47:51 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2011-05-10 14:25:06 -0400
commitfb03d4fc6c9bc4bf509221101639cde1b8330405 (patch)
tree66f0def391cd544056478558aa187a381e1722e2
parent7fb71adc357885c9ea9971efec3bb2a527b54364 (diff)
staging/keucr: don't use SUCCESS as macro name
Don't use "SUCCESS" as a macro name. This collides with SCSI's macro of the same name, but with a different value: drivers/staging/keucr/smcommon.h:9:9: warning: preprocessor token SUCCESS redefined include/scsi/scsi.h:463:9: this was the original definition Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat
-rw-r--r--drivers/staging/keucr/smcommon.h2
-rw-r--r--drivers/staging/keucr/smilmain.c104
-rw-r--r--drivers/staging/keucr/smilsub.c62
3 files changed, 84 insertions, 84 deletions
diff --git a/drivers/staging/keucr/smcommon.h b/drivers/staging/keucr/smcommon.h
index 00064cabf4e..278bdb87112 100644
--- a/drivers/staging/keucr/smcommon.h
+++ b/drivers/staging/keucr/smcommon.h
@@ -6,7 +6,7 @@
6/*************************************************************************** 6/***************************************************************************
7Define Difinetion 7Define Difinetion
8***************************************************************************/ 8***************************************************************************/
9#define SUCCESS 0x0000 /* SUCCESS */ 9#define SMSUCCESS 0x0000 /* SUCCESS */
10#define ERROR 0xFFFF /* ERROR */ 10#define ERROR 0xFFFF /* ERROR */
11#define CORRECT 0x0001 /* CORRECTABLE */ 11#define CORRECT 0x0001 /* CORRECTABLE */
12 12
diff --git a/drivers/staging/keucr/smilmain.c b/drivers/staging/keucr/smilmain.c
index 1ca99b4f62e..31f7813cab0 100644
--- a/drivers/staging/keucr/smilmain.c
+++ b/drivers/staging/keucr/smilmain.c
@@ -252,13 +252,13 @@ int Release_D_CopySector(struct us_data *us)
252 if (Media.PhyBlock==NO_ASSIGN) 252 if (Media.PhyBlock==NO_ASSIGN)
253 { 253 {
254 Media.PhyBlock=WriteBlock; 254 Media.PhyBlock=WriteBlock;
255 return(SUCCESS); 255 return(SMSUCCESS);
256 } 256 }
257 257
258 Clr_D_Bit(Assign[Media.Zone],Media.PhyBlock); 258 Clr_D_Bit(Assign[Media.Zone],Media.PhyBlock);
259 Media.PhyBlock=WriteBlock; 259 Media.PhyBlock=WriteBlock;
260 260
261 return(SUCCESS); 261 return(SMSUCCESS);
262} 262}
263/* 263/*
264//----- Media_D_WriteSector() ------------------------------------------ 264//----- Media_D_WriteSector() ------------------------------------------
@@ -568,7 +568,7 @@ int Media_D_OneSectWriteFlush(PFDO_DEVICE_EXTENSION fdoExt)
568// default: *c= 0; *h= 0; *s= 0; ErrCode = ERR_NoSmartMedia; return(ERROR); 568// default: *c= 0; *h= 0; *s= 0; ErrCode = ERR_NoSmartMedia; return(ERROR);
569// } 569// }
570// 570//
571// return(SUCCESS); 571// return(SMSUCCESS);
572//} 572//}
573// 573//
574////Power Control & Media Exist Check Subroutine 574////Power Control & Media Exist Check Subroutine
@@ -595,7 +595,7 @@ int Media_D_OneSectWriteFlush(PFDO_DEVICE_EXTENSION fdoExt)
595// MediaChange = ERROR; 595// MediaChange = ERROR;
596// //usleep(56*1024); 596// //usleep(56*1024);
597// if ((!Check_D_CntPower())&&(!MediaChange)) // 有 power & Media 沒被 change, 則 return success 597// if ((!Check_D_CntPower())&&(!MediaChange)) // 有 power & Media 沒被 change, 則 return success
598// return(SUCCESS); 598// return(SMSUCCESS);
599// //usleep(56*1024); 599// //usleep(56*1024);
600// 600//
601// if (Check_D_CardExist()) // Check if card is not exist, return err 601// if (Check_D_CardExist()) // Check if card is not exist, return err
@@ -614,7 +614,7 @@ int Media_D_OneSectWriteFlush(PFDO_DEVICE_EXTENSION fdoExt)
614// //usleep(56*1024); 614// //usleep(56*1024);
615// Ssfdc_D_Reset(fdoExt); 615// Ssfdc_D_Reset(fdoExt);
616// //usleep(56*1024); 616// //usleep(56*1024);
617// return(SUCCESS); 617// return(SMSUCCESS);
618//} 618//}
619// 619//
620////-----Check_D_MediaExist() -------------------------------------------- 620////-----Check_D_MediaExist() --------------------------------------------
@@ -626,7 +626,7 @@ int Media_D_OneSectWriteFlush(PFDO_DEVICE_EXTENSION fdoExt)
626// if (!Check_D_CardExist()) 626// if (!Check_D_CardExist())
627// { 627// {
628// if (!MediaChange) 628// if (!MediaChange)
629// return(SUCCESS); 629// return(SMSUCCESS);
630// 630//
631// ErrCode = ERR_ChangedMedia; 631// ErrCode = ERR_ChangedMedia;
632// return(ERROR); 632// return(ERROR);
@@ -646,7 +646,7 @@ int Media_D_OneSectWriteFlush(PFDO_DEVICE_EXTENSION fdoExt)
646// return(ERROR); 646// return(ERROR);
647// } 647// }
648// 648//
649// return(SUCCESS); 649// return(SMSUCCESS);
650//} 650//}
651*/ 651*/
652//SmartMedia Physical Format Test Subroutine 652//SmartMedia Physical Format Test Subroutine
@@ -658,7 +658,7 @@ int Check_D_MediaFmt(struct us_data *us)
658 658
659 //usleep(56*1024); 659 //usleep(56*1024);
660 if (!MediaChange) 660 if (!MediaChange)
661 return(SUCCESS); 661 return(SMSUCCESS);
662 662
663 MediaChange = ERROR; 663 MediaChange = ERROR;
664 SectCopyMode = COMPLETED; 664 SectCopyMode = COMPLETED;
@@ -678,8 +678,8 @@ int Check_D_MediaFmt(struct us_data *us)
678 } 678 }
679 679
680 680
681 MediaChange = SUCCESS; 681 MediaChange = SMSUCCESS;
682 return(SUCCESS); 682 return(SMSUCCESS);
683} 683}
684/* 684/*
685////----- Check_D_BlockIsFull() ---------------------------------- 685////----- Check_D_BlockIsFull() ----------------------------------
@@ -731,7 +731,7 @@ int Check_D_MediaFmt(struct us_data *us)
731// return(ERROR); 731// return(ERROR);
732// } 732// }
733// 733//
734// return(SUCCESS); 734// return(SMSUCCESS);
735//} 735//}
736*/ 736*/
737//SmartMedia Physical Address Control Subroutine 737//SmartMedia Physical Address Control Subroutine
@@ -763,7 +763,7 @@ int Conv_D_MediaAddr(struct us_data *us, DWORD addr)
763 Clr_D_RedundantData(Redundant); 763 Clr_D_RedundantData(Redundant);
764 Set_D_LogBlockAddr(Redundant); 764 Set_D_LogBlockAddr(Redundant);
765 Media.PhyBlock = Log2Phy[Media.Zone][Media.LogBlock]; 765 Media.PhyBlock = Log2Phy[Media.Zone][Media.LogBlock];
766 return(SUCCESS); 766 return(SMSUCCESS);
767 } 767 }
768 768
769 ErrCode = ERR_OutOfLBA; 769 ErrCode = ERR_OutOfLBA;
@@ -778,7 +778,7 @@ int Inc_D_MediaAddr(struct us_data *us)
778 //ADDRESS_T bb = (ADDRESS_T) &Media; 778 //ADDRESS_T bb = (ADDRESS_T) &Media;
779 779
780 if (++Media.Sector<Ssfdc.MaxSectors) 780 if (++Media.Sector<Ssfdc.MaxSectors)
781 return(SUCCESS); 781 return(SMSUCCESS);
782 782
783 if (Log2Phy[Media.Zone]==NULL) 783 if (Log2Phy[Media.Zone]==NULL)
784 { 784 {
@@ -797,7 +797,7 @@ int Inc_D_MediaAddr(struct us_data *us)
797 Clr_D_RedundantData(Redundant); 797 Clr_D_RedundantData(Redundant);
798 Set_D_LogBlockAddr(Redundant); 798 Set_D_LogBlockAddr(Redundant);
799 Media.PhyBlock=Log2Phy[Media.Zone][Media.LogBlock]; 799 Media.PhyBlock=Log2Phy[Media.Zone][Media.LogBlock];
800 return(SUCCESS); 800 return(SMSUCCESS);
801 } 801 }
802 802
803 Media.LogBlock=0; 803 Media.LogBlock=0;
@@ -818,7 +818,7 @@ int Inc_D_MediaAddr(struct us_data *us)
818 Clr_D_RedundantData(Redundant); 818 Clr_D_RedundantData(Redundant);
819 Set_D_LogBlockAddr(Redundant); 819 Set_D_LogBlockAddr(Redundant);
820 Media.PhyBlock=Log2Phy[Media.Zone][Media.LogBlock]; 820 Media.PhyBlock=Log2Phy[Media.Zone][Media.LogBlock];
821 return(SUCCESS); 821 return(SMSUCCESS);
822 } 822 }
823 823
824 Media.Zone=0; 824 Media.Zone=0;
@@ -834,7 +834,7 @@ int Check_D_FirstSect(void)
834 ADDRESS_T bb = (ADDRESS_T) &Media; 834 ADDRESS_T bb = (ADDRESS_T) &Media;
835 835
836 if (!Media.Sector) 836 if (!Media.Sector)
837 return(SUCCESS); 837 return(SMSUCCESS);
838 838
839 return(ERROR); 839 return(ERROR);
840} 840}
@@ -848,7 +848,7 @@ int Check_D_LastSect(void)
848 if (Media.Sector<(Ssfdc.MaxSectors-1)) 848 if (Media.Sector<(Ssfdc.MaxSectors-1))
849 return(ERROR); 849 return(ERROR);
850 850
851 return(SUCCESS); 851 return(SMSUCCESS);
852} 852}
853*/ 853*/
854//SmartMedia Read/Write Subroutine with Retry 854//SmartMedia Read/Write Subroutine with Retry
@@ -858,7 +858,7 @@ int Media_D_ReadOneSect(struct us_data *us, WORD count, BYTE *buf)
858 DWORD err, retry; 858 DWORD err, retry;
859 859
860 if (!Read_D_PhyOneSect(us, count, buf)) 860 if (!Read_D_PhyOneSect(us, count, buf))
861 return(SUCCESS); 861 return(SMSUCCESS);
862 if (ErrCode==ERR_HwError) 862 if (ErrCode==ERR_HwError)
863 return(ERROR); 863 return(ERROR);
864 if (ErrCode==ERR_DataStatus) 864 if (ErrCode==ERR_DataStatus)
@@ -868,7 +868,7 @@ int Media_D_ReadOneSect(struct us_data *us, WORD count, BYTE *buf)
868 if (Ssfdc.Attribute &MWP) 868 if (Ssfdc.Attribute &MWP)
869 { 869 {
870 if (ErrCode==ERR_CorReadErr) 870 if (ErrCode==ERR_CorReadErr)
871 return(SUCCESS); 871 return(SMSUCCESS);
872 return(ERROR); 872 return(ERROR);
873 } 873 }
874 874
@@ -884,13 +884,13 @@ int Media_D_ReadOneSect(struct us_data *us, WORD count, BYTE *buf)
884 884
885 ErrCode = err; 885 ErrCode = err;
886 if (ErrCode==ERR_CorReadErr) 886 if (ErrCode==ERR_CorReadErr)
887 return(SUCCESS); 887 return(SMSUCCESS);
888 return(ERROR); 888 return(ERROR);
889 } 889 }
890 890
891 MediaChange = ERROR; 891 MediaChange = ERROR;
892#else 892#else
893 if (ErrCode==ERR_CorReadErr) return(SUCCESS); 893 if (ErrCode==ERR_CorReadErr) return(SMSUCCESS);
894#endif 894#endif
895 895
896 return(ERROR); 896 return(ERROR);
@@ -904,7 +904,7 @@ int Media_D_WriteOneSect(PFDO_DEVICE_EXTENSION fdoExt, WORD count, BYTE *buf)
904 ADDRESS_T bb = (ADDRESS_T) &Media; 904 ADDRESS_T bb = (ADDRESS_T) &Media;
905 905
906 if (!Write_D_PhyOneSect(fdoExt, count, buf)) 906 if (!Write_D_PhyOneSect(fdoExt, count, buf))
907 return(SUCCESS); 907 return(SMSUCCESS);
908 if (ErrCode==ERR_HwError) 908 if (ErrCode==ERR_HwError)
909 return(ERROR); 909 return(ERROR);
910 910
@@ -918,7 +918,7 @@ int Media_D_WriteOneSect(PFDO_DEVICE_EXTENSION fdoExt, WORD count, BYTE *buf)
918 } 918 }
919 919
920 if (!Write_D_PhyOneSect(fdoExt, count, buf)) 920 if (!Write_D_PhyOneSect(fdoExt, count, buf))
921 return(SUCCESS); 921 return(SMSUCCESS);
922 if (ErrCode==ERR_HwError) 922 if (ErrCode==ERR_HwError)
923 return(ERROR); 923 return(ERROR);
924 } 924 }
@@ -940,7 +940,7 @@ int Media_D_CopyBlockHead(PFDO_DEVICE_EXTENSION fdoExt)
940 for(retry=0; retry<2; retry++) 940 for(retry=0; retry<2; retry++)
941 { 941 {
942 if (!Copy_D_BlockHead(fdoExt)) 942 if (!Copy_D_BlockHead(fdoExt))
943 return(SUCCESS); 943 return(SMSUCCESS);
944 if (ErrCode==ERR_HwError) 944 if (ErrCode==ERR_HwError)
945 return(ERROR); 945 return(ERROR);
946 } 946 }
@@ -955,7 +955,7 @@ int Media_D_CopyBlockTail(PFDO_DEVICE_EXTENSION fdoExt)
955 DWORD retry; 955 DWORD retry;
956 956
957 if (!Copy_D_BlockTail(fdoExt)) 957 if (!Copy_D_BlockTail(fdoExt))
958 return(SUCCESS); 958 return(SMSUCCESS);
959 if (ErrCode==ERR_HwError) 959 if (ErrCode==ERR_HwError)
960 return(ERROR); 960 return(ERROR);
961 961
@@ -969,7 +969,7 @@ int Media_D_CopyBlockTail(PFDO_DEVICE_EXTENSION fdoExt)
969 } 969 }
970 970
971 if (!Copy_D_BlockTail(fdoExt)) 971 if (!Copy_D_BlockTail(fdoExt))
972 return(SUCCESS); 972 return(SMSUCCESS);
973 if (ErrCode==ERR_HwError) 973 if (ErrCode==ERR_HwError)
974 return(ERROR); 974 return(ERROR);
975 } 975 }
@@ -991,7 +991,7 @@ int Media_D_CopyBlockTail(PFDO_DEVICE_EXTENSION fdoExt)
991// ADDRESS_T bb = (ADDRESS_T) &Media; 991// ADDRESS_T bb = (ADDRESS_T) &Media;
992// 992//
993// if (Media.PhyBlock==NO_ASSIGN) 993// if (Media.PhyBlock==NO_ASSIGN)
994// return(SUCCESS); 994// return(SMSUCCESS);
995// 995//
996// if (Log2Phy[Media.Zone]==NULL) 996// if (Log2Phy[Media.Zone]==NULL)
997// { 997// {
@@ -1019,7 +1019,7 @@ int Media_D_CopyBlockTail(PFDO_DEVICE_EXTENSION fdoExt)
1019// 1019//
1020// Clr_D_Bit(Assign[Media.Zone],Media.PhyBlock); 1020// Clr_D_Bit(Assign[Media.Zone],Media.PhyBlock);
1021// Media.PhyBlock=NO_ASSIGN; 1021// Media.PhyBlock=NO_ASSIGN;
1022// return(SUCCESS); 1022// return(SMSUCCESS);
1023//} 1023//}
1024// 1024//
1025////SmartMedia Erase Subroutine 1025////SmartMedia Erase Subroutine
@@ -1072,7 +1072,7 @@ int Media_D_CopyBlockTail(PFDO_DEVICE_EXTENSION fdoExt)
1072// } 1072// }
1073// 1073//
1074// } 1074// }
1075// return(SUCCESS); 1075// return(SMSUCCESS);
1076//} 1076//}
1077*/ 1077*/
1078//SmartMedia Physical Sector Data Copy Subroutine 1078//SmartMedia Physical Sector Data Copy Subroutine
@@ -1112,7 +1112,7 @@ int Copy_D_BlockAll(struct us_data *us, DWORD mode)
1112 1112
1113 Media.PhyBlock=WriteBlock; 1113 Media.PhyBlock=WriteBlock;
1114 Media.Sector=sect; 1114 Media.Sector=sect;
1115 return(SUCCESS); 1115 return(SMSUCCESS);
1116} 1116}
1117/* 1117/*
1118//----- Copy_D_BlockHead() --------------------------------------------- 1118//----- Copy_D_BlockHead() ---------------------------------------------
@@ -1145,7 +1145,7 @@ int Copy_D_BlockHead(PFDO_DEVICE_EXTENSION fdoExt)
1145 1145
1146 Media.PhyBlock=WriteBlock; 1146 Media.PhyBlock=WriteBlock;
1147 Media.Sector=sect; 1147 Media.Sector=sect;
1148 return(SUCCESS); 1148 return(SMSUCCESS);
1149} 1149}
1150 1150
1151//----- Copy_D_BlockTail() --------------------------------------------- 1151//----- Copy_D_BlockTail() ---------------------------------------------
@@ -1174,7 +1174,7 @@ int Copy_D_BlockTail(PFDO_DEVICE_EXTENSION fdoExt)
1174 1174
1175 Media.PhyBlock=WriteBlock; 1175 Media.PhyBlock=WriteBlock;
1176 Media.Sector=sect; 1176 Media.Sector=sect;
1177 return(SUCCESS); 1177 return(SMSUCCESS);
1178} 1178}
1179 1179
1180//----- Reassign_D_BlockHead() ----------------------------------------- 1180//----- Reassign_D_BlockHead() -----------------------------------------
@@ -1222,7 +1222,7 @@ int Reassign_D_BlockHead(PFDO_DEVICE_EXTENSION fdoExt)
1222 ReadBlock=block; 1222 ReadBlock=block;
1223 Media.Sector=sect; 1223 Media.Sector=sect;
1224 Media.PhyBlock=WriteBlock; 1224 Media.PhyBlock=WriteBlock;
1225 return(SUCCESS); 1225 return(SMSUCCESS);
1226} 1226}
1227*/ 1227*/
1228//SmartMedia Physical Block Assign/Release Subroutine 1228//SmartMedia Physical Block Assign/Release Subroutine
@@ -1242,7 +1242,7 @@ int Assign_D_WriteBlock(void)
1242 Media.PhyBlock=WriteBlock; 1242 Media.PhyBlock=WriteBlock;
1243 SectCopyMode=REQ_ERASE; 1243 SectCopyMode=REQ_ERASE;
1244 //ErrXDCode = NO_ERROR; 1244 //ErrXDCode = NO_ERROR;
1245 return(SUCCESS); 1245 return(SMSUCCESS);
1246 } 1246 }
1247 } 1247 }
1248 1248
@@ -1255,7 +1255,7 @@ int Assign_D_WriteBlock(void)
1255 Media.PhyBlock=WriteBlock; 1255 Media.PhyBlock=WriteBlock;
1256 SectCopyMode=REQ_ERASE; 1256 SectCopyMode=REQ_ERASE;
1257 //ErrXDCode = NO_ERROR; 1257 //ErrXDCode = NO_ERROR;
1258 return(SUCCESS); 1258 return(SMSUCCESS);
1259 } 1259 }
1260 } 1260 }
1261 1261
@@ -1278,7 +1278,7 @@ int Release_D_ReadBlock(struct us_data *us)
1278 SectCopyMode=COMPLETED; 1278 SectCopyMode=COMPLETED;
1279 1279
1280 if (mode==COMPLETED) 1280 if (mode==COMPLETED)
1281 return(SUCCESS); 1281 return(SMSUCCESS);
1282 1282
1283 Log2Phy[Media.Zone][Media.LogBlock]=WriteBlock; 1283 Log2Phy[Media.Zone][Media.LogBlock]=WriteBlock;
1284 Media.PhyBlock=ReadBlock; 1284 Media.PhyBlock=ReadBlock;
@@ -1286,7 +1286,7 @@ int Release_D_ReadBlock(struct us_data *us)
1286 if (Media.PhyBlock==NO_ASSIGN) 1286 if (Media.PhyBlock==NO_ASSIGN)
1287 { 1287 {
1288 Media.PhyBlock=WriteBlock; 1288 Media.PhyBlock=WriteBlock;
1289 return(SUCCESS); 1289 return(SMSUCCESS);
1290 } 1290 }
1291 1291
1292 if (mode==REQ_ERASE) 1292 if (mode==REQ_ERASE)
@@ -1303,7 +1303,7 @@ int Release_D_ReadBlock(struct us_data *us)
1303 return(ERROR); 1303 return(ERROR);
1304 1304
1305 Media.PhyBlock=WriteBlock; 1305 Media.PhyBlock=WriteBlock;
1306 return(SUCCESS); 1306 return(SMSUCCESS);
1307} 1307}
1308 1308
1309//----- Release_D_WriteBlock() ----------------------------------------- 1309//----- Release_D_WriteBlock() -----------------------------------------
@@ -1318,7 +1318,7 @@ int Release_D_WriteBlock(struct us_data *us)
1318 return(ERROR); 1318 return(ERROR);
1319 1319
1320 Media.PhyBlock=ReadBlock; 1320 Media.PhyBlock=ReadBlock;
1321 return(SUCCESS); 1321 return(SMSUCCESS);
1322} 1322}
1323 1323
1324//SmartMedia Physical Sector Data Copy Subroutine 1324//SmartMedia Physical Sector Data Copy Subroutine
@@ -1351,9 +1351,9 @@ int Copy_D_PhyOneSect(struct us_data *us)
1351 if (Check_D_DataStatus(WorkRedund)) 1351 if (Check_D_DataStatus(WorkRedund))
1352 { err=ERROR; break; } 1352 { err=ERROR; break; }
1353 if (!Check_D_ReadError(WorkRedund)) 1353 if (!Check_D_ReadError(WorkRedund))
1354 { err=SUCCESS; break; } 1354 { err=SMSUCCESS; break; }
1355 if (!Check_D_Correct(WorkBuf,WorkRedund)) 1355 if (!Check_D_Correct(WorkBuf,WorkRedund))
1356 { err=SUCCESS; break; } 1356 { err=SMSUCCESS; break; }
1357 1357
1358 err=ERROR; 1358 err=ERROR;
1359 SectCopyMode=REQ_FAIL; 1359 SectCopyMode=REQ_FAIL;
@@ -1361,7 +1361,7 @@ int Copy_D_PhyOneSect(struct us_data *us)
1361 } 1361 }
1362 else 1362 else
1363 { 1363 {
1364 err=SUCCESS; 1364 err=SMSUCCESS;
1365 for(i=0; i<SECTSIZE; i++) 1365 for(i=0; i<SECTSIZE; i++)
1366 WorkBuf[i]=DUMMY_DATA; 1366 WorkBuf[i]=DUMMY_DATA;
1367 Clr_D_RedundantData(WorkRedund); 1367 Clr_D_RedundantData(WorkRedund);
@@ -1382,7 +1382,7 @@ int Copy_D_PhyOneSect(struct us_data *us)
1382 { ErrCode = ERR_WriteFault; return(ERROR); } 1382 { ErrCode = ERR_WriteFault; return(ERROR); }
1383 1383
1384 Media.PhyBlock=ReadBlock; 1384 Media.PhyBlock=ReadBlock;
1385 return(SUCCESS); 1385 return(SMSUCCESS);
1386} 1386}
1387 1387
1388//SmartMedia Physical Sector Read/Write/Erase Subroutine 1388//SmartMedia Physical Sector Read/Write/Erase Subroutine
@@ -1398,7 +1398,7 @@ int Read_D_PhyOneSect(struct us_data *us, WORD count, BYTE *buf)
1398 { 1398 {
1399 for(i=0; i<SECTSIZE; i++) 1399 for(i=0; i<SECTSIZE; i++)
1400 *buf++=DUMMY_DATA; 1400 *buf++=DUMMY_DATA;
1401 return(SUCCESS); 1401 return(SMSUCCESS);
1402 } 1402 }
1403 1403
1404 for(retry=0; retry<2; retry++) 1404 for(retry=0; retry<2; retry++)
@@ -1420,7 +1420,7 @@ int Read_D_PhyOneSect(struct us_data *us, WORD count, BYTE *buf)
1420 { ErrCode = ERR_DataStatus; return(ERROR); } 1420 { ErrCode = ERR_DataStatus; return(ERROR); }
1421 1421
1422 if (!Check_D_ReadError(Redundant)) 1422 if (!Check_D_ReadError(Redundant))
1423 return(SUCCESS); 1423 return(SMSUCCESS);
1424 1424
1425 if (!Check_D_Correct(buf,Redundant)) 1425 if (!Check_D_Correct(buf,Redundant))
1426 { ErrCode = ERR_CorReadErr; return(ERROR); } 1426 { ErrCode = ERR_CorReadErr; return(ERROR); }
@@ -1442,7 +1442,7 @@ int Write_D_PhyOneSect(PFDO_DEVICE_EXTENSION fdoExt, WORD count, BYTE *buf)
1442 if (Ssfdc_D_CheckStatus()) 1442 if (Ssfdc_D_CheckStatus())
1443 { ErrCode = ERR_WriteFault; return(ERROR); } 1443 { ErrCode = ERR_WriteFault; return(ERROR); }
1444 1444
1445 return(SUCCESS); 1445 return(SMSUCCESS);
1446} 1446}
1447*/ 1447*/
1448//----- Erase_D_PhyOneBlock() ------------------------------------------ 1448//----- Erase_D_PhyOneBlock() ------------------------------------------
@@ -1456,7 +1456,7 @@ int Erase_D_PhyOneBlock(struct us_data *us)
1456 if (Ssfdc_D_CheckStatus()) 1456 if (Ssfdc_D_CheckStatus())
1457 { ErrCode = ERR_WriteFault; return(ERROR); } 1457 { ErrCode = ERR_WriteFault; return(ERROR); }
1458 1458
1459 return(SUCCESS); 1459 return(SMSUCCESS);
1460} 1460}
1461 1461
1462//SmartMedia Physical Format Check Local Subroutine 1462//SmartMedia Physical Format Check Local Subroutine
@@ -1540,7 +1540,7 @@ int Set_D_PhyFmtValue(struct us_data *us)
1540// } 1540// }
1541// } 1541// }
1542 1542
1543 return(SUCCESS); 1543 return(SMSUCCESS);
1544} 1544}
1545 1545
1546//----- Search_D_CIS() ------------------------------------------------- 1546//----- Search_D_CIS() -------------------------------------------------
@@ -1596,7 +1596,7 @@ int Search_D_CIS(struct us_data *us)
1596 CisArea.PhyBlock=Media.PhyBlock; 1596 CisArea.PhyBlock=Media.PhyBlock;
1597 CisArea.Sector=Media.Sector; 1597 CisArea.Sector=Media.Sector;
1598 Ssfdc_D_Reset(us); 1598 Ssfdc_D_Reset(us);
1599 return(SUCCESS); 1599 return(SMSUCCESS);
1600 } 1600 }
1601 1601
1602 Media.Sector++; 1602 Media.Sector++;
@@ -1733,7 +1733,7 @@ int Make_D_LogTable(struct us_data *us)
1733 } // End for (Media.Zone<MAX_ZONENUM) 1733 } // End for (Media.Zone<MAX_ZONENUM)
1734 1734
1735 Ssfdc_D_Reset(us); 1735 Ssfdc_D_Reset(us);
1736 return(SUCCESS); 1736 return(SMSUCCESS);
1737} 1737}
1738 1738
1739//----- MarkFail_D_PhyOneBlock() --------------------------------------- 1739//----- MarkFail_D_PhyOneBlock() ---------------------------------------
@@ -1761,7 +1761,7 @@ int MarkFail_D_PhyOneBlock(struct us_data *us)
1761 1761
1762 Ssfdc_D_Reset(us); 1762 Ssfdc_D_Reset(us);
1763 Media.Sector=sect; 1763 Media.Sector=sect;
1764 return(SUCCESS); 1764 return(SMSUCCESS);
1765} 1765}
1766/* 1766/*
1767// 1767//
@@ -1819,7 +1819,7 @@ int MarkFail_D_PhyOneBlock(struct us_data *us)
1819// 1819//
1820// Ssfdc_D_Reset(fdoExt); 1820// Ssfdc_D_Reset(fdoExt);
1821// 1821//
1822// return(SUCCESS); 1822// return(SMSUCCESS);
1823//} 1823//}
1824// 1824//
1825////----- Media_D_GetMediaInfo() --------------------------------------- 1825////----- Media_D_GetMediaInfo() ---------------------------------------
diff --git a/drivers/staging/keucr/smilsub.c b/drivers/staging/keucr/smilsub.c
index 3c1c0d46da7..b315d5f8e19 100644
--- a/drivers/staging/keucr/smilsub.c
+++ b/drivers/staging/keucr/smilsub.c
@@ -65,7 +65,7 @@ int Check_D_DataBlank(BYTE *redundant)
65 if (*redundant++!=0xFF) 65 if (*redundant++!=0xFF)
66 return(ERROR); 66 return(ERROR);
67 67
68 return(SUCCESS); 68 return(SMSUCCESS);
69} 69}
70 70
71//----- Check_D_FailBlock() -------------------------------------------- 71//----- Check_D_FailBlock() --------------------------------------------
@@ -74,13 +74,13 @@ int Check_D_FailBlock(BYTE *redundant)
74 redundant+=REDT_BLOCK; 74 redundant+=REDT_BLOCK;
75 75
76 if (*redundant==0xFF) 76 if (*redundant==0xFF)
77 return(SUCCESS); 77 return(SMSUCCESS);
78 if (!*redundant) 78 if (!*redundant)
79 return(ERROR); 79 return(ERROR);
80 if (hweight8(*redundant)<7) 80 if (hweight8(*redundant)<7)
81 return(ERROR); 81 return(ERROR);
82 82
83 return(SUCCESS); 83 return(SMSUCCESS);
84} 84}
85 85
86//----- Check_D_DataStatus() ------------------------------------------- 86//----- Check_D_DataStatus() -------------------------------------------
@@ -89,7 +89,7 @@ int Check_D_DataStatus(BYTE *redundant)
89 redundant+=REDT_DATA; 89 redundant+=REDT_DATA;
90 90
91 if (*redundant==0xFF) 91 if (*redundant==0xFF)
92 return(SUCCESS); 92 return(SMSUCCESS);
93 if (!*redundant) 93 if (!*redundant)
94 { 94 {
95 ErrXDCode = ERR_DataStatus; 95 ErrXDCode = ERR_DataStatus;
@@ -101,7 +101,7 @@ int Check_D_DataStatus(BYTE *redundant)
101 if (hweight8(*redundant)<5) 101 if (hweight8(*redundant)<5)
102 return(ERROR); 102 return(ERROR);
103 103
104 return(SUCCESS); 104 return(SMSUCCESS);
105} 105}
106 106
107//----- Load_D_LogBlockAddr() ------------------------------------------ 107//----- Load_D_LogBlockAddr() ------------------------------------------
@@ -116,17 +116,17 @@ int Load_D_LogBlockAddr(BYTE *redundant)
116 116
117 if (addr1==addr2) 117 if (addr1==addr2)
118 if ((addr1 &0xF000)==0x1000) 118 if ((addr1 &0xF000)==0x1000)
119 { Media.LogBlock=(addr1 &0x0FFF)/2; return(SUCCESS); } 119 { Media.LogBlock=(addr1 &0x0FFF)/2; return(SMSUCCESS); }
120 120
121 if (hweight16((WORD)(addr1^addr2))!=0x01) return(ERROR); 121 if (hweight16((WORD)(addr1^addr2))!=0x01) return(ERROR);
122 122
123 if ((addr1 &0xF000)==0x1000) 123 if ((addr1 &0xF000)==0x1000)
124 if (!(hweight16(addr1) &0x01)) 124 if (!(hweight16(addr1) &0x01))
125 { Media.LogBlock=(addr1 &0x0FFF)/2; return(SUCCESS); } 125 { Media.LogBlock=(addr1 &0x0FFF)/2; return(SMSUCCESS); }
126 126
127 if ((addr2 &0xF000)==0x1000) 127 if ((addr2 &0xF000)==0x1000)
128 if (!(hweight16(addr2) &0x01)) 128 if (!(hweight16(addr2) &0x01))
129 { Media.LogBlock=(addr2 &0x0FFF)/2; return(SUCCESS); } 129 { Media.LogBlock=(addr2 &0x0FFF)/2; return(SMSUCCESS); }
130 130
131 return(ERROR); 131 return(ERROR);
132} 132}
@@ -220,7 +220,7 @@ int Ssfdc_D_ReadCisSect(struct us_data *us, BYTE *buf,BYTE *redundant)
220 } 220 }
221 221
222 Media.Zone=zone; Media.PhyBlock=block; Media.Sector=sector; 222 Media.Zone=zone; Media.PhyBlock=block; Media.Sector=sector;
223 return(SUCCESS); 223 return(SMSUCCESS);
224} 224}
225/* 225/*
226////----- Ssfdc_D_WriteRedtMode() ---------------------------------------- 226////----- Ssfdc_D_WriteRedtMode() ----------------------------------------
@@ -426,7 +426,7 @@ int Ssfdc_D_ReadBlock(struct us_data *us, WORD count, BYTE *buf,BYTE *redundant)
426// 426//
427// if (!_Hw_D_ChkCardIn()) 427// if (!_Hw_D_ChkCardIn())
428// return(ERROR); 428// return(ERROR);
429// return(SUCCESS); 429// return(SMSUCCESS);
430//} 430//}
431// 431//
432////----- Ssfdc_D_ReadSect_PIO() --------------------------------------------- 432////----- Ssfdc_D_ReadSect_PIO() ---------------------------------------------
@@ -449,7 +449,7 @@ int Ssfdc_D_ReadBlock(struct us_data *us, WORD count, BYTE *buf,BYTE *redundant)
449// 449//
450// _Calc_D_ECCdata(buf); 450// _Calc_D_ECCdata(buf);
451// _Set_D_SsfdcRdStandby(); 451// _Set_D_SsfdcRdStandby();
452// return(SUCCESS); 452// return(SMSUCCESS);
453//} 453//}
454 454
455// 6250 CMD 3 455// 6250 CMD 3
@@ -507,7 +507,7 @@ int Ssfdc_D_WriteSect(PFDO_DEVICE_EXTENSION fdoExt, BYTE *buf,BYTE *redundant)
507// ENE_Print("Error\n"); 507// ENE_Print("Error\n");
508// } 508// }
509 509
510 return(SUCCESS); 510 return(SMSUCCESS);
511} 511}
512*/ 512*/
513//----- Ssfdc_D_CopyBlock() -------------------------------------------- 513//----- Ssfdc_D_CopyBlock() --------------------------------------------
@@ -612,7 +612,7 @@ int Ssfdc_D_WriteBlock(PFDO_DEVICE_EXTENSION fdoExt, WORD count, BYTE *buf,BYTE
612// ENE_Print("Error\n"); 612// ENE_Print("Error\n");
613// } 613// }
614 614
615 return(SUCCESS); 615 return(SMSUCCESS);
616} 616}
617// 617//
618////----- Ssfdc_D_WriteSect_DMA() -------------------------------------------- 618////----- Ssfdc_D_WriteSect_DMA() --------------------------------------------
@@ -702,7 +702,7 @@ int Ssfdc_D_WriteBlock(PFDO_DEVICE_EXTENSION fdoExt, WORD count, BYTE *buf,BYTE
702// if (!_Hw_D_ChkCardIn()) 702// if (!_Hw_D_ChkCardIn())
703// return(ERROR); 703// return(ERROR);
704// 704//
705// return(SUCCESS); 705// return(SMSUCCESS);
706//} 706//}
707// 707//
708////----- Ssfdc_D_WriteSect_PIO() -------------------------------------------- 708////----- Ssfdc_D_WriteSect_PIO() --------------------------------------------
@@ -727,7 +727,7 @@ int Ssfdc_D_WriteBlock(PFDO_DEVICE_EXTENSION fdoExt, WORD count, BYTE *buf,BYTE
727// 727//
728// _Set_D_SsfdcWrStandby(); 728// _Set_D_SsfdcWrStandby();
729// _Set_D_SsfdcRdStandby(); 729// _Set_D_SsfdcRdStandby();
730// return(SUCCESS); 730// return(SMSUCCESS);
731//} 731//}
732*/ 732*/
733//----- Ssfdc_D_WriteSectForCopy() ------------------------------------- 733//----- Ssfdc_D_WriteSectForCopy() -------------------------------------
@@ -891,14 +891,14 @@ int Ssfdc_D_WriteRedtData(struct us_data *us, BYTE *redundant)
891int Ssfdc_D_CheckStatus(void) 891int Ssfdc_D_CheckStatus(void)
892{ 892{
893 // Driver 不做 893 // Driver 不做
894 return(SUCCESS); 894 return(SMSUCCESS);
895 //_Set_D_SsfdcRdCmd(RDSTATUS); 895 //_Set_D_SsfdcRdCmd(RDSTATUS);
896 // 896 //
897 //if (_Check_D_SsfdcStatus()) 897 //if (_Check_D_SsfdcStatus())
898 //{ _Set_D_SsfdcRdStandby(); return(ERROR); } 898 //{ _Set_D_SsfdcRdStandby(); return(ERROR); }
899 // 899 //
900 //_Set_D_SsfdcRdStandby(); 900 //_Set_D_SsfdcRdStandby();
901 //return(SUCCESS); 901 //return(SMSUCCESS);
902} 902}
903/* 903/*
904////NAND Memory (SmartMedia) Control Subroutine for Read Data 904////NAND Memory (SmartMedia) Control Subroutine for Read Data
@@ -1093,7 +1093,7 @@ int Ssfdc_D_CheckStatus(void)
1093// 1093//
1094// do { 1094// do {
1095// if (!_Hw_D_ChkBusy()) 1095// if (!_Hw_D_ChkBusy())
1096// return(SUCCESS); 1096// return(SMSUCCESS);
1097// EDelay(100); 1097// EDelay(100);
1098// count++; 1098// count++;
1099// } while (count<=time); 1099// } while (count<=time);
@@ -1107,7 +1107,7 @@ int Ssfdc_D_CheckStatus(void)
1107// if (_Hw_D_InData() & WR_FAIL) 1107// if (_Hw_D_InData() & WR_FAIL)
1108// return(ERROR); 1108// return(ERROR);
1109// 1109//
1110// return(SUCCESS); 1110// return(SMSUCCESS);
1111//} 1111//}
1112// 1112//
1113//// For 712 1113//// For 712
@@ -1337,7 +1337,7 @@ int Set_D_SsfdcModel(BYTE dcode)
1337 return(ERROR); 1337 return(ERROR);
1338 } 1338 }
1339 1339
1340 return(SUCCESS); 1340 return(SMSUCCESS);
1341} 1341}
1342 1342
1343//----- _Check_D_DevCode() --------------------------------------------- 1343//----- _Check_D_DevCode() ---------------------------------------------
@@ -1386,7 +1386,7 @@ BYTE _Check_D_DevCode(BYTE dcode)
1386// if (_Hw_D_ChkPower()) 1386// if (_Hw_D_ChkPower())
1387// { 1387// {
1388// _Hw_D_EnableOB(); // Set SM_REG_CTRL_5 Reg. to 0x83 1388// _Hw_D_EnableOB(); // Set SM_REG_CTRL_5 Reg. to 0x83
1389// return(SUCCESS); 1389// return(SMSUCCESS);
1390// } 1390// }
1391// 1391//
1392// _Hw_D_SetVccOff(); 1392// _Hw_D_SetVccOff();
@@ -1417,7 +1417,7 @@ BYTE _Check_D_DevCode(BYTE dcode)
1417//int Check_D_CntPower(void) 1417//int Check_D_CntPower(void)
1418//{ 1418//{
1419// if (_Hw_D_ChkPower()) 1419// if (_Hw_D_ChkPower())
1420// return(SUCCESS); // Power On 1420// return(SMSUCCESS); // Power On
1421// 1421//
1422// return(ERROR); // Power Off 1422// return(ERROR); // Power Off
1423//} 1423//}
@@ -1429,7 +1429,7 @@ BYTE _Check_D_DevCode(BYTE dcode)
1429// 1429//
1430// if (!_Hw_D_ChkStatus()) // Not Status Change 1430// if (!_Hw_D_ChkStatus()) // Not Status Change
1431// if (_Hw_D_ChkCardIn()) 1431// if (_Hw_D_ChkCardIn())
1432// return(SUCCESS); // Card exist in Slot 1432// return(SMSUCCESS); // Card exist in Slot
1433// 1433//
1434// for(i=0,j=0,k=0; i<16; i++) { 1434// for(i=0,j=0,k=0; i<16; i++) {
1435// if (_Hw_D_ChkCardIn()) // Status Change 1435// if (_Hw_D_ChkCardIn()) // Status Change
@@ -1442,7 +1442,7 @@ BYTE _Check_D_DevCode(BYTE dcode)
1442// } 1442// }
1443// 1443//
1444// if (j>3) 1444// if (j>3)
1445// return(SUCCESS); // Card exist in Slot 1445// return(SMSUCCESS); // Card exist in Slot
1446// if (k>3) 1446// if (k>3)
1447// return(ERROR); // NO Card exist in Slot 1447// return(ERROR); // NO Card exist in Slot
1448// 1448//
@@ -1458,12 +1458,12 @@ BYTE _Check_D_DevCode(BYTE dcode)
1458// if (_Hw_D_ChkStatus()) 1458// if (_Hw_D_ChkStatus())
1459// return(ERROR); // Status Change 1459// return(ERROR); // Status Change
1460// 1460//
1461// return(SUCCESS); // Not Status Change 1461// return(SMSUCCESS); // Not Status Change
1462//} 1462//}
1463// 1463//
1464////----- Check_D_SsfdcWP() ---------------------------------------------- 1464////----- Check_D_SsfdcWP() ----------------------------------------------
1465//int Check_D_SsfdcWP(void) 1465//int Check_D_SsfdcWP(void)
1466//{ // ERROR: WP, SUCCESS: Not WP 1466//{ // ERROR: WP, SMSUCCESS: Not WP
1467// char i; 1467// char i;
1468// 1468//
1469// for(i=0; i<8; i++) { 1469// for(i=0; i<8; i++) {
@@ -1472,7 +1472,7 @@ BYTE _Check_D_DevCode(BYTE dcode)
1472// _Wait_D_Timer(TIME_WPCHK); 1472// _Wait_D_Timer(TIME_WPCHK);
1473// } 1473// }
1474// 1474//
1475// return(SUCCESS); 1475// return(SMSUCCESS);
1476//} 1476//}
1477// 1477//
1478*/ 1478*/
@@ -1480,13 +1480,13 @@ BYTE _Check_D_DevCode(BYTE dcode)
1480//----- Check_D_ReadError() ---------------------------------------------- 1480//----- Check_D_ReadError() ----------------------------------------------
1481int Check_D_ReadError(BYTE *redundant) 1481int Check_D_ReadError(BYTE *redundant)
1482{ 1482{
1483 return SUCCESS; 1483 return SMSUCCESS;
1484} 1484}
1485 1485
1486//----- Check_D_Correct() ---------------------------------------------- 1486//----- Check_D_Correct() ----------------------------------------------
1487int Check_D_Correct(BYTE *buf,BYTE *redundant) 1487int Check_D_Correct(BYTE *buf,BYTE *redundant)
1488{ 1488{
1489 return SUCCESS; 1489 return SMSUCCESS;
1490} 1490}
1491 1491
1492//----- Check_D_CISdata() ---------------------------------------------- 1492//----- Check_D_CISdata() ----------------------------------------------
@@ -1498,7 +1498,7 @@ int Check_D_CISdata(BYTE *buf, BYTE *redundant)
1498 int cis_len = sizeof(cis); 1498 int cis_len = sizeof(cis);
1499 1499
1500 if (!IsSSFDCCompliance && !IsXDCompliance) 1500 if (!IsSSFDCCompliance && !IsXDCompliance)
1501 return SUCCESS; 1501 return SMSUCCESS;
1502 1502
1503 if (!memcmp(redundant + 0x0D, EccBuf, 3)) 1503 if (!memcmp(redundant + 0x0D, EccBuf, 3))
1504 return memcmp(buf, cis, cis_len); 1504 return memcmp(buf, cis, cis_len);
@@ -1597,5 +1597,5 @@ int SM_ReadBlock(PFDO_DEVICE_EXTENSION fdoExt, BYTE *buf,BYTE *redundant)
1597 if (!NT_SUCCESS(ntStatus)) 1597 if (!NT_SUCCESS(ntStatus))
1598 return(ERROR); 1598 return(ERROR);
1599 1599
1600 return(SUCCESS); 1600 return(SMSUCCESS);
1601}*/ 1601}*/
generated by cgit v1.2.2 (git 2.25.0) at 2024-10-19 06:28:57 -0400