ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #9866 from j3hill/QSPI_Align 

QSPI write alignment fix for nRF52x
pull/9919/head
Martin Kojtal 2019-03-01 10:54:58 +01:00 committed by GitHub
parent f8d254fc4c 5d79ba82e7
commit b5d713d6d7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
targets/TARGET_NORDIC/TARGET_NRF5x/qspi_api.c
View File

@ -71,6 +71,7 @@ TODO
#define SCK_DELAY 0x05 #define SCK_DELAY 0x05
#define WORD_MASK 0x03 #define WORD_MASK 0x03
#define WORD_COUNT 16
// NRF SFDP defines // NRF SFDP defines
#define DWORD_LEN 4 #define DWORD_LEN 4
@ -272,13 +273,36 @@ qspi_status_t qspi_write(qspi_t *obj, const qspi_command_t *command, const void
return status; return status;
} }
// write here does not return how much it transfered, we return transfered all if (is_word_aligned(data)) {
ret_code_t ret = nrf_drv_qspi_write(data, *length, command->address.value); // write here does not return how much it transfered, we return transfered all
if (ret == NRF_SUCCESS ) { ret_code_t ret = nrf_drv_qspi_write(data, *length, command->address.value);
return QSPI_STATUS_OK; if (ret == NRF_SUCCESS ) {
} else { return QSPI_STATUS_OK;
return QSPI_STATUS_ERROR; } else {
return QSPI_STATUS_ERROR;
}
} }
else {
// if the data buffer is not WORD/4-byte aligned, use an aligned buffer on the stack
uint32_t aligned_buffer[WORD_COUNT];
uint32_t pos = 0;
size_t bytes_to_write = *length;
while(pos < *length) {
// copy into the aligned buffer
size_t diff = bytes_to_write <= sizeof(aligned_buffer) ? bytes_to_write : sizeof(aligned_buffer);
memcpy(aligned_buffer, &((const uint8_t *)data)[pos], diff);
// write one buffer over QSPI
ret_code_t ret = nrf_drv_qspi_write(aligned_buffer, diff, command->address.value+pos);
if (ret != NRF_SUCCESS ) {
return QSPI_STATUS_ERROR;
}
pos += diff;
bytes_to_write -= diff;
}
}
return QSPI_STATUS_OK;
} }
qspi_status_t qspi_read(qspi_t *obj, const qspi_command_t *command, void *data, size_t *length) qspi_status_t qspi_read(qspi_t *obj, const qspi_command_t *command, void *data, size_t *length)