diff options
Diffstat (limited to 'drivers/staging/keucr/smilmain.c')
-rw-r--r-- | drivers/staging/keucr/smilmain.c | 82 |
1 files changed, 41 insertions, 41 deletions
diff --git a/drivers/staging/keucr/smilmain.c b/drivers/staging/keucr/smilmain.c index 09d07e05102f..fc7cbc6f8a45 100644 --- a/drivers/staging/keucr/smilmain.c +++ b/drivers/staging/keucr/smilmain.c @@ -4,11 +4,11 @@ #include "smcommon.h" #include "smil.h" -static int Conv_D_MediaAddr(struct us_data *, DWORD); +static int Conv_D_MediaAddr(struct us_data *, u32); static int Inc_D_MediaAddr(struct us_data *); -static int Media_D_ReadOneSect(struct us_data *, WORD, BYTE *); +static int Media_D_ReadOneSect(struct us_data *, u16, u8 *); -static int Copy_D_BlockAll(struct us_data *, DWORD); +static int Copy_D_BlockAll(struct us_data *, u32); static int Assign_D_WriteBlock(void); static int Release_D_ReadBlock(struct us_data *); @@ -16,7 +16,7 @@ static int Release_D_WriteBlock(struct us_data *); static int Release_D_CopySector(struct us_data *); static int Copy_D_PhyOneSect(struct us_data *); -static int Read_D_PhyOneSect(struct us_data *, WORD, BYTE *); +static int Read_D_PhyOneSect(struct us_data *, u16, u8 *); static int Erase_D_PhyOneBlock(struct us_data *); static int Set_D_PhyFmtValue(struct us_data *); @@ -25,24 +25,24 @@ static int Make_D_LogTable(struct us_data *); static int MarkFail_D_PhyOneBlock(struct us_data *); -static DWORD ErrCode; -static BYTE WorkBuf[SECTSIZE]; -static BYTE Redundant[REDTSIZE]; -static BYTE WorkRedund[REDTSIZE]; +static u32 ErrCode; +static u8 WorkBuf[SECTSIZE]; +static u8 Redundant[REDTSIZE]; +static u8 WorkRedund[REDTSIZE]; /* 128 x 1000, Log2Phy[MAX_ZONENUM][MAX_LOGBLOCK]; */ -static WORD *Log2Phy[MAX_ZONENUM]; -static BYTE Assign[MAX_ZONENUM][MAX_BLOCKNUM / 8]; -static WORD AssignStart[MAX_ZONENUM]; -WORD ReadBlock; -WORD WriteBlock; -DWORD MediaChange; -static DWORD SectCopyMode; +static u16 *Log2Phy[MAX_ZONENUM]; +static u8 Assign[MAX_ZONENUM][MAX_BLOCKNUM / 8]; +static u16 AssignStart[MAX_ZONENUM]; +u16 ReadBlock; +u16 WriteBlock; +u32 MediaChange; +static u32 SectCopyMode; /* BIT Control Macro */ -static BYTE BitData[] = { 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80 }; -#define Set_D_Bit(a, b) (a[(BYTE)((b) / 8)] |= BitData[(b) % 8]) -#define Clr_D_Bit(a, b) (a[(BYTE)((b) / 8)] &= ~BitData[(b) % 8]) -#define Chk_D_Bit(a, b) (a[(BYTE)((b) / 8)] & BitData[(b) % 8]) +static u8 BitData[] = { 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80 }; +#define Set_D_Bit(a, b) (a[(u8)((b) / 8)] |= BitData[(b) % 8]) +#define Clr_D_Bit(a, b) (a[(u8)((b) / 8)] &= ~BitData[(b) % 8]) +#define Chk_D_Bit(a, b) (a[(u8)((b) / 8)] & BitData[(b) % 8]) /* ----- SM_FreeMem() ------------------------------------------------- */ int SM_FreeMem(void) @@ -62,9 +62,9 @@ int SM_FreeMem(void) /* SmartMedia Read/Write/Erase Function */ /* ----- Media_D_ReadSector() ------------------------------------------- */ -int Media_D_ReadSector(struct us_data *us, DWORD start, WORD count, BYTE *buf) +int Media_D_ReadSector(struct us_data *us, u32 start, u16 count, u8 *buf) { - WORD len, bn; + u16 len, bn; if (Conv_D_MediaAddr(us, start)) return ErrCode; @@ -97,9 +97,9 @@ int Media_D_ReadSector(struct us_data *us, DWORD start, WORD count, BYTE *buf) } /* here */ /* ----- Media_D_CopySector() ------------------------------------------ */ -int Media_D_CopySector(struct us_data *us, DWORD start, WORD count, BYTE *buf) +int Media_D_CopySector(struct us_data *us, u32 start, u16 count, u8 *buf) { - WORD len, bn; + u16 len, bn; /* pr_info("Media_D_CopySector !!!\n"); */ if (Conv_D_MediaAddr(us, start)) @@ -186,12 +186,12 @@ int Check_D_MediaFmt(struct us_data *us) /* SmartMedia Physical Address Control Subroutine */ /* ----- Conv_D_MediaAddr() --------------------------------------------- */ -static int Conv_D_MediaAddr(struct us_data *us, DWORD addr) +static int Conv_D_MediaAddr(struct us_data *us, u32 addr) { - DWORD temp; + u32 temp; temp = addr / Ssfdc.MaxSectors; - Media.Zone = (BYTE) (temp / Ssfdc.MaxLogBlocks); + Media.Zone = (u8) (temp / Ssfdc.MaxLogBlocks); if (Log2Phy[Media.Zone] == NULL) { if (Make_D_LogTable(us)) { @@ -200,8 +200,8 @@ static int Conv_D_MediaAddr(struct us_data *us, DWORD addr) } } - Media.Sector = (BYTE) (addr % Ssfdc.MaxSectors); - Media.LogBlock = (WORD) (temp % Ssfdc.MaxLogBlocks); + Media.Sector = (u8) (addr % Ssfdc.MaxSectors); + Media.LogBlock = (u16) (temp % Ssfdc.MaxLogBlocks); if (Media.Zone < Ssfdc.MaxZones) { Clr_D_RedundantData(Redundant); @@ -217,7 +217,7 @@ static int Conv_D_MediaAddr(struct us_data *us, DWORD addr) /* ----- Inc_D_MediaAddr() ---------------------------------------------- */ static int Inc_D_MediaAddr(struct us_data *us) { - WORD LogBlock = Media.LogBlock; + u16 LogBlock = Media.LogBlock; if (++Media.Sector < Ssfdc.MaxSectors) return SMSUCCESS; @@ -265,9 +265,9 @@ static int Inc_D_MediaAddr(struct us_data *us) /* SmartMedia Read/Write Subroutine with Retry */ /* ----- Media_D_ReadOneSect() ------------------------------------------ */ -static int Media_D_ReadOneSect(struct us_data *us, WORD count, BYTE *buf) +static int Media_D_ReadOneSect(struct us_data *us, u16 count, u8 *buf) { - DWORD err, retry; + u32 err, retry; if (!Read_D_PhyOneSect(us, count, buf)) return SMSUCCESS; @@ -309,9 +309,9 @@ static int Media_D_ReadOneSect(struct us_data *us, WORD count, BYTE *buf) /* SmartMedia Physical Sector Data Copy Subroutine */ /* ----- Copy_D_BlockAll() ---------------------------------------------- */ -static int Copy_D_BlockAll(struct us_data *us, DWORD mode) +static int Copy_D_BlockAll(struct us_data *us, u32 mode) { - BYTE sect; + u8 sect; sect = Media.Sector; @@ -381,7 +381,7 @@ static int Assign_D_WriteBlock(void) /* ----- Release_D_ReadBlock() ------------------------------------------ */ static int Release_D_ReadBlock(struct us_data *us) { - DWORD mode; + u32 mode; mode = SectCopyMode; SectCopyMode = COMPLETED; @@ -430,7 +430,7 @@ static int Release_D_WriteBlock(struct us_data *us) static int Copy_D_PhyOneSect(struct us_data *us) { int i; - DWORD err, retry; + u32 err, retry; /* pr_info("Copy_D_PhyOneSect --- Sector = %x\n", Media.Sector); */ if (ReadBlock != NO_ASSIGN) { @@ -504,10 +504,10 @@ static int Copy_D_PhyOneSect(struct us_data *us) /* SmartMedia Physical Sector Read/Write/Erase Subroutine */ /* ----- Read_D_PhyOneSect() -------------------------------------------- */ -static int Read_D_PhyOneSect(struct us_data *us, WORD count, BYTE *buf) +static int Read_D_PhyOneSect(struct us_data *us, u16 count, u8 *buf) { int i; - DWORD retry; + u32 retry; if (Media.PhyBlock == NO_ASSIGN) { for (i = 0; i < SECTSIZE; i++) @@ -637,10 +637,10 @@ static int Search_D_CIS(struct us_data *us) /* ----- Make_D_LogTable() ---------------------------------------------- */ static int Make_D_LogTable(struct us_data *us) { - WORD phyblock, logblock; + u16 phyblock, logblock; if (Log2Phy[Media.Zone] == NULL) { - Log2Phy[Media.Zone] = kmalloc(MAX_LOGBLOCK * sizeof(WORD), + Log2Phy[Media.Zone] = kmalloc(MAX_LOGBLOCK * sizeof(u16), GFP_KERNEL); /* pr_info("ExAllocatePool Zone = %x, Addr = %x\n", Media.Zone, Log2Phy[Media.Zone]); */ @@ -693,7 +693,7 @@ static int Make_D_LogTable(struct us_data *us) phyblock = Media.PhyBlock; logblock = Media.LogBlock; - Media.Sector = (BYTE)(Ssfdc.MaxSectors - 1); + Media.Sector = (u8)(Ssfdc.MaxSectors - 1); if (Ssfdc_D_ReadRedtData(us, Redundant)) { Ssfdc_D_Reset(us); @@ -738,7 +738,7 @@ static int Make_D_LogTable(struct us_data *us) /* ----- MarkFail_D_PhyOneBlock() --------------------------------------- */ static int MarkFail_D_PhyOneBlock(struct us_data *us) { - BYTE sect; + u8 sect; sect = Media.Sector; Set_D_FailBlock(WorkRedund); |