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

Review fixes

pull/7783/head
Senthil Ramakrishnan 2017-12-04 14:12:01 -06:00 committed by Maciej Bocianski
parent 273cf05d92
commit 894f8bdf9f
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/QSPI.cpp
View File

@ -107,8 +107,8 @@ qspi_status_t QSPI::read(unsigned int address, char *rx_buffer, size_t *rx_lengt
if(*rx_length != 0) { if(*rx_length != 0) {
lock(); lock();
if( true == _acquire()) { if( true == _acquire()) {
qspi_command_t *qspi_cmd = _build_qspi_command(-1, address, -1); _build_qspi_command(-1, address, -1);
if(QSPI_STATUS_OK == qspi_read(&_qspi, qspi_cmd, rx_buffer, rx_length)) { if(QSPI_STATUS_OK == qspi_read(&_qspi, &_qspi_command, rx_buffer, rx_length)) {
ret_status = QSPI_STATUS_OK; ret_status = QSPI_STATUS_OK;
} }
} }
@ -131,8 +131,8 @@ qspi_status_t QSPI::write(unsigned int address, const char *tx_buffer, size_t *t
if(*tx_length != 0) { if(*tx_length != 0) {
lock(); lock();
if(true == _acquire()) { if(true == _acquire()) {
qspi_command_t *qspi_cmd = _build_qspi_command(-1, address, -1); _build_qspi_command(-1, address, -1);
if(QSPI_STATUS_OK == qspi_write(&_qspi, qspi_cmd, tx_buffer, tx_length)) { if(QSPI_STATUS_OK == qspi_write(&_qspi, &_qspi_command, tx_buffer, tx_length)) {
ret_status = QSPI_STATUS_OK; ret_status = QSPI_STATUS_OK;
} }
} }
@ -155,8 +155,8 @@ qspi_status_t QSPI::read(unsigned int instruction, unsigned int address, unsigne
if(*rx_length != 0) { if(*rx_length != 0) {
lock(); lock();
if( true == _acquire()) { if( true == _acquire()) {
qspi_command_t *qspi_cmd = _build_qspi_command(instruction, address, alt); _build_qspi_command(instruction, address, alt);
if(QSPI_STATUS_OK == qspi_read(&_qspi, qspi_cmd, rx_buffer, rx_length)) { if(QSPI_STATUS_OK == qspi_read(&_qspi, &_qspi_command, rx_buffer, rx_length)) {
ret_status = QSPI_STATUS_OK; ret_status = QSPI_STATUS_OK;
} }
} }
@ -179,8 +179,8 @@ qspi_status_t QSPI::write(unsigned int instruction, unsigned int address, unsign
if(*tx_length != 0) { if(*tx_length != 0) {
lock(); lock();
if(true == _acquire()) { if(true == _acquire()) {
qspi_command_t *qspi_cmd = _build_qspi_command(instruction, address, alt); _build_qspi_command(instruction, address, alt);
if(QSPI_STATUS_OK == qspi_write(&_qspi, qspi_cmd, tx_buffer, tx_length)) { if(QSPI_STATUS_OK == qspi_write(&_qspi, &_qspi_command, tx_buffer, tx_length)) {
ret_status = QSPI_STATUS_OK; ret_status = QSPI_STATUS_OK;
} }
} }
@ -201,8 +201,8 @@ qspi_status_t QSPI::command_transfer(unsigned int instruction, const char *tx_bu
if(_initialized) { if(_initialized) {
lock(); lock();
if(true == _acquire()) { if(true == _acquire()) {
qspi_command_t *qspi_cmd = _build_qspi_command(instruction, -1, -1); //We just need the command _build_qspi_command(instruction, -1, -1); //We just need the command
if(QSPI_STATUS_OK == qspi_command_transfer(&_qspi, qspi_cmd, (const void *)tx_buffer, tx_length, (void *)rx_buffer, rx_length)) { if(QSPI_STATUS_OK == qspi_command_transfer(&_qspi, &_qspi_command, (const void *)tx_buffer, tx_length, (void *)rx_buffer, rx_length)) {
ret_status = QSPI_STATUS_OK; ret_status = QSPI_STATUS_OK;
} }
} }
@ -247,7 +247,7 @@ bool QSPI::_acquire()
return _initialized; return _initialized;
} }
qspi_command_t *QSPI::_build_qspi_command(int instruction, int address, int alt) void QSPI::_build_qspi_command(int instruction, int address, int alt)
{ {
memset( &_qspi_command, 0, sizeof(qspi_command_t) ); memset( &_qspi_command, 0, sizeof(qspi_command_t) );
//Set up instruction phase parameters //Set up instruction phase parameters
@ -281,8 +281,6 @@ qspi_command_t *QSPI::_build_qspi_command(int instruction, int address, int alt)
//Set up bus width for data phase //Set up bus width for data phase
_qspi_command.data.bus_width = _data_width; _qspi_command.data.bus_width = _data_width;
return &_qspi_command;
} }
} // namespace mbed } // namespace mbed

2
drivers/QSPI.h
View File

@ -217,7 +217,7 @@ private:
/* /*
* This function builds the qspi command struct to be send to Hal * This function builds the qspi command struct to be send to Hal
*/ */
inline qspi_command_t *_build_qspi_command(int instruction, int address, int alt); inline void _build_qspi_command(int instruction, int address, int alt);
}; };
} // namespace mbed } // namespace mbed