From 0d3ae3a16d847c3089e4d5d5cf2f48b83d724552 Mon Sep 17 00:00:00 2001 From: shirait Date: Thu, 9 Aug 2007 04:10:27 +0000 Subject: [PATCH] fix warning git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/twl_wrapsdk/trunk@232 4ee2a332-4b2b-5046-8439-1ba90f034370 --- build/libraries/devices/sdmc/ARM7/drnand.c | 7 +++--- build/libraries/devices/sdmc/ARM7/drsdmc.c | 10 ++++---- build/libraries/devices/sdmc/ARM7/sdmc.c | 27 ++++++++++++++-------- build/libraries/el/common/elf.c | 1 + build/libraries/el/common/elf_loader.c | 6 +++++ build/libraries/el/common/loader_subset.c | 4 ++-- build/tests/fatfs/fatfs_sd/ARM7/src/main.c | 2 +- 7 files changed, 35 insertions(+), 22 deletions(-) diff --git a/build/libraries/devices/sdmc/ARM7/drnand.c b/build/libraries/devices/sdmc/ARM7/drnand.c index 4e36736..1acd63e 100644 --- a/build/libraries/devices/sdmc/ARM7/drnand.c +++ b/build/libraries/devices/sdmc/ARM7/drnand.c @@ -112,7 +112,6 @@ void nandSetFormatRequest( u16 partition_num, u32* partition_sectors) *---------------------------------------------------------------------------*/ BOOL nandCheckMedia( void) //TODO:nand partition仕様に対応させること { - u16 i; SdmcResultInfo SdResult; u8* bufp; u32 buffer[512/4]; @@ -160,6 +159,7 @@ BOOL nandRtfsIo( int driveno, dword block, void* buffer, word count, BOOLEAN rea { u16 result; SdmcResultInfo SdResult; +#pragma unused( driveno) /**/ sdmcSelect( (u16)SDMC_PORT_NAND); @@ -201,7 +201,6 @@ int nandRtfsCtrl( int driveno, int opcode, void* pargs) { DDRIVE *pdr; DEV_GEOMETRY gc; - int heads, secptrack; /**/ sdmcSelect( (u16)SDMC_PORT_NAND); @@ -634,7 +633,7 @@ static BOOL sdi_get_nom( u32 MIN_NOM) /*FATのビット数を返す*/ static void sdi_get_fatparams( void) { - int i, mbytes; + u32 i, mbytes; for( i=0; i> 11); diff --git a/build/libraries/devices/sdmc/ARM7/sdmc.c b/build/libraries/devices/sdmc/ARM7/sdmc.c index 1d33e18..bccf0ad 100644 --- a/build/libraries/devices/sdmc/ARM7/sdmc.c +++ b/build/libraries/devices/sdmc/ARM7/sdmc.c @@ -227,14 +227,14 @@ void (*func_SDCARD_Out)(void); /* Returns: None *---------------------------------------------------------------------------*/ -static void MyCpuRecv32( const u32* src, u32* dest, u16 size) +static void MyCpuRecv32( const u32* src, u32* dest, u32 size) { u32 i; for( i=0; i<(size/sizeof(u32)); i++) { *(u32*)dest++ = *(u32*)src; } } -static void MyCpuRecv16( const u16* src, u16* dest, u16 size) +static void MyCpuRecv16( const u16* src, u16* dest, u32 size) { u32 i; for( i=0; i<(size/sizeof(u16)); i++) { @@ -811,8 +811,8 @@ void i_sdmcCalcSize( void) sdmc_current_spec.memory_capacity = ulCSize; ulSDCARD_Size = ulCSize; /* プロテクト領域サイズ算出 */ - sdmc_current_spec.protected_capacity = (((SD_SwapByte( &SD_SDSTATUS[2])) << 16) + - (SD_SwapByte( &SD_SDSTATUS[3]))) / 0x200; + sdmc_current_spec.protected_capacity = (u32)((((SD_SwapByte( &SD_SDSTATUS[2])) << 16) + + (SD_SwapByte( &SD_SDSTATUS[3]))) / 0x200); /*トータルサイズ算出 */ sdmc_current_spec.card_capacity = sdmc_current_spec.memory_capacity + sdmc_current_spec.protected_capacity; @@ -821,13 +821,13 @@ void i_sdmcCalcSize( void) sdmc_current_spec.csd_ver2_flag = 0; ulCSize = (u32)(((SD_CSD[3] & CSD_C_SIZE_BIT_71_62) >> 6) + ((SD_CSD[4] & CSD_C_SIZE_BIT_73_72) << 10) + 1); - mult_val = ((SD_CSD[2] & CSD_C_SIZE_MULT) >> 7) + 2; //2の乗数 + mult_val = (u16)(((SD_CSD[2] & CSD_C_SIZE_MULT) >> 7) + 2); //2の乗数 ulCSize = ulCSize << mult_val; if(SDCARD_MMCFlag){ /* MMCカードフラグON かチェック */ - read_block_len_val = ((SD_CSD[4] & CSD_READ_BL_LEN) >> 8); + read_block_len_val = (u16)((SD_CSD[4] & CSD_READ_BL_LEN) >> 8); ulCSize = (ulCSize << read_block_len_val); }else{ /* SDカードフラグ(SDCARD_SDFlag)ON のはず */ - read_block_len_val = (((SD_CSD[1] & CSD_WRITE_BL_LEN_BIT_25_24) << 2) | + read_block_len_val = (u16)(((SD_CSD[1] & CSD_WRITE_BL_LEN_BIT_25_24) << 2) | ((SD_CSD[0] & CSD_WRITE_BL_LEN_BIT_23_22) >> 14)); ulCSize = (ulCSize << read_block_len_val); } @@ -836,8 +836,8 @@ void i_sdmcCalcSize( void) sdmc_current_spec.memory_capacity = ulCSize; ulSDCARD_Size += ulCSize; /* 全セクタ数のセット */ /* プロテクト領域サイズ算出 */ - sdmc_current_spec.protected_capacity = ((SD_SwapByte( &SD_SDSTATUS[2])) << 16) + - (SD_SwapByte( &SD_SDSTATUS[3])); + sdmc_current_spec.protected_capacity = (u32)((SD_SwapByte( &SD_SDSTATUS[2])) << 16) + + (SD_SwapByte( &SD_SDSTATUS[3])); sdmc_current_spec.protected_capacity <<= mult_val; sdmc_current_spec.protected_capacity <<= read_block_len_val; sdmc_current_spec.protected_capacity /= SDCARD_SectorSize; //TODO:構造体にまとめること @@ -1126,6 +1126,7 @@ static SDMC_ERR_CODE SDCARDi_Read(void* buf,u32 bufsize,u32 offset,void(*func)(v s16 nRetryCount; /* リトライ回数カウント */ SDMC_ERR_CODE SaveErrStatus; /* エラーステータス保存用 */ u32 SaveStatus; /* カードステータス保存用 */ +#pragma unused( func) for( nRetryCount=0; nRetryCount>= 1; if( _T_) { /*BL命令でThumbからThumbに飛ぶ*/ - relocation_val = (*(vu16*)relocation_adr & 0xF800) | ((signed_val>>11) & 0x07FF) + + relocation_val = (u32)(*(vu16*)relocation_adr & 0xF800) | ((signed_val>>11) & 0x07FF) + ((((*((vu16*)(relocation_adr)+1)) & 0xF800) | (signed_val & 0x07FF)) << 16); }else{ /*BLX命令でThumbからARMに飛ぶ(v5未満だとBL→ベニアでBXという仕組みが必要)*/ if( (signed_val & 0x1)) { //_P_が4バイトアラインされていないとここに来る signed_val += 1; } - relocation_val = (*(vu16*)relocation_adr & 0xF800) | ((signed_val>>11) & 0x07FF) + + relocation_val = (u32)(*(vu16*)relocation_adr & 0xF800) | ((signed_val>>11) & 0x07FF) + ((((*((vu16*)(relocation_adr)+1)) & 0xE800) | (signed_val & 0x07FF)) << 16); } *(vu16*)relocation_adr = (vu16)relocation_val; diff --git a/build/tests/fatfs/fatfs_sd/ARM7/src/main.c b/build/tests/fatfs/fatfs_sd/ARM7/src/main.c index 25ef5f5..9382452 100644 --- a/build/tests/fatfs/fatfs_sd/ARM7/src/main.c +++ b/build/tests/fatfs/fatfs_sd/ARM7/src/main.c @@ -204,7 +204,6 @@ void TwlSpMain(void) #endif /*----------------------------*/ -#else sdmcSelect( (u16)SDMC_PORT_CARD); DEBUG_BEGIN(); @@ -228,6 +227,7 @@ void TwlSpMain(void) PRINTDEBUG( "sdmcWriteFifo success.\n"); } +#else /*デバイスドライバの登録*/