From 7b770dd9b609865df2ae4fe2abf49de61a3f3034 Mon Sep 17 00:00:00 2001 From: Dirk Ziegelmeier Date: Tue, 26 Jul 2016 20:10:17 +0200 Subject: [PATCH] Document 6LoWPAN and SLIP netif --- doc/doxygen/lwip.Doxyfile | 4 +++- doc/doxygen/ppp.h | 5 ----- src/netif/lowpan6.c | 6 ++++++ src/netif/ppp/ppp.c | 6 ++++++ src/netif/slipif.c | 22 +++++++++++++--------- 5 files changed, 28 insertions(+), 15 deletions(-) delete mode 100644 doc/doxygen/ppp.h diff --git a/doc/doxygen/lwip.Doxyfile b/doc/doxygen/lwip.Doxyfile index 0b9b8122..02700559 100644 --- a/doc/doxygen/lwip.Doxyfile +++ b/doc/doxygen/lwip.Doxyfile @@ -781,7 +781,7 @@ WARN_LOGFILE = # spaces. See also FILE_PATTERNS and EXTENSION_MAPPING # Note: If this tag is empty the current directory is searched. -INPUT = ../../src main_page.h ppp.h contrib.h +INPUT = ../../src main_page.h contrib.h # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses @@ -2106,6 +2106,8 @@ PREDEFINED = NO_SYS=0 \ LWIP_SO_LINGER=1 \ SO_REUSE=1 \ SO_REUSE_RXTOALL=1 \ + LWIP_HAVE_SLIPIF=1 \ + LWIP_6LOWPAN=1 \ "LWIP_DNS && LWIP_SOCKET " \ "(LWIP_DNS && LWIP_SOCKET)=1 " diff --git a/doc/doxygen/ppp.h b/doc/doxygen/ppp.h deleted file mode 100644 index 81e0856f..00000000 --- a/doc/doxygen/ppp.h +++ /dev/null @@ -1,5 +0,0 @@ -/** - * @defgroup ppp PPP - * @ingroup addons - * @verbinclude "ppp.txt" - */ diff --git a/src/netif/lowpan6.c b/src/netif/lowpan6.c index 44a71e90..b073efd4 100644 --- a/src/netif/lowpan6.c +++ b/src/netif/lowpan6.c @@ -39,6 +39,12 @@ * */ +/** + * @defgroup sixlowpan 6LowPAN netif + * @ingroup addons + * 6LowPAN netif implementation + */ + #include "netif/lowpan6.h" #if LWIP_IPV6 && LWIP_6LOWPAN diff --git a/src/netif/ppp/ppp.c b/src/netif/ppp/ppp.c index fe7d544b..d5e317cb 100644 --- a/src/netif/ppp/ppp.c +++ b/src/netif/ppp/ppp.c @@ -79,6 +79,12 @@ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ +/** + * @defgroup ppp PPP netif + * @ingroup addons + * @verbinclude "ppp.txt" + */ + #include "netif/ppp/ppp_opts.h" #if PPP_SUPPORT /* don't build if not configured for use in lwipopts.h */ diff --git a/src/netif/slipif.c b/src/netif/slipif.c index bf02475e..8849cc32 100644 --- a/src/netif/slipif.c +++ b/src/netif/slipif.c @@ -36,12 +36,21 @@ * * Author: Magnus Ivarsson * Simon Goldschmidt - * - * Usage: This netif can be used in three ways: + */ + + +/** + * @defgroup slipif SLIP netif + * @ingroup addons + * + * This is an arch independent SLIP netif. The specific serial hooks must be + * provided by another file. They are sio_open, sio_read/sio_tryread and sio_send + * + * Usage: This netif can be used in three ways:\n * 1) For NO_SYS==0, an RX thread can be used which blocks on sio_read() - * until data is received. + * until data is received.\n * 2) In your main loop, call slipif_poll() to check for new RX bytes, - * completed packets are fed into netif->input(). + * completed packets are fed into netif->input().\n * 3) Call slipif_received_byte[s]() from your serial RX ISR and * slipif_process_rxqueue() from your main loop. ISR level decodes * packets and puts completed packets on a queue which is fed into @@ -50,11 +59,6 @@ * */ -/* - * This is an arch independent SLIP netif. The specific serial hooks must be - * provided by another file. They are sio_open, sio_read/sio_tryread and sio_send - */ - #include "netif/slipif.h" #include "lwip/opt.h"