sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Removed to unnecessary, cloned USB-related logic

Browse Source
This commit is contained in:
Gregory Nutt 2014-03-17 14:13:09 -06:00
parent a63c3985e7
commit 1ec72470e3
9 changed files with 8 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configs/ea3131/src/up_boot.c
View File

@ -103,9 +103,9 @@ void lpc31_boardinitialize(void)
#endif
/* Initialize USB if the 1) the HS host or device controller is in the
* configuration and 2) the weak function sam_usbinitialize() has been brought
* into the build. Presumeably either CONFIG_USBDEV or CONFIG_USBHOST is also
* selected.
* configuration and 2) the weak function lpc31_usbhost_bootinitialize() has
* been brought into the build. Presumably either CONFIG_USBDEV or CONFIG_USBHOST
* is also selected.
*/
#if defined(CONFIG_SAMA5_UHPHS) || defined(CONFIG_SAMA5_UDPHS)

6
configs/olimex-lpc-h3131/src/lpc31_boot.c
View File

@ -102,9 +102,9 @@ void lpc31_boardinitialize(void)
#endif
/* Initialize USB if the 1) the HS host or device controller is in the
* configuration and 2) the weak function sam_usbinitialize() has been brought
* into the build. Presumeably either CONFIG_USBDEV or CONFIG_USBHOST is also
* selected.
* configuration and 2) the weak function lpc31_usbhost_bootinitialize() has
* been brought into the build. Presumably either CONFIG_USBDEV or
* CONFIG_USBHOST is also selected.
*/
#ifdef HAVE_USBHOST

10
configs/sam3u-ek/src/sam3u-ek.h
View File

@ -221,16 +221,6 @@
void weak_function sam_spiinitialize(void);
/************************************************************************************
* Name: sam_usbinitialize
*
* Description:
* Called to setup USB-related GPIO pins for the SAM3U-EK board.
*
************************************************************************************/
void weak_function sam_usbinitialize(void);
/************************************************************************************
* Name: sam_hsmciinit
*

12
configs/sam3u-ek/src/up_boot.c
View File

@ -81,18 +81,6 @@ void sam_boardinitialize(void)
}
#endif
/* Initialize USB if 1) USBDEV is selected, 2) the USB controller is not
* disabled, and 3) the weak function sam_usbinitialize() has been brought
* into the build.
*/
#if defined(CONFIG_USBDEV) && defined(CONFIG_SAM34_USB)
if (sam_usbinitialize)
{
sam_usbinitialize();
}
#endif
/* Configure on-board LEDs if LED support has been selected. */
#ifdef CONFIG_ARCH_LEDS

30
configs/sam3u-ek/src/up_usbdev.c
View File

@ -62,35 +62,6 @@
* Public Functions
************************************************************************************/
/************************************************************************************
* Name: sam_usbinitialize
*
* Description:
* Called to setup USB-related GPIO pins for the SAM3U-EK board.
*
************************************************************************************/
void sam_usbinitialize(void)
{
}
/************************************************************************************
* Name: sam_usbpullup
*
* Description:
* If USB is supported and the board supports a pullup via GPIO (for USB software
* connect and disconnect), then the board software must provide sam_pullup.
* See include/nuttx/usb/usbdev.h for additional description of this method.
* Alternatively, if no pull-up GPIO the following EXTERN can be redefined to be
* NULL.
*
************************************************************************************/
int sam_usbpullup(FAR struct usbdev_s *dev, bool enable)
{
return 0;
}
/************************************************************************************
* Name: sam_usbsuspend
*
@ -106,4 +77,3 @@ void sam_usbsuspend(FAR struct usbdev_s *dev, bool resume)
{
ulldbg("resume: %d\n", resume);
}

2
configs/sam4e-ek/src/Makefile
View File

@ -40,7 +40,7 @@ CFLAGS += -I$(TOPDIR)/sched
ASRCS =
AOBJS = $(ASRCS:.S=$(OBJEXT))
CSRCS = sam_boot.c sam_leds.c sam_buttons.c sam_usbdev.c
CSRCS = sam_boot.c sam_leds.c sam_buttons.c sam_udp.c
ifeq ($(CONFIG_HAVE_CXXINITIALIZE),y)
CSRCS += sam_cxxinitialize.c

10
configs/sam4e-ek/src/sam4e-ek.h
View File

@ -393,16 +393,6 @@
void weak_function sam_spiinitialize(void);
/************************************************************************************
* Name: sam_usbinitialize
*
* Description:
* Called to setup USB-related GPIO pins for the SAM4E-EK board.
*
************************************************************************************/
void weak_function sam_usbinitialize(void);
/************************************************************************************
* Name: sam_hsmci_initialize
*

12
configs/sam4e-ek/src/sam_boot.c
View File

@ -110,18 +110,6 @@ void sam_boardinitialize(void)
}
#endif
/* Initialize USB if 1) USBDEV is selected, 2) the USB controller is not
* disabled, and 3) the weak function sam_usbinitialize() has been brought
* into the build.
*/
#if defined(CONFIG_USBDEV) && defined(CONFIG_SAM34_UDP)
if (sam_usbinitialize)
{
sam_usbinitialize();
}
#endif
/* Configure on-board LEDs if LED support has been selected. */
#ifdef CONFIG_ARCH_LEDS

31
configs/sam4e-ek/src/sam_usbdev.c → configs/sam4e-ek/src/sam_udp.c
View File

@ -1,5 +1,5 @@
/************************************************************************************
* configs/sam4e-ek/src/sam_usbdev.c
* configs/sam4e-ek/src/sam_udp.c
*
* Copyright (C) 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -62,35 +62,6 @@
* Public Functions
************************************************************************************/
/************************************************************************************
* Name: sam_usbinitialize
*
* Description:
* Called to setup USB-related GPIO pins for the SAM4E-EK board.
*
************************************************************************************/
void sam_usbinitialize(void)
{
}
/************************************************************************************
* Name: sam_usbpullup
*
* Description:
* If USB is supported and the board supports a pullup via GPIO (for USB software
* connect and disconnect), then the board software must provide sam_pullup.
* See include/nuttx/usb/usbdev.h for additional description of this method.
* Alternatively, if no pull-up GPIO the following EXTERN can be redefined to be
* NULL.
*
************************************************************************************/
int sam_usbpullup(FAR struct usbdev_s *dev, bool enable)
{
return 0;
}
/************************************************************************************
* Name: sam_udp_suspend
*