Skip to content

Commit

Permalink
drivers/can: fix doxygen documentation + typo
Browse files Browse the repository at this point in the history
  • Loading branch information
aabadie committed Jul 2, 2017
1 parent d61be01 commit 127592e
Show file tree
Hide file tree
Showing 22 changed files with 47 additions and 35 deletions.
2 changes: 1 addition & 1 deletion cpu/native/can/candev_linux.c
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*/

/**
* @ingroup native_cpu
* @ingroup candev_linux
* @{
*
* @file
Expand Down
6 changes: 3 additions & 3 deletions cpu/native/include/candev_linux.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
*/

/**
* @ingroup native_cpu
* @ingroup drivers_can
* @defgroup candev_linux SocketCAN driver
* @ingroup drivers_can
* @brief Implementation of simulated CAN controller driver using SocketCAN on Linux
* @{
*
* @file
Expand All @@ -18,7 +18,6 @@
* @author Hermann Lelong <[email protected]>
* @author Aurelien Gonce <[email protected]>
* @author Vincent Dupont <[email protected]>
* @}
*/

#ifndef CANDEV_LINUX_H
Expand Down Expand Up @@ -102,3 +101,4 @@ extern candev_linux_conf_t candev_linux_conf[CAN_DLL_NUMOF];
#endif

#endif /* CANDEV_LINUX_H */
/** @} */
1 change: 0 additions & 1 deletion cpu/native/include/candev_linux_params.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
* @brief Default linux can config
*
* @author Vincent Dupont <[email protected]>
* @}
*/

#ifndef CANDEV_LINUX_PARAMS_H
Expand Down
5 changes: 2 additions & 3 deletions drivers/can_trx/can_trx.c
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,15 @@
*/

/**
* @defgroup drivers_can transceiver
* @ingroup drivers
* @ingroup drivers_trx_can
* @brief generic transceiver interface
*
* @{
*
* @file
* @brief generic transceiver interface
*
* @author Vincent Dupont <[email protected]>
* @}
*/

#include <errno.h>
Expand Down
7 changes: 7 additions & 0 deletions drivers/doc.txt
Original file line number Diff line number Diff line change
Expand Up @@ -43,3 +43,10 @@
* @ingroup drivers
* @brief Drivers for storage devices
*/

/**
* @defgroup drivers_can CAN Drivers
* @ingroup drivers
* @ingroup can
* @brief Drivers for CAN devices
*/
10 changes: 4 additions & 6 deletions drivers/include/can/can_trx.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,13 @@
*/

/**
* @defgroup trx_can CAN transceiver
* @ingroup can
* @ingroup drivers
* @brief generic transceiver interface
*
* @defgroup drivers_trx_can CAN transceiver interface
* @ingroup drivers_can
* @brief CAN generic transceiver interface
* @{
*
* @file
* @brief generic transceiver interface
* @brief CAN generic transceiver interface
*
* @author Aurelien Gonce <[email protected]>
* @author Vincent Dupont <[email protected]>
Expand Down
14 changes: 7 additions & 7 deletions drivers/include/can/candev.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@
*/

