Merge tag 'v1.1.1' into proposed_master

1.1.1 - 2020-09-14 ================== Fixed ----- - sw: fix SPI driver to update the spi_message->actual_length

Merge tag 'v1.1.1' into proposed_master
1.1.1 - 2020-09-14 ================== Fixed ----- - sw: fix SPI driver to update the spi_message->actual_length
5f92798d · Federico Vaga · b839fbb2 · 96630ec6 · 5f92798d · 5f92798d
Commit 5f92798d authored Sep 14, 2020 by Federico Vaga
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 1 deletion

CHANGELOG.rst CHANGELOG.rst +8 -0

spi-ocores.c software/spi-ocores/drivers/spi/spi-ocores.c +2 -1

No files found.
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -9,6 +9,14 @@ Change Log
 - Format inspired by: `Keep a Changelog <https://keepachangelog.com/en/1.0.0/>`_
 - Versioning scheme follows: `Semantic Versioning <https://semver.org/spec/v2.0.0.html>`_

+1.1.1 - 2020-09-14
+==================
+https://www.ohwr.org/project/general-cores/tags/v1.1.1
+
+Fixed
+-----
+- sw: fix SPI driver to update the spi_message->actual_length
+
 1.1.0 - 2020-07-24
 ==================
 https://www.ohwr.org/project/general-cores/tags/v1.1.0

--- a/software/spi-ocores/drivers/spi/spi-ocores.c
+++ b/software/spi-ocores/drivers/spi/spi-ocores.c
@@ -416,8 +416,9 @@ static int spi_ocores_sw_xfer_finish(struct spi_ocores *sp)
 	sp->cur_tx_buf = NULL;
 	sp->cur_rx_buf = NULL;
 	sp->cur_len = 0;
+	sp->master->cur_msg->actual_length += sp->cur_xfer->len;

-	return 0;
+        return 0;
 }

 /**