Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
Firmware
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
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Alberto Ruiz Garcia
Firmware
Commits
db044b64
Commit
db044b64
authored
12 years ago
by
px4dev
Browse files
Options
Downloads
Patches
Plain Diff
Hoist the oard-specific USB pieces.
parent
7b4118a5
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
apps/drivers/boards/px4fmu/px4fmu_usb.c
+14
-11
14 additions, 11 deletions
apps/drivers/boards/px4fmu/px4fmu_usb.c
nuttx/configs/px4fmu/src/Makefile
+1
-2
1 addition, 2 deletions
nuttx/configs/px4fmu/src/Makefile
with
15 additions
and
13 deletions
nuttx/config
s/px4fmu/
src/up
_usb
dev
.c
→
apps/drivers/board
s/px4fmu/
px4fmu
_usb.c
+
14
−
11
View file @
db044b64
/************************************************************************************
* configs/stm32f4discovery/src/up_usbdev.c
* arch/arm/src/board/up_boot.c
/****************************************************************************
*
* Copyright (C) 2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
* Copyright (C) 2012 PX4 Development Team. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
...
...
@@ -15,7 +12,7 @@
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
* 3. Neither the name
NuttX
nor the names of its contributors may be
* 3. Neither the name
PX4
nor the names of its contributors may be
* used to endorse or promote products derived from this software
* without specific prior written permission.
*
...
...
@@ -32,7 +29,13 @@
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
************************************************************************************/
****************************************************************************/
/**
* @file px4fmu_usb.c
*
* Board-specific USB functions.
*/
/************************************************************************************
* Included Files
...
...
@@ -50,7 +53,7 @@
#include
"up_arch.h"
#include
"stm32_internal.h"
#include
"px4fmu
-
internal.h"
#include
"px4fmu
_
internal.h"
/************************************************************************************
* Definitions
...
...
@@ -68,11 +71,11 @@
* Name: stm32_usbinitialize
*
* Description:
* Called to setup USB-related GPIO pins for the
STM3210E-EVAL
board.
* Called to setup USB-related GPIO pins for the
PX4FMU
board.
*
************************************************************************************/
void
stm32_usbinitialize
(
void
)
__EXPORT
void
stm32_usbinitialize
(
void
)
{
/* The OTG FS has an internal soft pull-up */
...
...
@@ -98,7 +101,7 @@ void stm32_usbinitialize(void)
*
************************************************************************************/
void
stm32_usbsuspend
(
FAR
struct
usbdev_s
*
dev
,
bool
resume
)
__EXPORT
void
stm32_usbsuspend
(
FAR
struct
usbdev_s
*
dev
,
bool
resume
)
{
ulldbg
(
"resume: %d
\n
"
,
resume
);
}
...
...
This diff is collapsed.
Click to expand it.
nuttx/configs/px4fmu/src/Makefile
+
1
−
2
View file @
db044b64
...
...
@@ -42,8 +42,7 @@ AOBJS = $(ASRCS:.S=$(OBJEXT))
CSRCS
=
up_leds.c
\
drv_gpio.c
\
drv_led.c drv_eeprom.c
\
up_usbdev.c
drv_led.c drv_eeprom.c
ifeq
($(CONFIG_ADC),y)
CSRCS
+=
up_adc.c
...
...
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