/**
* @ingroup can
* @ingroup drivers
* @defgroup drivers_can CAN drivers
* @defgroup drivers_candev CAN device driver interface
* @ingroup drivers_can
* @brief Definitions for low-level CAN driver interface
* @{
*
* This is the CAN controller driver interface
* This is the CAN controller generic driver interface
*
* @file
* @brief Definitions low-level CAN driver interface
* @brief Definitions for low-level CAN driver interface
*
* @author Vincent Dupont <[email protected]>
* @author Toon Stegen <[email protected]>
Expand All @@ -37,12 +37,12 @@ extern "C" {


/**
* @brief Possible event types that are send from the device driver to the
* @brief Possible event types that are sent from the device driver to the
* upper layer
*/
typedef enum {
CANDEV_EVENT_NOEVENT, /**< no event, used internally */
CANDEV_EVENT_ISR, /**< driver needs it's ISR handled */
CANDEV_EVENT_ISR, /**< driver needs its ISR handled */
CANDEV_EVENT_WAKE_UP, /**< driver has been woken up by bus */
CANDEV_EVENT_TX_CONFIRMATION, /**< a packet has been sent */
CANDEV_EVENT_TIMEOUT_TX_CONF, /**< tx conf timeout received */
Expand Down
3 changes: 3 additions & 0 deletions sys/can/conn/isotp.c
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,13 @@
*/

/**
* @ingroup conn_can
* @{
* @file
* @brief Implementation of isotp CAN connection
*
* @author Vincent Dupont <[email protected]>
* @}
*/

#ifdef MODULE_CAN_ISOTP
Expand Down
3 changes: 3 additions & 0 deletions sys/can/conn/raw.c
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,13 @@
*/

/**
* @ingroup conn_can
* @{
* @file
* @brief Implementation of raw CAN connection
*
* @author Vincent Dupont <[email protected]>
* @}
*/

#include <errno.h>
Expand Down
3 changes: 3 additions & 0 deletions sys/can/device.c
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,15 @@
*/

/**
* @ingroup can_dll
* @{
* @file
* @brief CAN device interface
*
* @author Toon Stegen <[email protected]>
* @author Vincent Dupont <[email protected]>
* @author Aurelien Gonce <[email protected]>
* @}
*/

#include <errno.h>
Expand Down
3 changes: 3 additions & 0 deletions sys/can/isotp/isotp.c
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,13 @@
*/

/**
* @ingroup can_isotp
* @{
* @file
* @brief ISO TP high level interface
*
* @author Vincent Dupont <[email protected]>
* @}
*/

#include <errno.h>
Expand Down
3 changes: 3 additions & 0 deletions sys/can/pkt.c
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,14 @@
*/

/**
* @ingroup can_dll
* @{
* @file
* @brief CAN memory allocation module
*
* @author Vincent Dupont <[email protected]>
* @author Toon Stegen <[email protected]>
* @}
*/

#include <string.h>
Expand Down
4 changes: 3 additions & 1 deletion sys/can/router.c
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,14 @@
*/

/**
*
* @ingroup can_dll
* @{
* @file
* @brief Functions for routing RX can frames
*
* @author Toon Stegen <[email protected]>
* @author Vincent Dupont <[email protected]>
* @}
*/

#include <stdint.h>
Expand Down
4 changes: 1 addition & 3 deletions sys/include/can/can.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,14 @@
*/

/**
* @ingroup can
* @defgroup can_dll Data Link Layer
* @ingroup can
* @brief CAN Data Link Layer
*
* The Data Link Layer is composed of the device, router, pkt and dll files.
* It can be used to send and receive raw CAN frames through multiple CAN controllers.
*
* @{
*
*
* @file
* @brief Definitions high-level CAN interface
*
Expand Down
2 changes: 1 addition & 1 deletion sys/include/can/common.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
*/

/**
* @ingroup can
* @defgroup can_common Common
* @ingroup can
* @brief CAN stack common definitions
*
* This module defines the common part of the CAN stack, including structures
Expand Down
2 changes: 1 addition & 1 deletion sys/include/can/conn/raw.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
*/

/**
* @ingroup can
* @defgroup conn_can Connection
* @ingroup can
* @brief conn interface for CAN stack
*
* This is the user interface to send and receive raw CAN frames or ISO-TP datagrams
Expand Down
1 change: 0 additions & 1 deletion sys/include/can/dll.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
* @ingroup can_dll
* @{
*
*
* @file
* @brief Definitions of low-level CAN DLL interface
*
Expand Down
2 changes: 1 addition & 1 deletion sys/include/can/doc.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* @defgroup can CAN
* @defgroup can CAN (Controller Area Network)
* @brief RIOT CAN stack
*
* This module is a full CAN stack integrated to RIOT.
Expand Down
3 changes: 1 addition & 2 deletions sys/include/can/isotp.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,11 @@
*/

/**
* @defgroup can_isotp ISOTP
* @ingroup can
* @defgroup isotp ISOTP
* @brief ISO transport protocol over CAN (ISO15765)
* @{
*
*
* @file
* @brief ISO TP high level interface
*
Expand Down
1 change: 0 additions & 1 deletion sys/include/can/pkt.h
Original file line number Diff line number Diff line change
Expand Up @@ -148,5 +148,4 @@ void can_pkt_buf_free(void *data, size_t size);
#endif

#endif /* CAN_PKT_H */

/** @} */
1 change: 0 additions & 1 deletion sys/include/can/raw.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
* @ingroup can_dll
* @{
*
*
* @file
* @brief Definitions high-level RAW CAN interface
*
Expand Down
2 changes: 0 additions & 2 deletions sys/include/can/router.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
* @ingroup can_dll
* @{
*
*
* @file
* @brief Functions for routing RX can frames
*
Expand Down Expand Up @@ -112,5 +111,4 @@ int can_router_dispatch_tx_error(can_pkt_t *pkt);
#endif

#endif /* CAN_ROUTER_H */

/** @} */

0 comments on commit 127592e

Please sign in to comment.