diff --git a/FreeRTOS/Demo/CORTEX_A9_RZ_R7S72100_IAR_DS-5/IAR/RTOSDemo.ewd b/FreeRTOS/Demo/CORTEX_A9_RZ_R7S72100_IAR_DS-5/IAR/RTOSDemo.ewd index 10f454cc6..81e55ac4f 100644 --- a/FreeRTOS/Demo/CORTEX_A9_RZ_R7S72100_IAR_DS-5/IAR/RTOSDemo.ewd +++ b/FreeRTOS/Demo/CORTEX_A9_RZ_R7S72100_IAR_DS-5/IAR/RTOSDemo.ewd @@ -12,7 +12,7 @@ C-SPY 2 - 25 + 26 1 1 + + + + + + @@ -257,7 +281,7 @@ CMSISDAP_ID 2 - 0 + 2 1 1 + + + + + + @@ -472,7 +520,7 @@ IJET_ID 2 - 2 + 3 1 1 + @@ -1253,14 +1305,6 @@ $TOOLKIT_DIR$\plugins\rtos\OpenRTOS\OpenRTOSPlugin.ewplugin 0 - - $TOOLKIT_DIR$\plugins\rtos\PowerPac\PowerPacRTOS.ewplugin - 0 - - - $TOOLKIT_DIR$\plugins\rtos\Quadros\Quadros_EWB6_Plugin.ewplugin - 0 - $TOOLKIT_DIR$\plugins\rtos\SafeRTOS\SafeRTOSPlugin.ewplugin 0 @@ -1269,6 +1313,10 @@ $TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin.ENU.ewplugin 0 + + $TOOLKIT_DIR$\plugins\rtos\TI-RTOS\tirtosplugin.ewplugin + 0 + $TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-286-KA-CSpy.ewplugin 0 diff --git a/FreeRTOS/Demo/CORTEX_A9_RZ_R7S72100_IAR_DS-5/IAR/RTOSDemo.ewp b/FreeRTOS/Demo/CORTEX_A9_RZ_R7S72100_IAR_DS-5/IAR/RTOSDemo.ewp index ce5914e3e..f0b9b6d9a 100644 --- a/FreeRTOS/Demo/CORTEX_A9_RZ_R7S72100_IAR_DS-5/IAR/RTOSDemo.ewp +++ b/FreeRTOS/Demo/CORTEX_A9_RZ_R7S72100_IAR_DS-5/IAR/RTOSDemo.ewp @@ -12,7 +12,7 @@ General 3 - 21 + 22 1 1 + ICCARM 2 - 28 + 30 1 1 + + AARM 2 - 8 + 9 1 1 + @@ -620,7 +637,7 @@ ILINK 0 - 15 + 16 1 1 + diff --git a/FreeRTOS/Demo/CORTEX_A9_RZ_R7S72100_IAR_DS-5/IAR/settings/RTOSDemo.dni b/FreeRTOS/Demo/CORTEX_A9_RZ_R7S72100_IAR_DS-5/IAR/settings/RTOSDemo.dni index 6174c3cd6..168f8bbb0 100644 --- a/FreeRTOS/Demo/CORTEX_A9_RZ_R7S72100_IAR_DS-5/IAR/settings/RTOSDemo.dni +++ b/FreeRTOS/Demo/CORTEX_A9_RZ_R7S72100_IAR_DS-5/IAR/settings/RTOSDemo.dni @@ -52,9 +52,6 @@ Title0=ITrgPwr Symbol0=0 4 1 LiveEnabled=0 LiveFile=PowerLogLive.log -[Trace2] -Enabled=0 -ShowSource=0 [SWOTraceWindow] ForcedPcSampling=0 ForcedInterruptLogs=0 @@ -94,9 +91,6 @@ UseAuto=0 TypeViolation=1 UnspecRange=1 ActionState=1 -[Trace1] -Enabled=0 -ShowSource=1 [Log file] LoggingEnabled=_ 0 LogFile=_ "" diff --git a/FreeRTOS/Demo/CORTEX_A9_RZ_R7S72100_IAR_DS-5/IAR/settings/RTOSDemo.wsdt b/FreeRTOS/Demo/CORTEX_A9_RZ_R7S72100_IAR_DS-5/IAR/settings/RTOSDemo.wsdt index e9229ca91..fb28973bb 100644 --- a/FreeRTOS/Demo/CORTEX_A9_RZ_R7S72100_IAR_DS-5/IAR/settings/RTOSDemo.wsdt +++ b/FreeRTOS/Demo/CORTEX_A9_RZ_R7S72100_IAR_DS-5/IAR/settings/RTOSDemo.wsdt @@ -14,7 +14,7 @@ - 290272727 + 306272727 @@ -30,7 +30,7 @@ - + TabID-16877-7786 @@ -38,11 +38,11 @@ Workspace - RTOSDemoRTOSDemo/Full-DemoRTOSDemo/Full-Demo/Common-Demo-Source + RTOSDemoRTOSDemo/Blinky-Demo - 0 + 0 TabID-27919-7988 @@ -58,20 +58,20 @@ TabID-959-438Ambiguous DefinitionsSelect-Ambiguous-DefinitionsTabID-21579-10611Find All DeclarationsFind-All-Declarations - 1 + 1 - TextEditor$WS_DIR$\..\Source\main.c00000122667766770TextEditor$WS_DIR$\..\Source\Full-Demo\main_full.c000004101938919389TextEditor$WS_DIR$\..\..\Common\Minimal\QueueOverwrite.c00000178814181410100000010000001 + TextEditor$WS_DIR$\..\Source\main.c0000062667766770TextEditor$WS_DIR$\..\Source\Full-Demo\main_full.c000004101938919389TextEditor$WS_DIR$\..\Source\Blinky-Demo\main_blinky.c0000063000100000010000001 - iaridepm.enu1-2-2692380-2-2200200119048203666227381706721-2-22461682-2-216842481002381252546119048203666 + iaridepm.enu1-2-2692380-2-2200200119048203666227381706721-2-22461682-2-216842481002381252546119048203666 diff --git a/FreeRTOS/Demo/CORTEX_A9_RZ_R7S72100_IAR_DS-5/Source/Full-Demo/config_fat_sl.h b/FreeRTOS/Demo/CORTEX_A9_RZ_R7S72100_IAR_DS-5/Source/Full-Demo/config_fat_sl.h index a51ecb8ed..1c69c6417 100644 --- a/FreeRTOS/Demo/CORTEX_A9_RZ_R7S72100_IAR_DS-5/Source/Full-Demo/config_fat_sl.h +++ b/FreeRTOS/Demo/CORTEX_A9_RZ_R7S72100_IAR_DS-5/Source/Full-Demo/config_fat_sl.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+FAT FS V1.0.0 (C) 2013 HCC Embedded + * FreeRTOS+FAT SL V1.0.1 (C) 2014 HCC Embedded * * FreeRTOS+FAT SL is an complementary component provided to Real Time Engineers * Ltd. by HCC Embedded for use with FreeRTOS. It is not, in itself, part of @@ -38,7 +38,7 @@ #define _CONFIG_FAT_SL_H #include "../version/ver_fat_sl.h" -#if VER_FAT_SL_MAJOR != 3 || VER_FAT_SL_MINOR != 2 +#if VER_FAT_SL_MAJOR != 5 || VER_FAT_SL_MINOR != 2 #error Incompatible FAT_SL version number! #endif diff --git a/FreeRTOS/Demo/CORTEX_A9_RZ_R7S72100_IAR_DS-5/Source/Full-Demo/config_mdriver_ram.h b/FreeRTOS/Demo/CORTEX_A9_RZ_R7S72100_IAR_DS-5/Source/Full-Demo/config_mdriver_ram.h index b769abe9f..87ad9c6d6 100644 --- a/FreeRTOS/Demo/CORTEX_A9_RZ_R7S72100_IAR_DS-5/Source/Full-Demo/config_mdriver_ram.h +++ b/FreeRTOS/Demo/CORTEX_A9_RZ_R7S72100_IAR_DS-5/Source/Full-Demo/config_mdriver_ram.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+FAT FS V1.0.0 (C) 2013 HCC Embedded + * FreeRTOS+FAT SL V1.0.1 (C) 2014 HCC Embedded * * FreeRTOS+FAT SL is an complementary component provided to Real Time Engineers * Ltd. by HCC Embedded for use with FreeRTOS. It is not, in itself, part of diff --git a/FreeRTOS/Demo/CORTEX_M4_ATSAM4E_Atmel_Studio/RTOSDemo.atsuo b/FreeRTOS/Demo/CORTEX_M4_ATSAM4E_Atmel_Studio/RTOSDemo.atsuo index 85c113a8b..2f22006d2 100644 Binary files a/FreeRTOS/Demo/CORTEX_M4_ATSAM4E_Atmel_Studio/RTOSDemo.atsuo and b/FreeRTOS/Demo/CORTEX_M4_ATSAM4E_Atmel_Studio/RTOSDemo.atsuo differ diff --git a/FreeRTOS/Demo/CORTEX_M4_ATSAM4E_Atmel_Studio/RTOSDemo.cproj b/FreeRTOS/Demo/CORTEX_M4_ATSAM4E_Atmel_Studio/RTOSDemo.cproj index df2987558..525f7236e 100644 --- a/FreeRTOS/Demo/CORTEX_M4_ATSAM4E_Atmel_Studio/RTOSDemo.cproj +++ b/FreeRTOS/Demo/CORTEX_M4_ATSAM4E_Atmel_Studio/RTOSDemo.cproj @@ -281,36 +281,6 @@ True -Wl,--entry=Reset_Handler -Wl,--cref -mthumb -T../src/ASF/sam/utils/linker_scripts/sam4e/sam4e16e/gcc/flash.ld - - - ../src - ../src/ASF/common/boards - ../src/ASF/common/services/clock - ../src/ASF/common/services/ioport - ../src/ASF/common/utils - ../src/ASF/sam/boards - ../src/ASF/sam/boards/sam4e_ek - ../src/ASF/sam/drivers/pmc - ../src/ASF/sam/utils - ../src/ASF/sam/utils/cmsis/sam4e/include - ../src/ASF/sam/utils/cmsis/sam4e/source/templates - ../src/ASF/sam/utils/fpu - ../src/ASF/sam/utils/header_files - ../src/ASF/sam/utils/preprocessor - ../src/ASF/thirdparty/CMSIS/Include - ../src/ASF/thirdparty/CMSIS/Lib/GCC - ../src/config - %24(ToolchainDir)\..\..\CMSIS_Atmel - %24(ToolchainDir)\..\..\CMSIS_Atmel\CMSIS\Include - %24(ToolchainDir)\..\..\CMSIS_Atmel\Device\ATMEL - %24(ToolchainDir)\..\..\CMSIS_Atmel\Device\ATMEL\sam4e\include - ../src/ASF/sam/components/ethernet_phy/ksz8051mnl - ../src/ASF/sam/drivers/gmac - ../src/ASF/sam/components/display/aat31xx - ../src/ASF/sam/components/display/ili93xx - ../src/ASF/sam/drivers/ebi/smc - - -DARM_MATH_CM4=true -DBOARD=SAM4E_EK -D__SAM4E16E__ -Dprintf=iprintf @@ -422,36 +392,6 @@ True -Wl,--entry=Reset_Handler -Wl,--cref -mthumb -T../src/ASF/sam/utils/linker_scripts/sam4e/sam4e16e/gcc/flash.ld - - - ../src - ../src/ASF/common/boards - ../src/ASF/common/services/clock - ../src/ASF/common/services/ioport - ../src/ASF/common/utils - ../src/ASF/sam/boards - ../src/ASF/sam/boards/sam4e_ek - ../src/ASF/sam/drivers/pmc - ../src/ASF/sam/utils - ../src/ASF/sam/utils/cmsis/sam4e/include - ../src/ASF/sam/utils/cmsis/sam4e/source/templates - ../src/ASF/sam/utils/fpu - ../src/ASF/sam/utils/header_files - ../src/ASF/sam/utils/preprocessor - ../src/ASF/thirdparty/CMSIS/Include - ../src/ASF/thirdparty/CMSIS/Lib/GCC - ../src/config - %24(ToolchainDir)\..\..\CMSIS_Atmel - %24(ToolchainDir)\..\..\CMSIS_Atmel\CMSIS\Include - %24(ToolchainDir)\..\..\CMSIS_Atmel\Device\ATMEL - %24(ToolchainDir)\..\..\CMSIS_Atmel\Device\ATMEL\sam4e\include - ../src/ASF/sam/components/ethernet_phy/ksz8051mnl - ../src/ASF/sam/drivers/gmac - ../src/ASF/sam/components/display/aat31xx - ../src/ASF/sam/components/display/ili93xx - ../src/ASF/sam/drivers/ebi/smc - - Default (-g) -DARM_MATH_CM4=true -DBOARD=SAM4E_EK -D__SAM4E16E__ -Dprintf=iprintf diff --git a/FreeRTOS/Demo/CORTEX_M4_ATSAM4E_Atmel_Studio/src/config/config_fat_sl.h b/FreeRTOS/Demo/CORTEX_M4_ATSAM4E_Atmel_Studio/src/config/config_fat_sl.h index 373d78092..8647077ee 100644 --- a/FreeRTOS/Demo/CORTEX_M4_ATSAM4E_Atmel_Studio/src/config/config_fat_sl.h +++ b/FreeRTOS/Demo/CORTEX_M4_ATSAM4E_Atmel_Studio/src/config/config_fat_sl.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+FAT FS V1.0.0 (C) 2013 HCC Embedded + * FreeRTOS+FAT SL V1.0.1 (C) 2014 HCC Embedded * * FreeRTOS+FAT SL is an complementary component provided to Real Time Engineers * Ltd. by HCC Embedded for use with FreeRTOS. It is not, in itself, part of @@ -38,7 +38,7 @@ #define _CONFIG_FAT_SL_H #include "../version/ver_fat_sl.h" -#if VER_FAT_SL_MAJOR != 3 || VER_FAT_SL_MINOR != 2 +#if VER_FAT_SL_MAJOR != 5 || VER_FAT_SL_MINOR != 2 #error Incompatible FAT_SL version number! #endif diff --git a/FreeRTOS/Demo/CORTEX_M4_ATSAM4E_Atmel_Studio/src/config/config_mdriver_ram.h b/FreeRTOS/Demo/CORTEX_M4_ATSAM4E_Atmel_Studio/src/config/config_mdriver_ram.h index bd7823ef1..de630faf2 100644 --- a/FreeRTOS/Demo/CORTEX_M4_ATSAM4E_Atmel_Studio/src/config/config_mdriver_ram.h +++ b/FreeRTOS/Demo/CORTEX_M4_ATSAM4E_Atmel_Studio/src/config/config_mdriver_ram.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+FAT FS V1.0.0 (C) 2013 HCC Embedded + * FreeRTOS+FAT SL V1.0.1 (C) 2014 HCC Embedded * * FreeRTOS+FAT SL is an complementary component provided to Real Time Engineers * Ltd. by HCC Embedded for use with FreeRTOS. It is not, in itself, part of diff --git a/FreeRTOS/Demo/CORTEX_SmartFusion2_M2S050_SoftConsole/RTOSDemo/Full-Demo/config_fat_sl.h b/FreeRTOS/Demo/CORTEX_SmartFusion2_M2S050_SoftConsole/RTOSDemo/Full-Demo/config_fat_sl.h index 373d78092..8647077ee 100644 --- a/FreeRTOS/Demo/CORTEX_SmartFusion2_M2S050_SoftConsole/RTOSDemo/Full-Demo/config_fat_sl.h +++ b/FreeRTOS/Demo/CORTEX_SmartFusion2_M2S050_SoftConsole/RTOSDemo/Full-Demo/config_fat_sl.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+FAT FS V1.0.0 (C) 2013 HCC Embedded + * FreeRTOS+FAT SL V1.0.1 (C) 2014 HCC Embedded * * FreeRTOS+FAT SL is an complementary component provided to Real Time Engineers * Ltd. by HCC Embedded for use with FreeRTOS. It is not, in itself, part of @@ -38,7 +38,7 @@ #define _CONFIG_FAT_SL_H #include "../version/ver_fat_sl.h" -#if VER_FAT_SL_MAJOR != 3 || VER_FAT_SL_MINOR != 2 +#if VER_FAT_SL_MAJOR != 5 || VER_FAT_SL_MINOR != 2 #error Incompatible FAT_SL version number! #endif diff --git a/FreeRTOS/Demo/CORTEX_SmartFusion2_M2S050_SoftConsole/RTOSDemo/Full-Demo/config_fat_sl_test.h b/FreeRTOS/Demo/CORTEX_SmartFusion2_M2S050_SoftConsole/RTOSDemo/Full-Demo/config_fat_sl_test.h new file mode 100644 index 000000000..2f56f933d --- /dev/null +++ b/FreeRTOS/Demo/CORTEX_SmartFusion2_M2S050_SoftConsole/RTOSDemo/Full-Demo/config_fat_sl_test.h @@ -0,0 +1,62 @@ +/* + * FreeRTOS+FAT SL V1.0.1 (C) 2014 HCC Embedded + * + * FreeRTOS+FAT SL is an complementary component provided to Real Time Engineers + * Ltd. by HCC Embedded for use with FreeRTOS. It is not, in itself, part of + * the FreeRTOS kernel. FreeRTOS+FAT SL is licensed separately from FreeRTOS, + * and uses a different license to FreeRTOS. FreeRTOS+FAT SL uses a dual + * license model, information on which is provided below: + * + * - Open source licensing - + * FreeRTOS+FAT SL is a free download and may be used, modified and distributed + * without charge provided the user adheres to version two of the GNU General + * Public license (GPL) and does not remove the copyright notice or this text. + * The GPL V2 text is available on the gnu.org web site, and on the following + * URL: http://www.FreeRTOS.org/gpl-2.0.txt + * + * - Commercial licensing - + * Businesses and individuals who wish to incorporate FreeRTOS+FAT SL into + * proprietary software for redistribution in any form must first obtain a + * commercial license - and in-so-doing support the maintenance, support and + * further development of the FreeRTOS+FAT SL product. Commercial licenses can + * be obtained from http://shop.freertos.org and do not require any source files + * to be changed. + * + * FreeRTOS+FAT SL is distributed in the hope that it will be useful. You + * cannot use FreeRTOS+FAT SL unless you agree that you use the software 'as + * is'. FreeRTOS+FAT SL is provided WITHOUT ANY WARRANTY; without even the + * implied warranties of NON-INFRINGEMENT, MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. Real Time Engineers Ltd. and HCC Embedded disclaims all + * conditions and terms, be they implied, expressed, or statutory. + * + * http://www.FreeRTOS.org + * http://www.FreeRTOS.org/FreeRTOS-Plus + * + */ + +#ifndef _CONFIG_FAT_SL_TEST_H +#define _CONFIG_FAT_SL_TEST_H + +#include "../version/ver_fat_sl.h" +#if VER_FAT_SL_MAJOR != 5 || VER_FAT_SL_MINOR != 2 + #error Incompatible FAT_SL version number! +#endif + + +/* +** Maximum size for seek test. +** Options: 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768 +*/ +#define F_MAX_SEEK_TEST 16384 + + +/* +** Defines media type for testing. +** Options: F_FAT12_MEDIA, F_FAT16_MEDIA, F_FAT32_MEDIA +*/ +#define F_FAT_TYPE F_FAT16_MEDIA + + +#endif /* ifndef _CONFIG_STHIN_TEST_H */ + + diff --git a/FreeRTOS/Demo/CORTEX_SmartFusion2_M2S050_SoftConsole/RTOSDemo/Full-Demo/config_mdriver_ram.h b/FreeRTOS/Demo/CORTEX_SmartFusion2_M2S050_SoftConsole/RTOSDemo/Full-Demo/config_mdriver_ram.h index eababe5fa..134fedd65 100644 --- a/FreeRTOS/Demo/CORTEX_SmartFusion2_M2S050_SoftConsole/RTOSDemo/Full-Demo/config_mdriver_ram.h +++ b/FreeRTOS/Demo/CORTEX_SmartFusion2_M2S050_SoftConsole/RTOSDemo/Full-Demo/config_mdriver_ram.h @@ -1,5 +1,5 @@ /* - * FreeRTOS+FAT FS V1.0.0 (C) 2013 HCC Embedded + * FreeRTOS+FAT SL V1.0.1 (C) 2014 HCC Embedded * * FreeRTOS+FAT SL is an complementary component provided to Real Time Engineers * Ltd. by HCC Embedded for use with FreeRTOS. It is not, in itself, part of diff --git a/FreeRTOS/Demo/Common/Minimal/EventGroupsDemo.c b/FreeRTOS/Demo/Common/Minimal/EventGroupsDemo.c index 4890fde4b..141bb1d5d 100644 --- a/FreeRTOS/Demo/Common/Minimal/EventGroupsDemo.c +++ b/FreeRTOS/Demo/Common/Minimal/EventGroupsDemo.c @@ -1019,8 +1019,8 @@ BaseType_t xMessagePosted; /* Clear the bits again. */ uxReturned = xEventGroupClearBitsFromISR( xISREventGroup, uxBitsToSet ); - /* The returned value should be the value before the bits were cleaed.*/ - if( uxReturned != uxBitsToSet ) + /* Check the message was posted. */ + if( uxReturned != pdPASS ) { xISRTestError = pdTRUE; } diff --git a/FreeRTOS/Demo/RX600_RX64M_RSK_Renesas_e2studio/.info b/FreeRTOS/Demo/RX600_RX64M_RSK_Renesas_e2studio/.info index d54af9bd6..03b185af8 100644 --- a/FreeRTOS/Demo/RX600_RX64M_RSK_Renesas_e2studio/.info +++ b/FreeRTOS/Demo/RX600_RX64M_RSK_Renesas_e2studio/.info @@ -2,5 +2,4 @@ TOOL_CHAIN=Renesas RXC Toolchain VERSION=v2.01.00 TC_INSTALL=C:\Devtools\Renesas\RX\2_1_0\ VERSION_IDE=3.06.02.004 -ACTIVE_CONFIGURATION=HardwareDebug -E2STUDIO_VERSION=2.1.0.21 +E2STUDIO_VERSION=2.1.0.21 \ No newline at end of file diff --git a/FreeRTOS/Demo/RX600_RX64M_RSK_Renesas_e2studio/Source/Renesas_Code/cg_src/r_cg_iodefine.h b/FreeRTOS/Demo/RX600_RX64M_RSK_Renesas_e2studio/Source/Renesas_Code/cg_src/r_cg_iodefine.h index b8f28645b..362e2f3b2 100644 --- a/FreeRTOS/Demo/RX600_RX64M_RSK_Renesas_e2studio/Source/Renesas_Code/cg_src/r_cg_iodefine.h +++ b/FreeRTOS/Demo/RX600_RX64M_RSK_Renesas_e2studio/Source/Renesas_Code/cg_src/r_cg_iodefine.h @@ -3,7 +3,7 @@ /* Device : RX/RX600/RX64M */ /* File Name : iodefine.h */ /* Abstract : Definition of I/O Register. */ -/* History : V0.8A (2014-02-18) [Hardware Manual Revision : 0.80] */ +/* History : V0.8C (2014-03-22) [Hardware Manual Revision : 0.80] */ /* Note : This is a typical example. */ /* */ /* Copyright(c) 2014 Renesas Electronics Corp. */ @@ -1768,6 +1768,8 @@ struct st_edmac { struct { unsigned long :24; unsigned long RMAFCE:1; + unsigned long :2; + unsigned long RRFCE:1; } BIT; } TRSCER; char wk7[4]; @@ -2783,9 +2785,9 @@ struct st_eptpc0 { unsigned long MACL:24; } BIT; } SYMACRL; - char wk0a[1]; + char wk1[4]; unsigned long SYIPADDRR; - char wk1[32]; + char wk2[32]; union { unsigned long LONG; struct { @@ -2801,7 +2803,7 @@ struct st_eptpc0 { unsigned long DNUM:8; } BIT; } SYDOMR; - char wk2[8]; + char wk3[8]; union { unsigned long LONG; struct { @@ -2899,7 +2901,7 @@ struct st_eptpc0 { unsigned long PNUM:16; } BIT; } SYPNUMR; - char wk3[20]; + char wk4[20]; union { unsigned long LONG; struct { @@ -2909,7 +2911,7 @@ struct st_eptpc0 { unsigned long BMUP:1; } BIT; } SYRVLDR; - char wk4[12]; + char wk5[12]; union { unsigned long LONG; struct { @@ -2955,7 +2957,7 @@ struct st_eptpc0 { unsigned long ANCE:1; } BIT; } SYTRENR; - char wk5[4]; + char wk6[4]; unsigned long MTCIDU; unsigned long MTCIDL; union { @@ -2965,7 +2967,7 @@ struct st_eptpc0 { unsigned long PNUM:16; } BIT; } MTPID; - char wk6[20]; + char wk7[20]; union { unsigned long LONG; struct { @@ -2988,7 +2990,7 @@ struct st_eptpc0 { unsigned long OFMRL; unsigned long MPDRU; unsigned long MPDRL; - char wk7[8]; + char wk8[8]; union { unsigned long LONG; struct { @@ -3016,7 +3018,7 @@ struct st_eptpc0 { unsigned long SRMV:16; } BIT; } SRR; - char wk8[8]; + char wk9[8]; union { unsigned long LONG; struct { @@ -3052,7 +3054,7 @@ struct st_eptpc0 { unsigned long TYPE:16; } BIT; } PETYPER; - char wk9[12]; + char wk10[12]; unsigned long PPIPR; unsigned long PDIPR; union { @@ -3108,7 +3110,7 @@ struct st_eptpc0 { unsigned long SEL:1; } BIT; } FFLTR; - char wk10[28]; + char wk11[28]; union { unsigned long LONG; struct { @@ -3137,7 +3139,7 @@ struct st_eptpc0 { unsigned long MACL:24; } BIT; } FMAC1RL; - char wk11[80]; + char wk12[80]; union { unsigned long LONG; struct { @@ -3563,6 +3565,7 @@ struct st_exdmac1 { }; struct st_flash { + char wk0[2]; union { unsigned char BYTE; struct { @@ -3570,7 +3573,7 @@ struct st_flash { unsigned char FLWE:2; } BIT; } FWEPROR; - char wk0[7806329]; + char wk1[7806329]; union { unsigned char BYTE; struct { @@ -3582,7 +3585,7 @@ struct st_flash { unsigned char ECRCT:1; } BIT; } FASTAT; - char wk1[3]; + char wk2[3]; union { unsigned char BYTE; struct { @@ -3594,7 +3597,7 @@ struct st_flash { unsigned char ECRCTIE:1; } BIT; } FAEINT; - char wk2[3]; + char wk3[3]; union { unsigned char BYTE; struct { @@ -3602,7 +3605,7 @@ struct st_flash { unsigned char FRDYIE:1; } BIT; } FRDYIE; - char wk3[23]; + char wk4[23]; union { unsigned long LONG; struct { @@ -3615,7 +3618,7 @@ struct st_flash { unsigned long FEADDR:32; } BIT; } FEADDR; - char wk4[28]; + char wk5[28]; union { unsigned short WORD; struct { @@ -3625,7 +3628,7 @@ struct st_flash { unsigned short FCRME:1; } BIT; } FCURAME; - char wk5[42]; + char wk6[42]; union { unsigned long LONG; struct { @@ -3654,7 +3657,7 @@ struct st_flash { unsigned short FENTRYC:1; } BIT; } FENTRYR; - char wk6[2]; + char wk7[2]; union { unsigned short WORD; struct { @@ -3663,7 +3666,7 @@ struct st_flash { unsigned short FPROTCN:1; } BIT; } FPROTR; - char wk7[2]; + char wk8[2]; union { unsigned short WORD; struct { @@ -3672,7 +3675,7 @@ struct st_flash { unsigned short SUINIT:1; } BIT; } FSUINITR; - char wk8[2]; + char wk9[2]; union { unsigned char BYTE; struct { @@ -3680,7 +3683,7 @@ struct st_flash { unsigned char FLOCKST:1; } BIT; } FLKSTAT; - char wk9[15]; + char wk10[15]; union { unsigned short WORD; struct { @@ -3688,7 +3691,7 @@ struct st_flash { unsigned short PCMDR:8; } BIT; } FCMDR; - char wk10[30]; + char wk11[30]; union { unsigned short WORD; struct { @@ -3696,7 +3699,7 @@ struct st_flash { unsigned short PEERRST:8; } BIT; } FPESTAT; - char wk11[14]; + char wk12[14]; union { unsigned char BYTE; struct { @@ -3704,7 +3707,7 @@ struct st_flash { unsigned char BCDIR:1; } BIT; } FBCCNT; - char wk12[3]; + char wk13[3]; union { unsigned char BYTE; struct { @@ -3712,7 +3715,7 @@ struct st_flash { unsigned char BCST:1; } BIT; } FBCSTAT; - char wk13[3]; + char wk14[3]; union { unsigned long LONG; struct { @@ -3720,7 +3723,7 @@ struct st_flash { unsigned long PSADR:19; } BIT; } FPSADDR; - char wk14[4]; + char wk15[4]; union { unsigned short WORD; struct { @@ -3728,7 +3731,7 @@ struct st_flash { unsigned short ESUSPMD:1; } BIT; } FCPSR; - char wk15[2]; + char wk16[2]; union { unsigned short WORD; struct { @@ -17396,7 +17399,7 @@ IPR_PERIA_INTA253=253,IPR_PERIA_INTA254=254,IPR_PERIA_INTA255=255 #define EXDMAC (*(volatile struct st_exdmac __evenaccess *)0x82A00) #define EXDMAC0 (*(volatile struct st_exdmac0 __evenaccess *)0x82800) #define EXDMAC1 (*(volatile struct st_exdmac1 __evenaccess *)0x82840) -#define FLASH (*(volatile struct st_flash __evenaccess *)0x8C296) +#define FLASH (*(volatile struct st_flash __evenaccess *)0x8C294) #define GPT (*(volatile struct st_gpt __evenaccess *)0xC2000) #define GPT0 (*(volatile struct st_gpt0 __evenaccess *)0xC2100) #define GPT1 (*(volatile struct st_gpt0 __evenaccess *)0xC2180)