Skip to content

Commit ebc8d9f

Browse files
committed
Merge pull request contiki-os#1344 from tsparber/fix-doxygen
doxygen: Fixed all warnings
2 parents f0c3d29 + 8792ba1 commit ebc8d9f

39 files changed

+277
-221
lines changed

.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@
3232
*.report
3333
summary
3434
*.summary
35+
*.runerr
36+
*.runlog
3537
*.faillog
3638
*.orig
3739
*~

apps/program-handler/program-handler.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -246,6 +246,7 @@ program_handler_load(char *name, char *arg)
246246
#else /* WITH_LOADER_ARCH */
247247
#define RUN(prg, process, arg) process_start(process, arg)
248248
#endif /* WITH_LOADER_ARCH */
249+
#if CTK_CONF_SCREENSAVER
249250
/*-----------------------------------------------------------------------------------*/
250251
/**
251252
* Configures the name of the screensaver to be loaded when
@@ -255,7 +256,6 @@ program_handler_load(char *name, char *arg)
255256
* should be used.
256257
*/
257258
/*-----------------------------------------------------------------------------------*/
258-
#if CTK_CONF_SCREENSAVER
259259
void
260260
program_handler_setscreensaver(char *name)
261261
{

core/net/ip/uip.h

+4-2
Original file line numberDiff line numberDiff line change
@@ -136,15 +136,18 @@ typedef struct uip_eth_addr {
136136
typedef uip_802154_longaddr uip_lladdr_t;
137137
#define UIP_802154_SHORTADDR_LEN 2
138138
#define UIP_802154_LONGADDR_LEN 8
139+
/** \brief Link layer address length */
139140
#define UIP_LLADDR_LEN UIP_802154_LONGADDR_LEN
140141
#else /*UIP_CONF_LL_802154*/
141142
#if UIP_CONF_LL_80211
142143
/** \brief 802.11 address */
143144
typedef uip_80211_addr uip_lladdr_t;
145+
/** \brief Link layer address length */
144146
#define UIP_LLADDR_LEN 6
145147
#else /*UIP_CONF_LL_80211*/
146148
/** \brief Ethernet address */
147149
typedef uip_eth_addr uip_lladdr_t;
150+
/** \brief Link layer address length */
148151
#define UIP_LLADDR_LEN 6
149152
#endif /*UIP_CONF_LL_80211*/
150153
#endif /*UIP_CONF_LL_802154*/
@@ -1368,8 +1371,7 @@ struct uip_conn {
13681371
uint8_t nrtx; /**< The number of retransmissions for the last
13691372
segment sent. */
13701373

1371-
/** The application state. */
1372-
uip_tcp_appstate_t appstate;
1374+
uip_tcp_appstate_t appstate; /** The application state. */
13731375
};
13741376

13751377

core/net/ipv6/sicslowpan.c

+7-6
Original file line numberDiff line numberDiff line change
@@ -1046,12 +1046,14 @@ uncompress_hdr_hc06(uint16_t ip_len)
10461046
* - Both src and dest interface ID are recoverable from lower layer
10471047
* header
10481048
* - Next header is either ICMP, UDP or TCP
1049+
*
10491050
* Moreover, if next header is UDP, we try to compress it using HC_UDP.
1050-
* This is feasible is both ports are between F0B0 and F0B0 + 15\n\n
1051+
* This is feasible is both ports are between F0B0 and F0B0 + 15.
1052+
*
10511053
*
10521054
* Resulting header structure:
1053-
* - For ICMP, TCP, non compressed UDP\n
1054-
* HC1 encoding = 11111010 (UDP) 11111110 (TCP) 11111100 (ICMP)\n
1055+
* - For ICMP, TCP, non compressed UDP\n
1056+
* HC1 encoding = 11111010 (UDP) 11111110 (TCP) 11111100 (ICMP)\n
10551057
* \verbatim
10561058
* 1 2 3
10571059
* 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
@@ -1062,8 +1064,8 @@ uncompress_hdr_hc06(uint16_t ip_len)
10621064
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
10631065
* \endverbatim
10641066
*
1065-
* - For compressed UDP
1066-
* HC1 encoding = 11111011, HC_UDP encoding = 11100000\n
1067+
* - For compressed UDP\n
1068+
* HC1 encoding = 11111011, HC_UDP encoding = 11100000\n
10671069
* \verbatim
10681070
* 1 2 3
10691071
* 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
@@ -1577,7 +1579,6 @@ output(const uip_lladdr_t *localdest)
15771579

15781580
/*--------------------------------------------------------------------*/
15791581
/** \brief Process a received 6lowpan packet.
1580-
* \param r The MAC layer
15811582
*
15821583
* The 6lowpan packet is put in packetbuf by the MAC. If its a frag1 or
15831584
* a non-fragmented packet we first uncompress the IP header. The

core/net/ipv6/uip-ds6-nbr.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -231,10 +231,10 @@ uip_ds6_link_neighbor_callback(int status, int numtx)
231231

232232
}
233233
/*---------------------------------------------------------------------------*/
234+
/** Periodic processing on neighbors */
234235
void
235236
uip_ds6_neighbor_periodic(void)
236237
{
237-
/* Periodic processing on neighbors */
238238
uip_ds6_nbr_t *nbr = nbr_table_head(ds6_neighbors);
239239
while(nbr != NULL) {
240240
switch(nbr->state) {

core/net/ipv6/uip-ds6.c

+8-8
Original file line numberDiff line numberDiff line change
@@ -53,23 +53,23 @@
5353
#define DEBUG DEBUG_NONE
5454
#include "net/ip/uip-debug.h"
5555

56-
struct etimer uip_ds6_timer_periodic; /** \brief Timer for maintenance of data structures */
56+
struct etimer uip_ds6_timer_periodic; /**< Timer for maintenance of data structures */
5757

5858
#if UIP_CONF_ROUTER
59-
struct stimer uip_ds6_timer_ra; /** \brief RA timer, to schedule RA sending */
59+
struct stimer uip_ds6_timer_ra; /**< RA timer, to schedule RA sending */
6060
#if UIP_ND6_SEND_RA
61-
static uint8_t racount; /** \brief number of RA already sent */
62-
static uint16_t rand_time; /** \brief random time value for timers */
61+
static uint8_t racount; /**< number of RA already sent */
62+
static uint16_t rand_time; /**< random time value for timers */
6363
#endif
6464
#else /* UIP_CONF_ROUTER */
65-
struct etimer uip_ds6_timer_rs; /** \brief RS timer, to schedule RS sending */
66-
static uint8_t rscount; /** \brief number of rs already sent */
65+
struct etimer uip_ds6_timer_rs; /**< RS timer, to schedule RS sending */
66+
static uint8_t rscount; /**< number of rs already sent */
6767
#endif /* UIP_CONF_ROUTER */
6868

6969
/** \name "DS6" Data structures */
7070
/** @{ */
71-
uip_ds6_netif_t uip_ds6_if; /** \brief The single interface */
72-
uip_ds6_prefix_t uip_ds6_prefix_list[UIP_DS6_PREFIX_NB]; /** \brief Prefix list */
71+
uip_ds6_netif_t uip_ds6_if; /**< The single interface */
72+
uip_ds6_prefix_t uip_ds6_prefix_list[UIP_DS6_PREFIX_NB]; /**< Prefix list */
7373

7474
/* Used by Cooja to enable extraction of addresses from memory.*/
7575
uint8_t uip_ds6_addr_size;

core/net/ipv6/uip-ds6.h

+1
Original file line numberDiff line numberDiff line change
@@ -282,6 +282,7 @@ uint8_t uip_ds6_is_addr_onlink(uip_ipaddr_t *ipaddr);
282282

283283
/** \name Unicast address list basic routines */
284284
/** @{ */
285+
/** \brief Add a unicast address to the interface */
285286
uip_ds6_addr_t *uip_ds6_addr_add(uip_ipaddr_t *ipaddr,
286287
unsigned long vlifetime, uint8_t type);
287288
void uip_ds6_addr_rm(uip_ds6_addr_t *addr);

core/net/ipv6/uip-nd6.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -811,7 +811,7 @@ uip_nd6_rs_output(void)
811811
return;
812812
}
813813
/*---------------------------------------------------------------------------*/
814-
/*
814+
/**
815815
* Process a Router Advertisement
816816
*
817817
* - Possible actions when receiving a RA: add router to router list,

core/net/ipv6/uip-nd6.h

+4-1
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,12 @@
5959

6060
/** \name RFC 4861 Host constant */
6161
/** @{ */
62+
/** \brief Maximum router solicitation delay */
6263
#define UIP_ND6_MAX_RTR_SOLICITATION_DELAY 1
64+
/** \brief Router solicitation interval */
6365
#define UIP_ND6_RTR_SOLICITATION_INTERVAL 4
64-
#define UIP_ND6_MAX_RTR_SOLICITATIONS 3
66+
/** \brief Maximum router solicitations */
67+
#define UIP_ND6_MAX_RTR_SOLICITATIONS 3
6568
/** @} */
6669

6770
/** \name RFC 4861 Router constants */

core/net/ipv6/uip6.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -654,7 +654,7 @@ static uint8_t uip_reassflags;
654654
*/
655655

656656

657-
struct etimer uip_reass_timer; /* timer for reassembly */
657+
struct etimer uip_reass_timer; /**< Timer for reassembly */
658658
uint8_t uip_reass_on; /* equal to 1 if we are currently reassembling a packet */
659659

660660
static uint32_t uip_id; /* For every packet that is to be fragmented, the source

cpu/arm/aducrf101/Common/ADuCRF101.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
*/
3434

3535
/****************************************************************************************************//**
36-
* @file ADUCRF101.h
36+
* @file ADuCRF101.h
3737
*
3838
* @brief CMSIS Cortex-M3 Core Peripheral Access Layer Header File for
3939
* default ADUCRF101 Device Series

cpu/arm/aducrf101/Common/radioeng.c

-1
Original file line numberDiff line numberDiff line change
@@ -1292,7 +1292,6 @@ static RIE_Responses RadioWaitOnState(RadioState FinalState)
12921292
/**
12931293
@fn RIE_Responses RadioWaitOnCmdLdr(void)
12941294
@brief Wait for Final State to be reached
1295-
@param FinalState State to wait on
12961295
@return RIE_Responses Error code
12971296
**/
12981297
static RIE_Responses RadioWaitOnCmdLdr(void)

cpu/arm/aducrf101/Common/system_ADuCRF101.c

+1-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
* IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3333
*/
3434
/**
35-
@file system_ADUCRF101.c
35+
@file system_ADuCRF101.c
3636
@brief CMSIS Cortex-M3 Device Peripheral Access Layer Implementation File
3737
for the ADuCRF101
3838
@version v1.0
@@ -106,7 +106,6 @@ void SystemCoreClockUpdate (void) /* Get Core Clock Frequency */
106106
/**
107107
* Initialize the system
108108
*
109-
* @param none
110109
* @return none
111110
*
112111
* @brief Setup the microcontroller system.

cpu/arm/aducrf101/Common/system_ADuCRF101.h

+1-3
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
* IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3333
*/
3434
/**
35-
@file system_ADUCRF101.h
35+
@file system_ADuCRF101.h
3636
@brief: CMSIS Cortex-M3 Device Peripheral Access Layer Header File
3737
for the ADuCRF101
3838
@version v0.2
@@ -51,7 +51,6 @@
5151
/**
5252
* @brief Initialize the system
5353
*
54-
* @param none
5554
* @return none
5655
*
5756
* Setup the microcontroller system.
@@ -62,7 +61,6 @@ extern void SystemInit (void);
6261
/**
6362
* @brief Update internal SystemCoreClock variable
6463
*
65-
* @param none
6664
* @return none
6765
*
6866
* Updates the internal SystemCoreClock with current core

cpu/arm/at91sam7s/loader/elfloader-arch-otf.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,8 @@
7171

7272
/**
7373
* \brief Perform a relocation.
74-
* \param output The output object for the segment.
74+
* \param input_fd The file descriptor for the ELF file.
75+
* \param output The output object for the segment.
7576
* \param sectionoffset The file offset at which the relocation can be found.
7677
* \param sectionaddr The section start address (absolute runtime).
7778
* \param rela A pointer to an ELF32 rela structure (struct elf32_rela).

cpu/arm/at91sam7s/loader/elfloader-otf.h

+25-25
Original file line numberDiff line numberDiff line change
@@ -169,11 +169,11 @@ struct elfloader_output {
169169
};
170170

171171
/**
172-
* \brief Allocate a new segment
173-
* \param input The output object
174-
* \param type Type of segment
175-
* \param size Size of segment in bytes
176-
* \return A pointer to the start of the segment.
172+
* \brief Allocate a new segment
173+
* \param output The output object
174+
* \param type Type of segment
175+
* \param size Size of segment in bytes
176+
* \return A pointer to the start of the segment.
177177
*
178178
* The returned address doesn't need to correspond to any real memory,
179179
* since it's only used for calculating the relocations.
@@ -182,39 +182,39 @@ void *elfloader_allocate_segment(struct elfloader_output *output,
182182
unsigned int type, int size);
183183

184184
/**
185-
* \brief Start writing to a new segment
186-
* \param input The output object
187-
* \param type Type of segment
188-
* \param addr Address of segment from elfloader_allocate_segment
189-
* \param size Size of segment in bytes
190-
* \return Returns ELFLOADER_OK if successful, otherwise an error code
185+
* \brief Start writing to a new segment
186+
* \param output The output object
187+
* \param type Type of segment
188+
* \param addr Address of segment from elfloader_allocate_segment
189+
* \param size Size of segment in bytes
190+
* \return Returns ELFLOADER_OK if successful, otherwise an error code
191191
*
192192
*/
193193
int elfloader_start_segment(struct elfloader_output *output,
194194
unsigned int type, void *addr, int size);
195195

196196
/**
197-
* \brief Mark end of segment
198-
* \param input The output object
199-
* \return Zero if successful
197+
* \brief Mark end of segment
198+
* \param output The output object
199+
* \return Zero if successful
200200
*/
201201
int elfloader_end_segment(struct elfloader_output *output);
202202

203203
/**
204-
* \brief Write data to a segment
205-
* \param input The output object
206-
* \param buf Data to be written
207-
* \param len Length of data
208-
* \return The number of bytes actually written, or negative if failed.
204+
* \brief Write data to a segment
205+
* \param output The output object
206+
* \param buf Data to be written
207+
* \param len Length of data
208+
* \return The number of bytes actually written, or negative if failed.
209209
*/
210210
int elfloader_write_segment(struct elfloader_output *output, const char *buf,
211211
unsigned int len);
212212

213213
/**
214-
* \brief Get the current offset in the file where the next data will
215-
* be written.
216-
* \param input The output object
217-
* \return The current offset.
214+
* \brief Get the current offset in the file where the next data will
215+
* be written.
216+
* \param output The output object
217+
* \return The current offset.
218218
*/
219219
unsigned int elfloader_segment_offset(struct elfloader_output *output);
220220

@@ -255,8 +255,8 @@ void elfloader_init(void);
255255

256256
/**
257257
* \brief Load and relocate an ELF file.
258-
* \param input Input object defining how to read from the ELF file
259-
* \param output Output object defining how to create and write to seegments.
258+
* \param input_fd Input object defining how to read from the ELF file
259+
* \param output Output object defining how to create and write to seegments.
260260
* \return ELFLOADER_OK if loading and relocation worked.
261261
* Otherwise an error value.
262262
*

0 commit comments

Comments
 (0)