diff options
author | Himangi Saraogi <himangi774@gmail.com> | 2014-03-16 03:14:57 +0530 |
---|---|---|
committer | Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com> | 2014-03-16 22:01:41 -0700 |
commit | 432f8574a7f5a2e63d00e91d79296440a97faf6f (patch) | |
tree | 3dfda34550d96022fdbdf128e07fbdeecfe31d68 /drivers/staging/keucr/smil.h | |
parent | 68b350073fca5c86cd9da1ba699ad9b8c459e6dc (diff) |
staging:keucr: Remove typedefs
As suggested by Pablo, this patch uses a coccinelle script to remove the
typedefs:
typedef u8 BOOLEAN; <-- use "bool" instead.
typedef u8 BYTE; <-- use "u8"
typedef u8 *PBYTE; <-- use "u8 *"
typedef u16 WORD; <-- use "u16"
typedef u16 *PWORD; <-- use "u16 *"
typedef u32 DWORD; <-- use "u32"
typedef u32 *PDWORD; <-- use "u32 *"
in common.h.
The coccinelle script is:
/* coccinelle script to remove typedefs. */
@remove_typedef@
@@
-typedef bool BOOLEAN;
-typedef u8 BYTE;
-typedef u8 *PBYTE;
-typedef u16 WORD;
-typedef u16 *PWORD;
-typedef u32 DWORD;
-typedef u32 *PDWORD;
@fix_usage@
typedef BOOLEAN;
@@
-BOOLEAN
+bool
@fix_usage1@
typedef BYTE;
@@
-BYTE
+u8
@fix_usage2@
typedef PBYTE;
@@
-PBYTE
+u8 *
@fix_usage3@
typedef WORD;
@@
-WORD
+u16
@fix_usage4@
typedef PWORD;
@@
-PWORD
+u16 *
@fix_usage5@
typedef DWORD;
identifier f;
@@
-DWORD
+u32
@fix_usage6@
typedef PDWORD;
@@
-PDWORD
+u32 *
Signed-off-by: Himangi Saraogi <himangi774@gmail.com>
Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
Diffstat (limited to 'drivers/staging/keucr/smil.h')
-rw-r--r-- | drivers/staging/keucr/smil.h | 112 |
1 files changed, 56 insertions, 56 deletions
diff --git a/drivers/staging/keucr/smil.h b/drivers/staging/keucr/smil.h index 9136e944726..39951738d23 100644 --- a/drivers/staging/keucr/smil.h +++ b/drivers/staging/keucr/smil.h @@ -169,29 +169,29 @@ SmartMedia Model & Attribute Struct Definition ***************************************************************************/ struct keucr_media_info { - BYTE Model; - BYTE Attribute; - BYTE MaxZones; - BYTE MaxSectors; - WORD MaxBlocks; - WORD MaxLogBlocks; + u8 Model; + u8 Attribute; + u8 MaxZones; + u8 MaxSectors; + u16 MaxBlocks; + u16 MaxLogBlocks; }; struct keucr_media_address { - BYTE Zone; /* Zone Number */ - BYTE Sector; /* Sector(512byte) Number on Block */ - WORD PhyBlock; /* Physical Block Number on Zone */ - WORD LogBlock; /* Logical Block Number of Zone */ + u8 Zone; /* Zone Number */ + u8 Sector; /* Sector(512byte) Number on Block */ + u16 PhyBlock; /* Physical Block Number on Zone */ + u16 LogBlock; /* Logical Block Number of Zone */ }; struct keucr_media_area { - BYTE Sector; /* Sector(512byte) Number on Block */ - WORD PhyBlock; /* Physical Block Number on Zone 0 */ + u8 Sector; /* Sector(512byte) Number on Block */ + u16 PhyBlock; /* Physical Block Number on Zone 0 */ }; -extern WORD ReadBlock; -extern WORD WriteBlock; -extern DWORD MediaChange; +extern u16 ReadBlock; +extern u16 WriteBlock; +extern u32 MediaChange; extern struct keucr_media_info Ssfdc; extern struct keucr_media_address Media; @@ -204,24 +204,24 @@ extern struct keucr_media_area CisArea; int Init_D_SmartMedia(void); int Pwoff_D_SmartMedia(void); int Check_D_SmartMedia(void); -int Check_D_Parameter(struct us_data *, WORD *, BYTE *, BYTE *); -int Media_D_ReadSector(struct us_data *, DWORD, WORD, BYTE *); -int Media_D_WriteSector(struct us_data *, DWORD, WORD, BYTE *); -int Media_D_CopySector(struct us_data *, DWORD, WORD, BYTE *); -int Media_D_EraseBlock(struct us_data *, DWORD, WORD); +int Check_D_Parameter(struct us_data *, u16 *, u8 *, u8 *); +int Media_D_ReadSector(struct us_data *, u32, u16, u8 *); +int Media_D_WriteSector(struct us_data *, u32, u16, u8 *); +int Media_D_CopySector(struct us_data *, u32, u16, u8 *); +int Media_D_EraseBlock(struct us_data *, u32, u16); int Media_D_EraseAll(struct us_data *); /******************************************/ -int Media_D_OneSectWriteStart(struct us_data *, DWORD, BYTE *); -int Media_D_OneSectWriteNext(struct us_data *, BYTE *); +int Media_D_OneSectWriteStart(struct us_data *, u32, u8 *); +int Media_D_OneSectWriteNext(struct us_data *, u8 *); int Media_D_OneSectWriteFlush(struct us_data *); /******************************************/ extern int SM_FreeMem(void); /* ENE SM function */ -void SM_EnableLED(struct us_data *, BOOLEAN); +void SM_EnableLED(struct us_data *, bool); void Led_D_TernOn(void); void Led_D_TernOff(void); -int Media_D_EraseAllRedtData(DWORD Index, BOOLEAN CheckBlock); +int Media_D_EraseAllRedtData(u32 Index, bool CheckBlock); /*DWORD Media_D_GetMediaInfo(struct us_data * fdoExt, PIOCTL_MEDIA_INFO_IN pParamIn, PIOCTL_MEDIA_INFO_OUT pParamOut); */ @@ -229,31 +229,31 @@ int Media_D_EraseAllRedtData(DWORD Index, BOOLEAN CheckBlock); * SMILSub.c */ /******************************************/ -int Check_D_DataBlank(BYTE *); -int Check_D_FailBlock(BYTE *); -int Check_D_DataStatus(BYTE *); -int Load_D_LogBlockAddr(BYTE *); -void Clr_D_RedundantData(BYTE *); -void Set_D_LogBlockAddr(BYTE *); -void Set_D_FailBlock(BYTE *); -void Set_D_DataStaus(BYTE *); +int Check_D_DataBlank(u8 *); +int Check_D_FailBlock(u8 *); +int Check_D_DataStatus(u8 *); +int Load_D_LogBlockAddr(u8 *); +void Clr_D_RedundantData(u8 *); +void Set_D_LogBlockAddr(u8 *); +void Set_D_FailBlock(u8 *); +void Set_D_DataStaus(u8 *); /******************************************/ void Ssfdc_D_Reset(struct us_data *); -int Ssfdc_D_ReadCisSect(struct us_data *, BYTE *, BYTE *); +int Ssfdc_D_ReadCisSect(struct us_data *, u8 *, u8 *); void Ssfdc_D_WriteRedtMode(void); -void Ssfdc_D_ReadID(BYTE *, BYTE); -int Ssfdc_D_ReadSect(struct us_data *, BYTE *, BYTE *); -int Ssfdc_D_ReadBlock(struct us_data *, WORD, BYTE *, BYTE *); -int Ssfdc_D_WriteSect(struct us_data *, BYTE *, BYTE *); -int Ssfdc_D_WriteBlock(struct us_data *, WORD, BYTE *, BYTE *); -int Ssfdc_D_CopyBlock(struct us_data *, WORD, BYTE *, BYTE *); -int Ssfdc_D_WriteSectForCopy(struct us_data *, BYTE *, BYTE *); +void Ssfdc_D_ReadID(u8 *, u8); +int Ssfdc_D_ReadSect(struct us_data *, u8 *, u8 *); +int Ssfdc_D_ReadBlock(struct us_data *, u16, u8 *, u8 *); +int Ssfdc_D_WriteSect(struct us_data *, u8 *, u8 *); +int Ssfdc_D_WriteBlock(struct us_data *, u16, u8 *, u8 *); +int Ssfdc_D_CopyBlock(struct us_data *, u16, u8 *, u8 *); +int Ssfdc_D_WriteSectForCopy(struct us_data *, u8 *, u8 *); int Ssfdc_D_EraseBlock(struct us_data *); -int Ssfdc_D_ReadRedtData(struct us_data *, BYTE *); -int Ssfdc_D_WriteRedtData(struct us_data *, BYTE *); +int Ssfdc_D_ReadRedtData(struct us_data *, u8 *); +int Ssfdc_D_WriteRedtData(struct us_data *, u8 *); int Ssfdc_D_CheckStatus(void); -int Set_D_SsfdcModel(BYTE); +int Set_D_SsfdcModel(u8); void Cnt_D_Reset(void); int Cnt_D_PowerOn(void); void Cnt_D_PowerOff(void); @@ -263,26 +263,26 @@ int Check_D_CntPower(void); int Check_D_CardExist(void); int Check_D_CardStsChg(void); int Check_D_SsfdcWP(void); -int SM_ReadBlock(struct us_data *, BYTE *, BYTE *); +int SM_ReadBlock(struct us_data *, u8 *, u8 *); -int Ssfdc_D_ReadSect_DMA(struct us_data *, BYTE *, BYTE *); -int Ssfdc_D_ReadSect_PIO(struct us_data *, BYTE *, BYTE *); -int Ssfdc_D_WriteSect_DMA(struct us_data *, BYTE *, BYTE *); -int Ssfdc_D_WriteSect_PIO(struct us_data *, BYTE *, BYTE *); +int Ssfdc_D_ReadSect_DMA(struct us_data *, u8 *, u8 *); +int Ssfdc_D_ReadSect_PIO(struct us_data *, u8 *, u8 *); +int Ssfdc_D_WriteSect_DMA(struct us_data *, u8 *, u8 *); +int Ssfdc_D_WriteSect_PIO(struct us_data *, u8 *, u8 *); /******************************************/ -int Check_D_ReadError(BYTE *); -int Check_D_Correct(BYTE *, BYTE *); -int Check_D_CISdata(BYTE *, BYTE *); -void Set_D_RightECC(BYTE *); +int Check_D_ReadError(u8 *); +int Check_D_Correct(u8 *, u8 *); +int Check_D_CISdata(u8 *, u8 *); +void Set_D_RightECC(u8 *); /* * SMILECC.c */ -void calculate_ecc(BYTE *, BYTE *, BYTE *, BYTE *, BYTE *); -BYTE correct_data(BYTE *, BYTE *, BYTE, BYTE, BYTE); -int _Correct_D_SwECC(BYTE *, BYTE *, BYTE *); -void _Calculate_D_SwECC(BYTE *, BYTE *); +void calculate_ecc(u8 *, u8 *, u8 *, u8 *, u8 *); +u8 correct_data(u8 *, u8 *, u8, u8, u8); +int _Correct_D_SwECC(u8 *, u8 *, u8 *); +void _Calculate_D_SwECC(u8 *, u8 *); void SM_Init(void); |