From 8e9df8ade0437df1c1a64abfda3bda9b4a0bcd6b Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Wed, 2 Jul 2014 17:23:25 -0600 Subject: [PATCH] NET: Misc naming clean-up --- Documentation/NuttxPortingGuide.html | 86 +++++++++++++++++++++++++--- drivers/net/encx24j600.c | 4 +- include/nuttx/net/netdev.h | 5 +- net/tcp/tcp_conn.c | 6 +- 4 files changed, 86 insertions(+), 15 deletions(-) diff --git a/Documentation/NuttxPortingGuide.html b/Documentation/NuttxPortingGuide.html index d5de8016f5..0f54a3e871 100644 --- a/Documentation/NuttxPortingGuide.html +++ b/Documentation/NuttxPortingGuide.html @@ -184,9 +184,11 @@ . |- nuttx | |-- Makefile +| |-- Kconfig | |-- Documentation | | `-- (documentation files)/ | |-- arch/ +| | |-- Kconfig | | |-- <arch-name>/ | | | |-- include/ | | | | |--<chip-name>/ @@ -201,6 +203,7 @@ | | `-- <other-architecture directories>/ | |-- binfmt/ | | |-- Makefile +| | |-- Kconfig | | |-- (binfmt-specific sub-directories)/ | | | `-- (binfmt-specific source files) | | `-- (common binfmt source files) @@ -216,16 +219,19 @@ | | `-- <(other board directories)>/ | |-- drivers/ | | |-- Makefile +| | |-- Kconfig | | |-- (driver-specific sub-directories)/ | | | `-- (driver-specific source files) | | `-- (common driver source files) | |-- fs/ | | |-- Makefile +| | |-- Kconfig | | |-- (file system-specific sub-directories)/ | | | `-- (file system-specific source files) | | `-- (common file system source files) | |-- graphics/ | | |-- Makefile +| | |-- Kconfig | | |-- (feature-specific sub-directories)/ | | | `-- (feature-specific source files library source files) | | `-- (common graphics-related source files) @@ -237,43 +243,76 @@ | | `-- (non-standard header files) | |-- libc/ | | |-- Makefile +| | |-- Kconfig | | `-- (libc source files) | |-- libxx/ | | |-- Makefile +| | |-- Kconfig | | `-- (libxx management source files) | |-- mm/ | | |-- Makefile +| | |-- Kconfig | | `-- (memory management source files) | |-- net/ | | |-- Makefile -| | |-- uip/ -| | | `-- (uip source files) -| | `-- (BSD socket source files) +| | |-- Kconfig +| | |-- arp/ +| | | `-- (ARP source files) +| | |-- devif/ +| | | `-- (Ethernet device interface source files) +| | |-- icmp/ +| | | `-- (ICMP source files) +| | |-- igmp/ +| | | `-- (IGMP source files) +| | |-- iob/ +| | | `-- (I/O buffering source files) +| | |-- ipv6/ +| | | `-- (IPv6 source files) +| | |-- netdev/ +| | | `-- (Socket device interface source files) +| | |-- pkt/ +| | | `-- (Packet socket source files) +| | |-- route/ +| | | `-- (Routing table source files) +| | |-- socket/ +| | | `-- (BSD socket source files) +| | |-- tcp/ +| | | `-- (TCP source files) +| | |-- udp/ +| | | `-- (UDP source files) +| | `-- utils/ +| | `-- (Miscellaneous, utility source files) | |-- sched/ | | |-- Makefile +| | |-- Kconfig | | `-- (sched source files) | |-- syscall/ | | |-- Makefile +| | |-- Kconfig | | `-- (syscall source files) | `-- tools/ | `-- (miscellaneous scripts and programs) `- apps |-- netutils/ | |-- Makefile + | |-- Kconfig | |-- (network feature sub-directories)/ | | `-- (network feature source files) | `-- (netutils common files) |-- nshlib/ | |-- Makefile + | |-- Kconfig | `-- NuttShell (NSH) files |-- (Board-specific applications)/ | |-- Makefile + | |-- Kconfig | |-- (Board-specific application sub-directories)/ | | `-- (Board-specific application source files) | `-- (Board-specific common files) `-- examples/ `-- (example)/ |-- Makefile + |-- Kconfig `-- (example source files) @@ -1223,10 +1262,42 @@ include/ |-- netinet/ | `-- (Standard header files) |-- nuttx/ +| |-analog/ +| | `-- (Analog driver header files) +| |-audio/ +| | `-- (Audio driver header files) +| |-binfmt/ +| | `-- (Binary format header files) +| |-fs/ +| | `-- (File System header files) +| |-input/ +| | `-- (Input device driver header files) +| |-lcd/ +| | `-- (LCD driver header files) +| |-mtd/ +| | `-- (Memory technology device header files) +| |-serial/ +| | `-- (Serial driver header files) | |-net/ -| | `-- uip/ -| | `-- (uIP specific header files) -| `-- (NuttX specific header files) +| | `-- (Networking header files) +| |-nx/ +| | `-- (NX graphics header files) +| |-power/ +| | `-- (Power management header files) +| |-sensors/ +| | `-- (Sensor device driver header files) +| |-sercomm/ +| | `-- (SERCOMM driver header files) +| |-serial/ +| | `-- (Serial driver header files) +| |-spi/ +| | `-- (SPI driver header files) +| |-syslog/ +| | `-- (SYSLOG header files) +| |-usb/ +| | `-- (USB driver header files) +| `-wireless/ +| `-- (Wireless device driver header files) `- sys/ `-- (More standard header files) @@ -1292,8 +1363,7 @@ libc/

2.12 nuttx/net

- This directory contains the implementation of the NuttX internal socket APIs. - The subdirectory, uip contains the uIP port. + This directory contains the implementation of the NuttX networking layer including internal socket APIs.

2.13 nuttx/sched

diff --git a/drivers/net/encx24j600.c b/drivers/net/encx24j600.c index c3feb49188..d6cd1386eb 100644 --- a/drivers/net/encx24j600.c +++ b/drivers/net/encx24j600.c @@ -1303,7 +1303,7 @@ static void enc_txif(FAR struct enc_driver_s *priv) wd_cancel(priv->txtimeout); - /* Poll for uip packets */ + /* Poll for TX packets from the networking layer */ devif_poll(&priv->dev, enc_txpoll); } @@ -1319,7 +1319,7 @@ static void enc_txif(FAR struct enc_driver_s *priv) * Function: enc_rxldpkt * * Description: - * Load packet from the enc's RX buffer to the uip d_buf. + * Load packet from the enc's RX buffer to the driver d_buf. * * Parameters: * priv - Reference to the driver state structure diff --git a/include/nuttx/net/netdev.h b/include/nuttx/net/netdev.h index 896b001029..76556b86b0 100644 --- a/include/nuttx/net/netdev.h +++ b/include/nuttx/net/netdev.h @@ -290,7 +290,7 @@ int devif_input(struct net_driver_s *dev); * out the packet. * * Example: - * int driver_callback(struct uip_driver_dev *dev) + * int driver_callback(struct net_driver_s *dev) * { * if (dev->d_len > 0) * { @@ -308,7 +308,7 @@ int devif_input(struct net_driver_s *dev); * need to call the arp_out() function in the callback function * before sending the packet: * - * int driver_callback(struct uip_driver_dev *dev) + * int driver_callback(struct net_driver_s *dev) * { * if (dev->d_len > 0) * { @@ -316,6 +316,7 @@ int devif_input(struct net_driver_s *dev); * devicedriver_send(); * return 1; <-- Terminates polling if necessary * } + * * return 0; * } * diff --git a/net/tcp/tcp_conn.c b/net/tcp/tcp_conn.c index f2eba21ca1..e81542b45d 100644 --- a/net/tcp/tcp_conn.c +++ b/net/tcp/tcp_conn.c @@ -498,9 +498,9 @@ FAR struct tcp_conn_s *tcp_listener(uint16_t portno) * Name: tcp_alloc_accept() * * Description: - * Called when uip_interrupt matches the incoming packet with a connection - * in LISTEN. In that case, this function will create a new connection and - * initialize it to send a SYNACK in return. + * Called when driver interrupt processing matches the incoming packet + * with a connection in LISTEN. In that case, this function will create + * a new connection and initialize it to send a SYNACK in return. * * Assumptions: * This function is called from UIP logic at interrupt level