nold/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere synced 2024-12-23 04:41:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

[sdmmc] sdmmc_handle_cpu_transfer: handle unaligned buffers

Browse source
This commit is contained in:
TuxSH 2018-05-09 20:46:16 +02:00
parent b9b13e215f
commit ff2472385f
2 changed files with 40 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
fusee/fusee-primary/src/sdmmc.c
View file

@ -1033,10 +1033,28 @@ static int sdmmc_handle_cpu_transfer(struct mmc *mmc, uint16_t blocks, bool is_w
// Transfer the data to the relevant // Transfer the data to the relevant
if (is_write) { if (is_write) {
if ((uintptr_t)buffer & 3) {
// Handle unaligned buffers
uint32_t w;
uint8_t *data = (uint8_t *)buffer;
w = data[0] | (data[1] << 8) | (data[2] << 16) | (data[3] << 24);
mmc->regs->buffer = w;
} else {
mmc->regs->buffer = *buffer; mmc->regs->buffer = *buffer;
}
} else {
if ((uintptr_t)buffer & 3) {
// Handle unaligned buffers
uint32_t w = mmc->regs->buffer;
uint8_t *data = (uint8_t *)buffer;
data[0] = w & 0xFF;
data[1] = (w >> 8) & 0xFF;
data[2] = (w >> 16) & 0xFF;
data[3] = (w >> 24) & 0xFF;
} else { } else {
*buffer = mmc->regs->buffer; *buffer = mmc->regs->buffer;
} }
}
// Advance by a register size... // Advance by a register size...
bytes_remaining_in_block -= sizeof(mmc->regs->buffer); bytes_remaining_in_block -= sizeof(mmc->regs->buffer);

18
fusee/fusee-secondary/src/sdmmc.c
View file

@ -1033,10 +1033,28 @@ static int sdmmc_handle_cpu_transfer(struct mmc *mmc, uint16_t blocks, bool is_w
// Transfer the data to the relevant // Transfer the data to the relevant
if (is_write) { if (is_write) {
if ((uintptr_t)buffer & 3) {
// Handle unaligned buffers
uint32_t w;
uint8_t *data = (uint8_t *)buffer;
w = data[0] | (data[1] << 8) | (data[2] << 16) | (data[3] << 24);
mmc->regs->buffer = w;
} else {
mmc->regs->buffer = *buffer; mmc->regs->buffer = *buffer;
}
} else {
if ((uintptr_t)buffer & 3) {
// Handle unaligned buffers
uint32_t w = mmc->regs->buffer;
uint8_t *data = (uint8_t *)buffer;
data[0] = w & 0xFF;
data[1] = (w >> 8) & 0xFF;
data[2] = (w >> 16) & 0xFF;
data[3] = (w >> 24) & 0xFF;
} else { } else {
*buffer = mmc->regs->buffer; *buffer = mmc->regs->buffer;
} }
}
// Advance by a register size... // Advance by a register size...
bytes_remaining_in_block -= sizeof(mmc->regs->buffer); bytes_remaining_in_block -= sizeof(mmc->regs->buffer);