Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-24 16:11:56 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merged in masayuki2009/nuttx.nuttx/fix_rndis_related (pull request #873)

Browse Source 
configs: Change CONFIG_NSH_MACADDR to CONFIG_NETINIT_MACADDR

Please see apps/netutils/netinit/Kconfig

Signed-off-by: Masayuki Ishikawa <Masayuki.Ishikawa@jp.sony.com>

Approved-by: Gregory Nutt <gnutt@nuttx.org>
This commit is contained in:
Masayuki Ishikawa
2019-05-22 01:21:10 +00:00
committed by Gregory Nutt
parent 272b5b2636
commit 13560d6fa3
6 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configs/freedom-k64f/README.txt
+1 -1
View File
@@ -861,7 +861,7 @@ Where <subdir> is one of the following:
CONFIG_NSH_NOMAC=y
CONFIG_NSH_SWMAC=y
CONFIG_NSH_MACADDR=0x00e0deadbeef
CONFIG_NETINIT_MACADDR=0x00e0deadbeef
nsh:
---
configs/freedom-k66f/README.txt
+1 -1
View File
@@ -868,7 +868,7 @@ Where <subdir> is one of the following:
CONFIG_NSH_NOMAC=y
CONFIG_NSH_SWMAC=y
CONFIG_NSH_MACADDR=0x00e0deadbeef
CONFIG_NETINIT_MACADDR=0x00e0deadbeef
nsh:
---
configs/lc823450-xgevk/src/lc823450_bringup.c
+6 -6
View File
@@ -116,14 +116,14 @@ int lc823450_bringup(void)
lc823450_wm8776initialize(0);
#endif
#if defined(CONFIG_RNDIS) && defined(CONFIG_NSH_MACADDR)
#if defined(CONFIG_RNDIS) && defined(CONFIG_NETINIT_MACADDR)
uint8_t mac[6];
mac[0] = 0xa0; /* TODO */
mac[1] = (CONFIG_NSH_MACADDR >> (8 * 4)) & 0xff;
mac[2] = (CONFIG_NSH_MACADDR >> (8 * 3)) & 0xff;
mac[3] = (CONFIG_NSH_MACADDR >> (8 * 2)) & 0xff;
mac[4] = (CONFIG_NSH_MACADDR >> (8 * 1)) & 0xff;
mac[5] = (CONFIG_NSH_MACADDR >> (8 * 0)) & 0xff;
mac[1] = (CONFIG_NETINIT_MACADDR >> (8 * 4)) & 0xff;
mac[2] = (CONFIG_NETINIT_MACADDR >> (8 * 3)) & 0xff;
mac[3] = (CONFIG_NETINIT_MACADDR >> (8 * 2)) & 0xff;
mac[4] = (CONFIG_NETINIT_MACADDR >> (8 * 1)) & 0xff;
mac[5] = (CONFIG_NETINIT_MACADDR >> (8 * 0)) & 0xff;
usbdev_rndis_initialize(mac);
#endif
configs/omnibusf4/src/stm32_bringup.c
+6 -6
View File
@@ -306,16 +306,16 @@ int stm32_bringup(void)
}
#endif
#if defined(CONFIG_RNDIS) && defined(CONFIG_NSH_MACADDR)
#if defined(CONFIG_RNDIS) && defined(CONFIG_NETINIT_MACADDR)
/* Set up a MAC address for the RNDIS device. */
uint8_t mac[6];
mac[0] = 0xa0; /* TODO */
mac[1] = (CONFIG_NSH_MACADDR >> (8 * 4)) & 0xff;
mac[2] = (CONFIG_NSH_MACADDR >> (8 * 3)) & 0xff;
mac[3] = (CONFIG_NSH_MACADDR >> (8 * 2)) & 0xff;
mac[4] = (CONFIG_NSH_MACADDR >> (8 * 1)) & 0xff;
mac[5] = (CONFIG_NSH_MACADDR >> (8 * 0)) & 0xff;
mac[1] = (CONFIG_NETINIT_MACADDR >> (8 * 4)) & 0xff;
mac[2] = (CONFIG_NETINIT_MACADDR >> (8 * 3)) & 0xff;
mac[3] = (CONFIG_NETINIT_MACADDR >> (8 * 2)) & 0xff;
mac[4] = (CONFIG_NETINIT_MACADDR >> (8 * 1)) & 0xff;
mac[5] = (CONFIG_NETINIT_MACADDR >> (8 * 0)) & 0xff;
usbdev_rndis_initialize(mac);
#endif
configs/stm32f4discovery/src/stm32_bringup.c
+6 -6
View File
@@ -427,14 +427,14 @@ int stm32_bringup(void)
}
#endif
#if defined(CONFIG_RNDIS) && defined(CONFIG_NSH_MACADDR)
#if defined(CONFIG_RNDIS) && defined(CONFIG_NETINIT_MACADDR)
uint8_t mac[6];
mac[0] = 0xa0; /* TODO */
mac[1] = (CONFIG_NSH_MACADDR >> (8 * 4)) & 0xff;
mac[2] = (CONFIG_NSH_MACADDR >> (8 * 3)) & 0xff;
mac[3] = (CONFIG_NSH_MACADDR >> (8 * 2)) & 0xff;
mac[4] = (CONFIG_NSH_MACADDR >> (8 * 1)) & 0xff;
mac[5] = (CONFIG_NSH_MACADDR >> (8 * 0)) & 0xff;
mac[1] = (CONFIG_NETINIT_MACADDR >> (8 * 4)) & 0xff;
mac[2] = (CONFIG_NETINIT_MACADDR >> (8 * 3)) & 0xff;
mac[3] = (CONFIG_NETINIT_MACADDR >> (8 * 2)) & 0xff;
mac[4] = (CONFIG_NETINIT_MACADDR >> (8 * 1)) & 0xff;
mac[5] = (CONFIG_NETINIT_MACADDR >> (8 * 0)) & 0xff;
usbdev_rndis_initialize(mac);
#endif
configs/viewtool-stm32f107/src/stm32_max3421e.c
+6 -6
View File
@@ -364,16 +364,16 @@ int stm32_max3421e_setup(void)
}
#endif
#if defined(CONFIG_RNDIS) && defined(CONFIG_NSH_MACADDR)
#if defined(CONFIG_RNDIS) && defined(CONFIG_NETINIT_MACADDR)
{
uint8_t mac[6];
mac[0] = 0xa0; /* TODO */
mac[1] = (CONFIG_NSH_MACADDR >> (8 * 4)) & 0xff;
mac[2] = (CONFIG_NSH_MACADDR >> (8 * 3)) & 0xff;
mac[3] = (CONFIG_NSH_MACADDR >> (8 * 2)) & 0xff;
mac[4] = (CONFIG_NSH_MACADDR >> (8 * 1)) & 0xff;
mac[5] = (CONFIG_NSH_MACADDR >> (8 * 0)) & 0xff;
mac[1] = (CONFIG_NETINIT_MACADDR >> (8 * 4)) & 0xff;
mac[2] = (CONFIG_NETINIT_MACADDR >> (8 * 3)) & 0xff;
mac[3] = (CONFIG_NETINIT_MACADDR >> (8 * 2)) & 0xff;
mac[4] = (CONFIG_NETINIT_MACADDR >> (8 * 1)) & 0xff;
mac[5] = (CONFIG_NETINIT_MACADDR >> (8 * 0)) & 0xff;
ret = usbdev_rndis_initialize(mac);
if (ret < 0)