Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
P
Platform-independent core collection
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
18
Issues
18
List
Board
Labels
Milestones
Merge Requests
5
Merge Requests
5
Wiki
Wiki
image/svg+xml
Discourse
Discourse
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Projects
Platform-independent core collection
Commits
96630ec6
Commit
96630ec6
authored
Sep 14, 2020
by
Federico Vaga
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'release/v1.1.1' into master
parents
258eb8e0
53876421
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
1 deletion
+10
-1
CHANGELOG.rst
CHANGELOG.rst
+8
-0
spi-ocores.c
software/spi-ocores/drivers/spi/spi-ocores.c
+2
-1
No files found.
CHANGELOG.rst
View file @
96630ec6
...
...
@@ -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
...
...
software/spi-ocores/drivers/spi/spi-ocores.c
View file @
96630ec6
...
...
@@ -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
;
}
/**
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment