Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
NuttX RTOS
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container Registry
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
f4grx
NuttX RTOS
Commits
bd5eb523
Commit
bd5eb523
authored
8 years ago
by
Michał Łyszczek
Browse files
Options
Downloads
Patches
Plain Diff
Added check to make sure USBDEV is not set with USBHOST
parent
12e97600
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
configs/stm32butterfly2/src/stm32_butterfly2.h
+2
-2
2 additions, 2 deletions
configs/stm32butterfly2/src/stm32_butterfly2.h
configs/stm32butterfly2/src/stm32_usbhost.c
+5
-1
5 additions, 1 deletion
configs/stm32butterfly2/src/stm32_usbhost.c
with
7 additions
and
3 deletions
configs/stm32butterfly2/src/stm32_butterfly2.h
+
2
−
2
View file @
bd5eb523
...
...
@@ -32,8 +32,8 @@
* POSSIBILITY OF SUCH DAMAGE.
****************************************************************************/
#ifndef __CONFIGS_STM32_BUTTERFLY2_SRC_STM32_BUTTERFLY2_H
1
#define __CONFIGS_STM32_BUTTERFLY2_SRC_STM32_BUTTERFLY2_H
#ifndef __CONFIGS_STM32_BUTTERFLY2_SRC_STM32_BUTTERFLY2_H
#define __CONFIGS_STM32_BUTTERFLY2_SRC_STM32_BUTTERFLY2_H
1
/*****************************************************************************
* Included Files
...
...
This diff is collapsed.
Click to expand it.
configs/stm32butterfly2/src/stm32_usbhost.c
+
5
−
1
View file @
bd5eb523
...
...
@@ -56,7 +56,11 @@
****************************************************************************/
#ifndef CONFIG_STM32_OTGFS
#error "CONFIG_USBHOST requires CONFIG_STM32_OTGFS to be enabled"
# error "CONFIG_USBHOST requires CONFIG_STM32_OTGFS to be enabled"
#endif
#ifdef CONFIG_USBDEV
# error "CONFIG_USBHOST cannot be set alongside CONFIG_USBDEV"
#endif
/*****************************************************************************
...
...
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