Jelajahi Sumber

Updated Core_A documentation

Daniel Brondani 8 tahun lalu
induk
melakukan
e48eaaca24

+ 1 - 4
CMSIS/Core_A/Include/cmsis_armcc.h

@@ -43,10 +43,7 @@
 #endif                                          
 #endif                                          
 #ifndef   __STATIC_INLINE                       
 #ifndef   __STATIC_INLINE                       
   #define __STATIC_INLINE                        static __inline
   #define __STATIC_INLINE                        static __inline
-#endif                                          
-#ifndef   __STATIC_ASM                          
-  #define __STATIC_ASM                           static __asm
-#endif                                          
+#endif                                                                                   
 #ifndef   __NO_RETURN                           
 #ifndef   __NO_RETURN                           
   #define __NO_RETURN                            __declspec(noreturn)
   #define __NO_RETURN                            __declspec(noreturn)
 #endif                                          
 #endif                                          

+ 1 - 4
CMSIS/Core_A/Include/cmsis_armclang.h

@@ -38,10 +38,7 @@
 #endif                                          
 #endif                                          
 #ifndef   __STATIC_INLINE                       
 #ifndef   __STATIC_INLINE                       
   #define __STATIC_INLINE                        static __inline
   #define __STATIC_INLINE                        static __inline
-#endif                                          
-#ifndef   __STATIC_ASM                          
-  #define __STATIC_ASM                           static __asm
-#endif                                          
+#endif                                                                                    
 #ifndef   __NO_RETURN                           
 #ifndef   __NO_RETURN                           
   #define __NO_RETURN                            __declspec(noreturn)
   #define __NO_RETURN                            __declspec(noreturn)
 #endif                                          
 #endif                                          

+ 12 - 9
CMSIS/DoxyGen/Core_A/src/cmsis_armcc.txt

@@ -76,12 +76,12 @@ Defines a static function that may be inlined by the compiler. If the compiler g
 all calls to this functions, no additional function implementation is generated which may further optimize space.
 all calls to this functions, no additional function implementation is generated which may further optimize space.
 
 
 <b> Code Example:</b>
 <b> Code Example:</b>
-\todo add example
-*/
-
-/**
-\def __STATIC_ASM          
-\todo Daniel: Need input to this
+\code
+__STATIC_INLINE uint32_t GIC_GetPriority(IRQn_Type IRQn)
+{
+  return((uint32_t)GICDistributor->D_IPRIORITYR[((uint32_t)(int32_t)IRQn)]);
+}
+\endcode
 */
 */
 
 
 /**  
 /**  
@@ -113,7 +113,6 @@ __USED uint32_t const CMSIS_RTOS_RTX_Version = osCMSIS_RTX;
 __USED uint32_t const os_clockrate = OS_TICK;
 __USED uint32_t const os_clockrate = OS_TICK;
 __USED uint32_t const os_timernum  = 0;
 __USED uint32_t const os_timernum  = 0;
 \endcode
 \endcode
-\todo Daniel: verify example
 **/
 **/
 
 
 /**             
 /**             
@@ -188,12 +187,16 @@ struct foo {
 \fn __STATIC_INLINE uint32_t __get_CPSR(void)
 \fn __STATIC_INLINE uint32_t __get_CPSR(void)
 \details
 \details
 	This function returns the content of the CPSR Register.
 	This function returns the content of the CPSR Register.
+  
+\fn __STATIC_INLINE void __set_CPSR(uint32_t cpsr)
+\details
+	This function assigns the given value to the CPSR Register.
 
 
-\fn __STATIC_INLINE void __set_SP(uint32_t stack)
+\fn __STATIC_INLINE __ASM void __set_SP(uint32_t stack)
 \details
 \details
   This function assigns the given value to the current stack pointer.
   This function assigns the given value to the current stack pointer.
 
 
-\fn __STATIC_ASM void __set_SP_usr(uint32_t topOfProcStack)
+\fn __STATIC_INLINE __ASM void __set_SP_usr(uint32_t topOfProcStack)
 \details
 \details
   This function assigns the given value to the USR/SYS Stack Pointer (PSP).
   This function assigns the given value to the USR/SYS Stack Pointer (PSP).
 
 

+ 2 - 2
CMSIS/DoxyGen/Core_A/src/core_ca.txt

@@ -412,7 +412,7 @@ Hardware Abstraction Layer.
 \fn __STATIC_INLINE void L1C_InvalidateDCacheAll(void) 
 \fn __STATIC_INLINE void L1C_InvalidateDCacheAll(void) 
 \fn __STATIC_INLINE void L1C_CleanDCacheAll(void) 
 \fn __STATIC_INLINE void L1C_CleanDCacheAll(void) 
 \fn __STATIC_INLINE void L1C_CleanInvalidateDCacheAll(void) 
 \fn __STATIC_INLINE void L1C_CleanInvalidateDCacheAll(void) 
-\fn __STATIC_ASM void __L1C_CleanInvalidateCache(uint32_t op) 
+\fn __STATIC_INLINE __ASM void __L1C_CleanInvalidateCache(uint32_t op) 
 @}
 @}
 */
 */
 
 
@@ -526,7 +526,7 @@ __STATIC_INLINE void PL1_SetControl(uint32_t value);
 \defgroup FPU_functions Floating Point Unit Functions
 \defgroup FPU_functions Floating Point Unit Functions
 \brief FPU functions
 \brief FPU functions
 @{
 @{
-\fn __STATIC_ASM void __FPU_Enable(void) 
+\fn __STATIC_INLINE __ASM void __FPU_Enable(void) 
 @}
 @}
 */
 */