Add a stub that can be used when networking is enabled, but there is no ethernet driver
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3368 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo
parent
f69bf78abb
commit
93cf78af8b
86
arch/arm/src/common/up_etherstub.c
Executable file
86
arch/arm/src/common/up_etherstub.c
Executable file
@ -0,0 +1,86 @@
|
||||
/****************************************************************************
|
||||
* arch/arm/src/common/up_etherstub.c
|
||||
*
|
||||
* Copyright (C) 2011 Gregory Nutt. All rights reserved.
|
||||
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
*
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* 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
|
||||
* used to endorse or promote products derived from this software
|
||||
* without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
|
||||
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
|
||||
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
|
||||
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
|
||||
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
|
||||
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
|
||||
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
|
||||
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||
* POSSIBILITY OF SUCH DAMAGE.
|
||||
*
|
||||
****************************************************************************/
|
||||
|
||||
/****************************************************************************
|
||||
* Included Files
|
||||
****************************************************************************/
|
||||
|
||||
#include <nuttx/config.h>
|
||||
|
||||
#include "up_internal.h"
|
||||
|
||||
/****************************************************************************
|
||||
* Definitions
|
||||
****************************************************************************/
|
||||
|
||||
/****************************************************************************
|
||||
* Public Data
|
||||
****************************************************************************/
|
||||
|
||||
/****************************************************************************
|
||||
* Private Data
|
||||
****************************************************************************/
|
||||
|
||||
/****************************************************************************
|
||||
* Private Functions
|
||||
****************************************************************************/
|
||||
|
||||
/****************************************************************************
|
||||
* Public Functions
|
||||
****************************************************************************/
|
||||
|
||||
/****************************************************************************
|
||||
* Name: up_netinitialize (stub)
|
||||
*
|
||||
* Description:
|
||||
* This is a stub version os up_netinitialize. Normally, up_netinitialize
|
||||
* is defined in board/up_network.c for board-specific ethernet
|
||||
* implementations, or chip/xyx_ethernet.c for chip-specific ethernet
|
||||
* implementations. The stub version here is used in the cornercase where
|
||||
* the network is enable yet there is no ethernet driver to be initialized.
|
||||
* In this case, up_initialize will still try to call up_netinitialize()
|
||||
* when one does not exist. This cornercase would occur if, for example,
|
||||
* only a USB network interface is being used or perhaps if a SLIP is
|
||||
* being used).
|
||||
*
|
||||
* In the long run, it might be better to have some kind of CONFIG_NO_ETHERNET
|
||||
* to suppress the call to up_netinitialize() in up_initialize(). Then
|
||||
* this stub would not be needed.
|
||||
*
|
||||
****************************************************************************/
|
||||
|
||||
void up_netinitialize(void)
|
||||
{
|
||||
}
|
||||
@ -1,7 +1,7 @@
|
||||
/****************************************************************************
|
||||
* common/up_internal.h
|
||||
*
|
||||
* Copyright (C) 2007-2010 Gregory Nutt. All rights reserved.
|
||||
* Copyright (C) 2007-2011 Gregory Nutt. All rights reserved.
|
||||
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
@ -259,7 +259,11 @@ extern void up_ledoff(int led);
|
||||
# define up_ledoff(led)
|
||||
#endif
|
||||
|
||||
/* Defined in board/up_network.c */
|
||||
/* Defined in board/up_network.c for board-specific ethernet implementations,
|
||||
* or chip/xyx_ethernet.c for chip-specific ethernet implementations, or
|
||||
* common/up_etherstub.c for a cornercase where the network is enable yet
|
||||
* there is no ethernet driver to be initialized.
|
||||
*/
|
||||
|
||||
#ifdef CONFIG_NET
|
||||
extern void up_netinitialize(void);
|
||||
|
||||
@ -48,6 +48,12 @@ CMN_CSRCS = up_assert.c up_blocktask.c up_copystate.c up_createstack.c \
|
||||
up_sigdeliver.c up_unblocktask.c up_usestack.c up_doirq.c \
|
||||
up_hardfault.c up_svcall.c
|
||||
|
||||
ifeq ($(CONFIG_NET),y)
|
||||
ifneq ($(CONFIG_LPC17_ETHERNET),y)
|
||||
CMN_CSRCS += up_etherstub.c
|
||||
endif
|
||||
endif
|
||||
|
||||
# Required LPC17xx files
|
||||
|
||||
CHIP_ASRCS =
|
||||
@ -77,6 +83,8 @@ ifeq ($(CONFIG_LPC17_GPDMA),y)
|
||||
CHIP_CSRCS += lpc17_gpdma.c
|
||||
endif
|
||||
|
||||
ifdef CONFIG_NET
|
||||
ifeq ($(CONFIG_NET),y)
|
||||
ifeq ($(CONFIG_LPC17_ETHERNET),y)
|
||||
CHIP_CSRCS += lpc17_ethernet.c
|
||||
endif
|
||||
endif
|
||||
|
||||
@ -1770,25 +1770,3 @@ int usbhost_wlaninit(void)
|
||||
return usbhost_registerclass(&g_wlan);
|
||||
}
|
||||
|
||||
#if defined(CONFIG_NET) && defined(CONFIG_NET_WLAN)
|
||||
|
||||
/****************************************************************************
|
||||
* Name: up_netinitialize
|
||||
*
|
||||
* Description:
|
||||
* Initialize the first network interface. If there are more than one
|
||||
* interface in the chip, then board-specific logic will have to provide
|
||||
* this function to determine which, if any, Ethernet controllers should
|
||||
* be initialized.
|
||||
*
|
||||
****************************************************************************/
|
||||
|
||||
#ifndef CONFIG_LPC17_ETHERNET
|
||||
void up_netinitialize(void)
|
||||
{
|
||||
/* stub */
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif /* CONFIG_NET && CONFIG_NET_WLAN */
|
||||
|
||||
|
||||
@ -494,16 +494,16 @@ static int nsh_execute(FAR struct nsh_vtbl_s *vtbl, int argc, char *argv[])
|
||||
|
||||
/* If the command was not found, then try to execute the command from
|
||||
* a list of pre-built applications.
|
||||
*/
|
||||
*/
|
||||
|
||||
#ifdef CONFIG_EXAMPLES_NSH_BUILTIN_APPS
|
||||
if (handler == cmd_unrecognized && nsh_execapp(vtbl, cmd, argv) == OK)
|
||||
{
|
||||
/* The pre-built application was successfully started -- run OK.
|
||||
* If not, then fall through to execute the cmd_nrecognized handler.
|
||||
*/
|
||||
/* The pre-built application was successfully started -- return OK.
|
||||
* If not, then fall through to execute the cmd_nrecognized handler.
|
||||
*/
|
||||
|
||||
return OK;
|
||||
return OK;
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user