diff options
Diffstat (limited to 'nuttx/arch/arm/src/common/up_arch.h')
| -rw-r--r-- | nuttx/arch/arm/src/common/up_arch.h | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/nuttx/arch/arm/src/common/up_arch.h b/nuttx/arch/arm/src/common/up_arch.h index 6c8a2a6e3..3b001542b 100644 --- a/nuttx/arch/arm/src/common/up_arch.h +++ b/nuttx/arch/arm/src/common/up_arch.h @@ -42,14 +42,14 @@ #include <nuttx/config.h> #ifndef __ASSEMBLY__ -# include <sys/types.h> +# include <stdint.h> #endif #include <arch/board/board.h> #include "chip.h" /**************************************************************************** - * Definitions + * Pre-processor Definitions ****************************************************************************/ /**************************************************************************** @@ -58,25 +58,25 @@ #ifndef __ASSEMBLY__ -# define getreg8(a) (*(volatile ubyte *)(a)) -# define putreg8(v,a) (*(volatile ubyte *)(a) = (v)) -# define getreg32(a) (*(volatile uint32 *)(a)) -# define putreg32(v,a) (*(volatile uint32 *)(a) = (v)) +# define getreg8(a) (*(volatile uint8_t *)(a)) +# define putreg8(v,a) (*(volatile uint8_t *)(a) = (v)) +# define getreg32(a) (*(volatile uint32_t *)(a)) +# define putreg32(v,a) (*(volatile uint32_t *)(a) = (v)) /* Some compiler options will convert short loads and stores into byte loads * and stores. We don't want this to happen for IO reads and writes! */ -/* # define getreg16(a) (*(volatile uint16 *)(a)) */ -static inline uint16 getreg16(unsigned int addr) +/* # define getreg16(a) (*(volatile uint16_t *)(a)) */ +static inline uint16_t getreg16(unsigned int addr) { - uint16 retval; + uint16_t retval; __asm__ __volatile__("\tldrh %0, [%1]\n\t" : "=r"(retval) : "r"(addr)); return retval; } -/* define putreg16(v,a) (*(volatile uint16 *)(a) = (v)) */ -static inline void putreg16(uint16 val, unsigned int addr) +/* define putreg16(v,a) (*(volatile uint16_t *)(a) = (v)) */ +static inline void putreg16(uint16_t val, unsigned int addr) { __asm__ __volatile__("\tstrh %0, [%1]\n\t": : "r"(val), "r"(addr)); } @@ -95,9 +95,9 @@ extern "C" { /* Atomic modification of registers */ -EXTERN void modifyreg8(unsigned int addr, ubyte clearbits, ubyte setbits); -EXTERN void modifyreg16(unsigned int addr, uint16 clearbits, uint16 setbits); -EXTERN void modifyreg32(unsigned int addr, uint32 clearbits, uint32 setbits); +EXTERN void modifyreg8(unsigned int addr, uint8_t clearbits, uint8_t setbits); +EXTERN void modifyreg16(unsigned int addr, uint16_t clearbits, uint16_t setbits); +EXTERN void modifyreg32(unsigned int addr, uint32_t clearbits, uint32_t setbits); #undef EXTERN #if defined(__cplusplus) |