mirror of
https://github.com/RIOT-OS/RIOT.git
synced 2024-12-29 04:50:03 +01:00
Merge pull request #3428 from gebart/pr/doxygen-groups
doxygen: Clean up groups for msp430 and arm7
This commit is contained in:
commit
58e2224740
@ -24,7 +24,6 @@
|
||||
#include "lpc23xx.h"
|
||||
#include "cpu.h"
|
||||
|
||||
#define PCRTC BIT9
|
||||
#define CL_CPU_DIV 4
|
||||
|
||||
|
||||
|
@ -28,10 +28,9 @@
|
||||
#include "cpu.h"
|
||||
#include "config.h"
|
||||
|
||||
#define PCRTC BIT9
|
||||
#define CL_CPU_DIV 4
|
||||
|
||||
#define WD_INTERVAL 10 ///< number of seconds before WD triggers
|
||||
#define WD_INTERVAL 10 /**< number of seconds before WD triggers */
|
||||
|
||||
/*---------------------------------------------------------------------------*/
|
||||
/**
|
||||
|
@ -24,7 +24,6 @@
|
||||
#include "VIC.h"
|
||||
#include "cpu.h"
|
||||
|
||||
#define PCRTC BIT9
|
||||
#define CL_CPU_DIV 4
|
||||
|
||||
/*---------------------------------------------------------------------------*/
|
||||
|
@ -8,7 +8,7 @@
|
||||
* General Public License v2.1. See the file LICENSE in the top level
|
||||
* directory for more details.
|
||||
*
|
||||
* @ingroup arm7_common
|
||||
* @ingroup cpu_arm7_common
|
||||
* @{
|
||||
* @file
|
||||
* @author Kaspar Schleiser <kaspar@schleiser.de>
|
||||
|
@ -7,7 +7,7 @@
|
||||
*/
|
||||
|
||||
/**
|
||||
* @ingroup arm7_common
|
||||
* @ingroup cpu_arm7_common
|
||||
* @{
|
||||
*/
|
||||
|
||||
|
@ -5,15 +5,15 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#ifndef __ARM_COMMON_H
|
||||
#define __ARM_COMMON_H
|
||||
#ifndef VIC_H_
|
||||
#define VIC_H_
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
/**
|
||||
* @ingroup arm7_common
|
||||
* @ingroup cpu_arm7_common
|
||||
* @{
|
||||
*/
|
||||
|
||||
@ -30,16 +30,16 @@ extern "C" {
|
||||
/**
|
||||
* @name IRQ Priority Mapping
|
||||
*/
|
||||
//@{
|
||||
/** @{ */
|
||||
#define HIGHEST_PRIORITY 0x01
|
||||
#define IRQP_RTIMER 1 // FIQ_PRIORITY // TODO: investigate problems with rtimer and FIQ
|
||||
#define IRQP_RTIMER 1 /* FIQ_PRIORITY // TODO: investigate problems with rtimer and FIQ */
|
||||
#define IRQP_TIMER1 1
|
||||
#define IRQP_WATCHDOG 1
|
||||
#define IRQP_CLOCK 3
|
||||
#define IRQP_GPIO 4
|
||||
#define IRQP_RTC 8
|
||||
#define LOWEST_PRIORITY 0x0F
|
||||
// @}
|
||||
/** @} */
|
||||
|
||||
|
||||
#define WDT_INT 0
|
||||
@ -89,4 +89,4 @@ bool cpu_install_irq(int IntNumber, void *HandlerAddr, int Priority);
|
||||
#endif
|
||||
|
||||
/** @} */
|
||||
#endif /*ARMVIC_H_*/
|
||||
#endif /* VIC_H_*/
|
||||
|
@ -6,11 +6,11 @@
|
||||
* more details.
|
||||
*/
|
||||
|
||||
#ifndef __ARM_COMMON_H
|
||||
#define __ARM_COMMON_H
|
||||
#ifndef ARM7_COMMON_H_
|
||||
#define ARM7_COMMON_H_
|
||||
|
||||
/**
|
||||
* @defgroup arm7_common ARM CPU common
|
||||
* @defgroup cpu_arm7_common ARM7 CPU common
|
||||
* @brief Common implementations and headers for ARM based micro-controllers
|
||||
* @ingroup cpu
|
||||
* @{
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
/**
|
||||
* @file
|
||||
* @brief ARM CPU common declarations
|
||||
* @brief ARM7 CPU common declarations
|
||||
*
|
||||
* @author Freie Universität Berlin, Computer Systems & Telematics
|
||||
*
|
||||
@ -100,4 +100,4 @@ extern "C" {
|
||||
#endif
|
||||
|
||||
/** @} */
|
||||
#endif // __ARM_COMMON_H
|
||||
#endif /* ARM7_COMMON_H_ */
|
||||
|
@ -7,7 +7,7 @@
|
||||
*/
|
||||
|
||||
/**
|
||||
* @ingroup arm7_common
|
||||
* @ingroup cpu_arm7_common
|
||||
* @{
|
||||
*
|
||||
* @file
|
||||
|
@ -9,7 +9,7 @@
|
||||
|
||||
/**
|
||||
* @file
|
||||
* @ingroup arm7_common
|
||||
* @ingroup cpu_arm7_common
|
||||
* @brief LPC2387 NewLib system calls implementation
|
||||
*
|
||||
* @author Michael Baar <michael.baar@fu-berlin.de>
|
||||
|
@ -7,7 +7,7 @@
|
||||
\li <a href="http://www.nxp.com/pip/LPC2387_2.html">Documentation</a>
|
||||
|
||||
<h2>Components</h2>
|
||||
\li \ref arm7_common
|
||||
\li \ref cpu_arm7_common
|
||||
\li \ref lpc2387_rtc
|
||||
|
||||
<h2>Memory layout</h2>
|
||||
|
@ -12,6 +12,7 @@
|
||||
#define __LPC2387_H
|
||||
|
||||
#include "lpc23xx.h"
|
||||
#include "arm7_common.h"
|
||||
#include "bitarithm.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
@ -31,24 +32,6 @@ extern "C" {
|
||||
|
||||
#define _XTAL (72000)
|
||||
|
||||
/**
|
||||
* @name Timer Symbols
|
||||
* @{
|
||||
*/
|
||||
#define MR0I BIT0
|
||||
#define MR0R BIT1
|
||||
#define MR0S BIT2
|
||||
#define MR1I BIT3
|
||||
#define MR1R BIT4
|
||||
#define MR1S BIT5
|
||||
#define MR2I BIT6
|
||||
#define MR2R BIT7
|
||||
#define MR2S BIT8
|
||||
#define MR3I BIT9
|
||||
#define MR3R BIT10
|
||||
#define MR3S BIT11
|
||||
/** @} */
|
||||
|
||||
/**
|
||||
* @name RTC constants
|
||||
* @{
|
||||
@ -90,53 +73,6 @@ extern "C" {
|
||||
#define WDINT BIT3
|
||||
/** @} */
|
||||
|
||||
/**
|
||||
* @name PCONP Constants
|
||||
* @{
|
||||
*/
|
||||
#define PCTIM0 BIT1
|
||||
#define PCTIM1 BIT2
|
||||
#define PCUART0 BIT3
|
||||
#define PCUART1 BIT4
|
||||
#define PCPWM1 BIT6
|
||||
#define PCI2C0 BIT7
|
||||
#define PCSPI BIT8
|
||||
#define PCRTC BIT9
|
||||
#define PCSSP1 BIT10
|
||||
#define PCEMC BIT11
|
||||
#define PCAD BIT12
|
||||
#define PCAN1 BIT13
|
||||
#define PCAN2 BIT14
|
||||
#define PCI2C1 BIT19
|
||||
#define PCSSP0 BIT21
|
||||
#define PCTIM2 BIT22
|
||||
#define PCTIM3 BIT23
|
||||
#define PCUART2 BIT24
|
||||
#define PCUART3 BIT25
|
||||
#define PCI2C2 BIT26
|
||||
#define PCI2S BIT27
|
||||
#define PCSDC BIT28
|
||||
#define PCGPDMA BIT29
|
||||
#define PCENET BIT30
|
||||
#define PCUSB BIT31
|
||||
/** @} */
|
||||
|
||||
/**
|
||||
* @name PCON Constants
|
||||
* @{
|
||||
*/
|
||||
#define PM0 BIT0
|
||||
#define PM1 BIT1
|
||||
#define BODPDM BIT2
|
||||
#define BOGD BIT3
|
||||
#define BORD BIT4
|
||||
#define PM2 BIT7
|
||||
|
||||
#define PM_IDLE (PM0)
|
||||
#define PM_SLEEP (PM2|PM0)
|
||||
#define PM_POWERDOWN (PM1)
|
||||
/** @} */
|
||||
|
||||
/**
|
||||
* @name INTWAKE Constants
|
||||
* @{
|
||||
|
@ -26,8 +26,6 @@
|
||||
/* guard file in case no PWM device is defined */
|
||||
#if PWM_NUMOF
|
||||
|
||||
#define PCPWM1 BIT6
|
||||
|
||||
/**
|
||||
* @note The PWM is always initialized with left-aligned mode.
|
||||
*
|
||||
|
@ -7,7 +7,7 @@
|
||||
*/
|
||||
|
||||
/**
|
||||
* @ingroup msp430
|
||||
* @ingroup cpu_msp430_common
|
||||
* @{
|
||||
*
|
||||
* @file
|
||||
|
@ -7,11 +7,11 @@
|
||||
* directory for more details.
|
||||
*/
|
||||
|
||||
#ifndef _CPU_H
|
||||
#define _CPU_H
|
||||
#ifndef CPU_H_
|
||||
#define CPU_H_
|
||||
|
||||
/**
|
||||
* @defgroup msp430 TI MSP430
|
||||
* @defgroup cpu_msp430_common TI MSP430
|
||||
* @ingroup cpu
|
||||
* @brief Texas Instruments MSP430 specific code
|
||||
|
||||
@ -167,4 +167,4 @@ void msp430_cpu_init(void);
|
||||
#endif
|
||||
|
||||
/** @} */
|
||||
#endif // _CPU_H
|
||||
#endif /* CPU_H_ */
|
||||
|
@ -7,7 +7,7 @@
|
||||
*/
|
||||
|
||||
/**
|
||||
* @ingroup cpu
|
||||
* @ingroup cpu_msp430_common
|
||||
* @{
|
||||
*/
|
||||
|
||||
@ -21,8 +21,8 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#ifndef __HWTIMER_CPU_H
|
||||
#define __HWTIMER_CPU_H
|
||||
#ifndef HWTIMER_CPU_H_
|
||||
#define HWTIMER_CPU_H_
|
||||
|
||||
#include <stdint.h>
|
||||
|
||||
@ -72,4 +72,4 @@ typedef struct {
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif // __HWTIMER_CPU_H
|
||||
#endif /* HWTIMER_CPU_H_ */
|
||||
|
@ -7,7 +7,7 @@
|
||||
*/
|
||||
|
||||
/**
|
||||
* @ingroup msp430
|
||||
* @ingroup cpu_msp430_common
|
||||
* @{
|
||||
*
|
||||
* @file
|
||||
|
Loading…
Reference in New Issue
Block a user