Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
L
lufa
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Erik Strand
lufa
Commits
f10126a9
Commit
f10126a9
authored
14 years ago
by
Dean Camera
Browse files
Options
Downloads
Patches
Plain Diff
Added new \ref SPI_GetCurrentMode() function to the SPI peripheral driver.
parent
d8fe01f1
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
LUFA/Drivers/Peripheral/AVR8/SPI_AVR8.h
+20
-4
20 additions, 4 deletions
LUFA/Drivers/Peripheral/AVR8/SPI_AVR8.h
LUFA/ManPages/ChangeLog.txt
+4
-1
4 additions, 1 deletion
LUFA/ManPages/ChangeLog.txt
with
24 additions
and
5 deletions
LUFA/Drivers/Peripheral/AVR8/SPI_AVR8.h
+
20
−
4
View file @
f10126a9
...
@@ -167,16 +167,23 @@
...
@@ -167,16 +167,23 @@
*/
*/
static
inline
void
SPI_Init
(
const
uint8_t
SPIOptions
)
static
inline
void
SPI_Init
(
const
uint8_t
SPIOptions
)
{
{
DDRB
|=
((
1
<<
1
)
|
(
1
<<
2
));
/* Prevent high rise times on PB.0 (/SS) from forcing a change to SPI slave mode */
DDRB
&
=
~
(
(
1
<<
0
)
|
(
1
<<
3
))
;
DDRB
|
=
(
1
<<
0
);
PORTB
|=
(
(
1
<<
0
)
|
(
1
<<
3
))
;
PORTB
|=
(
1
<<
0
);
SPCR
=
((
1
<<
SPE
)
|
SPIOptions
);
DDRB
|=
((
1
<<
1
)
|
(
1
<<
2
));
DDRB
&=
~
(
1
<<
3
);
PORTB
|=
(
1
<<
3
);
if
(
SPIOptions
&
SPI_USE_DOUBLESPEED
)
if
(
SPIOptions
&
SPI_USE_DOUBLESPEED
)
SPSR
|=
(
1
<<
SPI2X
);
SPSR
|=
(
1
<<
SPI2X
);
else
else
SPSR
&=
~
(
1
<<
SPI2X
);
SPSR
&=
~
(
1
<<
SPI2X
);
/* Switch /SS to input mode after configuration to allow for forced mode changes */
DDRB
&=
~
(
1
<<
0
);
SPCR
=
((
1
<<
SPE
)
|
SPIOptions
);
}
}
/** Turns off the SPI driver, disabling and returning used hardware to their default configuration. */
/** Turns off the SPI driver, disabling and returning used hardware to their default configuration. */
...
@@ -189,6 +196,15 @@
...
@@ -189,6 +196,15 @@
SPSR
=
0
;
SPSR
=
0
;
}
}
/** Retrieves the currently selected SPI mode, once the SPI interface has been configured.
*
* \return \ref SPI_MODE_MASTER if the interface is currently in SPI Master mode, \ref SPI_MODE_SLAVE otherwise
*/
static
inline
uint8_t
SPI_GetCurrentMode
(
void
)
{
return
(
SPCR
&
SPI_MODE_MASTER
);
}
/** Sends and receives a byte through the SPI interface, blocking until the transfer is complete.
/** Sends and receives a byte through the SPI interface, blocking until the transfer is complete.
*
*
* \param[in] Byte Byte to send through the SPI interface.
* \param[in] Byte Byte to send through the SPI interface.
...
...
This diff is collapsed.
Click to expand it.
LUFA/ManPages/ChangeLog.txt
+
4
−
1
View file @
f10126a9
...
@@ -18,6 +18,7 @@
...
@@ -18,6 +18,7 @@
* - Added new EVENT_Audio_Device_StreamStartStop() event to the Audio Device Class driver to detect stream start/stop events
* - Added new EVENT_Audio_Device_StreamStartStop() event to the Audio Device Class driver to detect stream start/stop events
* - Added board driver support for the Busware TUL board
* - Added board driver support for the Busware TUL board
* - Added new Host mode Audio Class driver
* - Added new Host mode Audio Class driver
* - Added new \ref SPI_GetCurrentMode() function to the SPI peripheral driver
* - Library Applications:
* - Library Applications:
* - Added RNDIS device mode to the Webserver project
* - Added RNDIS device mode to the Webserver project
* - Added new incomplete AndroidAccessoryHost Host LowLevel demo
* - Added new incomplete AndroidAccessoryHost Host LowLevel demo
...
@@ -40,7 +41,9 @@
...
@@ -40,7 +41,9 @@
*
*
* <b>Fixed:</b>
* <b>Fixed:</b>
* - Core:
* - Core:
* - Large number of documentation and code comment corrections (thanks to Andrewy from Microsin.ru)
* - Large number of documentation and code comment corrections (thanks to Andrey from Microsin.ru)
* - Fixed possibility of the AVR's SPI interface being pulled out of master mode if the /SS pin is a input and pulled low (thanks
* to Andrey from Microsin.ru)
* - Library Applications:
* - Library Applications:
* - Fixed incorrect signature in the CDC and DFU class bootloaders for the ATMEGA8U2
* - Fixed incorrect signature in the CDC and DFU class bootloaders for the ATMEGA8U2
* - Fixed KeyboardHost and KeyboardHostWithParser demos displaying incorrect values when numerical keys were pressed
* - Fixed KeyboardHost and KeyboardHostWithParser demos displaying incorrect values when numerical keys were pressed
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment