diff --git a/Documentation/components/drivers/special/socketcan.rst b/Documentation/components/drivers/special/socketcan.rst index cd9556fc48..b85905b40f 100644 --- a/Documentation/components/drivers/special/socketcan.rst +++ b/Documentation/components/drivers/special/socketcan.rst @@ -23,7 +23,7 @@ SocketCAN Device Drivers - **Initialization sequence is as follows**. - #. up_netinitialize(void) is called on startup of NuttX in this + #. xxx_netinitialize(void) is called on startup of NuttX in this function you call your own init function to initialize your CAN driver #. In your own init function you create the net_driver_s diff --git a/boards/arm/stm32f7/stm32f777zit6-meadow/src/stm32_boot.c b/boards/arm/stm32f7/stm32f777zit6-meadow/src/stm32_boot.c index b94e2df956..8aaa0554c4 100644 --- a/boards/arm/stm32f7/stm32f777zit6-meadow/src/stm32_boot.c +++ b/boards/arm/stm32f7/stm32f777zit6-meadow/src/stm32_boot.c @@ -70,10 +70,6 @@ extern FAR struct qspi_dev_s *stm32f7_qspi_initialize(int intf); * ****************************************************************************/ -void up_netinitialize(void) -{ -} - void stm32_boardinitialize(void) { #if defined(CONFIG_STM32F7_SPI1) || defined(CONFIG_STM32F7_SPI2) || \ diff --git a/boards/x86_64/intel64/qemu-intel64/src/qemu_net.c b/boards/x86_64/intel64/qemu-intel64/src/qemu_net.c index fe01de8b44..2464568ed6 100644 --- a/boards/x86_64/intel64/qemu-intel64/src/qemu_net.c +++ b/boards/x86_64/intel64/qemu-intel64/src/qemu_net.c @@ -50,8 +50,7 @@ ****************************************************************************/ #ifdef CONFIG_NET -void up_netinitialize(void) +void x86_64_netinitialize(void) { } #endif - diff --git a/boards/xtensa/esp32/esp32-devkitc/src/esp32_w5500.c b/boards/xtensa/esp32/esp32-devkitc/src/esp32_w5500.c index dd6d245343..b629d19d00 100644 --- a/boards/xtensa/esp32/esp32-devkitc/src/esp32_w5500.c +++ b/boards/xtensa/esp32/esp32-devkitc/src/esp32_w5500.c @@ -179,7 +179,7 @@ static void up_reset(const struct w5500_lower_s *lower, bool reset) * Name: arm_netinitialize ****************************************************************************/ -void up_netinitialize(void) +void riscv_netinitialize(void) { struct spi_dev_s *spi; int ret; diff --git a/drivers/usbdev/Kconfig b/drivers/usbdev/Kconfig index d9b855ee46..4faecbdc6b 100644 --- a/drivers/usbdev/Kconfig +++ b/drivers/usbdev/Kconfig @@ -963,10 +963,10 @@ menuconfig RNDIS - "Remote NDIS To USB Mapping" This option may required CONFIG_NETDEV_LATEINIT=y otherwise, the - power-up initialization may call the non-existent up_netinitialize(). + power-up initialization may call the non-existent xxx_netinitialize(). This option is not automatically selected because it may be that you have an additional network device that requires the early - up_netinitialize() call. + xxx_netinitialize() call. if RNDIS @@ -1102,10 +1102,10 @@ menuconfig NET_CDCECM Revision 1.2, February 9, 2007" This option may require CONFIG_NETDEV_LATEINIT=y, otherwise the - power-up initialization may call the non-existent up_netinitialize(). + power-up initialization may call the non-existent xxx_netinitialize(). This option is not automatically selected because it may be that you have an additional network device that requires the early - up_netinitialize() call. + xxx_netinitialize() call. if NET_CDCECM diff --git a/net/Kconfig b/net/Kconfig index 82ac9eb7a6..3a67f2eb42 100644 --- a/net/Kconfig +++ b/net/Kconfig @@ -277,7 +277,7 @@ config NETDEV_LATEINIT ---help--- Normally, networking initialization occur in the later phase of the boot process in the function up_initialize() when it calls the - driver initialization function, up_netinitialize(). This + driver initialization function, xxx_netinitialize(). This initialization occurs after a sufficient amount of the OS has been initialized so that driver registration can be performed, but before the completion of OS initialization and before the first @@ -289,15 +289,15 @@ config NETDEV_LATEINIT - If you are using SLIP or PPPD, then there will be no network driver to be initialized, - Certain multi-network configurations where a simple call to - up_netinitialize() may be insufficient, and + xxx_netinitialize() may be insufficient, and - Situations where there are other board-level hardware dependencies so that the hardware is not in an appropriate - state for up_netinitialize() to be called. + state for xxx_netinitialize() to be called. Examples of this latter situation include such things as network drivers that required some setup via an I2C I/O expander, or network drivers that depend on USB, SPI, I2C, PCI, serial, or other - interfaces that may not be ready when up_netinitialize() is normally + interfaces that may not be ready when xxx_netinitialize() is normally called. endmenu # Link layer support