rvtr/GodMode9i
1
Fork 0
mirror of https://github.com/rvtr/GodMode9i.git synced 2025-11-02 00:11:07 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

sdmmc: Try to fix Data16 code

Browse Source
This commit is contained in:
RocketRobz 2020-10-04 01:55:27 -06:00
parent c77e0ace97
commit 581e0545a0
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
arm7/source/my_sdmmc.c
View File

@ -65,13 +65,26 @@ void my_sdmmc_send_command(struct mmcdevice *ctx, uint32_t cmd, uint32_t args) {
u32 size = ctx->size; u32 size = ctx->size;
const u16 blkSize = sdmmc_read16(REG_SDBLKLEN32); const u16 blkSize = sdmmc_read16(REG_SDBLKLEN32);
#ifdef DATA32_SUPPORT
u32 *rDataPtr32 = (u32*)ctx->rData; u32 *rDataPtr32 = (u32*)ctx->rData;
#else
u16 *rDataPtr16 = (u16*)ctx->rData;
#endif
u8 *rDataPtr8 = ctx->rData; u8 *rDataPtr8 = ctx->rData;
#ifdef DATA32_SUPPORT
const u32 *tDataPtr32 = (u32*)ctx->tData; const u32 *tDataPtr32 = (u32*)ctx->tData;
#else
const u16 *tDataPtr16 = (u16*)ctx->tData;
#endif
const u8 *tDataPtr8 = ctx->tData; const u8 *tDataPtr8 = ctx->tData;
#ifdef DATA32_SUPPORT
bool rUseBuf = ( NULL != rDataPtr32 ); bool rUseBuf = ( NULL != rDataPtr32 );
bool tUseBuf = ( NULL != tDataPtr32 ); bool tUseBuf = ( NULL != tDataPtr32 );
#else
bool rUseBuf = ( NULL != rDataPtr16 );
bool tUseBuf = ( NULL != tDataPtr16 );
#endif
u16 status0 = 0; u16 status0 = 0;
while(1) while(1)
@ -111,16 +124,16 @@ void my_sdmmc_send_command(struct mmcdevice *ctx, uint32_t cmd, uint32_t args) {
} }
} }
#else #else
if(!((u32)rDataPtr16 & 1)) if(!((u16)rDataPtr16 & 1))
{ {
for(u32 i = 0; i < blkSize; i += 4) for(u16 i = 0; i < blkSize; i += 2)
{ {
*rDataPtr16++ = sdmmc_read16(REG_SDFIFO); *rDataPtr16++ = sdmmc_read16(REG_SDFIFO);
} }
} }
else else
{ {
for(u32 i = 0; i < blkSize; i += 4) for(u16 i = 0; i < blkSize; i += 2)
{ {
u16 data = sdmmc_read16(REG_SDFIFO); u16 data = sdmmc_read16(REG_SDFIFO);
*rDataPtr8++ = data; *rDataPtr8++ = data;
@ -168,16 +181,16 @@ void my_sdmmc_send_command(struct mmcdevice *ctx, uint32_t cmd, uint32_t args) {
} }
} }
#else #else
if(!((u32)tDataPtr16 & 1)) if(!((u16)tDataPtr16 & 1))
{ {
for(u32 i = 0; i < blkSize; i += 2) for(u16 i = 0; i < blkSize; i += 2)
{ {
sdmmc_write16(REG_SDFIFO, *tDataPtr16++); sdmmc_write16(REG_SDFIFO, *tDataPtr16++);
} }
} }
else else
{ {
for(u32 i = 0; i < blkSize; i += 2) for(u16 i = 0; i < blkSize; i += 2)
{ {
u16 data = *tDataPtr8++; u16 data = *tDataPtr8++;
data |= (u16)(*tDataPtr8++ << 8); data |= (u16)(*tDataPtr8++ << 8);