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
58695b59
Commit
58695b59
authored
Mar 13, 2020
by
Federico Vaga
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' into develop
parents
e848e4ba
ba3aa59f
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
2 deletions
+4
-2
spi-ocores.c
software/spi-ocores/drivers/spi/spi-ocores.c
+4
-2
No files found.
software/spi-ocores/drivers/spi/spi-ocores.c
View file @
58695b59
...
...
@@ -467,9 +467,11 @@ static int spi_ocores_sw_xfer_next_init(struct spi_ocores *sp)
ctrl
=
sp
->
ctrl_base
;
if
(
sp
->
master
->
cur_msg
->
spi
->
mode
&
SPI_CPHA
)
{
ctrl
|=
SPI_OCORES_CTRL_Tx_NEG
;
ctrl
|=
SPI_OCORES_CTRL_Rx_NEG
;
}
else
ctrl
|=
SPI_OCORES_CTRL_Tx_NEG
;
if
(
sp
->
master
->
cur_msg
->
spi
->
mode
&
SPI_LSB_FIRST
)
ctrl
|=
SPI_OCORES_CTRL_LSB
;
ctrl
|=
nbits
;
...
...
@@ -596,7 +598,7 @@ static int spi_ocores_process(struct spi_ocores *sp)
spi_ocores_finalize_current_message
(
sp
);
}
return
0
;
return
err
;
}
/**
...
...
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