diff --git a/cpu/cortexm_common/include/cpu.h b/cpu/cortexm_common/include/cpu.h
index fcb80da5f432294a72f55aa944787241b1dfa097..0b6f294b11e0e2fd8a754bf9b4771cfc42065ef9 100644
--- a/cpu/cortexm_common/include/cpu.h
+++ b/cpu/cortexm_common/include/cpu.h
@@ -23,16 +23,14 @@
* @author Stefan Pfeiffer <stefan.pfeiffer@fu-berlin.de>
* @author Hauke Petersen <hauke.petersen@fu-berlin.de>
* @author Joakim Gebart <joakim.gebart@eistec.se>
+ *
+ * @todo remove include irq.h once core was adjusted
*/
#ifndef CPU_H_
#define CPU_H_
#include "cpu_conf.h"
-
-/*
- * TODO: remove once core was adjusted
- */
#include "irq.h"
#ifdef __cplusplus
@@ -49,8 +47,8 @@ extern "C" {
* If needed, you can overwrite these values the the `cpu_conf.h` file of the
* specific CPU implementation.
*
- * TODO: Adjust values for Cortex-M4F with FPU?
- * TODO: Configure second set if no newlib nano.specs are available?
+ * @todo Adjust values for Cortex-M4F with FPU?
+ * @todo Configure second set if no newlib nano.specs are available?
* @{
*/
#ifndef THREAD_EXTRA_STACKSIZE_PRINTF
@@ -67,7 +65,7 @@ extern "C" {
/**
* @brief UART0 buffer size definition for compatibility reasons
*
- * TODO: remove once the remodeling of the uart0 driver is done
+ * @todo remove once the remodeling of the uart0 driver is done
* @{
*/
#ifndef UART0_BUFSIZE
diff --git a/drivers/include/ng_at86rf2xx.h b/drivers/include/ng_at86rf2xx.h
index ebbdcd7a14735b87c5441f6c400d97f6654f1a46..66e6230f206a11d7567686e693a030869a78beb8 100644
--- a/drivers/include/ng_at86rf2xx.h
+++ b/drivers/include/ng_at86rf2xx.h
@@ -70,7 +70,7 @@ extern "C" {
/**
* @brief Default PAN ID
*
- * TODO: Read some global network stack specific configuration value
+ * @todo Read some global network stack specific configuration value
*/
#define NG_AT86RF2XX_DEFAULT_PANID (0x0023)
diff --git a/sys/include/cbor.h b/sys/include/cbor.h
index 4967f08c82961921cd62865f565fc91bd599787b..e3c35366e88acfbbf961cd940e4b896dd81d5f2b 100644
--- a/sys/include/cbor.h
+++ b/sys/include/cbor.h
@@ -94,7 +94,7 @@
* - 24-31: (Reserved) - No support
* - 32-255: (Unassigned) - No support
*
- * TODO: API for Indefinite-Length Byte Strings and Text Strings
+ * @todo API for Indefinite-Length Byte Strings and Text Strings
* (see https://tools.ietf.org/html/rfc7049#section-2.2.2)
*/
diff --git a/sys/include/net/ng_fib.h b/sys/include/net/ng_fib.h
index 3756c948df21f492872e9cfd5ea415587fd0714f..81f00461aa833af7fa4ccd381c959280ea3add54 100644
--- a/sys/include/net/ng_fib.h
+++ b/sys/include/net/ng_fib.h
@@ -40,7 +40,7 @@ typedef struct rp_address_msg_t {
/**
* @brief the size in bytes of a full address
- * TODO: replace with UNIVERSAL_ADDRESS_SIZE (#3022)
+ * @todo replace with UNIVERSAL_ADDRESS_SIZE (#3022)
*/
#define FIB_DESTINATION_SIZE_SUBSTITUTE (16)
diff --git a/sys/include/net/ng_icmpv6.h b/sys/include/net/ng_icmpv6.h
index de076d8de50e9138f90d0d860c470fa37df5af07..8bb2828d59b95b02d58c01aee28b43dbec4e737d 100644
--- a/sys/include/net/ng_icmpv6.h
+++ b/sys/include/net/ng_icmpv6.h
@@ -20,6 +20,8 @@
* @brief Definitions for ICMPv6
*
* @author Martine Lenders <mlenders@inf.fu-berlin.de>
+ *
+ * @todo build error messages
*/
#ifndef NG_ICMPV6_H_
@@ -77,8 +79,6 @@ void ng_icmpv6_demux(kernel_pid_t iface, ng_pktsnip_t *pkt);
*/
ng_pktsnip_t *ng_icmpv6_build(ng_pktsnip_t *next, uint8_t type, uint8_t code, size_t size);
-/* TODO: build error messages */
-
/**
* @brief Calculates the checksum for an ICMPv6 packet.
*
diff --git a/sys/include/net/ng_icmpv6/error.h b/sys/include/net/ng_icmpv6/error.h
index dd4f0a2712170e01d022351723a4d32778ecd717..634ff8001542f90edf4bff474d2e176a05b647a5 100644
--- a/sys/include/net/ng_icmpv6/error.h
+++ b/sys/include/net/ng_icmpv6/error.h
@@ -16,6 +16,8 @@
* @brief ICMPv6 error message definitions
*
* @author Martine Lenders <mlenders@inf.fu-berlin.de>
+ *
+ * @todo implement build and handle functions
*/
#ifndef NG_ICMPV6_ERROR_H_
#define NG_ICMPV6_ERROR_H_
@@ -146,8 +148,6 @@ typedef struct __attribute__((packed)) {
network_uint32_t ptr; /**< pointer */
} ng_icmpv6_error_param_prob_t;
-/* TODO: implement build and handle functions */
-
#ifdef __cplusplus
}
#endif
diff --git a/sys/include/net/ng_zep.h b/sys/include/net/ng_zep.h
index e2ddc866169b8588ee647f2b95fc24b235d8c0e5..31a54eb0394dbc7c80f9b0eed8f0d81d8f266915 100644
--- a/sys/include/net/ng_zep.h
+++ b/sys/include/net/ng_zep.h
@@ -92,7 +92,7 @@ extern "C" {
/**
* @brief Default PAN ID
*
- * TODO: Read some global network stack specific configuration value
+ * @todo Read some global network stack specific configuration value
*/
#define NG_ZEP_DEFAULT_PANID (0x0023)
diff --git a/sys/include/timex.h b/sys/include/timex.h
index 2182f72ec68b6fbd7fd92c3d41e9ac4c1c043ae2..317fdf85b49a4fc8b4055451a371fc78a050009b 100644
--- a/sys/include/timex.h
+++ b/sys/include/timex.h
@@ -173,6 +173,8 @@ static inline timex_t timex_from_uint64(const uint64_t timestamp)
* @note The buffer must have a size of TIMEX_MAX_STR_LEN characters
*
* @return A pointer to the string representation of the timestamp
+ *
+ * @todo replace call to snprintf by something more efficient
*/
static inline const char *timex_to_str(timex_t t, char *timestamp)
{
@@ -180,7 +182,6 @@ static inline const char *timex_to_str(timex_t t, char *timestamp)
/* 2^32 seconds have maximum 10 digits, microseconds are always < 1000000
* in a normalized timestamp, plus two chars for the point and terminator
* => 10 + 6 + 2 = 20 */
- /* TODO: replace call to snprintf by something more efficient */
snprintf(timestamp, TIMEX_MAX_STR_LEN, "%" PRIu32 ".%06" PRIu32 " s",
t.seconds, t.microseconds);
return timestamp;