MirrorBackup/SafeA9LHInstaller
1
0
Fork 0
forked from gnmmarechal/SafeA9LHInstaller
Code Pull Requests Activity

Minor stuff (2)

Browse Source
This commit is contained in:
Aurora 2016-09-29 16:21:08 +02:00
parent 3ef2ab2cc7
commit a46bf2a4ba
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/fatfs/diskio.c
View File

@ -37,8 +37,7 @@ DSTATUS disk_initialize (
BYTE pdrv /* Physical drive nmuber to identify the drive */
)
{
if(pdrv == CTRNAND)
ctrNandInit();
if(pdrv == CTRNAND) ctrNandInit();
return RES_OK;
}

22
source/fatfs/sdmmc/sdmmc.c
View File

@ -266,17 +266,17 @@ static u32 calcSDSize(u8 *csd, int type)
switch(type)
{
case 0:
{
u32 block_len = csd[9] & 0xF;
block_len = 1u << block_len;
u32 mult = (u32)((csd[4] >> 7) | ((csd[5] & 3) << 1));
mult = 1u << (mult + 2);
result = csd[8] & 3;
result = (result << 8) | csd[7];
result = (result << 2) | (csd[6] >> 6);
result = (result + 1) * mult * block_len / 512;
}
{
u32 block_len = csd[9] & 0xF;
block_len = 1u << block_len;
u32 mult = (u32)((csd[4] >> 7) | ((csd[5] & 3) << 1));
mult = 1u << (mult + 2);
result = csd[8] & 3;
result = (result << 8) | csd[7];
result = (result << 2) | (csd[6] >> 6);
result = (result + 1) * mult * block_len / 512;
break;
}
case 1:
result = csd[7] & 0x3F;
result = (result << 8) | csd[6];
@ -473,5 +473,5 @@ void sdmmc_get_cid(bool isNand, u32 *info)
bool sdmmc_sdcard_init()
{
InitSD();
return Nand_Init() + SD_Init() == 0;
return (Nand_Init() | SD_Init()) == 0;
}