diff options
22 files changed, 49 insertions, 51 deletions
diff --git a/nuttx/arch/hc/include/hc12/irq.h b/nuttx/arch/hc/include/hc12/irq.h index 08d991031..b499b171d 100755 --- a/nuttx/arch/hc/include/hc12/irq.h +++ b/nuttx/arch/hc/include/hc12/irq.h @@ -45,7 +45,6 @@ ************************************************************************************/ #include <nuttx/config.h> -#include <sys/types.h> #include <nuttx/irq.h> /************************************************************************************ diff --git a/nuttx/arch/hc/include/hcs12/irq.h b/nuttx/arch/hc/include/hcs12/irq.h index 6e2e45ee0..b6adf7322 100755 --- a/nuttx/arch/hc/include/hcs12/irq.h +++ b/nuttx/arch/hc/include/hcs12/irq.h @@ -45,7 +45,6 @@ ************************************************************************************/ #include <nuttx/config.h> -#include <sys/types.h> #include <nuttx/irq.h> /************************************************************************************ diff --git a/nuttx/arch/hc/include/mc9s12ne64/irq.h b/nuttx/arch/hc/include/mc9s12ne64/irq.h index dc98f3b8c..8462a8dd3 100755 --- a/nuttx/arch/hc/include/mc9s12ne64/irq.h +++ b/nuttx/arch/hc/include/mc9s12ne64/irq.h @@ -45,7 +45,6 @@ ************************************************************************************/ #include <nuttx/config.h> -#include <sys/types.h> #include <nuttx/irq.h> /************************************************************************************ diff --git a/nuttx/arch/hc/src/common/up_arch.h b/nuttx/arch/hc/src/common/up_arch.h index 8234148a2..01fa74b28 100755 --- a/nuttx/arch/hc/src/common/up_arch.h +++ b/nuttx/arch/hc/src/common/up_arch.h @@ -42,7 +42,7 @@ #include <nuttx/config.h> #ifndef __ASSEMBLY__ -# include <sys/types.h> +# include <stdint.h> #endif #include <arch/board/board.h> @@ -58,12 +58,12 @@ #ifndef __ASSEMBLY__ -# define getreg8(a) (*(volatile ubyte *)(a)) -# define putreg8(v,a) (*(volatile ubyte *)(a) = (v)) -# define getreg16(a) (*(volatile uint16 *)(a)) -# define putreg16(v,a) (*(volatile uint16 *)(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 getreg16(a) (*(volatile uint16_t *)(a)) +# define putreg16(v,a) (*(volatile uint16_t *)(a) = (v)) +# define getreg32(a) (*(volatile uint32_t *)(a)) +# define putreg32(v,a) (*(volatile uint32_t *)(a) = (v)) /**************************************************************************** * Public Function Prototypes @@ -79,9 +79,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) diff --git a/nuttx/arch/hc/src/common/up_createstack.c b/nuttx/arch/hc/src/common/up_createstack.c index 4750c463b..6e2240ef9 100755 --- a/nuttx/arch/hc/src/common/up_createstack.c +++ b/nuttx/arch/hc/src/common/up_createstack.c @@ -40,6 +40,7 @@ #include <nuttx/config.h> #include <sys/types.h> +#include <stdint.h> #include <sched.h> #include <debug.h> @@ -92,7 +93,7 @@ int up_create_stack(_TCB *tcb, size_t stack_size) if (!tcb->stack_alloc_ptr) { - tcb->stack_alloc_ptr = (uint32 *)malloc(stack_size); + tcb->stack_alloc_ptr = (uint32_t *)malloc(stack_size); } if (tcb->stack_alloc_ptr) @@ -119,7 +120,7 @@ int up_create_stack(_TCB *tcb, size_t stack_size) /* Save the adjusted stack values in the _TCB */ - tcb->adj_stack_ptr = (uint32*)top_of_stack; + tcb->adj_stack_ptr = (uint32_t*)top_of_stack; tcb->adj_stack_size = size_of_stack; up_ledon(LED_STACKCREATED); diff --git a/nuttx/arch/hc/src/common/up_idle.c b/nuttx/arch/hc/src/common/up_idle.c index 67d1ccae3..ec00a8da6 100755 --- a/nuttx/arch/hc/src/common/up_idle.c +++ b/nuttx/arch/hc/src/common/up_idle.c @@ -38,7 +38,7 @@ ****************************************************************************/ #include <nuttx/config.h> -#include <sys/types.h> + #include <nuttx/arch.h> #include "up_internal.h" diff --git a/nuttx/arch/hc/src/common/up_initialize.c b/nuttx/arch/hc/src/common/up_initialize.c index 725479a07..38e70be19 100755 --- a/nuttx/arch/hc/src/common/up_initialize.c +++ b/nuttx/arch/hc/src/common/up_initialize.c @@ -39,7 +39,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <debug.h> #include <nuttx/arch.h> diff --git a/nuttx/arch/hc/src/common/up_internal.h b/nuttx/arch/hc/src/common/up_internal.h index ada4bf8fe..fe7cac257 100755 --- a/nuttx/arch/hc/src/common/up_internal.h +++ b/nuttx/arch/hc/src/common/up_internal.h @@ -40,6 +40,9 @@ * Included Files ****************************************************************************/ +#include <nuttx/config.h> +#include <stdint.h> + /**************************************************************************** * Definitions ****************************************************************************/ @@ -96,19 +99,19 @@ typedef void (*up_vector_t)(void); * structure. If is non-NULL only during interrupt processing. */ -extern uint16 *current_regs; +extern uint16_t *current_regs; /* This is the beginning of heap as provided from processor-specific logic. * This is the first address in RAM after the loaded program+bss+idle stack. * The end of the heap is CONFIG_DRAM_END */ -extern uint16 g_heapbase; +extern uint16_t g_heapbase; /* Address of the saved user stack pointer */ #if CONFIG_ARCH_INTERRUPTSTACK > 1 -extern uint32 g_userstack; +extern uint32_t g_userstack; #endif /**************************************************************************** @@ -125,16 +128,16 @@ extern void up_boot(void); /* Context switching functions */ -extern void up_copystate(uint32 *dest, uint32 *src); -extern void up_decodeirq(uint32 *regs); +extern void up_copystate(uint32_t *dest, uint32_t *src); +extern void up_decodeirq(uint32_t *regs); extern void up_irqinitialize(void); -extern int up_saveusercontext(uint32 *saveregs); -extern void up_fullcontextrestore(uint32 *restoreregs) __attribute__ ((noreturn)); -extern void up_switchcontext(uint32 *saveregs, uint32 *restoreregs); +extern int up_saveusercontext(uint32_t *saveregs); +extern void up_fullcontextrestore(uint32_t *restoreregs) __attribute__ ((noreturn)); +extern void up_switchcontext(uint32_t *saveregs, uint32_t *restoreregs); /* Interrupt handling */ -extern uint16 *up_doirq(int irq, uint32 *regs); +extern uint16_t *up_doirq(int irq, uint32_t *regs); extern void up_maskack_irq(int irq); /* Signal handling */ @@ -144,7 +147,7 @@ extern void up_sigdeliver(void); /* System timer initialization */ extern void up_timerinit(void); -extern int up_timerisr(int irq, uint32 *regs); +extern int up_timerisr(int irq, uint32_t *regs); /* Debug output */ diff --git a/nuttx/arch/hc/src/common/up_interruptcontext.c b/nuttx/arch/hc/src/common/up_interruptcontext.c index dec88f860..82caae044 100755 --- a/nuttx/arch/hc/src/common/up_interruptcontext.c +++ b/nuttx/arch/hc/src/common/up_interruptcontext.c @@ -38,8 +38,8 @@ ****************************************************************************/ #include <nuttx/config.h> -#include <sys/types.h> +#include <stdbool.h> #include <nuttx/arch.h> #include <nuttx/irq.h> @@ -60,12 +60,12 @@ /**************************************************************************** * Name: up_interrupt_context * - * Description: Return TRUE is we are currently executing in the interrupt + * Description: Return true is we are currently executing in the interrupt * handler context. * ****************************************************************************/ -boolean up_interrupt_context(void) +bool up_interrupt_context(void) { return current_regs != NULL; } diff --git a/nuttx/arch/hc/src/common/up_modifyreg16.c b/nuttx/arch/hc/src/common/up_modifyreg16.c index 2774d309d..c5ca0f86c 100755 --- a/nuttx/arch/hc/src/common/up_modifyreg16.c +++ b/nuttx/arch/hc/src/common/up_modifyreg16.c @@ -39,7 +39,7 @@ #include <nuttx/config.h> -#include <sys/types.h> +#include <stdint.h> #include <debug.h> #include <arch/irq.h> @@ -71,10 +71,10 @@ * ****************************************************************************/ -void modifyreg16(unsigned int addr, uint16 clearbits, uint16 setbits) +void modifyreg16(unsigned int addr, uint16_t clearbits, uint16_t setbits) { irqstate_t flags; - uint16 regval; + uint16_t regval; flags = irqsave(); regval = getreg16(addr); diff --git a/nuttx/arch/hc/src/common/up_modifyreg32.c b/nuttx/arch/hc/src/common/up_modifyreg32.c index f846c835e..ba68fc723 100755 --- a/nuttx/arch/hc/src/common/up_modifyreg32.c +++ b/nuttx/arch/hc/src/common/up_modifyreg32.c @@ -39,7 +39,7 @@ #include <nuttx/config.h> -#include <sys/types.h> +#include <stdint.h> #include <debug.h> #include <arch/irq.h> @@ -71,10 +71,10 @@ * ****************************************************************************/ -void modifyreg32(unsigned int addr, uint32 clearbits, uint32 setbits) +void modifyreg32(unsigned int addr, uint32_t clearbits, uint32_t setbits) { irqstate_t flags; - uint32 regval; + uint32_t regval; flags = irqsave(); regval = getreg32(addr); diff --git a/nuttx/arch/hc/src/common/up_modifyreg8.c b/nuttx/arch/hc/src/common/up_modifyreg8.c index 3f6f8b4f5..063c0921b 100755 --- a/nuttx/arch/hc/src/common/up_modifyreg8.c +++ b/nuttx/arch/hc/src/common/up_modifyreg8.c @@ -39,7 +39,7 @@ #include <nuttx/config.h> -#include <sys/types.h> +#include <stdint.h> #include <debug.h> #include <arch/irq.h> @@ -71,10 +71,10 @@ * ****************************************************************************/ -void modifyreg8(unsigned int addr, ubyte clearbits, ubyte setbits) +void modifyreg8(unsigned int addr, uint8_t clearbits, uint8_t setbits) { irqstate_t flags; - ubyte regval; + uint8_t regval; flags = irqsave(); regval = getreg8(addr); diff --git a/nuttx/arch/hc/src/common/up_puts.c b/nuttx/arch/hc/src/common/up_puts.c index 470d0ba59..7681b7483 100755 --- a/nuttx/arch/hc/src/common/up_puts.c +++ b/nuttx/arch/hc/src/common/up_puts.c @@ -38,7 +38,7 @@ ****************************************************************************/ #include <nuttx/config.h> -#include <sys/types.h> + #include <nuttx/arch.h> #include "up_internal.h" diff --git a/nuttx/arch/hc/src/common/up_releasestack.c b/nuttx/arch/hc/src/common/up_releasestack.c index 0bffef92e..bcb3761cc 100755 --- a/nuttx/arch/hc/src/common/up_releasestack.c +++ b/nuttx/arch/hc/src/common/up_releasestack.c @@ -38,7 +38,6 @@ ****************************************************************************/ #include <nuttx/config.h> -#include <sys/types.h> #include <sched.h> #include <debug.h> diff --git a/nuttx/arch/hc/src/common/up_usestack.c b/nuttx/arch/hc/src/common/up_usestack.c index ab7109a8c..f5b5798f0 100755 --- a/nuttx/arch/hc/src/common/up_usestack.c +++ b/nuttx/arch/hc/src/common/up_usestack.c @@ -38,11 +38,14 @@ ****************************************************************************/ #include <nuttx/config.h> + #include <sys/types.h> +#include <stdint.h> #include <sched.h> #include <debug.h> #include <nuttx/kmalloc.h> #include <nuttx/arch.h> + #include "up_internal.h" /**************************************************************************** @@ -111,7 +114,7 @@ int up_use_stack(_TCB *tcb, void *stack, size_t stack_size) /* Save the adjusted stack values in the _TCB */ - tcb->adj_stack_ptr = (uint32*)top_of_stack; + tcb->adj_stack_ptr = (uint32_t*)top_of_stack; tcb->adj_stack_size = size_of_stack; return OK; } diff --git a/nuttx/arch/hc/src/mc9s12ne64/chip.h b/nuttx/arch/hc/src/mc9s12ne64/chip.h index cb8df40d8..8e87c5435 100755 --- a/nuttx/arch/hc/src/mc9s12ne64/chip.h +++ b/nuttx/arch/hc/src/mc9s12ne64/chip.h @@ -41,7 +41,6 @@ ************************************************************************************/ #include <nuttx/config.h> -#include <sys/types.h> /************************************************************************************ * Definitions diff --git a/nuttx/arch/hc/src/mc9s12ne64/mc9s12ne64_crg.h b/nuttx/arch/hc/src/mc9s12ne64/mc9s12ne64_crg.h index cd4794fc2..9929ceadf 100755 --- a/nuttx/arch/hc/src/mc9s12ne64/mc9s12ne64_crg.h +++ b/nuttx/arch/hc/src/mc9s12ne64/mc9s12ne64_crg.h @@ -41,7 +41,6 @@ ************************************************************************************/
#include <nuttx/config.h>
-#include <sys/types.h>
#include "chip.h"
/************************************************************************************
diff --git a/nuttx/arch/hc/src/mc9s12ne64/mc9s12ne64_flash.h b/nuttx/arch/hc/src/mc9s12ne64/mc9s12ne64_flash.h index 44164f5fe..c5ad0e128 100755 --- a/nuttx/arch/hc/src/mc9s12ne64/mc9s12ne64_flash.h +++ b/nuttx/arch/hc/src/mc9s12ne64/mc9s12ne64_flash.h @@ -41,7 +41,6 @@ ************************************************************************************/ #include <nuttx/config.h> -#include <sys/types.h> #include "chip.h" /************************************************************************************ diff --git a/nuttx/arch/hc/src/mc9s12ne64/mc9s12ne64_internal.h b/nuttx/arch/hc/src/mc9s12ne64/mc9s12ne64_internal.h index 5bc0677c3..fb8f2662a 100755 --- a/nuttx/arch/hc/src/mc9s12ne64/mc9s12ne64_internal.h +++ b/nuttx/arch/hc/src/mc9s12ne64/mc9s12ne64_internal.h @@ -41,7 +41,9 @@ ************************************************************************************/ #include <nuttx/config.h> -#include <sys/types.h> + +#include <stdint.h> +#include <stdbool.h> #include "up_internal.h" #include "chip.h" @@ -124,8 +126,8 @@ EXTERN int hcs12_ethinitialize(int intf); struct spi_dev_s; enum spi_dev_e; -EXTERN void hcs12_spiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, boolean selected); -EXTERN ubyte hcs12_spistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid); +EXTERN void hcs12_spiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected); +EXTERN uint8_t hcs12_spistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid); #undef EXTERN #if defined(__cplusplus) diff --git a/nuttx/arch/hc/src/mc9s12ne64/mc9s12ne64_mmc.h b/nuttx/arch/hc/src/mc9s12ne64/mc9s12ne64_mmc.h index d1b29991e..d7caeae3e 100755 --- a/nuttx/arch/hc/src/mc9s12ne64/mc9s12ne64_mmc.h +++ b/nuttx/arch/hc/src/mc9s12ne64/mc9s12ne64_mmc.h @@ -41,7 +41,6 @@ ************************************************************************************/ #include <nuttx/config.h> -#include <sys/types.h> #include "chip.h" /************************************************************************************ diff --git a/nuttx/arch/hc/src/mc9s12ne64/mc9s12ne64_serial.c b/nuttx/arch/hc/src/mc9s12ne64/mc9s12ne64_serial.c index 1cfa4ab88..ed8914a9d 100755 --- a/nuttx/arch/hc/src/mc9s12ne64/mc9s12ne64_serial.c +++ b/nuttx/arch/hc/src/mc9s12ne64/mc9s12ne64_serial.c @@ -38,7 +38,6 @@ ****************************************************************************/ #include <nuttx/config.h> -#include <sys/types.h> #include "up_internal.h" diff --git a/nuttx/arch/hc/src/mc9s12ne64/mc9s12ne64_start.S b/nuttx/arch/hc/src/mc9s12ne64/mc9s12ne64_start.S index 34823f307..5ea7c32f4 100755 --- a/nuttx/arch/hc/src/mc9s12ne64/mc9s12ne64_start.S +++ b/nuttx/arch/hc/src/mc9s12ne64/mc9s12ne64_start.S @@ -39,7 +39,6 @@ ****************************************************************************/ #include <nuttx/config.h> -#include <sys/types.h> #include "mc9s12ne64_internal.h" #include "mc9s12ne64_mmc.h" |