nold/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere synced 2024-12-22 20:31:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

Actually don't use memcpy in sdmmc

Browse source
This commit is contained in:
TuxSH 2018-05-19 03:10:06 +02:00
parent 2a98e2e3b8
commit 64cdd2e63f
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1278,7 +1278,7 @@ static int sdmmc_handle_cpu_transfer(struct mmc *mmc, uint16_t blocks, bool is_w
// Handle unaligned buffers // Handle unaligned buffers
uint32_t w; uint32_t w;
uint8_t *data = (uint8_t *)buffer; uint8_t *data = (uint8_t *)buffer;
memcpy(&w, data, 4); w = data[0] | (data[1] << 8) | (data[2] << 16) | (data[3] << 24);
mmc->regs->buffer = w; mmc->regs->buffer = w;
} else { } else {
mmc->regs->buffer = *buffer; mmc->regs->buffer = *buffer;
@ -1288,7 +1288,10 @@ static int sdmmc_handle_cpu_transfer(struct mmc *mmc, uint16_t blocks, bool is_w
// Handle unaligned buffers // Handle unaligned buffers
uint32_t w = mmc->regs->buffer; uint32_t w = mmc->regs->buffer;
uint8_t *data = (uint8_t *)buffer; uint8_t *data = (uint8_t *)buffer;
memcpy(&w, data, 4); 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;
} }

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

@ -1278,7 +1278,7 @@ static int sdmmc_handle_cpu_transfer(struct mmc *mmc, uint16_t blocks, bool is_w
// Handle unaligned buffers // Handle unaligned buffers
uint32_t w; uint32_t w;
uint8_t *data = (uint8_t *)buffer; uint8_t *data = (uint8_t *)buffer;
memcpy(&w, data, 4); w = data[0] | (data[1] << 8) | (data[2] << 16) | (data[3] << 24);
mmc->regs->buffer = w; mmc->regs->buffer = w;
} else { } else {
mmc->regs->buffer = *buffer; mmc->regs->buffer = *buffer;
@ -1288,7 +1288,10 @@ static int sdmmc_handle_cpu_transfer(struct mmc *mmc, uint16_t blocks, bool is_w
// Handle unaligned buffers // Handle unaligned buffers
uint32_t w = mmc->regs->buffer; uint32_t w = mmc->regs->buffer;
uint8_t *data = (uint8_t *)buffer; uint8_t *data = (uint8_t *)buffer;
memcpy(&w, data, 4); 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;
} }