fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-20 06:53:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Change all occurrences of CONFIG_EXAMPLE_ to CONFIG_EXAMPLES_ for consistency; fleshed out a few more Kconfig files

Browse Source 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5211 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo
2012-10-04 17:36:07 +00:00
parent b0eb4f3cce
commit 44a18f5361
208 changed files with 2527 additions and 2464 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/examples/ftpd/ftpd.h
+13 -13
View File
@@ -61,12 +61,12 @@
* If CONFIG_EXAMPLES_FTPD_NONETINIT is not defined, then the following may
* be specified to customized the network configuration:
*
* CONFIG_EXAMPLE_FTPD_NOMAC - If the hardware has no MAC address of its
* CONFIG_EXAMPLES_FTPD_NOMAC - If the hardware has no MAC address of its
* own, define this =y to provide a bogus address for testing.
* CONFIG_EXAMPLE_FTPD_IPADDR - The target IP address. Default 10.0.0.2
* CONFIG_EXAMPLE_FTPD_DRIPADDR - The default router address. Default
* CONFIG_EXAMPLES_FTPD_IPADDR - The target IP address. Default 10.0.0.2
* CONFIG_EXAMPLES_FTPD_DRIPADDR - The default router address. Default
* 10.0.0.1
* CONFIG_EXAMPLE_FTPD_NETMASK - The network mask. Default: 255.255.255.0
* CONFIG_EXAMPLES_FTPD_NETMASK - The network mask. Default: 255.255.255.0
*/
#ifndef CONFIG_EXAMPLES_FTPD_PRIO
@@ -92,18 +92,18 @@
#endif
#ifdef CONFIG_EXAMPLES_FTPD_NONETINIT
# undef CONFIG_EXAMPLE_FTPD_IPADDR
# undef CONFIG_EXAMPLE_FTPD_DRIPADDR
# undef CONFIG_EXAMPLE_FTPD_NETMASK
# undef CONFIG_EXAMPLES_FTPD_IPADDR
# undef CONFIG_EXAMPLES_FTPD_DRIPADDR
# undef CONFIG_EXAMPLES_FTPD_NETMASK
#else
# ifndef CONFIG_EXAMPLE_FTPD_IPADDR
# define CONFIG_EXAMPLE_FTPD_IPADDR 0x0a000002
# ifndef CONFIG_EXAMPLES_FTPD_IPADDR
# define CONFIG_EXAMPLES_FTPD_IPADDR 0x0a000002
# endif
# ifndef CONFIG_EXAMPLE_FTPD_DRIPADDR
# define CONFIG_EXAMPLE_FTPD_DRIPADDR 0x0a000001
# ifndef CONFIG_EXAMPLES_FTPD_DRIPADDR
# define CONFIG_EXAMPLES_FTPD_DRIPADDR 0x0a000001
# endif
# ifndef CONFIG_EXAMPLE_FTPD_NETMASK
# define CONFIG_EXAMPLE_FTPD_NETMASK 0xffffff00
# ifndef CONFIG_EXAMPLES_FTPD_NETMASK
# define CONFIG_EXAMPLES_FTPD_NETMASK 0xffffff00
# endif
#endif
apps/examples/ftpd/ftpd_main.c
+5 -5
View File
@@ -83,13 +83,13 @@ static void fptd_netinit(void)
{
#ifndef CONFIG_EXAMPLES_FTPD_NONETINIT
struct in_addr addr;
#ifdef CONFIG_EXAMPLE_FTPD_NOMAC
#ifdef CONFIG_EXAMPLES_FTPD_NOMAC
uint8_t mac[IFHWADDRLEN];
#endif
/* Many embedded network interfaces must have a software assigned MAC */
#ifdef CONFIG_EXAMPLE_FTPD_NOMAC
#ifdef CONFIG_EXAMPLES_FTPD_NOMAC
mac[0] = 0x00;
mac[1] = 0xe0;
mac[2] = 0xde;
@@ -101,17 +101,17 @@ static void fptd_netinit(void)
/* Set up our host address */
addr.s_addr = HTONL(CONFIG_EXAMPLE_FTPD_IPADDR);
addr.s_addr = HTONL(CONFIG_EXAMPLES_FTPD_IPADDR);
uip_sethostaddr("eth0", &addr);
/* Set up the default router address */
addr.s_addr = HTONL(CONFIG_EXAMPLE_FTPD_DRIPADDR);
addr.s_addr = HTONL(CONFIG_EXAMPLES_FTPD_DRIPADDR);
uip_setdraddr("eth0", &addr);
/* Setup the subnet mask */
addr.s_addr = HTONL(CONFIG_EXAMPLE_FTPD_NETMASK);
addr.s_addr = HTONL(CONFIG_EXAMPLES_FTPD_NETMASK);
uip_setnetmask("eth0", &addr);
#endif /* CONFIG_EXAMPLES_FTPD_NONETINIT */
}