Commit c968a85d authored by Tomasz Bursztyka's avatar Tomasz Bursztyka Committed by Anas Nashif
Browse files

drivers/spi: Properly check for rx/tx and buffering on 



Current buffers might be configured to skip data, thus only len will be
set, buf will be NULL. Buffer should be used if only len is > 0 and
buffer is valid as well.

tx/rx are "on" if len is > 0
tx/rx buf should be touched if only len is > 0 _and_ buf != NULL.

Signed-off-by: default avatarTomasz Bursztyka <tomasz.bursztyka@linux.intel.com>
parent 6fbd8611

drivers/spi/spi_context.h

+14 −2
Original line number Diff line number Diff line
@@ -227,7 +227,13 @@ void spi_context_update_tx(struct spi_context *ctx, u8_t dfs, u32_t len) 
static ALWAYS_INLINE

bool spi_context_tx_on(struct spi_context *ctx)

{

	return !!(ctx->tx_buf || ctx->tx_len);

	return !!(ctx->tx_len);

}



static ALWAYS_INLINE

bool spi_context_tx_buf_on(struct spi_context *ctx)

{

	return !!(ctx->tx_buf && ctx->tx_len);

}



static ALWAYS_INLINE
@@ -263,7 +269,13 @@ void spi_context_update_rx(struct spi_context *ctx, u8_t dfs, u32_t len) 
static ALWAYS_INLINE

bool spi_context_rx_on(struct spi_context *ctx)

{

	return !!(ctx->rx_buf || ctx->rx_len);

	return !!(ctx->rx_len);

}



static ALWAYS_INLINE

bool spi_context_rx_buf_on(struct spi_context *ctx)

{

	return !!(ctx->rx_buf && ctx->rx_len);

}



static inline size_t spi_context_longest_current_buf(struct spi_context *ctx)

drivers/spi/spi_dw.c

+2 −2
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ static void push_data(struct device *dev) 
	}



	while (f_tx) {

		if (spi_context_tx_on(&spi->ctx)) {

		if (spi_context_tx_buf_on(&spi->ctx)) {

			switch (spi->dfs) {

			case 1:

				data = UNALIGNED_GET((u8_t *)
@@ -155,7 +155,7 @@ static void pull_data(struct device *dev) 


		DBG_COUNTER_INC();



		if (spi_context_rx_on(&spi->ctx)) {

		if (spi_context_rx_buf_on(&spi->ctx)) {

			switch (spi->dfs) {

			case 1:

				UNALIGNED_PUT(data, (u8_t *)spi->ctx.rx_buf);

CRA Git | Maintained and supported by SUSTech CRA and CCSE