Skip to content

Commit

Permalink
Doxygen hacks and fixups.
Browse files Browse the repository at this point in the history
- Shut Doxygen up in various places
- Fix some genuine docs bugs
- Ignore sources we're not responsible for

Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
  • Loading branch information
Marti Bolivar committed Jun 28, 2012
1 parent 11c79ef commit 50ee209
Show file tree
Hide file tree
Showing 10 changed files with 24 additions and 25 deletions.
2 changes: 1 addition & 1 deletion libmaple/include/libmaple/dma.h
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ extern void dma_set_mem_addr(dma_dev *dev, dma_tube tube, __io void *address);
*
* @param dev DMA Device
* @param tube Tube whose peripheral data register base address to set.
* @param addr Peripheral memory base address to use.
* @param address Peripheral memory base address to use.
*/
extern void dma_set_per_addr(dma_dev *dev, dma_tube tube, __io void *address);

Expand Down
8 changes: 3 additions & 5 deletions libmaple/include/libmaple/dma_common.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,9 @@
* @author Marti Bolivar <mbolivar@leaflabs.com>
* @brief Common DMA sub-header for <series/dma.h> and <libmaple/dma.h>.
*
* WARNING: CONTENTS UNSTABLE
*
* The existence of this file is an implementation detail. Its
* contents are not stable, so never include it directly. If you need
* something from here, #include <libmaple/dma.h> instead.
* CONTENTS UNSTABLE. The existence of this file is an implementation
* detail. Never include it directly. If you need something from
* here, include <libmaple/dma.h> instead.
*/

/*
Expand Down
8 changes: 3 additions & 5 deletions libmaple/include/libmaple/i2c_common.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,9 @@
* @author Marti Bolivar <mbolivar@leaflabs.com>
* @brief This file is an implementation detail
*
* WARNING: CONTENTS UNSTABLE
*
* The existence of this file is an implementation detail. Its
* contents are not stable, so never include it directly. If you need
* something from here, #include <libmaple/i2c.h> instead.
* CONTENTS UNSTABLE. The existence of this file is an implementation
* detail. Never include it directly. If you need something from
* here, include <libmaple/i2c.h> instead.
*/

#ifndef _LIBMAPLE_I2C_COMMON_H_
Expand Down
7 changes: 4 additions & 3 deletions libmaple/include/libmaple/spi.h
Original file line number Diff line number Diff line change
Expand Up @@ -215,11 +215,12 @@ void spi_init(spi_dev *dev);
struct gpio_dev;
/**
* @brief Configure GPIO bit modes for use as a SPI port's pins.
* @param as_master If true, configure bits for use as a bus master.
* Otherwise, configure bits for use as slave.
*
* @param dev SPI device
* @param as_master If true, configure as bus master; otherwise, as slave.
* @param nss_dev NSS pin's GPIO device
* @param comm_dev SCK, MISO, MOSI pins' GPIO device
* @param nss_bit NSS pin's GPIO bit on nss_dev
* @param comm_dev SCK, MISO, MOSI pins' GPIO device
* @param sck_bit SCK pin's GPIO bit on comm_dev
* @param miso_bit MISO pin's GPIO bit on comm_dev
* @param mosi_bit MOSI pin's GPIO bit on comm_dev
Expand Down
2 changes: 1 addition & 1 deletion libmaple/stm32f1/include/series/i2c.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
*****************************************************************************/

/**
* @file libmaple/include/stm32f1/include/series/i2c.h
* @file libmaple/stm32f1/include/series/i2c.h
* @brief STM32F1 I2C
*/

Expand Down
2 changes: 1 addition & 1 deletion libmaple/stm32f2/include/series/gpio.h
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ void gpio_set_modef(struct gpio_dev *dev,
* default speed.
*
* @param dev GPIO device.
* @param pin Pin on the device whose mode to set, 0--15.
* @param bit Bit on the device whose mode to set, 0--15.
* @param mode Mode to set the pin to.
*/
static inline void gpio_set_mode(struct gpio_dev *dev,
Expand Down
2 changes: 1 addition & 1 deletion libmaple/usb/stm32f1/usb.c
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
*****************************************************************************/

/**
* @file libmaple/usb/usb.c
* @file libmaple/usb/stm32f1/usb.c
* @brief USB support.
*
* This is a mess. What we need almost amounts to a ground-up rewrite.
Expand Down
2 changes: 1 addition & 1 deletion libmaple/usb/stm32f1/usb_cdcacm.c
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
*****************************************************************************/

/**
* @file libmaple/usb/usb_cdcacm.c
* @file libmaple/usb/stm32f1/usb_cdcacm.c
* @brief USB CDC ACM (a.k.a. virtual serial terminal, VCOM).
*
* FIXME: this works on the STM32F1 USB peripherals, and probably no
Expand Down
14 changes: 8 additions & 6 deletions support/doxygen/Doxyfile
Original file line number Diff line number Diff line change
Expand Up @@ -564,7 +564,7 @@ WARN_IF_DOC_ERROR = YES
# wrong or incomplete parameter documentation, but not about the absence of
# documentation.

WARN_NO_PARAMDOC = YES
WARN_NO_PARAMDOC = NO

# The WARN_FORMAT tag determines the format of the warning messages that
# doxygen can produce. The string should contain the $file, $line, and $text
Expand Down Expand Up @@ -621,9 +621,8 @@ RECURSIVE = YES
# excluded from the INPUT source files. This way you can easily exclude a
# subdirectory from a directory tree whose root is specified with the INPUT tag.

# FIXME The USB thing needs to get redone (ST code stripped out,
# etc.). Until then, just ignore it.
EXCLUDE = ../libmaple/usb/
# We include the FreeRTOS sources. That's probably a mistake. Oh well.
EXCLUDE = ./libraries/FreeRTOS/

# The EXCLUDE_SYMLINKS tag can be used select whether or not files or
# directories that are symbolic links (a Unix filesystem feature) are excluded
Expand Down Expand Up @@ -1351,13 +1350,13 @@ EXPAND_ONLY_PREDEF = YES
# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files
# in the INCLUDE_PATH (see below) will be search if a #include is found.

SEARCH_INCLUDES = YES
SEARCH_INCLUDES = NO

# The INCLUDE_PATH tag can be used to specify one or more directories that
# contain include files that are not input files but should be processed by
# the preprocessor.

INCLUDE_PATH =
INCLUDE_PATH =

# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
# patterns (like *.h and *.hpp) to filter out the header-files in the
Expand All @@ -1383,6 +1382,9 @@ PREDEFINED = __attribute__()= \
STM32_MEDIUM_DENSITY \
STM32_HIGH_DENSITY \
STM32_XL_DENSITY \
PCLK1=0 STM32_PCLK1=0 \
PCLK2=0 STM32_PCLK2=0 \
STM32_HAVE_TIMER(x)=1 \
__DOXYGEN__

# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
Expand Down
2 changes: 1 addition & 1 deletion wirish/boards/maple_native/include/board/board.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
*****************************************************************************/

/**
* @file wirish/boards/maple_native/include/board/board.h.
* @file wirish/boards/maple_native/include/board/board.h
* @author Marti Bolivar <mbolivar@leaflabs.com>
* @brief Maple Native board header file.
*
Expand Down

0 comments on commit 50ee209

Please sign in to comment.