Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-04 23:03:27 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fix SAMA5D* warnings

Browse Source 
sama5d3-xplained:ethernet-over-phy configuration found in build testing:

  arch/arm/src/sama5/sam_irq.c:  Fix "Control reaches end of non-void function " warning
  arch/arm/src/sama5/sam_udphs.c:  Fix "unused variable 'epno'" warning
  boards/arm/sama5/sama5d*-*/src/sam_usb.c:  Fix "warning 'HAVE_USBHOST' not defined" warnings
This commit is contained in:
Gregory Nutt
2020-01-22 09:37:41 -06:00
committed by Alin Jerpelea
parent 6b413ec241
commit c1f75af084
5 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/arm/src/sama5/sam_irq.c
+2
View File
@@ -841,6 +841,8 @@ int up_prioritize_irq(int irq, int priority)
{ {
sam_prioritize_irq(SAM_AIC_VBASE, irq, priority); sam_prioritize_irq(SAM_AIC_VBASE, irq, priority);
} }
return OK;
} }
#endif #endif
arch/arm/src/sama5/sam_udphs.c
+1 -1
View File
@@ -3392,7 +3392,7 @@ static int sam_ep_configure(struct usbdev_ep_s *ep,
/* Verify parameters. Endpoint 0 is not available at this interface */ /* Verify parameters. Endpoint 0 is not available at this interface */
#if defined(CONFIG_DEBUG_FEATURES) || defined(CONFIG_USBDEV_TRACE) #if defined(CONFIG_DEBUG_ASSERTIONS) || defined(CONFIG_USBDEV_TRACE)
uint8_t epno = USB_EPNO(desc->addr); uint8_t epno = USB_EPNO(desc->addr);
usbtrace(TRACE_EPCONFIGURE, (uint16_t)epno); usbtrace(TRACE_EPCONFIGURE, (uint16_t)epno);
boards/arm/sama5/sama5d3-xplained/src/sam_usb.c
+4 -4
View File
@@ -108,7 +108,7 @@ static xcpt_t g_ochandler;
* *
****************************************************************************/ ****************************************************************************/
#if HAVE_USBHOST #ifdef HAVE_USBHOST
#ifdef CONFIG_DEBUG_USB #ifdef CONFIG_DEBUG_USB
static int usbhost_waiter(struct usbhost_connection_s *dev, static int usbhost_waiter(struct usbhost_connection_s *dev,
const char *hcistr) const char *hcistr)
@@ -298,7 +298,7 @@ void weak_function sam_usbinitialize(void)
* *
****************************************************************************/ ****************************************************************************/
#if HAVE_USBHOST #ifdef HAVE_USBHOST
int sam_usbhost_initialize(void) int sam_usbhost_initialize(void)
{ {
pid_t pid; pid_t pid;
@@ -416,7 +416,7 @@ int sam_usbhost_initialize(void)
* *
****************************************************************************/ ****************************************************************************/
#if HAVE_USBHOST #ifdef HAVE_USBHOST
void sam_usbhost_vbusdrive(int rhport, bool enable) void sam_usbhost_vbusdrive(int rhport, bool enable)
{ {
pio_pinset_t pinset = 0; pio_pinset_t pinset = 0;
@@ -500,7 +500,7 @@ void sam_usbhost_vbusdrive(int rhport, bool enable)
* *
****************************************************************************/ ****************************************************************************/
#if HAVE_USBHOST #ifdef HAVE_USBHOST
xcpt_t sam_setup_overcurrent(xcpt_t handler) xcpt_t sam_setup_overcurrent(xcpt_t handler)
{ {
#if defined(CONFIG_SAMA5_PIOD_IRQ) && (defined(CONFIG_SAMA5_UHPHS_RHPORT2) || \ #if defined(CONFIG_SAMA5_PIOD_IRQ) && (defined(CONFIG_SAMA5_UHPHS_RHPORT2) || \
boards/arm/sama5/sama5d3x-ek/src/sam_usb.c
+4 -4
View File
@@ -108,7 +108,7 @@ static xcpt_t g_ochandler;
* *
****************************************************************************/ ****************************************************************************/
#if HAVE_USBHOST #ifdef HAVE_USBHOST
#ifdef CONFIG_DEBUG_USB #ifdef CONFIG_DEBUG_USB
static int usbhost_waiter(struct usbhost_connection_s *dev, static int usbhost_waiter(struct usbhost_connection_s *dev,
const char *hcistr) const char *hcistr)
@@ -296,7 +296,7 @@ void weak_function sam_usbinitialize(void)
* *
****************************************************************************/ ****************************************************************************/
#if HAVE_USBHOST #ifdef HAVE_USBHOST
int sam_usbhost_initialize(void) int sam_usbhost_initialize(void)
{ {
pid_t pid; pid_t pid;
@@ -415,7 +415,7 @@ int sam_usbhost_initialize(void)
* *
****************************************************************************/ ****************************************************************************/
#if HAVE_USBHOST #ifdef HAVE_USBHOST
void sam_usbhost_vbusdrive(int rhport, bool enable) void sam_usbhost_vbusdrive(int rhport, bool enable)
{ {
pio_pinset_t pinset = 0; pio_pinset_t pinset = 0;
@@ -493,7 +493,7 @@ void sam_usbhost_vbusdrive(int rhport, bool enable)
* *
****************************************************************************/ ****************************************************************************/
#if HAVE_USBHOST #ifdef HAVE_USBHOST
xcpt_t sam_setup_overcurrent(xcpt_t handler) xcpt_t sam_setup_overcurrent(xcpt_t handler)
{ {
#if defined(CONFIG_SAMA5_PIOD_IRQ) && (defined(CONFIG_SAMA5_UHPHS_RHPORT2) || \ #if defined(CONFIG_SAMA5_PIOD_IRQ) && (defined(CONFIG_SAMA5_UHPHS_RHPORT2) || \
boards/arm/sama5/sama5d4-ek/src/sam_usb.c
+4 -4
View File
@@ -108,7 +108,7 @@ static xcpt_t g_ochandler;
* *
****************************************************************************/ ****************************************************************************/
#if HAVE_USBHOST #ifdef HAVE_USBHOST
#ifdef CONFIG_DEBUG_USB #ifdef CONFIG_DEBUG_USB
static int usbhost_waiter(struct usbhost_connection_s *dev, static int usbhost_waiter(struct usbhost_connection_s *dev,
const char *hcistr) const char *hcistr)
@@ -296,7 +296,7 @@ void weak_function sam_usbinitialize(void)
* *
****************************************************************************/ ****************************************************************************/
#if HAVE_USBHOST #ifdef HAVE_USBHOST
int sam_usbhost_initialize(void) int sam_usbhost_initialize(void)
{ {
pid_t pid; pid_t pid;
@@ -414,7 +414,7 @@ int sam_usbhost_initialize(void)
* *
****************************************************************************/ ****************************************************************************/
#if HAVE_USBHOST #ifdef HAVE_USBHOST
void sam_usbhost_vbusdrive(int rhport, bool enable) void sam_usbhost_vbusdrive(int rhport, bool enable)
{ {
pio_pinset_t pinset = 0; pio_pinset_t pinset = 0;
@@ -493,7 +493,7 @@ void sam_usbhost_vbusdrive(int rhport, bool enable)
* *
****************************************************************************/ ****************************************************************************/
#if HAVE_USBHOST #ifdef HAVE_USBHOST
xcpt_t sam_setup_overcurrent(xcpt_t handler) xcpt_t sam_setup_overcurrent(xcpt_t handler)
{ {
#if defined(CONFIG_SAMA5_PIOD_IRQ) && (defined(CONFIG_SAMA5_UHPHS_RHPORT2) || \ #if defined(CONFIG_SAMA5_PIOD_IRQ) && (defined(CONFIG_SAMA5_UHPHS_RHPORT2) || \