aboutsummaryrefslogtreecommitdiffstats
path: root/os
diff options
context:
space:
mode:
authorgdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2010-03-25 15:28:15 +0000
committergdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2010-03-25 15:28:15 +0000
commitdea859c252d1ba02aaead3022b004702679712a6 (patch)
tree797ad6edd1b85672dcf84d1a476e3312d9bfdf5e /os
parentf38a21493342f3bd2f7e3371508e4ff280f76fb3 (diff)
downloadChibiOS-dea859c252d1ba02aaead3022b004702679712a6.tar.gz
ChibiOS-dea859c252d1ba02aaead3022b004702679712a6.tar.bz2
ChibiOS-dea859c252d1ba02aaead3022b004702679712a6.zip
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@1777 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os')
-rw-r--r--os/hal/platforms/AT91SAM7/mac_lld.h4
-rw-r--r--os/hal/platforms/AT91SAM7/serial_lld.h6
-rw-r--r--os/hal/platforms/AVR/serial_lld.h6
-rw-r--r--os/hal/platforms/LPC214x/serial_lld.h6
-rw-r--r--os/hal/platforms/LPC214x/spi_lld.h4
-rw-r--r--os/hal/platforms/LPC214x/vic.c18
-rw-r--r--os/hal/platforms/LPC214x/vic.h5
-rw-r--r--os/hal/platforms/MSP430/serial_lld.h6
-rw-r--r--os/hal/platforms/Posix/serial_lld.h6
-rw-r--r--os/hal/platforms/STM32/adc_lld.h4
-rw-r--r--os/hal/platforms/STM32/can_lld.h4
-rw-r--r--os/hal/platforms/STM32/pwm_lld.h10
-rw-r--r--os/hal/platforms/STM32/serial_lld.h12
-rw-r--r--os/hal/platforms/STM32/spi_lld.h11
-rw-r--r--os/hal/platforms/STM32/stm32_dma.h5
-rw-r--r--os/hal/platforms/Win32/serial_lld.h6
16 files changed, 47 insertions, 66 deletions
diff --git a/os/hal/platforms/AT91SAM7/mac_lld.h b/os/hal/platforms/AT91SAM7/mac_lld.h
index a1580aa7e..c98afc0f8 100644
--- a/os/hal/platforms/AT91SAM7/mac_lld.h
+++ b/os/hal/platforms/AT91SAM7/mac_lld.h
@@ -167,8 +167,9 @@ typedef struct {
/* External declarations. */
/*===========================================================================*/
-/** @cond never*/
+#if !defined(__DOXYGEN__)
extern MACDriver ETH1;
+#endif
#ifdef __cplusplus
extern "C" {
@@ -191,7 +192,6 @@ extern "C" {
#ifdef __cplusplus
}
#endif
-/** @endcond*/
#endif /* CH_HAL_USE_MAC */
diff --git a/os/hal/platforms/AT91SAM7/serial_lld.h b/os/hal/platforms/AT91SAM7/serial_lld.h
index cc03b144f..e3bb23259 100644
--- a/os/hal/platforms/AT91SAM7/serial_lld.h
+++ b/os/hal/platforms/AT91SAM7/serial_lld.h
@@ -131,11 +131,10 @@ typedef struct {
/* External declarations. */
/*===========================================================================*/
-/** @cond never*/
-#if USE_SAM7_USART0
+#if USE_SAM7_USART0 && !defined(__DOXYGEN__)
extern SerialDriver SD1;
#endif
-#if USE_SAM7_USART1
+#if USE_SAM7_USART1 && !defined(__DOXYGEN__)
extern SerialDriver SD2;
#endif
@@ -148,7 +147,6 @@ extern "C" {
#ifdef __cplusplus
}
#endif
-/** @endcond*/
#endif /* CH_HAL_USE_SERIAL */
diff --git a/os/hal/platforms/AVR/serial_lld.h b/os/hal/platforms/AVR/serial_lld.h
index cfdb40aa9..b89bd3ef3 100644
--- a/os/hal/platforms/AVR/serial_lld.h
+++ b/os/hal/platforms/AVR/serial_lld.h
@@ -121,11 +121,10 @@ typedef struct {
/* External declarations. */
/*===========================================================================*/
-/** @cond never*/
-#if USE_AVR_USART0
+#if USE_AVR_USART0 && !defined(__DOXYGEN__)
extern SerialDriver SD1;
#endif
-#if USE_AVR_USART1
+#if USE_AVR_USART1 && !defined(__DOXYGEN__)
extern SerialDriver SD2;
#endif
@@ -138,7 +137,6 @@ extern "C" {
#ifdef __cplusplus
}
#endif
-/** @endcond*/
#endif /* CH_HAL_USE_SERIAL */
diff --git a/os/hal/platforms/LPC214x/serial_lld.h b/os/hal/platforms/LPC214x/serial_lld.h
index ad93fc953..34da8c8d4 100644
--- a/os/hal/platforms/LPC214x/serial_lld.h
+++ b/os/hal/platforms/LPC214x/serial_lld.h
@@ -152,11 +152,10 @@ typedef struct {
/* External declarations. */
/*===========================================================================*/
-/** @cond never*/
-#if USE_LPC214x_UART0
+#if USE_LPC214x_UART0 && !defined(__DOXYGEN__)
extern SerialDriver SD1;
#endif
-#if USE_LPC214x_UART1
+#if USE_LPC214x_UART1 && !defined(__DOXYGEN__)
extern SerialDriver SD2;
#endif
@@ -169,7 +168,6 @@ extern "C" {
#ifdef __cplusplus
}
#endif
-/** @endcond*/
#endif /* CH_HAL_USE_SERIAL */
diff --git a/os/hal/platforms/LPC214x/spi_lld.h b/os/hal/platforms/LPC214x/spi_lld.h
index 64719ad9b..cf6a06df4 100644
--- a/os/hal/platforms/LPC214x/spi_lld.h
+++ b/os/hal/platforms/LPC214x/spi_lld.h
@@ -113,8 +113,7 @@ typedef struct {
/* External declarations. */
/*===========================================================================*/
-/** @cond never*/
-#if USE_LPC214x_SPI1
+#if USE_LPC214x_SPI1 && !defined(__DOXYGEN__)
extern SPIDriver SPID1;
#endif
@@ -134,7 +133,6 @@ extern "C" {
#ifdef __cplusplus
}
#endif
-/** @endcond*/
#endif /* CH_HAL_USE_SPI */
diff --git a/os/hal/platforms/LPC214x/vic.c b/os/hal/platforms/LPC214x/vic.c
index f9b18f887..c4e11231f 100644
--- a/os/hal/platforms/LPC214x/vic.c
+++ b/os/hal/platforms/LPC214x/vic.c
@@ -18,8 +18,9 @@
*/
/**
- * @file LPC214x/vic.c
- * @brief LPC214x VIC peripheral support code.
+ * @file LPC214x/vic.c
+ * @brief LPC214x VIC peripheral support code.
+ *
* @addtogroup LPC214x_VIC
* @{
*/
@@ -27,8 +28,8 @@
#include "ch.h"
/**
- * @brief VIC Initialization.
- * @note Better reset everything in the VIC, it is a HUGE source of trouble.
+ * @brief VIC Initialization.
+ * @note Better reset everything in the VIC, it is a HUGE source of trouble.
*/
void vic_init(void) {
int i;
@@ -45,11 +46,12 @@ void vic_init(void) {
}
/**
- * @brief Initializes a VIC vector.
+ * @brief Initializes a VIC vector.
* @details Set a vector for an interrupt source and enables it.
- * @param[in] handler the pointer to the IRQ service routine
- * @param[in] vector the vector number
- * @param[in] source the IRQ source to be associated to the vector
+ *
+ * @param[in] handler the pointer to the IRQ service routine
+ * @param[in] vector the vector number
+ * @param[in] source the IRQ source to be associated to the vector
*/
void SetVICVector(void *handler, int vector, int source) {
diff --git a/os/hal/platforms/LPC214x/vic.h b/os/hal/platforms/LPC214x/vic.h
index df4b1b67e..c0fd3ea3e 100644
--- a/os/hal/platforms/LPC214x/vic.h
+++ b/os/hal/platforms/LPC214x/vic.h
@@ -18,8 +18,9 @@
*/
/**
- * @file LPC214x/vic.h
- * @brief LPC214x VIC peripheral support code.
+ * @file LPC214x/vic.h
+ * @brief LPC214x VIC peripheral support header.
+ *
* @addtogroup LPC214x_VIC
* @{
*/
diff --git a/os/hal/platforms/MSP430/serial_lld.h b/os/hal/platforms/MSP430/serial_lld.h
index 62d3358bf..ad7ae7dd4 100644
--- a/os/hal/platforms/MSP430/serial_lld.h
+++ b/os/hal/platforms/MSP430/serial_lld.h
@@ -125,11 +125,10 @@ typedef struct {
/* External declarations. */
/*===========================================================================*/
-/** @cond never*/
-#if USE_MSP430_USART0
+#if USE_MSP430_USART0 && !defined(__DOXYGEN__)
extern SerialDriver SD1;
#endif
-#if USE_MSP430_USART1
+#if USE_MSP430_USART1 && !defined(__DOXYGEN__)
extern SerialDriver SD2;
#endif
@@ -142,7 +141,6 @@ extern "C" {
#ifdef __cplusplus
}
#endif
-/** @endcond*/
#endif /* CH_HAL_USE_SERIAL */
diff --git a/os/hal/platforms/Posix/serial_lld.h b/os/hal/platforms/Posix/serial_lld.h
index f4892a994..ddb084db6 100644
--- a/os/hal/platforms/Posix/serial_lld.h
+++ b/os/hal/platforms/Posix/serial_lld.h
@@ -141,11 +141,10 @@ typedef struct {
/* External declarations. */
/*===========================================================================*/
-/** @cond never*/
-#if USE_SIM_SERIAL1
+#if USE_SIM_SERIAL1 && !defined(__DOXYGEN__)
extern SerialDriver SD1;
#endif
-#if USE_SIM_SERIAL2
+#if USE_SIM_SERIAL2 && !defined(__DOXYGEN__)
extern SerialDriver SD2;
#endif
@@ -159,7 +158,6 @@ extern "C" {
#ifdef __cplusplus
}
#endif
-/** @endcond*/
#endif /* CH_HAL_USE_SERIAL */
diff --git a/os/hal/platforms/STM32/adc_lld.h b/os/hal/platforms/STM32/adc_lld.h
index bbc21244b..134fb9ba4 100644
--- a/os/hal/platforms/STM32/adc_lld.h
+++ b/os/hal/platforms/STM32/adc_lld.h
@@ -258,8 +258,7 @@ typedef struct {
/* External declarations. */
/*===========================================================================*/
-/** @cond never*/
-#if USE_STM32_ADC1
+#if USE_STM32_ADC1 && !defined(__DOXYGEN__)
extern ADCDriver ADCD1;
#endif
@@ -274,7 +273,6 @@ extern "C" {
#ifdef __cplusplus
}
#endif
-/** @endcond*/
#endif /* CH_HAL_USE_ADC */
diff --git a/os/hal/platforms/STM32/can_lld.h b/os/hal/platforms/STM32/can_lld.h
index 7f1770770..0e1d0fee0 100644
--- a/os/hal/platforms/STM32/can_lld.h
+++ b/os/hal/platforms/STM32/can_lld.h
@@ -293,8 +293,7 @@ typedef struct {
/* External declarations. */
/*===========================================================================*/
-/** @cond never*/
-#if USE_STM32_CAN1
+#if USE_STM32_CAN1 && !defined(__DOXYGEN__)
extern CANDriver CAND1;
#endif
@@ -315,7 +314,6 @@ extern "C" {
#ifdef __cplusplus
}
#endif
-/** @endcond*/
#endif /* CH_HAL_USE_CAN */
diff --git a/os/hal/platforms/STM32/pwm_lld.h b/os/hal/platforms/STM32/pwm_lld.h
index 9e7cbd080..a16b248b1 100644
--- a/os/hal/platforms/STM32/pwm_lld.h
+++ b/os/hal/platforms/STM32/pwm_lld.h
@@ -216,20 +216,19 @@ typedef struct {
/* External declarations. */
/*===========================================================================*/
-/** @cond never*/
-#if defined(USE_STM32_PWM1)
+#if defined(USE_STM32_PWM1) && !defined(__DOXYGEN__)
extern PWMDriver PWMD1;
#endif
-#if defined(USE_STM32_PWM2)
+#if defined(USE_STM32_PWM2) && !defined(__DOXYGEN__)
extern PWMDriver PWMD2;
#endif
-#if defined(USE_STM32_PWM3)
+#if defined(USE_STM32_PWM3) && !defined(__DOXYGEN__)
extern PWMDriver PWMD3;
#endif
-#if defined(USE_STM32_PWM4)
+#if defined(USE_STM32_PWM4) && !defined(__DOXYGEN__)
extern PWMDriver PWMD4;
#endif
@@ -246,7 +245,6 @@ extern "C" {
#ifdef __cplusplus
}
#endif
-/** @endcond*/
#endif /* CH_HAL_USE_PWM */
diff --git a/os/hal/platforms/STM32/serial_lld.h b/os/hal/platforms/STM32/serial_lld.h
index 1fee0e879..eb625230b 100644
--- a/os/hal/platforms/STM32/serial_lld.h
+++ b/os/hal/platforms/STM32/serial_lld.h
@@ -214,21 +214,20 @@ typedef struct {
/* External declarations. */
/*===========================================================================*/
-/** @cond never*/
-#if USE_STM32_USART1
+#if USE_STM32_USART1 && !defined(__DOXYGEN__)
extern SerialDriver SD1;
#endif
-#if USE_STM32_USART2
+#if USE_STM32_USART2 && !defined(__DOXYGEN__)
extern SerialDriver SD2;
#endif
-#if USE_STM32_USART3
+#if USE_STM32_USART3 && !defined(__DOXYGEN__)
extern SerialDriver SD3;
#endif
#if defined(STM32F10X_HD) || defined(STM32F10X_CL)
-#if USE_STM32_UART4
+#if USE_STM32_UART4 && !defined(__DOXYGEN__)
extern SerialDriver SD4;
#endif
-#if USE_STM32_UART5
+#if USE_STM32_UART5 && !defined(__DOXYGEN__)
extern SerialDriver SD5;
#endif
#endif
@@ -242,7 +241,6 @@ extern "C" {
#ifdef __cplusplus
}
#endif
-/** @endcond*/
#endif /* CH_HAL_USE_SERIAL */
diff --git a/os/hal/platforms/STM32/spi_lld.h b/os/hal/platforms/STM32/spi_lld.h
index 6d8d2a257..8afe01e93 100644
--- a/os/hal/platforms/STM32/spi_lld.h
+++ b/os/hal/platforms/STM32/spi_lld.h
@@ -18,8 +18,9 @@
*/
/**
- * @file STM32/spi_lld.h
- * @brief STM32 SPI subsystem low level driver header.
+ * @file STM32/spi_lld.h
+ * @brief STM32 SPI subsystem low level driver header.
+ *
* @addtogroup STM32_SPI
* @{
*/
@@ -188,12 +189,11 @@ typedef struct {
/* External declarations. */
/*===========================================================================*/
-/** @cond never*/
-#if USE_STM32_SPI1
+#if USE_STM32_SPI1 && !defined(__DOXYGEN__)
extern SPIDriver SPID1;
#endif
-#if USE_STM32_SPI2
+#if USE_STM32_SPI2 && !defined(__DOXYGEN__)
extern SPIDriver SPID2;
#endif
@@ -213,7 +213,6 @@ extern "C" {
#ifdef __cplusplus
}
#endif
-/** @endcond*/
#endif /* CH_HAL_USE_SPI */
diff --git a/os/hal/platforms/STM32/stm32_dma.h b/os/hal/platforms/STM32/stm32_dma.h
index 1dcb56d24..51c16741b 100644
--- a/os/hal/platforms/STM32/stm32_dma.h
+++ b/os/hal/platforms/STM32/stm32_dma.h
@@ -18,8 +18,9 @@
*/
/**
- * @file stm32_dma.h
- * @brief STM32 DMA helper driver header.
+ * @file stm32_dma.h
+ * @brief STM32 DMA helper driver header.
+ *
* @addtogroup STM32_DMA
* @{
*/
diff --git a/os/hal/platforms/Win32/serial_lld.h b/os/hal/platforms/Win32/serial_lld.h
index fc1e21b36..6ded1c4f2 100644
--- a/os/hal/platforms/Win32/serial_lld.h
+++ b/os/hal/platforms/Win32/serial_lld.h
@@ -132,11 +132,10 @@ typedef struct {
/* External declarations. */
/*===========================================================================*/
-/** @cond never*/
-#if USE_WIN32_SERIAL1
+#if USE_WIN32_SERIAL1 && !defined(__DOXYGEN__)
extern SerialDriver SD1;
#endif
-#if USE_WIN32_SERIAL2
+#if USE_WIN32_SERIAL2 && !defined(__DOXYGEN__)
extern SerialDriver SD2;
#endif
@@ -150,7 +149,6 @@ extern "C" {
#ifdef __cplusplus
}
#endif
-/** @endcond*/
#endif /* CH_HAL_USE_SERIAL */