Minor updates to demo projects to ensure correct building with V8 rc1.

pull/4/head
Richard Barry 11 years ago
parent 2b6eb1c5ab
commit e4965ca03c

@ -33,6 +33,7 @@
Includes <System Includes> , "Project Includes" Includes <System Includes> , "Project Includes"
******************************************************************************/ ******************************************************************************/
#include <stddef.h> #include <stddef.h>
#include <stdint.h>
/****************************************************************************** /******************************************************************************
Macro definitions Macro definitions
@ -45,20 +46,23 @@ Macro definitions
/****************************************************************************** /******************************************************************************
Typedef definitions Typedef definitions
******************************************************************************/ ******************************************************************************/
typedef char char_t; typedef char char_t;
typedef unsigned int bool_t;
typedef int int_t; typedef int int_t;
typedef signed char int8_t;
typedef signed short int16_t;
typedef signed long int32_t;
typedef signed long long int64_t;
typedef unsigned char uint8_t;
typedef unsigned short uint16_t;
typedef unsigned long uint32_t;
typedef unsigned long long uint64_t;
typedef float float32_t;
typedef double float64_t;
typedef long double float128_t;
#ifdef TYPES_ALREADY_DEFINED_IN_STDINT
typedef unsigned int bool_t;
typedef signed char int8_t;
typedef signed short int16_t;
typedef signed long int32_t;
typedef signed long long int64_t;
typedef unsigned char uint8_t;
typedef unsigned short uint16_t;
typedef unsigned long uint32_t;
typedef unsigned long long uint64_t;
typedef float float32_t;
typedef double float64_t;
typedef long double float128_t;
#endif
#endif /* R_TYPEDEFS_H */ #endif /* R_TYPEDEFS_H */

@ -84,7 +84,7 @@
#define configUSE_TICK_HOOK 1 #define configUSE_TICK_HOOK 1
#define configCPU_CLOCK_HZ ( 96000000UL ) #define configCPU_CLOCK_HZ ( 96000000UL )
#define configTICK_RATE_HZ ( ( portTickType ) 1000 ) #define configTICK_RATE_HZ ( ( portTickType ) 1000 )
#define configMAX_PRIORITIES ( ( unsigned portBASE_TYPE ) 5 ) #define configMAX_PRIORITIES ( 5 )
#define configMINIMAL_STACK_SIZE ( ( unsigned short ) 90 ) #define configMINIMAL_STACK_SIZE ( ( unsigned short ) 90 )
#define configTOTAL_HEAP_SIZE ( ( size_t ) ( 30 * 1024 ) ) #define configTOTAL_HEAP_SIZE ( ( size_t ) ( 30 * 1024 ) )
#define configMAX_TASK_NAME_LEN ( 10 ) #define configMAX_TASK_NAME_LEN ( 10 )

@ -106,6 +106,11 @@ extern uint32_t SystemCoreClock;
#define configUSE_APPLICATION_TASK_TAG 0 #define configUSE_APPLICATION_TASK_TAG 0
#define configUSE_COUNTING_SEMAPHORES 1 #define configUSE_COUNTING_SEMAPHORES 1
/* The full demo always has tasks to run so the tick will never be turned off.
The blinky demo will use the default tickless idle implementation to turn the
tick off. */
#define configUSE_TICKLESS_IDLE 1
/* Run time stats gathering definitions. */ /* Run time stats gathering definitions. */
void vConfigureTimerForRunTimeStats( void ); void vConfigureTimerForRunTimeStats( void );
uint32_t ulGetRunTimeCounterValue( void ); uint32_t ulGetRunTimeCounterValue( void );

@ -88,7 +88,6 @@
/* Constants required to pend a PendSV interrupt from the tick ISR if the /* Constants required to pend a PendSV interrupt from the tick ISR if the
preemptive scheduler is being used. These are just standard bits and registers preemptive scheduler is being used. These are just standard bits and registers
within the Cortex-M core itself. */ within the Cortex-M core itself. */
#define portNVIC_INT_CTRL_REG ( * ( ( volatile unsigned long * ) 0xe000ed04 ) )
#define portNVIC_PENDSVSET_BIT ( 1UL << 28UL ) #define portNVIC_PENDSVSET_BIT ( 1UL << 28UL )
/* The alarm used to generate interrupts in the asynchronous timer. */ /* The alarm used to generate interrupts in the asynchronous timer. */

@ -91,7 +91,7 @@ assembly files that include this header file. */
#define configUSE_TICK_HOOK 1 #define configUSE_TICK_HOOK 1
#define configCPU_CLOCK_HZ ( SystemCoreClock ) #define configCPU_CLOCK_HZ ( SystemCoreClock )
#define configTICK_RATE_HZ ( ( portTickType ) 1000 ) #define configTICK_RATE_HZ ( ( portTickType ) 1000 )
#define configMAX_PRIORITIES ( ( unsigned portBASE_TYPE ) 5 ) #define configMAX_PRIORITIES ( 5 )
#define configMINIMAL_STACK_SIZE ( ( unsigned short ) 90 ) #define configMINIMAL_STACK_SIZE ( ( unsigned short ) 90 )
#define configTOTAL_HEAP_SIZE ( ( size_t ) ( 60 * 1024 ) ) #define configTOTAL_HEAP_SIZE ( ( size_t ) ( 60 * 1024 ) )
#define configMAX_TASK_NAME_LEN ( 10 ) #define configMAX_TASK_NAME_LEN ( 10 )

Loading…
Cancel
Save