diff options
| author | px4dev <px4@purgatory.org> | 2012-10-23 22:31:36 -0700 |
|---|---|---|
| committer | px4dev <px4@purgatory.org> | 2012-10-23 23:51:13 -0700 |
| commit | db044b64cddea9510dd5b43be304ef723acda636 (patch) | |
| tree | 8f3887c3d455cca9a09c87a6b6235327a5126017 | |
| parent | 7b4118a5e7a2da0e352ba30128e42c244f1542c9 (diff) | |
| download | px4-firmware-db044b64cddea9510dd5b43be304ef723acda636.tar.gz px4-firmware-db044b64cddea9510dd5b43be304ef723acda636.tar.bz2 px4-firmware-db044b64cddea9510dd5b43be304ef723acda636.zip | |
Hoist the oard-specific USB pieces.
| -rw-r--r-- | apps/drivers/boards/px4fmu/px4fmu_usb.c (renamed from nuttx/configs/px4fmu/src/up_usbdev.c) | 25 | ||||
| -rw-r--r-- | nuttx/configs/px4fmu/src/Makefile | 3 |
2 files changed, 15 insertions, 13 deletions
diff --git a/nuttx/configs/px4fmu/src/up_usbdev.c b/apps/drivers/boards/px4fmu/px4fmu_usb.c index 4ef105e91..d635e719b 100644 --- a/nuttx/configs/px4fmu/src/up_usbdev.c +++ b/apps/drivers/boards/px4fmu/px4fmu_usb.c @@ -1,9 +1,6 @@ -/************************************************************************************ - * 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); } diff --git a/nuttx/configs/px4fmu/src/Makefile b/nuttx/configs/px4fmu/src/Makefile index e64d076bd..281d9c247 100644 --- a/nuttx/configs/px4fmu/src/Makefile +++ b/nuttx/configs/px4fmu/src/Makefile @@ -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 |