From: richardbarry Date: Fri, 6 Feb 2009 13:21:35 +0000 (+0000) Subject: Continue 78K0R development. X-Git-Tag: V5.1.2~15 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=829f48c51cb183ee57a92b02c7e15c39a3b3d80b;p=freertos Continue 78K0R development. git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@681 1d2547de-c912-0410-9cb9-b8ca96c0e9e2 --- diff --git a/Demo/NEC_78K0R_IAR/FreeRTOSConfig.h b/Demo/NEC_78K0R_IAR/FreeRTOSConfig.h index 97fb3c442..e85097a7a 100644 --- a/Demo/NEC_78K0R_IAR/FreeRTOSConfig.h +++ b/Demo/NEC_78K0R_IAR/FreeRTOSConfig.h @@ -50,18 +50,6 @@ #ifndef FREERTOS_CONFIG_H #define FREERTOS_CONFIG_H -/* Only include in C files */ -#ifdef __IAR_SYSTEMS_ICC__ - - #pragma language=extended - #pragma system_include - - #include - #include - #include - -#endif /* __IAR_SYSTEMS_ICC__ */ - /* * 78K0R Clock Source Configuration * 1 = use internal High Speed Clock Source (typically 8Mhz on the 78K0R/Kx3) @@ -90,43 +78,68 @@ #define configUSE_PREEMPTION 1 -/* Only use following section for C files */ -#ifdef __IAR_SYSTEMS_ICC__ - - #define configUSE_IDLE_HOOK 0 - #define configUSE_TICK_HOOK 0 - #define configTICK_RATE_HZ ( ( portTickType ) 1000 ) - #define configMAX_PRIORITIES ( ( unsigned portBASE_TYPE ) 4 ) - #define configMINIMAL_STACK_SIZE ( ( unsigned portSHORT ) 100 ) - #define configTOTAL_HEAP_SIZE ( (size_t ) ( 7000 ) ) - #define configMAX_TASK_NAME_LEN ( 10 ) - #define configUSE_TRACE_FACILITY 0 - #define configUSE_16_BIT_TICKS 1 - #define configIDLE_SHOULD_YIELD 1 - #define configCHECK_FOR_STACK_OVERFLOW 2 - #define configUSE_MUTEXES 1 - - /* Co-routine definitions. */ - #define configUSE_CO_ROUTINES 0 - #define configMAX_CO_ROUTINE_PRIORITIES ( 2 ) - - /* Set the following definitions to 1 to include the API function, or zero - to exclude the API function. */ - #define INCLUDE_vTaskPrioritySet 1 - #define INCLUDE_uxTaskPriorityGet 1 - #define INCLUDE_vTaskDelete 1 - #define INCLUDE_vTaskCleanUpResources 0 - #define INCLUDE_vTaskSuspend 1 - #define INCLUDE_vTaskDelayUntil 1 - #define INCLUDE_vTaskDelay 1 - - #ifdef configCLOCK_SOURCE == 0 - #define configCPU_CLOCK_HZ ( ( unsigned portLONG ) 20000000 ) /* using the external clock source */ - #else - #define configCPU_CLOCK_HZ ( ( unsigned portLONG ) 8000000 ) /* using the internal high speed clock */ - #endif /* configCLOCK_SOURCE */ - -#endif /* __IAR_SYSTEMS_ICC__ */ + /* Only use following section for C files */ + #ifdef __IAR_SYSTEMS_ICC__ + + #pragma language=extended + #pragma system_include + + #include + + #define configUSE_IDLE_HOOK 0 + #define configUSE_TICK_HOOK 0 + #define configTICK_RATE_HZ ( ( portTickType ) 1000 ) + #define configMAX_PRIORITIES ( ( unsigned portBASE_TYPE ) 4 ) + #define configMINIMAL_STACK_SIZE ( ( unsigned portSHORT ) 100 ) + #define configMAX_TASK_NAME_LEN ( 10 ) + #define configUSE_TRACE_FACILITY 0 + #define configUSE_16_BIT_TICKS 1 + #define configIDLE_SHOULD_YIELD 1 + #define configCHECK_FOR_STACK_OVERFLOW 2 + #define configUSE_MUTEXES 1 + + /* Co-routine definitions. */ + #define configUSE_CO_ROUTINES 0 + #define configMAX_CO_ROUTINE_PRIORITIES ( 2 ) + + /* Set the following definitions to 1 to include the API function, or zero + to exclude the API function. */ + #define INCLUDE_vTaskPrioritySet 1 + #define INCLUDE_uxTaskPriorityGet 1 + #define INCLUDE_vTaskDelete 1 + #define INCLUDE_vTaskCleanUpResources 0 + #define INCLUDE_vTaskSuspend 1 + #define INCLUDE_vTaskDelayUntil 1 + #define INCLUDE_vTaskDelay 1 + + #ifdef configCLOCK_SOURCE == 0 + #define configCPU_CLOCK_HZ ( ( unsigned portLONG ) 20000000 ) /* using the external clock source */ + #else + #define configCPU_CLOCK_HZ ( ( unsigned portLONG ) 8000000 ) /* using the internal high speed clock */ + #endif /* configCLOCK_SOURCE */ + + /* Definitions that are specific to the project being used. */ + #ifdef __IAR_78K0R_Kx3__ + + /* Device specific includes. */ + #include + #include + + #define configTOTAL_HEAP_SIZE ( (size_t ) ( 7000 ) ) + + #endif /* __IAR_78K0R_Kx3__ */ + + #ifdef __IAR_78K0R_Kx3L__ + + /* Device specific includes. */ + #include + #include + + #define configTOTAL_HEAP_SIZE ( (size_t ) ( 2400 ) ) + + #endif /* _IAR_78K0R_Kx3L__ */ + + #endif /* __IAR_SYSTEMS_ICC__ */ #endif /* FREERTOS_CONFIG_H */ diff --git a/Demo/NEC_78K0R_IAR/rtosdemo.ewd b/Demo/NEC_78K0R_IAR/rtosdemo.ewd index a1daedfbb..602fa5b1a 100644 --- a/Demo/NEC_78K0R_IAR/rtosdemo.ewd +++ b/Demo/NEC_78K0R_IAR/rtosdemo.ewd @@ -3,7 +3,7 @@ 2 - Debug + 78K0R_Kx3 78000 @@ -221,36 +221,40 @@ 0 - $EW_DIR$\common\plugins\CodeCoverage\codecoverage.ENU.ewplugin + $EW_DIR$\common\plugins\CodeCoverage\CodeCoverage.ENU.ewplugin 1 - $EW_DIR$\common\plugins\Orti\orti.ENU.ewplugin + $EW_DIR$\common\plugins\Orti\Orti.ENU.ewplugin 0 - $EW_DIR$\common\plugins\Profiling\profiling.ENU.ewplugin + $EW_DIR$\common\plugins\Profiling\Profiling.ENU.ewplugin 1 - $EW_DIR$\common\plugins\Stack\stack.ENU.ewplugin + $EW_DIR$\common\plugins\Stack\Stack.ENU.ewplugin + 1 + + + $EW_DIR$\common\plugins\SymList\SymList.ENU.ewplugin 1 - Release + 78K0R_Kx3L 78000 - 0 + 1 C-SPY 5 2 1 - 0 + 1 - Release + 78K0R_Kx3L 78000 - 0 + 1 General 5 7 1 - 0 + 1 @@ -1284,7 +1282,7 @@ 9 1 - 0 + 1 diff --git a/Demo/NEC_78K0R_IAR/settings/rtosdemo.wsdt b/Demo/NEC_78K0R_IAR/settings/rtosdemo.wsdt index 3574b6f71..7f3985b97 100644 --- a/Demo/NEC_78K0R_IAR/settings/rtosdemo.wsdt +++ b/Demo/NEC_78K0R_IAR/settings/rtosdemo.wsdt @@ -3,7 +3,7 @@ - rtosdemo/Debug + rtosdemo/78K0R_Kx3 @@ -20,7 +20,7 @@ 2091624461 - + 48268826 @@ -44,7 +44,7 @@ Build - TabID-2405-1208Debug LogDebug-Log + TabID-2405-1208Debug LogDebug-LogTabID-11455-24944Find in FilesFind-in-Files 0 @@ -59,7 +59,7 @@ - iaridepm.enu1-2-2785351-2-2218205155714208758252143801426-2-21531402-2-214041551002857157841155714208758 + iaridepm.enu1-2-2535351-2-2218205155714208758252143546843-2-24031402-2-214044051002857412424155714208758