From 92f04df81b2bbeed4284668fc50e455731202555 Mon Sep 17 00:00:00 2001
From: rtel <rtel@1d2547de-c912-0410-9cb9-b8ca96c0e9e2>
Date: Mon, 18 Nov 2019 17:23:14 +0000
Subject: [PATCH] Remove driver files that generate compiler warnings from the
 RISC-V_Renode_Emulator_SoftConsole project. Update RISC-V ports so the
 interrupt stack is set to a known value before the scheduler is started if
 the interrupt stack is statically defined rather than re-using the main.c()
 stack.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2754 1d2547de-c912-0410-9cb9-b8ca96c0e9e2
---
 .../FreeRTOSConfig.h                          |    2 +-
 .../settings/RTOSDemo.wsdt                    |   48 +-
 .../.cproject                                 |    4 +
 .../.settings/language.settings.xml           |    2 +-
 .../FreeRTOSConfig.h                          |    4 +-
 .../Microsemi_Code/drivers/CoreI2C/core_i2c.c | 1563 -----------------
 .../drivers/CoreI2C/i2c_interrupt.c           |   35 -
 .../Microsemi_Code/riscv_hal/syscall.c        |  266 ---
 .../blinky_demo/main_blinky.c                 |    1 -
 .../full_demo/main_full.c                     |    1 -
 .../RISC-V_Renode_Emulator_SoftConsole/main.c |   10 +-
 FreeRTOS/Demo/WIN32-MSVC-lwIP/WIN32.vcxproj   |    2 +
 FreeRTOS/Demo/WIN32-MSVC/FreeRTOSConfig.h     |    2 +-
 FreeRTOS/Source/portable/GCC/RISC-V/port.c    |   20 +-
 FreeRTOS/Source/portable/GCC/RISC-V/portASM.S |    4 +-
 FreeRTOS/Source/portable/IAR/RISC-V/port.c    |   15 +-
 FreeRTOS/Source/portable/IAR/RISC-V/portASM.s |   10 +-
 17 files changed, 76 insertions(+), 1913 deletions(-)
 delete mode 100644 FreeRTOS/Demo/RISC-V_Renode_Emulator_SoftConsole/Microsemi_Code/drivers/CoreI2C/core_i2c.c
 delete mode 100644 FreeRTOS/Demo/RISC-V_Renode_Emulator_SoftConsole/Microsemi_Code/drivers/CoreI2C/i2c_interrupt.c
 delete mode 100644 FreeRTOS/Demo/RISC-V_Renode_Emulator_SoftConsole/Microsemi_Code/riscv_hal/syscall.c

diff --git a/FreeRTOS/Demo/RISC-V_RV32_SiFive_HiFive1_IAR/FreeRTOSConfig.h b/FreeRTOS/Demo/RISC-V_RV32_SiFive_HiFive1_IAR/FreeRTOSConfig.h
index 216c6dae1..c1be60059 100644
--- a/FreeRTOS/Demo/RISC-V_RV32_SiFive_HiFive1_IAR/FreeRTOSConfig.h
+++ b/FreeRTOS/Demo/RISC-V_RV32_SiFive_HiFive1_IAR/FreeRTOSConfig.h
@@ -57,7 +57,7 @@
 #define configIDLE_SHOULD_YIELD			0
 #define configUSE_MUTEXES				1
 #define configQUEUE_REGISTRY_SIZE		8
-#define configCHECK_FOR_STACK_OVERFLOW	3
+#define configCHECK_FOR_STACK_OVERFLOW	2
 #define configUSE_RECURSIVE_MUTEXES		1
 #define configUSE_MALLOC_FAILED_HOOK	1
 #define configUSE_APPLICATION_TASK_TAG	0
diff --git a/FreeRTOS/Demo/RISC-V_RV32_SiFive_HiFive1_IAR/settings/RTOSDemo.wsdt b/FreeRTOS/Demo/RISC-V_RV32_SiFive_HiFive1_IAR/settings/RTOSDemo.wsdt
index bdceed166..038dfe810 100644
--- a/FreeRTOS/Demo/RISC-V_RV32_SiFive_HiFive1_IAR/settings/RTOSDemo.wsdt
+++ b/FreeRTOS/Demo/RISC-V_RV32_SiFive_HiFive1_IAR/settings/RTOSDemo.wsdt
@@ -56,7 +56,7 @@
                     <item>33054</item>
                     <item>0</item>
                     <item>33035</item>
-                    <item>33036</item>
+                    <item>33037</item>
                     <item>34399</item>
                     <item>0</item>
                     <item>33038</item>
@@ -78,13 +78,11 @@
                     <ExpandedNode>RTOSDemo/FreeRTOS_source/portable/memmang</ExpandedNode>
                     <ExpandedNode>RTOSDemo/SiFive_code</ExpandedNode>
                     <ExpandedNode>RTOSDemo/blinky_demo</ExpandedNode>
-                    <ExpandedNode>RTOSDemo/full_demo</ExpandedNode>
-                    <ExpandedNode>RTOSDemo/full_demo/common</ExpandedNode>
                 </NodeDict>
             </IarPane-34059>
             <ControlBarVersion>
                 <Major>14</Major>
-                <Minor>22</Minor>
+                <Minor>23</Minor>
             </ControlBarVersion>
             <MFCToolBarParameters>
                 <Tooltips>1</Tooltips>
@@ -103,7 +101,7 @@
             <Pane-59393>
                 <ID>0</ID>
                 <RectRecentFloat>0A0000000A0000006E0000006E000000</RectRecentFloat>
-                <RectRecentDocked>0000000057050000000A00006A050000</RectRecentDocked>
+                <RectRecentDocked>0000000058050000700D00006B050000</RectRecentDocked>
                 <RecentFrameAlignment>4096</RecentFrameAlignment>
                 <RecentRowIndex>0</RecentRowIndex>
                 <IsFloating>0</IsFloating>
@@ -115,8 +113,8 @@
             </BasePane-59393>
             <Pane--1>
                 <ID>4294967295</ID>
-                <RectRecentFloat>0000000089040000000A00006E050000</RectRecentFloat>
-                <RectRecentDocked>0000000072040000000A000057050000</RectRecentDocked>
+                <RectRecentFloat>000000004A020000000600002F030000</RectRecentFloat>
+                <RectRecentDocked>0000000073040000700D000058050000</RectRecentDocked>
                 <RecentFrameAlignment>4096</RecentFrameAlignment>
                 <RecentRowIndex>0</RecentRowIndex>
                 <IsFloating>0</IsFloating>
@@ -129,7 +127,7 @@
             <Pane-34049>
                 <ID>34049</ID>
                 <RectRecentFloat>210100008A03000098080000F0040000</RectRecentFloat>
-                <RectRecentDocked>040000008A040000FC0900003D050000</RectRecentDocked>
+                <RectRecentDocked>040000008B0400006C0D00003E050000</RectRecentDocked>
                 <RecentFrameAlignment>32768</RecentFrameAlignment>
                 <RecentRowIndex>0</RecentRowIndex>
                 <IsFloating>0</IsFloating>
@@ -152,7 +150,7 @@
             <Pane-34052>
                 <ID>34052</ID>
                 <RectRecentFloat>210100008A03000098080000F0040000</RectRecentFloat>
-                <RectRecentDocked>040000008A040000FC0900003D050000</RectRecentDocked>
+                <RectRecentDocked>040000008B040000FC0500003E050000</RectRecentDocked>
                 <RecentFrameAlignment>32768</RecentFrameAlignment>
                 <RecentRowIndex>0</RecentRowIndex>
                 <IsFloating>0</IsFloating>
@@ -174,7 +172,7 @@
             <Pane-34053>
                 <ID>34053</ID>
                 <RectRecentFloat>210100008A03000098080000F0040000</RectRecentFloat>
-                <RectRecentDocked>040000008A040000FC0900003D050000</RectRecentDocked>
+                <RectRecentDocked>040000008B040000FC0500003E050000</RectRecentDocked>
                 <RecentFrameAlignment>32768</RecentFrameAlignment>
                 <RecentRowIndex>0</RecentRowIndex>
                 <IsFloating>0</IsFloating>
@@ -196,7 +194,7 @@
             <Pane-34054>
                 <ID>34054</ID>
                 <RectRecentFloat>210100008A03000098080000F0040000</RectRecentFloat>
-                <RectRecentDocked>040000008A040000FC0900003D050000</RectRecentDocked>
+                <RectRecentDocked>040000008B040000FC0500003E050000</RectRecentDocked>
                 <RecentFrameAlignment>32768</RecentFrameAlignment>
                 <RecentRowIndex>0</RecentRowIndex>
                 <IsFloating>0</IsFloating>
@@ -212,14 +210,14 @@
                 <ColumnWidth2>1144</ColumnWidth2>
                 <ColumnWidth3>508</ColumnWidth3>
                 <FilterLevel>2</FilterLevel>
-                <LiveFile></LiveFile>
+                <LiveFile />
                 <LiveLogEnabled>0</LiveLogEnabled>
                 <LiveFilterLevel>-1</LiveFilterLevel>
             </IarPane-34054>
             <Pane-34055>
                 <ID>34055</ID>
                 <RectRecentFloat>210100008A03000098080000F0040000</RectRecentFloat>
-                <RectRecentDocked>040000008A040000FC0900003D050000</RectRecentDocked>
+                <RectRecentDocked>040000008B040000FC0500003E050000</RectRecentDocked>
                 <RecentFrameAlignment>32768</RecentFrameAlignment>
                 <RecentRowIndex>0</RecentRowIndex>
                 <IsFloating>0</IsFloating>
@@ -227,12 +225,12 @@
                 <PinState>0</PinState>
             </Pane-34055>
             <BasePane-34055>
-                <IsVisible>1</IsVisible>
+                <IsVisible>0</IsVisible>
             </BasePane-34055>
             <IarPane-34055>
-                <ColumnWidth0>1198</ColumnWidth0>
-                <ColumnWidth1>171</ColumnWidth1>
-                <ColumnWidth2>2054</ColumnWidth2>
+                <ColumnWidth0>532</ColumnWidth0>
+                <ColumnWidth1>76</ColumnWidth1>
+                <ColumnWidth2>912</ColumnWidth2>
                 <FilterLevel>2</FilterLevel>
                 <LiveFile />
                 <LiveLogEnabled>0</LiveLogEnabled>
@@ -241,7 +239,7 @@
             <Pane-34058>
                 <ID>34058</ID>
                 <RectRecentFloat>210100008A03000098080000F0040000</RectRecentFloat>
-                <RectRecentDocked>040000008A040000FC0900003D050000</RectRecentDocked>
+                <RectRecentDocked>040000008B040000FC0500003E050000</RectRecentDocked>
                 <RecentFrameAlignment>32768</RecentFrameAlignment>
                 <RecentRowIndex>0</RecentRowIndex>
                 <IsFloating>0</IsFloating>
@@ -288,7 +286,7 @@
             <Pane-34056>
                 <ID>34056</ID>
                 <RectRecentFloat>000000001700000022010000C8000000</RectRecentFloat>
-                <RectRecentDocked>040000008A040000FC0900003D050000</RectRecentDocked>
+                <RectRecentDocked>040000008B0400006C0D00003E050000</RectRecentDocked>
                 <RecentFrameAlignment>32768</RecentFrameAlignment>
                 <RecentRowIndex>0</RecentRowIndex>
                 <IsFloating>0</IsFloating>
@@ -321,7 +319,7 @@
             <Pane-34059>
                 <ID>34059</ID>
                 <RectRecentFloat>00000000170000000601000078010000</RectRecentFloat>
-                <RectRecentDocked>0000000032000000DD0100006E040000</RectRecentDocked>
+                <RectRecentDocked>0000000032000000DD0100006F040000</RectRecentDocked>
                 <RecentFrameAlignment>4096</RecentFrameAlignment>
                 <RecentRowIndex>0</RecentRowIndex>
                 <IsFloating>0</IsFloating>
@@ -332,11 +330,11 @@
                 <IsVisible>1</IsVisible>
             </BasePane-34059>
             <DockingManager-256>
-                <DockingPaneAndPaneDividers>0000000010000000000000000010000001000000FFFFFFFFFFFFFFFFDD01000032000000E10100006E040000010000000200001004000000010000000AFFFFFFD70500000B85000000000000000000000000000000000000010000000B850000010000000B850000000000000080000000000000FFFFFFFFFFFFFFFF00000000000000000400000004000000000000000100000004000000010000000000000000000000098500000000000000000000000000000000000001000000098500000100000009850000000000000080000001000000FFFFFFFFFFFFFFFF000000006E040000000A000072040000010000000100001004000000010000009DFEFFFF38010000FFFFFFFF070000000885000001850000048500000585000006850000078500000A850000FFFF02000B004354616262656450616E6500800000010000000000000089040000000A00006E0500000000000072040000000A000057050000000000004080005607000000FFFEFF1153006F0075007200630065002000420072006F0077007300650020004C006F006700010000000885000001000000FFFFFFFFFFFFFFFFFFFEFF054200750069006C006400010000000185000001000000FFFFFFFFFFFFFFFFFFFEFF0C4400650063006C00610072006100740069006F006E007300000000000485000001000000FFFFFFFFFFFFFFFFFFFEFF0A5200650066006500720065006E00630065007300000000000585000001000000FFFFFFFFFFFFFFFFFFFEFF0D460069006E006400200069006E002000460069006C0065007300000000000685000001000000FFFFFFFFFFFFFFFFFFFEFF1541006D0062006900670075006F0075007300200044006500660069006E006900740069006F006E007300010000000785000001000000FFFFFFFFFFFFFFFFFFFEFF0B54006F006F006C0020004F0075007400700075007400000000000A85000001000000FFFFFFFFFFFFFFFF01000000000000000000000000000000000000000000000001000000FFFFFFFF0885000001000000FFFFFFFF08850000000000000080000000000000FFFFFFFFFFFFFFFF00000000000000000400000004000000000000000100000004000000010000000000000000000000038500000000000000000000000000000000000001000000038500000100000003850000000000000080000000000000FFFFFFFFFFFFFFFF00000000000000000400000004000000000000000100000004000000010000000000000000000000028500000000000000000000000000000000000001000000028500000100000002850000000000000080000000000000FFFFFFFFFFFFFFFF000000000000000004000000040000000000000001000000040000000100000000000000000000000D85000000000000000000000000000000000000010000000D850000010000000D850000000000000080000000000000FFFFFFFFFFFFFFFF000000000000000004000000040000000000000001000000040000000100000000000000000000000C85000000000000000000000000000000000000010000000C850000010000000C850000000000000080000000000000FFFFFFFFFFFFFFFF00000000A2040000000A0000A6040000000000000100000004000000010000000000000000000000FFFFFFFF010000000E8500000180008000000000000000000000BD040000000A00006E05000000000000A6040000000A000057050000000000004080004601000000FFFEFF094400650062007500670020004C006F006700000000000E85000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFF0E85000001000000FFFFFFFF0E850000000000000000000000000000</DockingPaneAndPaneDividers>
+                <DockingPaneAndPaneDividers>0000000010000000000000000010000001000000FFFFFFFFFFFFFFFFDD01000032000000E10100006F040000010000000200001004000000010000000AFFFFFFD70500000B85000000000000000000000000000000000000010000000B850000010000000B850000000000000080000000000000FFFFFFFFFFFFFFFF00000000000000000400000004000000000000000100000004000000010000000000000000000000098500000000000000000000000000000000000001000000098500000100000009850000000000000080000001000000FFFFFFFFFFFFFFFF000000006F040000700D000073040000010000000100001004000000010000009DFEFFFF38010000FFFFFFFF070000000885000001850000048500000585000006850000078500000A850000FFFF02000B004354616262656450616E650080000001000000000000004A020000000600002F0300000000000073040000700D000058050000000000004080005607000000FFFEFF1153006F0075007200630065002000420072006F0077007300650020004C006F006700010000000885000001000000FFFFFFFFFFFFFFFFFFFEFF054200750069006C006400010000000185000001000000FFFFFFFFFFFFFFFFFFFEFF0C4400650063006C00610072006100740069006F006E007300000000000485000001000000FFFFFFFFFFFFFFFFFFFEFF0A5200650066006500720065006E00630065007300000000000585000001000000FFFFFFFFFFFFFFFFFFFEFF0D460069006E006400200069006E002000460069006C0065007300000000000685000001000000FFFFFFFFFFFFFFFFFFFEFF1541006D0062006900670075006F0075007300200044006500660069006E006900740069006F006E007300000000000785000001000000FFFFFFFFFFFFFFFFFFFEFF0B54006F006F006C0020004F0075007400700075007400000000000A85000001000000FFFFFFFFFFFFFFFF01000000000000000000000000000000000000000000000001000000FFFFFFFF0885000001000000FFFFFFFF08850000000000000080000000000000FFFFFFFFFFFFFFFF00000000000000000400000004000000000000000100000004000000010000000000000000000000038500000000000000000000000000000000000001000000038500000100000003850000000000000080000000000000FFFFFFFFFFFFFFFF00000000000000000400000004000000000000000100000004000000010000000000000000000000028500000000000000000000000000000000000001000000028500000100000002850000000000000080000000000000FFFFFFFFFFFFFFFF000000000000000004000000040000000000000001000000040000000100000000000000000000000D85000000000000000000000000000000000000010000000D850000010000000D850000000000000080000000000000FFFFFFFFFFFFFFFF000000000000000004000000040000000000000001000000040000000100000000000000000000000C85000000000000000000000000000000000000010000000C850000010000000C850000000000000080000000000000FFFFFFFFFFFFFFFF00000000A3040000700D0000A7040000000000000100000004000000010000000000000000000000FFFFFFFF010000000E85000001800080000000000000000000007E020000000600002F03000000000000A7040000700D000058050000000000004080004601000000FFFEFF094400650062007500670020004C006F006700000000000E85000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFF0E85000001000000FFFFFFFF0E850000000000000000000000000000</DockingPaneAndPaneDividers>
             </DockingManager-256>
             <MFCToolBar-34048>
                 <Name>Main</Name>
-                <Buttons>00200000010000002000FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000035000000FFFEFF000000000000000000000000000100000001000000018001E100000000000036000000FFFEFF000000000000000000000000000100000001000000018003E100000000040038000000FFFEFF0000000000000000000000000001000000010000000180008100000000000019000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018007E10000000004003B000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018023E10000000004003D000000FFFEFF000000000000000000000000000100000001000000018022E10000000004003C000000FFFEFF000000000000000000000000000100000001000000018025E10000000004003F000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001802BE100000000040042000000FFFEFF00000000000000000000000000010000000100000001802CE100000000040043000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6E4281000000000400FFFFFFFFFFFEFF0000000000000000000100000000000000010000007800000002002050FFFFFFFFFFFEFF0096000000000000004800FFFEFF042E0065006E006400FFFEFF0C70007800430075007200720065006E007400540043004200FFFEFF076D00730074006100740075007300FFFEFF046D00650070006300FFFEFF066D0063006100750073006500FFFEFF095F005F00610072006D00200076006F006C00FFFEFF0D5F005F00610072006D00200076006F006C00610069006C006500FFFEFF0E5F005F00610073006D00200076006F006C006100740069006C006500FFFEFF056D007400760065006300FFFEFF1278005400610073006B0049006E006300720065006D0065006E0074005400690063006B00FFFEFF0870006F0072007400480041004E004400FFFEFF0470006F0072007400FFFEFF0363006C007A00FFFEFF095500530045005F0050004F00520054005F00FFFEFF1F700075006C006C004D0061006300680069006E006500540069006D006500720043006F006D00700061007200650052006500670069007300740065007200FFFEFF055F005F00610073006D00FFFEFF0C780049005300520053007400610063006B0054006F007000FFFEFF1A63006F006E006600690067004900530052005F0053005400410043004B005F00530049005A0045005F0057004F00520044005300FFFEFF1B75007800540069006D006500720049006E006300720065006D0065006E007400730046006F0072004F006E0065005400690063006B00FFFEFF107000720076005300650074007500700048006100720064007700610072006500FFFEFF0955004100520054005F005200450047005700FFFEFF0B55004100520054005F0054005800460055004C004C00FFFEFF164D004500540041004C005F005300490046004900560045005F00550041005200540030005F00440049005600FFFEFF194D004500540041004C005F005300490046004900560045005F00550041005200540030005F00540058004300540052004C00FFFEFF0F7400610073006B00520045005300450054005F0052004500410044005900FFFEFF0855004100520054005F00520045004700FFFEFF18700072007600530065007400750070005000650072006900700068006500720061006C00540069006D00650072007300FFFEFF06650062007200650061006B00FFFEFF0C63006F006E00660069006700410053005300450052005400FFFEFF095400490043004B005F0048004F004F004B00FFFEFF0575006C00520065006700FFFEFF16700075006C00520065006700540065007300740031004C006F006F00700043006F0075006E00740065007200FFFEFF1575006C00520065006700540065007300740032004C006F006F00700043006F0075006E00740065007200FFFEFF087400690063006B0068006F006F006B00FFFEFF0A73006500740075007000740069006D0065007200FFFEFF0C70007200760043006800650063006B005400610073006B00FFFEFF116D00610069006E0055004100520054005F0052004500470049005300540045005200FFFEFF0873007400610072007400730063006800FFFEFF1175006C0043006800650063006B005400610073006B004300790063006C0065007300FFFEFF1078004500720072006F0072004F00630063007500720072006500640020003D00FFFEFF0974006F00670067006C0065006C0065006400FFFEFF156D00610069006E005200450044005F004C00450044005F004700500049004F005F0050004F0052005400FFFEFF146D00610069006E0055004100520054005F00540058005F00460055004C004C005F00420049005400FFFEFF156D00610069006E00550041005200540030005F00540058005F0044004100540041005F00520045004700FFFEFF204D004500540041004C005F005300490046004900560045005F00550041005200540030005F00310030003000310033003000300030005F00530049005A004500FFFEFF194D004500540041004C005F005300490046004900560045005F00550041005200540030005F0030005F00530049005A004500FFFEFF124D004500540041004C005F005300490046004900560045005F0055004100520054003000FFFEFF194D004500540041004C005F005300490046004900560045005F00550041005200540030005F00540058004400410054004100FFFEFF194D004500540041004C005F005300490046004900560045005F00550041005200540030005F00520058004400410054004100FFFEFF0674006F00670067006C006500FFFEFF1178004500720072006F0072004F00630063007500720072006500640020003D002000FFFEFF1270007200760042006100730069006300440065006C006100790054006500730074007300FFFEFF0E78005000720069006D006100720079004300790063006C0065007300FFFEFF1976005000720069006D0061007200790042006C006F0063006B00540069006D00650054006500730074005400610073006B00FFFEFF0F5400610073006B005000720069006F007200690074007900530065007400FFFEFF12700072007600530069006E0067006C0065005400610073006B0054006500730074007300FFFEFF187000720076004E006F006E0042006C006F0063006B0069006E006700530065006E006400650072005400610073006B00FFFEFF0B6E006F006E0062006C006F0063006B0069006E006700FFFEFF0D7000720076004500630068006F00530065007200760065007200FFFEFF1F63006F006E0066006900670053005500500050004F00520054005F005300540041005400490043005F0041004C004C004F0043004100540049004F004E00FFFEFF0D7000720076004500630068006F0043006C00690065006E007400FFFEFF2F730074006100740069006300200076006F006900640020007000720076004500630068006F0043006C00690065006E0074002800200076006F006900640020002A007000760050006100720061006D006500740065007200730020002900FFFEFF0770006F00720074005F006F007000FFFEFF0E76005400610073006B00440065006C00610079002800200070006F00FFFEFF0A53005400410043004B005F004F00560045005200FFFEFF09780049005300520053007400610063006B00FFFEFF0F730074006100720074007300630068006500640075006C00650072006500FFFEFF066D0065006D00730065007400FFFEFF1770006F00720074004900530052005F0053005400410043004B005F00460049004C004C005F004200590054004500FFFEFF0773007400610063006B005F007600FFFEFF0A73007400610063006B005F006F00760065007200FFFEFF062E0061006C00690067006E00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018021810000000004002C000000FFFEFF000000000000000000000000000100000001000000018024E10000000004003E000000FFFEFF000000000000000000000000000100000001000000018028E100000000040040000000FFFEFF000000000000000000000000000100000001000000018029E100000000040041000000FFFEFF000000000000000000000000000100000001000000018002810000000004001B000000FFFEFF0000000000000000000000000001000000010000000180298100000000040030000000FFFEFF000000000000000000000000000100000001000000018027810000000004002E000000FFFEFF000000000000000000000000000100000001000000018028810000000004002F000000FFFEFF00000000000000000000000000010000000100000001801D8100000000040028000000FFFEFF00000000000000000000000000010000000100000001801E8100000000040029000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001800B810000000004001F000000FFFEFF00000000000000000000000000010000000100000001800C8100000000000020000000FFFEFF00000000000000000000000000010000000100000001805F8600000000000034000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001800E8100000000000022000000FFFEFF00000000000000000000000000010000000100000001800F8100000000000023000000FFFEFF00000000000000000000000000010000000100000000000000FFFEFF044D00610069006E00E8020000</Buttons>
+                <Buttons>00200000010000002000FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000035000000FFFEFF000000000000000000000000000100000001000000018001E100000000000036000000FFFEFF000000000000000000000000000100000001000000018003E100000000000038000000FFFEFF0000000000000000000000000001000000010000000180008100000000000019000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018007E10000000000003B000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018023E10000000004003D000000FFFEFF000000000000000000000000000100000001000000018022E10000000004003C000000FFFEFF000000000000000000000000000100000001000000018025E10000000000003F000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001802BE100000000000042000000FFFEFF00000000000000000000000000010000000100000001802CE100000000040043000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6E4281000000000000FFFFFFFFFFFEFF0000000000000000000100000000000000010000007800000002002050FFFFFFFFFFFEFF0096000000000000004800FFFEFF042E0065006E006400FFFEFF0C70007800430075007200720065006E007400540043004200FFFEFF076D00730074006100740075007300FFFEFF046D00650070006300FFFEFF066D0063006100750073006500FFFEFF095F005F00610072006D00200076006F006C00FFFEFF0D5F005F00610072006D00200076006F006C00610069006C006500FFFEFF0E5F005F00610073006D00200076006F006C006100740069006C006500FFFEFF056D007400760065006300FFFEFF1278005400610073006B0049006E006300720065006D0065006E0074005400690063006B00FFFEFF0870006F0072007400480041004E004400FFFEFF0470006F0072007400FFFEFF0363006C007A00FFFEFF095500530045005F0050004F00520054005F00FFFEFF1F700075006C006C004D0061006300680069006E006500540069006D006500720043006F006D00700061007200650052006500670069007300740065007200FFFEFF055F005F00610073006D00FFFEFF0C780049005300520053007400610063006B0054006F007000FFFEFF1A63006F006E006600690067004900530052005F0053005400410043004B005F00530049005A0045005F0057004F00520044005300FFFEFF1B75007800540069006D006500720049006E006300720065006D0065006E007400730046006F0072004F006E0065005400690063006B00FFFEFF107000720076005300650074007500700048006100720064007700610072006500FFFEFF0955004100520054005F005200450047005700FFFEFF0B55004100520054005F0054005800460055004C004C00FFFEFF164D004500540041004C005F005300490046004900560045005F00550041005200540030005F00440049005600FFFEFF194D004500540041004C005F005300490046004900560045005F00550041005200540030005F00540058004300540052004C00FFFEFF0F7400610073006B00520045005300450054005F0052004500410044005900FFFEFF0855004100520054005F00520045004700FFFEFF18700072007600530065007400750070005000650072006900700068006500720061006C00540069006D00650072007300FFFEFF06650062007200650061006B00FFFEFF0C63006F006E00660069006700410053005300450052005400FFFEFF095400490043004B005F0048004F004F004B00FFFEFF0575006C00520065006700FFFEFF16700075006C00520065006700540065007300740031004C006F006F00700043006F0075006E00740065007200FFFEFF1575006C00520065006700540065007300740032004C006F006F00700043006F0075006E00740065007200FFFEFF087400690063006B0068006F006F006B00FFFEFF0A73006500740075007000740069006D0065007200FFFEFF0C70007200760043006800650063006B005400610073006B00FFFEFF116D00610069006E0055004100520054005F0052004500470049005300540045005200FFFEFF0873007400610072007400730063006800FFFEFF1175006C0043006800650063006B005400610073006B004300790063006C0065007300FFFEFF1078004500720072006F0072004F00630063007500720072006500640020003D00FFFEFF0974006F00670067006C0065006C0065006400FFFEFF156D00610069006E005200450044005F004C00450044005F004700500049004F005F0050004F0052005400FFFEFF146D00610069006E0055004100520054005F00540058005F00460055004C004C005F00420049005400FFFEFF156D00610069006E00550041005200540030005F00540058005F0044004100540041005F00520045004700FFFEFF204D004500540041004C005F005300490046004900560045005F00550041005200540030005F00310030003000310033003000300030005F00530049005A004500FFFEFF194D004500540041004C005F005300490046004900560045005F00550041005200540030005F0030005F00530049005A004500FFFEFF124D004500540041004C005F005300490046004900560045005F0055004100520054003000FFFEFF194D004500540041004C005F005300490046004900560045005F00550041005200540030005F00540058004400410054004100FFFEFF194D004500540041004C005F005300490046004900560045005F00550041005200540030005F00520058004400410054004100FFFEFF0674006F00670067006C006500FFFEFF1178004500720072006F0072004F00630063007500720072006500640020003D002000FFFEFF1270007200760042006100730069006300440065006C006100790054006500730074007300FFFEFF0E78005000720069006D006100720079004300790063006C0065007300FFFEFF1976005000720069006D0061007200790042006C006F0063006B00540069006D00650054006500730074005400610073006B00FFFEFF0F5400610073006B005000720069006F007200690074007900530065007400FFFEFF12700072007600530069006E0067006C0065005400610073006B0054006500730074007300FFFEFF187000720076004E006F006E0042006C006F0063006B0069006E006700530065006E006400650072005400610073006B00FFFEFF0B6E006F006E0062006C006F0063006B0069006E006700FFFEFF0D7000720076004500630068006F00530065007200760065007200FFFEFF1F63006F006E0066006900670053005500500050004F00520054005F005300540041005400490043005F0041004C004C004F0043004100540049004F004E00FFFEFF0D7000720076004500630068006F0043006C00690065006E007400FFFEFF2F730074006100740069006300200076006F006900640020007000720076004500630068006F0043006C00690065006E0074002800200076006F006900640020002A007000760050006100720061006D006500740065007200730020002900FFFEFF0770006F00720074005F006F007000FFFEFF0E76005400610073006B00440065006C00610079002800200070006F00FFFEFF0A53005400410043004B005F004F00560045005200FFFEFF09780049005300520053007400610063006B00FFFEFF0F730074006100720074007300630068006500640075006C00650072006500FFFEFF066D0065006D00730065007400FFFEFF1770006F00720074004900530052005F0053005400410043004B005F00460049004C004C005F004200590054004500FFFEFF0773007400610063006B005F007600FFFEFF0A73007400610063006B005F006F00760065007200FFFEFF062E0061006C00690067006E00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018021810000000000002C000000FFFEFF000000000000000000000000000100000001000000018024E10000000000003E000000FFFEFF000000000000000000000000000100000001000000018028E100000000000040000000FFFEFF000000000000000000000000000100000001000000018029E100000000000041000000FFFEFF000000000000000000000000000100000001000000018002810000000000001B000000FFFEFF0000000000000000000000000001000000010000000180298100000000000030000000FFFEFF000000000000000000000000000100000001000000018027810000000000002E000000FFFEFF000000000000000000000000000100000001000000018028810000000000002F000000FFFEFF00000000000000000000000000010000000100000001801D8100000000000028000000FFFEFF00000000000000000000000000010000000100000001801E8100000000040029000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001800B810000000004001F000000FFFEFF00000000000000000000000000010000000100000001800D8100000000000021000000FFFEFF00000000000000000000000000010000000100000001805F8600000000000034000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001800E8100000000000022000000FFFEFF00000000000000000000000000010000000100000001800F8100000000000023000000FFFEFF00000000000000000000000000010000000100000000000000FFFEFF044D00610069006E00E8020000</Buttons>
             </MFCToolBar-34048>
             <Pane-34048>
                 <ID>34048</ID>
@@ -353,7 +351,7 @@
             </BasePane-34048>
             <IarPane-34062>
                 <ColumnWidth0>21</ColumnWidth0>
-                <ColumnWidth1>2497</ColumnWidth1>
+                <ColumnWidth1>3394</ColumnWidth1>
                 <FilterLevel>2</FilterLevel>
                 <LiveFile></LiveFile>
                 <LiveLogEnabled>0</LiveLogEnabled>
@@ -362,7 +360,7 @@
             <Pane-34062>
                 <ID>34062</ID>
                 <RectRecentFloat>000000001700000022010000C8000000</RectRecentFloat>
-                <RectRecentDocked>00000000BA040000000A000057050000</RectRecentDocked>
+                <RectRecentDocked>00000000BB040000700D000058050000</RectRecentDocked>
                 <RecentFrameAlignment>4096</RecentFrameAlignment>
                 <RecentRowIndex>0</RecentRowIndex>
                 <IsFloating>0</IsFloating>
@@ -503,7 +501,7 @@
         </Desktop>
         <MDIWindows>
             <MDIClientArea-0>
-                <MDITabsState>0100000003000000010000000000000000000000010000000100000002000000000000000100000001000000000000002800000028000000010000000F0000000200000001000000FFFEFF252400570053005F0044004900520024005C002E002E005C0043006F006D006D006F006E005C004D0069006E0069006D0061006C005C0062006C006F0063006B00740069006D002E00630001000000FFFF010014004966436F6E74656E7453746F72616765496D706CFFFEFF00FFFEFFFF2A013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E003400350034003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E00310037003400390038003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E00310037003400390038003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0A62006C006F0063006B00740069006D002E00630000000000FFFFFFFFFFFFFFFFFFFEFF0F2400570053005F0044004900520024005C006D00610069006E002E006300010000000180FFFEFF00FFFEFFFF28013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E003100360036003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0037003400320035003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0037003400320035003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF066D00610069006E002E00630000000000FFFFFFFFFFFFFFFFFFFEFF1E2400570053005F0044004900520024005C00660075006C006C005F00640065006D006F005C006D00610069006E005F00660075006C006C002E006300010000000180FFFEFF00FFFEFFFF22013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E003100350038003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0030003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0030003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0B6D00610069006E005F00660075006C006C002E00630000000000FFFFFFFFFFFFFFFFFFFEFF192400570053005F0044004900520024005C004600720065006500520054004F00530043006F006E006600690067002E006800010000000180FFFEFF00FFFEFFFF27013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E00340030003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0034003100350030003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0034003100350030003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF104600720065006500520054004F00530043006F006E006600690067002E00680000000000FFFFFFFFFFFFFFFFFFFEFF2E2400570053005F0044004900520024005C002E002E005C0043006F006D006D006F006E005C004D0069006E0069006D0061006C005C004D00650073007300610067006500420075006600660065007200440065006D006F002E006300010000000180FFFEFF00FFFEFFFF2A013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E003700330034003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E00330032003500350031003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E00330032003500350031003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF134D00650073007300610067006500420075006600660065007200440065006D006F002E00630000000000FFFFFFFFFFFFFFFFFFFEFF282400570053005F0044004900520024005C002E002E005C002E002E005C0053006F0075007200630065005C0069006E0063006C007500640065005C004600720065006500520054004F0053002E006800010000000180FFFEFF00FFFEFFFF2A013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E003800310034003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E00320034003300350032003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E00320034003300350032003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0A4600720065006500520054004F0053002E00680000000000FFFFFFFFFFFFFFFFFFFEFF262400570053005F0044004900520024005C002E002E005C0043006F006D006D006F006E005C004D0069006E0069006D0061006C005C00540069006D0065007200440065006D006F002E006300010000000180FFFEFF00FFFEFFFF28013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E003700330039003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0036003800330033003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0036003800330033003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0B540069006D0065007200440065006D006F002E00630000000000FFFFFFFFFFFFFFFFFFFEFF1D2400570053005F0044004900520024005C002E002E005C002E002E005C0053006F0075007200630065005C007400610073006B0073002E006300010000000180FFFEFF00FFFEFFFF2B013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0031003100340033003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E00340035003200300031003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E00340035003200300031003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF077400610073006B0073002E00630000000000FFFFFFFFFFFFFFFFFFFEFF332400570053005F0044004900520024005C002E002E005C002E002E005C0053006F0075007200630065005C0070006F0072007400610062006C0065005C004900410052005C0052004900530043002D0056005C0070006F0072007400410053004D002E007300010000000180FFFEFF00FFFEFFFF27013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E00360033003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0033003800350031003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0033003800350031003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0970006F0072007400410053004D002E00730000000000FFFFFFFFFFFFFFFFFFFEFF302400570053005F0044004900520024005C002E002E005C002E002E005C0053006F0075007200630065005C0070006F0072007400610062006C0065005C004900410052005C0052004900530043002D0056005C0070006F00720074002E006300010000000180FFFEFF00FFFEFFFF28013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E003100320034003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0037003200390034003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0037003200390034003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0670006F00720074002E00630000000000FFFFFFFFFFFFFFFFFFFEFF352400570053005F0044004900520024005C002E002E005C002E002E005C0053006F0075007200630065005C0070006F0072007400610062006C0065005C004900410052005C0052004900530043002D0056005C0070006F00720074006D006100630072006F002E006800010000000180FFFEFF00FFFEFFFF21013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E00370039003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0030003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0030003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0B70006F00720074006D006100630072006F002E00680000000000FFFFFFFFFFFFFFFFFFFEFF242400570053005F0044004900520024005C002E002E005C0043006F006D006D006F006E005C004D0069006E0069006D0061006C005C00640079006E0061006D00690063002E006300010000000180FFFEFF00FFFEFFFF28013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E003100310039003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0037003100360035003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0037003100360035003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF09640079006E0061006D00690063002E00630000000000FFFFFFFFFFFFFFFFFFFEFF272400570053005F0044004900520024005C002E002E005C0043006F006D006D006F006E005C004D0069006E0069006D0061006C005C005400610073006B004E006F0074006900660079002E006300010000000180FFFEFF00FFFEFFFF27013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E00370038003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0033003800300030003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0033003800300030003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0C5400610073006B004E006F0074006900660079002E00630000000000FFFFFFFFFFFFFFFFFFFEFF1C2400570053005F0044004900520024005C00660075006C006C005F00640065006D006F005C0052006500670054006500730074002E007300010000000180FFFEFF00FFFEFFFF28013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E003100310037003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0034003000390035003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0034003000390035003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0952006500670054006500730074002E00730000000000FFFFFFFFFFFFFFFFFFFEFF222400570053005F0044004900520024005C0062006C0069006E006B0079005F00640065006D006F005C006D00610069006E005F0062006C0069006E006B0079002E006300010000000180FFFEFF00FFFEFFFF28013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E003100300031003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0035003200360037003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0035003200360037003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0D6D00610069006E005F0062006C0069006E006B0079002E00630000000000FFFFFFFFFFFFFFFF0000000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000100000002000000E101000049000000000A000085040000</MDITabsState>
+                <MDITabsState>010000000300000001000000000000000000000001000000010000000200000000000000010000000100000000000000280000002800000001000000040000000200000001000000FFFEFF0F2400570053005F0044004900520024005C006D00610069006E002E00630001000000FFFF010014004966436F6E74656E7453746F72616765496D706CFFFEFF00FFFEFFFF2A013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E003200340033003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E00310030003500360031003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E00310030003500360031003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF066D00610069006E002E00630000000000FFFFFFFFFFFFFFFFFFFEFF302400570053005F0044004900520024005C002E002E005C002E002E005C0053006F0075007200630065005C0070006F0072007400610062006C0065005C004900410052005C0052004900530043002D0056005C0070006F00720074002E006300010000000180FFFEFF00FFFEFFFF27013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E00350037003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0034003500320038003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0034003500350038003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0670006F00720074002E00630000000000FFFFFFFFFFFFFFFFFFFEFF192400570053005F0044004900520024005C004600720065006500520054004F00530043006F006E006600690067002E006800010000000180FFFEFF00FFFEFFFF27013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E00320035003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0032003600350039003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0032003600350039003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF104600720065006500520054004F00530043006F006E006600690067002E00680000000000FFFFFFFFFFFFFFFFFFFEFF332400570053005F0044004900520024005C002E002E005C002E002E005C0053006F0075007200630065005C0070006F0072007400610062006C0065005C004900410052005C0052004900530043002D0056005C0070006F0072007400410053004D002E007300010000000180FFFEFF00FFFEFFFF28013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E003100330032003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0036003000370030003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0036003100300032003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0970006F0072007400410053004D002E00730000000000FFFFFFFFFFFFFFFF0000000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000100000002000000E101000049000000700D000086040000</MDITabsState>
             </MDIClientArea-0>
         </MDIWindows>
     </WindowStorage>
diff --git a/FreeRTOS/Demo/RISC-V_Renode_Emulator_SoftConsole/.cproject b/FreeRTOS/Demo/RISC-V_Renode_Emulator_SoftConsole/.cproject
index ec8b66487..278fb9f6a 100644
--- a/FreeRTOS/Demo/RISC-V_Renode_Emulator_SoftConsole/.cproject
+++ b/FreeRTOS/Demo/RISC-V_Renode_Emulator_SoftConsole/.cproject
@@ -153,6 +153,10 @@
                                 								
                                 <option id="ilg.gnumcueclipse.managedbuild.cross.riscv.option.c.compiler.other.458885637" name="Other compiler flags" superClass="ilg.gnumcueclipse.managedbuild.cross.riscv.option.c.compiler.other" useByScannerDiscovery="true" value="" valueType="string"/>
                                 								
+                                <option id="ilg.gnumcueclipse.managedbuild.cross.riscv.option.c.compiler.otherwarnings.501755172" name="Other warning flags" superClass="ilg.gnumcueclipse.managedbuild.cross.riscv.option.c.compiler.otherwarnings" useByScannerDiscovery="true" value="-Wall -Wextra" valueType="string"/>
+                                								
+                                <option id="ilg.gnumcueclipse.managedbuild.cross.riscv.option.c.compiler.otheroptimizations.161916863" name="Other optimization flags" superClass="ilg.gnumcueclipse.managedbuild.cross.riscv.option.c.compiler.otheroptimizations" useByScannerDiscovery="true" value="" valueType="string"/>
+                                								
                                 <inputType id="ilg.gnumcueclipse.managedbuild.cross.riscv.tool.c.compiler.input.1901773760" superClass="ilg.gnumcueclipse.managedbuild.cross.riscv.tool.c.compiler.input"/>
                                 							
                             </tool>
diff --git a/FreeRTOS/Demo/RISC-V_Renode_Emulator_SoftConsole/.settings/language.settings.xml b/FreeRTOS/Demo/RISC-V_Renode_Emulator_SoftConsole/.settings/language.settings.xml
index 199f873dc..a39d90c9a 100644
--- a/FreeRTOS/Demo/RISC-V_Renode_Emulator_SoftConsole/.settings/language.settings.xml
+++ b/FreeRTOS/Demo/RISC-V_Renode_Emulator_SoftConsole/.settings/language.settings.xml
@@ -11,7 +11,7 @@
             			
             <provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
             			
-            <provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-1790871989465787416" id="ilg.gnumcueclipse.managedbuild.cross.riscv.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT RISC-V Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+            <provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-515639860269293471" id="ilg.gnumcueclipse.managedbuild.cross.riscv.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT RISC-V Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
                 				
                 <language-scope id="org.eclipse.cdt.core.gcc"/>
                 				
diff --git a/FreeRTOS/Demo/RISC-V_Renode_Emulator_SoftConsole/FreeRTOSConfig.h b/FreeRTOS/Demo/RISC-V_Renode_Emulator_SoftConsole/FreeRTOSConfig.h
index 724426b1d..79f1a00a1 100644
--- a/FreeRTOS/Demo/RISC-V_Renode_Emulator_SoftConsole/FreeRTOSConfig.h
+++ b/FreeRTOS/Demo/RISC-V_Renode_Emulator_SoftConsole/FreeRTOSConfig.h
@@ -85,7 +85,6 @@
  *
  * See http://www.freertos.org/a00110.html.
  *----------------------------------------------------------*/
-
 #define configCLINT_BASE_ADDRESS		PRCI_BASE
 #define configUSE_PREEMPTION			1
 #define configUSE_IDLE_HOOK				1
@@ -143,4 +142,7 @@ to exclude the API function. */
 header file. */
 #define configASSERT( x ) if( ( x ) == 0 ) { taskDISABLE_INTERRUPTS(); __asm volatile( "ebreak" ); for( ;; ); }
 
+/* Defined in main.c and used in main_blinky.c and main_full.c. */
+void vSendString( const char * const pcString );
+
 #endif /* FREERTOS_CONFIG_H */
diff --git a/FreeRTOS/Demo/RISC-V_Renode_Emulator_SoftConsole/Microsemi_Code/drivers/CoreI2C/core_i2c.c b/FreeRTOS/Demo/RISC-V_Renode_Emulator_SoftConsole/Microsemi_Code/drivers/CoreI2C/core_i2c.c
deleted file mode 100644
index daa18879d..000000000
--- a/FreeRTOS/Demo/RISC-V_Renode_Emulator_SoftConsole/Microsemi_Code/drivers/CoreI2C/core_i2c.c
+++ /dev/null
@@ -1,1563 +0,0 @@
-/*******************************************************************************
- * (c) Copyright 2009-2015 Microsemi  SoC Products Group.  All rights reserved.
- * 
- * CoreI2C software driver implementation.
- * 
- * SVN $Revision: 7984 $
- * SVN $Date: 2015-10-12 12:07:40 +0530 (Mon, 12 Oct 2015) $
- */
-#include <stdint.h>
-#include <stdlib.h>
-#include <stddef.h>
-#include <unistd.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include <sys/times.h>
-#include <stdio.h>
-#include <string.h>
-#include "cpu_types.h"
-#include "core_smbus_regs.h"
-#include "core_i2c.h"
-#include "hal.h"
-#include "hal_assert.h"
-
-
-#include <string.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*------------------------------------------------------------------------------
- * I2C transaction direction.
- */
-#define WRITE_DIR    0u
-#define READ_DIR     1u
-
-/* -- TRANSACTIONS TYPES -- */
-#define NO_TRANSACTION                      0u
-#define MASTER_WRITE_TRANSACTION            1u
-#define MASTER_READ_TRANSACTION             2u
-#define MASTER_RANDOM_READ_TRANSACTION      3u
-#define WRITE_SLAVE_TRANSACTION             4u
-#define READ_SLAVE_TRANSACTION              5u
-
-/* -- SMBUS H/W STATES -- */
-/* -- MASTER STATES -- */
-#define ST_BUS_ERROR        0x00u           /* Bus error during MST or selected slave modes */
-#define ST_I2C_IDLE         0xF8u           /* No activity and no interrupt either... */
-#define ST_START            0x08u           /* start condition sent */
-#define ST_RESTART          0x10u           /* repeated start */
-#define ST_SLAW_ACK         0x18u           /* SLA+W sent, ack received */
-#define ST_SLAW_NACK        0x20u           /* SLA+W sent, nack received */
-#define ST_TX_DATA_ACK      0x28u           /* Data sent, ACK'ed */
-#define ST_TX_DATA_NACK     0x30u           /* Data sent, NACK'ed */
-#define ST_LOST_ARB         0x38u           /* Master lost arbitration */
-#define ST_SLAR_ACK         0x40u           /* SLA+R sent, ACK'ed */
-#define ST_SLAR_NACK        0x48u           /* SLA+R sent, NACK'ed */
-#define ST_RX_DATA_ACK      0x50u           /* Data received, ACK sent */
-#define ST_RX_DATA_NACK     0x58u           /* Data received, NACK sent */
-#define ST_RESET_ACTIVATED  0xD0u           /* Master reset is activated */
-#define ST_STOP_TRANSMIT    0xE0u           /* Stop has been transmitted */
-
-/* -- SLAVE STATES -- */
-#define ST_SLAVE_SLAW       0x60u           /* SLA+W received */
-#define ST_SLAVE_SLAR_ACK   0xA8u           /* SLA+R received, ACK returned */
-#define ST_SLV_LA           0x68u           /* Slave lost arbitration */
-#define ST_GCA              0x70u           /* GCA received */
-#define ST_GCA_LA           0x78u           /* GCA lost arbitration */
-#define ST_RDATA            0x80u           /* Data received */
-#define ST_SLA_NACK         0x88u           /* Slave addressed, NACK returned */
-#define ST_GCA_ACK          0x90u           /* Previously addresses with GCA, data ACKed */
-#define ST_GCA_NACK         0x98u           /* GCA addressed, NACK returned */
-#define ST_RSTOP            0xA0u           /* Stop received */
-#define ST_SLARW_LA         0xB0u           /* Arbitration lost */
-#define ST_RACK             0xB8u           /* Byte sent, ACK received */
-#define ST_SLAVE_RNACK      0xC0u           /* Byte sent, NACK received */
-#define ST_FINAL            0xC8u           /* Final byte sent, ACK received */
-#define ST_SLV_RST          0xD8u           /* Slave reset state */
-
-
-/* I2C Channel base offset */
-#define CHANNEL_BASE_SHIFT    5u
-#define CHANNEL_MASK        0x1E0u
-
-/*
- * Maximum address offset length in slave write-read transactions.
- * A maximum of two bytes will be interpreted as address offset within the slave
- * tx buffer.
- */
-#define MAX_OFFSET_LENGTH       2u
-
-/*------------------------------------------------------------------------------
- * I2C interrupts control functions implemented "i2c_interrupt.c".
- * the implementation of these functions depend on the underlying hardware
- * design and how the CoreI2C interrupt line is connected to the system's
- * interrupt controller.
- */
-void I2C_enable_irq( i2c_instance_t * this_i2c );
-void I2C_disable_irq( i2c_instance_t * this_i2c );
-static void enable_slave_if_required(i2c_instance_t * this_i2c);
-
-/*------------------------------------------------------------------------------
- * I2C_init()
- * See "core_i2c.h" for details of how to use this function.
- */
-void I2C_init
-(
-    i2c_instance_t * this_i2c,
-    addr_t base_address,
-    uint8_t ser_address,
-    i2c_clock_divider_t ser_clock_speed
-)
-{
-    psr_t saved_psr;
-    uint_fast16_t clock_speed = (uint_fast16_t)ser_clock_speed;
-    
-    /*
-     * We need to disable ints while doing this as there is no guarantee we
-     * have not been called already and the ISR is active.
-     */
-
-   saved_psr=HAL_disable_interrupts();
-    
-    /*
-     * Initialize all items of the this_i2c data structure to zero. This
-     * initializes all state variables to their init value. It relies on
-     * the fact that NO_TRANSACTION, I2C_SUCCESS and I2C_RELEASE_BUS all
-     * have an actual value of zero.
-     */
-    memset(this_i2c, 0, sizeof(i2c_instance_t));
-    
-    /*
-     * Set base address of I2C hardware used by this instance.
-     */
-    this_i2c->base_address = base_address;
-
-    /*
-     * Update Serial address of the device
-     */
-    this_i2c->ser_address = ((uint_fast8_t)ser_address << 1u);
-    
-    /*
-     * Configure hardware.
-     */
-    HAL_set_8bit_reg_field(this_i2c->base_address, ENS1, 0x00); /* Reset I2C hardware. */
-    HAL_set_8bit_reg_field(this_i2c->base_address, ENS1, 0x01); /* set enable bit */
-    HAL_set_8bit_reg_field(this_i2c->base_address, CR2, ( (clock_speed >> 2) & 0x01) );
-    HAL_set_8bit_reg_field(this_i2c->base_address, CR1, ( (clock_speed >> 1) & 0x01) );
-    HAL_set_8bit_reg_field(this_i2c->base_address, CR0, ( clock_speed & 0x01) );
-
-    HAL_set_8bit_reg(this_i2c->base_address, ADDRESS, this_i2c->ser_address);
-    HAL_set_8bit_reg(this_i2c->base_address, ADDRESS1, this_i2c->ser_address);
-    
-    /*
-     * Finally safe to enable interrupts.
-     */
-
-   	HAL_restore_interrupts( saved_psr );
-}
-/*------------------------------------------------------------------------------
- * I2C_channel_init()
- * See "core_i2c.h" for details of how to use this function.
- */
-void I2C_channel_init
-(
-    i2c_instance_t * this_i2c_channel,
-    i2c_instance_t * this_i2c,
-    i2c_channel_number_t channel_number,
-    i2c_clock_divider_t ser_clock_speed
-)
-{
-    psr_t saved_psr;
-    uint_fast16_t clock_speed = (uint_fast16_t)ser_clock_speed;
-    
-    HAL_ASSERT(channel_number < I2C_MAX_CHANNELS);
-    HAL_ASSERT(I2C_CHANNEL_0 != channel_number);
-
-    /* 
-     * Cannot allow channel 0 in this function as we will trash the hardware
-     * base address and slave address.
-     */
-    if ((channel_number < I2C_MAX_CHANNELS) &&
-        (I2C_CHANNEL_0 != channel_number))
-    {
-        /*
-         * We need to disable ints while doing this as the hardware should already
-         * be active at this stage.
-         */
-
-   	saved_psr=HAL_disable_interrupts();
-        /*
-         * Initialize channel data.
-         */
-        memset(this_i2c_channel, 0, sizeof(i2c_instance_t));
-        
-        this_i2c_channel->base_address =
-               ((this_i2c->base_address) & ~((addr_t)CHANNEL_MASK)) 
-            | (((addr_t)channel_number) << CHANNEL_BASE_SHIFT);
-
-        this_i2c_channel->ser_address = this_i2c->ser_address;
-
-        HAL_set_8bit_reg_field(this_i2c_channel->base_address, ENS1, 0x00); /* Reset I2C channel hardware. */
-        HAL_set_8bit_reg_field(this_i2c_channel->base_address, ENS1, 0x01); /* set enable bit */
-        HAL_set_8bit_reg_field(this_i2c_channel->base_address, CR2, ( (clock_speed >> 2) & 0x01) );
-        HAL_set_8bit_reg_field(this_i2c_channel->base_address, CR1, ( (clock_speed >> 1) & 0x01) );
-        HAL_set_8bit_reg_field(this_i2c_channel->base_address, CR0, ( clock_speed & 0x01) );
-        /*
-         * Finally safe to enable interrupts.
-         */
-
-   	HAL_restore_interrupts( saved_psr );
-    }
-}
-
-/*------------------------------------------------------------------------------
- * I2C_write()
- * See "core_i2c.h" for details of how to use this function.
- */
-void I2C_write
-(
-    i2c_instance_t * this_i2c,
-    uint8_t serial_addr,
-    const uint8_t * write_buffer,
-    uint16_t write_size,
-    uint8_t options
-)
-{
-    psr_t saved_psr;
-    volatile uint8_t stat_ctrl;
-
-
-   	saved_psr=HAL_disable_interrupts();
-
-    /* Update the transaction only when there is no transaction going on I2C */
-    if( this_i2c->transaction == NO_TRANSACTION)
-    {
-      this_i2c->transaction = MASTER_WRITE_TRANSACTION;
-    }
-
-    /* Update the Pending transaction information so that transaction can restarted */
-    this_i2c->pending_transaction = MASTER_WRITE_TRANSACTION ;
-
-    /* Update target address */
-    this_i2c->target_addr = (uint_fast8_t)serial_addr << 1u;
-    this_i2c->dir = WRITE_DIR;
-    this_i2c->master_tx_buffer = write_buffer;
-    this_i2c->master_tx_size = write_size;
-    this_i2c->master_tx_idx = 0u;
-
-    /* Set I2C status in progress */
-    this_i2c->master_status = I2C_IN_PROGRESS;
-    this_i2c->options = options;
-
-    if(I2C_IN_PROGRESS == this_i2c->slave_status)
-    {
-        this_i2c->is_transaction_pending = 1u;
-    }
-    else
-    {
-        HAL_set_8bit_reg_field(this_i2c->base_address, STA, 0x01u);
-    }
-
-    /*
-     * Clear interrupts if required (depends on repeated starts).
-     * Since the Bus is on hold, only then prior status needs to
-     * be cleared.
-     */
-    if ( I2C_HOLD_BUS == this_i2c->bus_status )
-    {
-        HAL_set_8bit_reg_field(this_i2c->base_address, SI, 0x00u);
-    }
-
-    stat_ctrl = HAL_get_8bit_reg( this_i2c->base_address, STATUS);
-    stat_ctrl = stat_ctrl;  /* Avoids lint warning. */
-
-    /* Enable the interrupt. ( Re-enable) */
-    I2C_enable_irq( this_i2c );
-
-
-   	HAL_restore_interrupts(saved_psr);
-}
-
-/*------------------------------------------------------------------------------
- * I2C_read()
- * See "core_i2c.h" for details of how to use this function.
- */
-void I2C_read
-(
-    i2c_instance_t * this_i2c,
-    uint8_t serial_addr,
-    uint8_t * read_buffer,
-    uint16_t read_size,
-    uint8_t options
-)
-{
-    psr_t saved_psr;
-    volatile uint8_t stat_ctrl;
-
-
-   	saved_psr=HAL_disable_interrupts();
-    
-    /* Update the transaction only when there is no transaction going on I2C */
-    if( this_i2c->transaction == NO_TRANSACTION)
-    {
-      this_i2c->transaction = MASTER_READ_TRANSACTION;
-    }
-
-    /* Update the Pending transaction information so that transaction can restarted */
-    this_i2c->pending_transaction = MASTER_READ_TRANSACTION ;
-
-    /* Update target address */
-    this_i2c->target_addr = (uint_fast8_t)serial_addr << 1u;
-
-    this_i2c->dir = READ_DIR;
-
-    this_i2c->master_rx_buffer = read_buffer;
-    this_i2c->master_rx_size = read_size;
-    this_i2c->master_rx_idx = 0u;
-
-    /* Set I2C status in progress */
-    this_i2c->master_status = I2C_IN_PROGRESS;
-
-    this_i2c->options = options;
-    
-    if(I2C_IN_PROGRESS == this_i2c->slave_status)
-    {
-        this_i2c->is_transaction_pending = 1u;
-    }
-    else
-    {
-        HAL_set_8bit_reg_field(this_i2c->base_address, STA, 0x01u);
-    }
-
-    /*
-     * Clear interrupts if required (depends on repeated starts).
-     * Since the Bus is on hold, only then prior status needs to
-     * be cleared.
-     */
-    if ( I2C_HOLD_BUS == this_i2c->bus_status )
-    {
-        HAL_set_8bit_reg_field(this_i2c->base_address, SI, 0x00u);
-    }
-
-    stat_ctrl = HAL_get_8bit_reg( this_i2c->base_address, STATUS);
-    stat_ctrl = stat_ctrl;  /* Avoids lint warning. */
-
-    /* Enable the interrupt. ( Re-enable) */
-    I2C_enable_irq( this_i2c );
-
-   	HAL_restore_interrupts( saved_psr );
-
-}
-
-/*------------------------------------------------------------------------------
- * I2C_write_read()
- * See "core_i2c.h" for details of how to use this function.
- */
-void I2C_write_read
-(
-    i2c_instance_t * this_i2c,
-    uint8_t serial_addr,
-    const uint8_t * addr_offset,
-    uint16_t offset_size,
-    uint8_t * read_buffer,
-    uint16_t read_size,
-    uint8_t options
-)
-{
-    HAL_ASSERT(offset_size > 0u);
-    HAL_ASSERT(addr_offset != (uint8_t *)0);
-    HAL_ASSERT(read_size > 0u);
-    HAL_ASSERT(read_buffer != (uint8_t *)0);
-    
-    this_i2c->master_status = I2C_FAILED;
-    
-    if((read_size > 0u) && (offset_size > 0u))
-    {
-        psr_t saved_psr;
-        volatile uint8_t stat_ctrl;
-
-
-   	saved_psr=HAL_disable_interrupts();
-
-        /* Update the transaction only when there is no transaction going on I2C */
-        if( this_i2c->transaction == NO_TRANSACTION)
-        {
-            this_i2c->transaction = MASTER_RANDOM_READ_TRANSACTION;
-        }
-
-        /* Update the Pending transaction information so that transaction can restarted */
-        this_i2c->pending_transaction = MASTER_RANDOM_READ_TRANSACTION ;
-
-        /* Update target address */
-        this_i2c->target_addr = (uint_fast8_t)serial_addr << 1u;
-
-        this_i2c->dir = WRITE_DIR;
-
-        this_i2c->master_tx_buffer = addr_offset;
-        this_i2c->master_tx_size = offset_size;
-        this_i2c->master_tx_idx = 0u;
-
-        this_i2c->master_rx_buffer = read_buffer;
-        this_i2c->master_rx_size = read_size;
-        this_i2c->master_rx_idx = 0u;
-        
-        /* Set I2C status in progress */
-        this_i2c->master_status = I2C_IN_PROGRESS;
-        this_i2c->options = options;
-        
-        if(I2C_IN_PROGRESS == this_i2c->slave_status)
-        {
-            this_i2c->is_transaction_pending = 1u;
-        }
-        else
-        {
-            HAL_set_8bit_reg_field(this_i2c->base_address, STA, 0x01u);
-        }
-
-        /*
-         * Clear interrupts if required (depends on repeated starts).
-         * Since the Bus is on hold, only then prior status needs to
-         * be cleared.
-         */
-        if ( I2C_HOLD_BUS == this_i2c->bus_status )
-        {
-            HAL_set_8bit_reg_field(this_i2c->base_address, SI, 0x00u);
-        }
-
-        stat_ctrl = HAL_get_8bit_reg( this_i2c->base_address, STATUS);
-        stat_ctrl = stat_ctrl;  /* Avoids lint warning. */
-            
-        /* Enable the interrupt. ( Re-enable) */
-        I2C_enable_irq( this_i2c );
-
-
-   	HAL_restore_interrupts( saved_psr );
-    }
-}
-
-/*------------------------------------------------------------------------------
- * I2C_get_status()
- * See "core_i2c.h" for details of how to use this function.
- */
-i2c_status_t I2C_get_status
-(
-    i2c_instance_t * this_i2c
-)
-{
-    i2c_status_t i2c_status ;
-
-    i2c_status = this_i2c->master_status ;
-
-    return i2c_status;
-}
-
-/*------------------------------------------------------------------------------
- * I2C_wait_complete()
- * See "core_i2c.h" for details of how to use this function.
- */
-i2c_status_t I2C_wait_complete
-(
-    i2c_instance_t * this_i2c,
-    uint32_t timeout_ms
-)
-{
-    i2c_status_t i2c_status;
-    psr_t saved_psr;
-    /*
-     * Because we have no idea of what CPU we are supposed to be running on
-     * we need to guard this write to the timeout value to avoid ISR/user code
-     * interaction issues. Checking the status below should be fine as only a
-     * single byte should change in that.
-     */
-
-   	saved_psr=HAL_disable_interrupts();
-    this_i2c->master_timeout_ms = timeout_ms;
-
-   	HAL_restore_interrupts( saved_psr );
-
-    /* Run the loop until state returns I2C_FAILED  or I2C_SUCESS*/
-    do {
-        i2c_status = this_i2c->master_status;
-    } while(I2C_IN_PROGRESS == i2c_status);
-    return i2c_status;
-}
-
-/*------------------------------------------------------------------------------
- * I2C_system_tick()
- * See "core_i2c.h" for details of how to use this function.
- */
-void I2C_system_tick
-(
-    i2c_instance_t * this_i2c,
-    uint32_t ms_since_last_tick
-)
-{
-    if(this_i2c->master_timeout_ms != I2C_NO_TIMEOUT)
-    {
-       if(this_i2c->master_timeout_ms > ms_since_last_tick)
-        {
-            this_i2c->master_timeout_ms -= ms_since_last_tick;
-        }
-        else
-        {
-            psr_t saved_psr;
-            /*
-             * We need to disable interrupts here to ensure we can update the
-             * shared data without the I2C ISR interrupting us.
-             */
-
-   	saved_psr=HAL_disable_interrupts();
-
-            /*
-             * Mark current transaction as having timed out.
-             */
-            this_i2c->master_status = I2C_TIMED_OUT;
-            this_i2c->transaction = NO_TRANSACTION;
-            this_i2c->is_transaction_pending = 0;
-
-
-   	HAL_restore_interrupts( saved_psr );
-            
-            /*
-             * Make sure we do not incorrectly signal a timeout for subsequent
-             * transactions.
-             */
-            this_i2c->master_timeout_ms = I2C_NO_TIMEOUT;
-        }
-    }
-}
-
-/*------------------------------------------------------------------------------
- * I2C_set_slave_tx_buffer()
- * See "core_i2c.h" for details of how to use this function.
- */
-void I2C_set_slave_tx_buffer
-(
-    i2c_instance_t * this_i2c,
-    const uint8_t * tx_buffer,
-    uint16_t tx_size
-)
-{
-    psr_t saved_psr;
-
-    /*
-     * We need to disable interrupts here to ensure we can update the
-     * shared data without the I2C ISR interrupting us.
-     */
-
-   	saved_psr=HAL_disable_interrupts();
-    
-    this_i2c->slave_tx_buffer = tx_buffer;
-    this_i2c->slave_tx_size = tx_size;
-    this_i2c->slave_tx_idx = 0u;
-    
-
-   	HAL_restore_interrupts( saved_psr );
-}
-
-/*------------------------------------------------------------------------------
- * I2C_set_slave_rx_buffer()
- * See "core_i2c.h" for details of how to use this function.
- */
-void I2C_set_slave_rx_buffer
-(
-    i2c_instance_t * this_i2c,
-    uint8_t * rx_buffer,
-    uint16_t rx_size
-)
-{
-    psr_t saved_psr;
-
-    /*
-     * We need to disable interrupts here to ensure we can update the
-     * shared data without the I2C ISR interrupting us.
-     */
-
-   	saved_psr=HAL_disable_interrupts();
-
-    this_i2c->slave_rx_buffer = rx_buffer;
-    this_i2c->slave_rx_size = rx_size;
-    this_i2c->slave_rx_idx = 0u;
-
-
-   	HAL_restore_interrupts( saved_psr );
-}
-
-/*------------------------------------------------------------------------------
- * I2C_set_slave_mem_offset_length()
- * See "core_i2c.h" for details of how to use this function.
- */
-void I2C_set_slave_mem_offset_length
-(
-    i2c_instance_t * this_i2c,
-    uint8_t offset_length
-)
-{
-    HAL_ASSERT(offset_length <= MAX_OFFSET_LENGTH);
-    
-    /*
-     * Single byte update, should be interrupt safe
-     */
-    if(offset_length > MAX_OFFSET_LENGTH)
-    {
-        this_i2c->slave_mem_offset_length = MAX_OFFSET_LENGTH;
-    }
-    else
-    {
-        this_i2c->slave_mem_offset_length = offset_length;
-    }
-}
-
-/*------------------------------------------------------------------------------
- * I2C_register_write_handler()
- * See "core_i2c.h" for details of how to use this function.
- */
-void I2C_register_write_handler
-(
-    i2c_instance_t * this_i2c,
-    i2c_slave_wr_handler_t handler
-)
-{
-    psr_t saved_psr;
-
-    /*
-     * We need to disable interrupts here to ensure we can update the
-     * shared data without the I2C ISR interrupting us.
-     */
-
-   	saved_psr=HAL_disable_interrupts();
-
-    this_i2c->slave_write_handler = handler;
-
-
-   	HAL_restore_interrupts( saved_psr );
-}
-
-/*------------------------------------------------------------------------------
- * I2C_enable_slave()
- * See "core_i2c.h" for details of how to use this function.
- */
-void I2C_enable_slave
-(
-    i2c_instance_t * this_i2c
-)
-{
-    psr_t saved_psr;
-
-    /*
-     * We need to disable interrupts here to ensure we can update the
-     * hardware register and slave mode flag without the I2C ISR interrupting
-     * us.
-     */
-
-   	saved_psr=HAL_disable_interrupts();
-
-    /* Set the Assert Acknowledge bit. */
-    HAL_set_8bit_reg_field(this_i2c->base_address, AA, 0x01u);
-
-    /* Enable slave mode */
-    this_i2c->is_slave_enabled = 1u;
-
-
-   	HAL_restore_interrupts( saved_psr );
-
-    /* Enable I2C IRQ*/
-    I2C_enable_irq( this_i2c );
-}
-
-/*------------------------------------------------------------------------------
- * I2C_disable_slave()
- * See "core_i2c.h" for details of how to use this function.
- */
-void I2C_disable_slave
-(
-    i2c_instance_t * this_i2c
-)
-{
-    psr_t saved_psr;
-
-    /*
-     * We need to disable interrupts here to ensure we can update the
-     * hardware register without the I2C ISR interrupting us.
-     */
-
-   	saved_psr=HAL_disable_interrupts();
-    
-    /* Reset the assert acknowledge bit. */
-    HAL_set_8bit_reg_field(this_i2c->base_address, AA, 0x00u);
-
-    /* Disable slave mode with IRQ blocked to make whole change atomic */
-    this_i2c->is_slave_enabled = 0u;
-
-
-   	HAL_restore_interrupts( saved_psr );
-}
-
-/*------------------------------------------------------------------------------
- * 
- */
-static void enable_slave_if_required
-(
-    i2c_instance_t * this_i2c
-)
-{
-    /*
-     * This function is only called from within the ISR and so does not need
-     * guarding on the register access.
-     */
-    if( 0 != this_i2c->is_slave_enabled )
-    {
-        HAL_set_8bit_reg_field( this_i2c->base_address, AA, 0x01u );
-    }
-}
-/*------------------------------------------------------------------------------
- * I2C_set_slave_second_addr()
- * See "i2c.h" for details of how to use this function.
- */
-void I2C_set_slave_second_addr
-(
-    i2c_instance_t * this_i2c,
-    uint8_t second_slave_addr
-)
-{
-    uint8_t second_slave_address;
-    
-    /*
-      This function does not support CoreI2C hardware configured with a fixed 
-      second slave address.  The current implementation of the ADDR1[0] register
-      bit makes it difficult for the driver to support both programmable and
-      fixed second slave address, so we choose to support programmable only.
-      With the programmable configuration, ADDR1[0] and ADDR0[0] both control
-      enable/disable of GCA recognition, as an effective OR of the 2 bit fields.
-      Therefore we set ADDR1[0] to 0 here, so that only ADDR0[0] controls GCA.
-     */
-    second_slave_address = (uint8_t)((second_slave_addr << 1u) & (~SLAVE1_EN_MASK));
-
-    /*
-     * Single byte register write, should be interrupt safe
-     */
-    HAL_set_8bit_reg(this_i2c->base_address, ADDRESS1, second_slave_address);
-}
-
-/*------------------------------------------------------------------------------
- * I2C_disable_slave_second_addr()
- * See "i2c.h" for details of how to use this function.
- */
-void I2C_disable_slave_second_addr
-(
-    i2c_instance_t * this_i2c
-)
-{
-    /*
-      We are disabling the second slave address by setting the value of the 2nd
-      slave address to the primary slave address. The reason for using this method
-      of disabling 2nd slave address is that ADDRESS1[0] has different meaning 
-      depending on hardware configuration. Its use would likely interfere with
-      the intended GCA setting.
-     */
-    /*
-     * Single byte register write, should be interrupt safe
-     */
-    HAL_set_8bit_reg(this_i2c->base_address, ADDRESS1, this_i2c->ser_address);
-}
-
-/*------------------------------------------------------------------------------
- * i2C_set_gca()
- * See "i2c.h" for details of how to use this function.
- */
-
-void I2C_set_gca
-(
-    i2c_instance_t * this_i2c
-)
-{
-    /* 
-     * This read modify write access should be interrupt safe as the address
-     * register is not written to in the ISR.
-     */
-    /* accept GC addressing. */
-    HAL_set_8bit_reg_field(this_i2c->base_address, GC, 0x01u);
-}
-
-/*------------------------------------------------------------------------------
- * I2C_clear_gca()
- * See "i2c.h" for details of how to use this function.
- */
-void I2C_clear_gca
-(
-    i2c_instance_t * this_i2c
-)
-{
-    /* 
-     * This read modify write access should be interrupt safe as the address
-     * register is not written to in the ISR.
-     */
-    /* Clear GC addressing. */
-    HAL_set_8bit_reg_field(this_i2c->base_address, GC, 0x00u);
-}
-
-/*------------------------------------------------------------------------------
- * I2C_isr()
- * See "core_i2c.h" for details of how to use this function.
- */
-void I2C_isr
-(
-    i2c_instance_t * this_i2c
-)
-{
-    volatile uint8_t status;
-    uint8_t data;
-    uint8_t hold_bus;
-    uint8_t clear_irq = 1u;
-
-    status = HAL_get_8bit_reg( this_i2c->base_address, STATUS);
-    
-    switch( status )
-    {
-        /************** MASTER TRANSMITTER / RECEIVER *******************/
-      
-        case ST_START: /* start has been xmt'd */
-        case ST_RESTART: /* repeated start has been xmt'd */
-  	    //write_hex(STDOUT_FILENO, status);
-            HAL_set_8bit_reg_field( this_i2c->base_address, STA, 0x00u);
-            HAL_set_8bit_reg( this_i2c->base_address, DATA, this_i2c->target_addr); /* write call address */
-            HAL_set_8bit_reg_field( this_i2c->base_address, DIR, this_i2c->dir); /* set direction bit */
-            if(this_i2c->dir == WRITE_DIR)
-            {
-                 this_i2c->master_tx_idx = 0u;
-            }
-            else
-            {
-                 this_i2c->master_rx_idx = 0u;
-            }
-
-            /*
-             * Clear the pending transaction. This condition will be true if the slave 
-             * has acquired the bus to carry out pending master transaction which 
-             * it had received during its slave transmission or reception mode. 
-             */
-            if(this_i2c->is_transaction_pending)
-            {
-                this_i2c->is_transaction_pending = 0u;
-            }
-
-            /*
-             * Make sure to update proper transaction after master START
-             * or RESTART
-             */
-            if(this_i2c->transaction != this_i2c->pending_transaction)
-            {
-                this_i2c->transaction = this_i2c->pending_transaction;
-            }
-            break;
-            
-        case ST_LOST_ARB:
-              /* Set start bit.  Let's keep trying!  Don't give up! */
-              HAL_set_8bit_reg_field(this_i2c->base_address, STA, 0x01u);
-              break;
-
-        case ST_STOP_TRANSMIT:
-             /* Stop has been transmitted. Do nothing */
-              break;
-
-        /******************* MASTER TRANSMITTER *************************/
-        case ST_SLAW_NACK:
-  	    //write_hex(STDOUT_FILENO, status);
-            /* SLA+W has been transmitted; not ACK has been received - let's stop. */
-            HAL_set_8bit_reg_field(this_i2c->base_address, STO, 0x01u);
-            this_i2c->master_status = I2C_FAILED;
-            this_i2c->transaction = NO_TRANSACTION;
-            enable_slave_if_required(this_i2c);
-            break;
-            
-        case ST_SLAW_ACK:
-        case ST_TX_DATA_ACK:
-  	    //write_hex(STDOUT_FILENO, status);
-            /* data byte has been xmt'd with ACK, time to send stop bit or repeated start. */
-            if (this_i2c->master_tx_idx < this_i2c->master_tx_size)
-            {    
-                HAL_set_8bit_reg(this_i2c->base_address, DATA, (uint_fast8_t)this_i2c->master_tx_buffer[this_i2c->master_tx_idx++]);
-            }
-            else if ( this_i2c->transaction == MASTER_RANDOM_READ_TRANSACTION )
-            {
-                /* We are finished sending the address offset part of a random read transaction.
-                 * It is is time to send a restart in order to change direction. */
-                 this_i2c->dir = READ_DIR;
-                 HAL_set_8bit_reg_field(this_i2c->base_address, STA, 0x01u);
-            }
-            else /* done sending. let's stop */
-            {
-                /*
-                 * Set the transaction back to NO_TRANSACTION to allow user to do further
-                 * transaction
-                 */
-                this_i2c->transaction = NO_TRANSACTION;
-                hold_bus = this_i2c->options & I2C_HOLD_BUS;
-
-                /* Store the information of current I2C bus status in the bus_status*/
-                this_i2c->bus_status  = hold_bus;
-                if ( hold_bus == 0u )
-                { 
-                    HAL_set_8bit_reg_field(this_i2c->base_address, STO, 0x01u);  /*xmt stop condition */
-                    enable_slave_if_required(this_i2c);
-                }
-                else
-                {
-                    I2C_disable_irq( this_i2c );
-                    clear_irq = 0u;
-                }
-                this_i2c->master_status = I2C_SUCCESS;
-            }
-            break;
-
-          case ST_TX_DATA_NACK:
-  	    //write_hex(STDOUT_FILENO, status);
-            /* data byte SENT, ACK to be received
-             * In fact, this means we've received a NACK (This may not be 
-             * obvious, but if we've rec'd an ACK then we would be in state 
-             * 0x28!) hence, let's send a stop bit
-             */
-            HAL_set_8bit_reg_field(this_i2c->base_address, STO, 0x01u);/* xmt stop condition */
-            this_i2c->master_status = I2C_FAILED;
-
-            /*
-             * Set the transaction back to NO_TRANSACTION to allow user to do further
-             * transaction
-             */
-            this_i2c->transaction = NO_TRANSACTION;
-            enable_slave_if_required(this_i2c);
-            break;
-              
-      /********************* MASTER (or slave?) RECEIVER *************************/
-      
-      /* STATUS codes 08H, 10H, 38H are all covered in MTX mode */
-        case ST_SLAR_ACK: /* SLA+R tx'ed. */
-//  	    //write_hex(STDOUT_FILENO, status);
-            /* Let's make sure we ACK the first data byte received (set AA bit in CTRL) unless
-             * the next byte is the last byte of the read transaction.
-             */
-            if(this_i2c->master_rx_size > 1u)
-            {
-                HAL_set_8bit_reg_field(this_i2c->base_address, AA, 0x01u);
-            }
-            else if(1u == this_i2c->master_rx_size)
-            {
-                HAL_set_8bit_reg_field(this_i2c->base_address, AA, 0x00u);
-            }
-            else /* this_i2c->master_rx_size == 0u */
-            {
-                HAL_set_8bit_reg_field(this_i2c->base_address, AA, 0x01u);
-                HAL_set_8bit_reg_field(this_i2c->base_address, STO, 0x01u);
-                this_i2c->master_status = I2C_SUCCESS;
-                this_i2c->transaction = NO_TRANSACTION;
-            }
-            break;
-            
-        case ST_SLAR_NACK: /* SLA+R tx'ed; let's release the bus (send a stop condition) */
-//  	    //write_hex(STDOUT_FILENO, status);
-            HAL_set_8bit_reg_field(this_i2c->base_address, STO, 0x01u);
-            this_i2c->master_status = I2C_FAILED;
-
-            /*
-             * Set the transaction back to NO_TRANSACTION to allow user to do further
-             * transaction
-             */
-            this_i2c->transaction = NO_TRANSACTION;
-            enable_slave_if_required(this_i2c);
-            break;
-          
-        case ST_RX_DATA_ACK: /* Data byte received, ACK returned */
-//  	    //write_hex(STDOUT_FILENO, status);
-            /* First, get the data */
-            this_i2c->master_rx_buffer[this_i2c->master_rx_idx++] = HAL_get_8bit_reg(this_i2c->base_address, DATA);
-            if( this_i2c->master_rx_idx >= (this_i2c->master_rx_size - 1u))
-            {
-                /* If we're at the second last byte, let's set AA to 0 so
-                 * we return a NACK at the last byte. */
-                HAL_set_8bit_reg_field(this_i2c->base_address, AA, 0x00u);
-            }
-            break;
-            
-        case ST_RX_DATA_NACK: /* Data byte received, NACK returned */
-//  	    //write_hex(STDOUT_FILENO, status);
-            /* Get the data, then send a stop condition */
-            this_i2c->master_rx_buffer[this_i2c->master_rx_idx] = HAL_get_8bit_reg(this_i2c->base_address, DATA);
-          
-            hold_bus = this_i2c->options & I2C_HOLD_BUS; 
-
-            /* Store the information of current I2C bus status in the bus_status*/
-            this_i2c->bus_status  = hold_bus;
-            if ( hold_bus == 0u )
-            { 
-                HAL_set_8bit_reg_field(this_i2c->base_address, STO, 0x01u);  /*xmt stop condition */
-
-                /* Bus is released, now we can start listening to bus, if it is slave */
-                   enable_slave_if_required(this_i2c);
-            }
-            else
-            {
-                I2C_disable_irq( this_i2c );
-                clear_irq = 0u;
-            }
-            /*
-             * Set the transaction back to NO_TRANSACTION to allow user to do further
-             * transaction
-             */
-            this_i2c->transaction = NO_TRANSACTION;
-            this_i2c->master_status = I2C_SUCCESS;
-            break;
-        
-        /******************** SLAVE RECEIVER **************************/
-        case ST_GCA_NACK: /* NACK after, GCA addressing */
-        case ST_SLA_NACK: /* Re-enable AA (assert ack) bit for future transmissions */
-  	    //write_hex(STDOUT_FILENO, status);
-            HAL_set_8bit_reg_field(this_i2c->base_address, AA, 0x01u);
-
-            this_i2c->transaction = NO_TRANSACTION;
-            this_i2c->slave_status = I2C_SUCCESS;
-            
-            /* Check if transaction was pending. If yes, set the START bit */
-            if(this_i2c->is_transaction_pending)
-            {
-                HAL_set_8bit_reg_field(this_i2c->base_address, STA, 0x01u);
-            }
-            break;
-            
-        case ST_GCA_LA: /* Arbitr. lost (GCA rec'd) */
-        case ST_SLV_LA: /* Arbitr. lost (SLA rec'd) */
-  	    //write_hex(STDOUT_FILENO, status);
-            /*
-             *  We lost arbitration and either the GCE or our address was the
-             *  one received so pend the master operation we were starting.
-             */
-            this_i2c->is_transaction_pending = 1u;
-            /* Fall through to normal ST processing as we are now in slave mode */
-
-        case ST_GCA: /* General call address received, ACK returned */
-        case ST_SLAVE_SLAW: /* SLA+W received, ACK returned */
-  	    //write_hex(STDOUT_FILENO, status);
-            this_i2c->transaction = WRITE_SLAVE_TRANSACTION;
-            this_i2c->slave_rx_idx = 0u;
-            this_i2c->random_read_addr = 0u;
-            /*
-             * If Start Bit is set clear it, but store that information since it is because of
-             * pending transaction
-             */
-            if(HAL_get_8bit_reg_field(this_i2c->base_address, STA))
-            {
-                HAL_set_8bit_reg_field(this_i2c->base_address, STA, 0x00u);
-                this_i2c->is_transaction_pending = 1u;
-            }
-            this_i2c->slave_status = I2C_IN_PROGRESS;
-#ifdef INCLUDE_SLA_IN_RX_PAYLOAD
-            /* Fall through to put address as first byte in payload buffer */
-#else
-            /* Only break from this case if the slave address must NOT be included at the
-             * beginning of the received write data. */
-            break;
-#endif            
-        case ST_GCA_ACK: /* DATA received; ACK sent after GCA */
-        case ST_RDATA: /* DATA received; must clear DATA register */
-  	    //write_hex(STDOUT_FILENO, status);
-            if((this_i2c->slave_rx_buffer != (uint8_t *)0)
-               && (this_i2c->slave_rx_idx < this_i2c->slave_rx_size))
-            {
-                data = HAL_get_8bit_reg(this_i2c->base_address, DATA);
-                this_i2c->slave_rx_buffer[this_i2c->slave_rx_idx++] = data;
-                
-#ifdef INCLUDE_SLA_IN_RX_PAYLOAD
-                if((ST_RDATA == status) || (ST_GCA_ACK == status))
-                {
-                    /* Ignore the slave address byte in the random read address
-                       computation in the case where INCLUDE_SLA_IN_RX_PAYLOAD
-                       is defined. */
-#endif
-                    this_i2c->random_read_addr = (this_i2c->random_read_addr << 8) + data;
-#ifdef INCLUDE_SLA_IN_RX_PAYLOAD
-                }
-#endif
-            }
-            
-            if(this_i2c->slave_rx_idx >= this_i2c->slave_rx_size)
-            {
-                /* Rx buffer is full. NACK next received byte. */
-                HAL_set_8bit_reg_field(this_i2c->base_address, AA, 0x00u); 
-            }
-            break;
-            
-        case ST_RSTOP:
-  	    //write_hex(STDOUT_FILENO, status);
-            /* STOP or repeated START occurred. */
-            /* We cannot be sure if the transaction has actually completed as
-             * this hardware state reports that either a STOP or repeated START
-             * condition has occurred. We assume that this is a repeated START
-             * if the transaction was a write from the master to this point.*/
-            if ( this_i2c->transaction == WRITE_SLAVE_TRANSACTION )
-            {
-                if ( this_i2c->slave_rx_idx == this_i2c->slave_mem_offset_length )
-                {
-                    this_i2c->slave_tx_idx = this_i2c->random_read_addr;
-                }
-                /* Call the slave's write transaction handler if it exists. */
-                if ( this_i2c->slave_write_handler != 0u )
-                {
-                    i2c_slave_handler_ret_t h_ret;
-                    h_ret = this_i2c->slave_write_handler( this_i2c, this_i2c->slave_rx_buffer, (uint16_t)this_i2c->slave_rx_idx );
-                    if ( I2C_REENABLE_SLAVE_RX == h_ret )
-                    {
-                        /* There is a small risk that the write handler could
-                         * call I2C_disable_slave() but return
-                         * I2C_REENABLE_SLAVE_RX in error so we only enable
-                         * ACKs if still in slave mode. */
-                         enable_slave_if_required(this_i2c);
-                    }
-                    else
-                    {
-                        HAL_set_8bit_reg_field( this_i2c->base_address, AA, 0x0u );
-                        /* Clear slave mode flag as well otherwise in mixed
-                         * master/slave applications, the AA bit will get set by
-                         * subsequent master operations. */
-                        this_i2c->is_slave_enabled = 0u;
-                    }
-                }
-                else
-                {
-                    /* Re-enable address acknowledge in case we were ready to nack the next received byte. */
-                    HAL_set_8bit_reg_field( this_i2c->base_address, AA, 0x01u );
-                }
-            }
-            else /* A stop or repeated start outside a write/read operation */
-            {
-                /*
-                 * Reset slave_tx_idx so that a subsequent read will result in the slave's
-                 * transmit buffer being sent from the first byte.
-                 */
-                this_i2c->slave_tx_idx = 0u;
-                /*
-                 * See if we need to re-enable acknowledgement as some error conditions, such
-                 * as a master prematurely ending a transfer, can see us get here with AA set
-                 * to 0 which will disable slave operation if we are not careful.
-                 */
-                enable_slave_if_required(this_i2c);
-            }
-
-            /* Mark any previous master write transaction as complete. */
-            this_i2c->slave_status = I2C_SUCCESS;
-            
-            /* Check if transaction was pending. If yes, set the START bit */
-            if(this_i2c->is_transaction_pending)
-            {
-                HAL_set_8bit_reg_field(this_i2c->base_address, STA, 0x01u);
-            }
-
-            /*
-             * Set the transaction back to NO_TRANSACTION to allow user to do further
-             * transaction
-             */
-            this_i2c->transaction = NO_TRANSACTION;
-
-            break;
-            
-        case ST_SLV_RST: /* SMBUS ONLY: timeout state. must clear interrupt */
-  	    //write_hex(STDOUT_FILENO, status);
-            /*
-             * Set the transaction back to NO_TRANSACTION to allow user to do further
-             * transaction.
-             */
-            this_i2c->transaction = NO_TRANSACTION;
-            /*
-             * Reset slave_tx_idx so that a subsequent read will result in the slave's
-             * transmit buffer being sent from the first byte.
-             */
-            this_i2c->slave_tx_idx = 0u;
-            /*
-             * Clear status to I2C_FAILED only if there was an operation in progress.
-             */
-            if(I2C_IN_PROGRESS == this_i2c->slave_status)
-            {
-                this_i2c->slave_status = I2C_FAILED;
-            }
-
-            enable_slave_if_required(this_i2c); /* Make sure AA is set correctly */
-
-            break;
-            
-        /****************** SLAVE TRANSMITTER **************************/
-        case ST_SLAVE_SLAR_ACK: /* SLA+R received, ACK returned */
-        case ST_SLARW_LA:       /* Arbitration lost, and: */
-        case ST_RACK:           /* Data tx'ed, ACK received */
-  	    //write_hex(STDOUT_FILENO, status);
-            if ( status == ST_SLAVE_SLAR_ACK )
-            {
-                this_i2c->transaction = READ_SLAVE_TRANSACTION;
-                this_i2c->random_read_addr = 0u;
-                this_i2c->slave_status = I2C_IN_PROGRESS;
-                /* If Start Bit is set clear it, but store that information since it is because of
-                 * pending transaction
-                 */
-                if(HAL_get_8bit_reg_field(this_i2c->base_address, STA))
-                {
-                    HAL_set_8bit_reg_field(this_i2c->base_address, STA, 0x00u);
-                    this_i2c->is_transaction_pending = 1u;
-                 }
-            }
-            if (this_i2c->slave_tx_idx >= this_i2c->slave_tx_size)
-            {
-                /* Ensure 0xFF is returned to the master when the slave specifies
-                 * an empty transmit buffer. */
-                HAL_set_8bit_reg(this_i2c->base_address, DATA, 0xFFu);
-            }
-            else
-            {
-                /* Load the data the data byte to be sent to the master. */
-                HAL_set_8bit_reg(this_i2c->base_address, DATA, (uint_fast8_t)this_i2c->slave_tx_buffer[this_i2c->slave_tx_idx++]);
-            }
-            /* Determine if this is the last data byte to send to the master. */
-            if (this_i2c->slave_tx_idx >= this_i2c->slave_tx_size) /* last byte? */
-            {
-                 HAL_set_8bit_reg_field(this_i2c->base_address, AA, 0x00u); 
-                /* Next read transaction will result in slave's transmit buffer
-                 * being sent from the first byte. */
-                this_i2c->slave_tx_idx = 0u;
-            }
-            break;
-        
-        case ST_SLAVE_RNACK:    /* Data byte has been transmitted; not-ACK has been received. */
-        case ST_FINAL: /* Last Data byte tx'ed, ACK received */
-  	    //write_hex(STDOUT_FILENO, status);
-            /* We assume that the transaction will be stopped by the master.
-             * Reset slave_tx_idx so that a subsequent read will result in the slave's
-             * transmit buffer being sent from the first byte. */
-            this_i2c->slave_tx_idx = 0u;
-            HAL_set_8bit_reg_field(this_i2c->base_address, AA, 0x01u); 
-
-            /*  Mark previous state as complete */
-            this_i2c->slave_status = I2C_SUCCESS;
-            /* Check if transaction was pending. If yes, set the START bit */
-            if(this_i2c->is_transaction_pending)
-            {
-                HAL_set_8bit_reg_field(this_i2c->base_address, STA, 0x01u);
-            }
-            /*
-             * Set the transaction back to NO_TRANSACTION to allow user to do further
-             * transaction
-             */
-            this_i2c->transaction = NO_TRANSACTION;
-
-            break;
-
-        /* Master Reset has been activated Wait 35 ms for interrupt to be set,
-         * clear interrupt and proceed to 0xF8 state. */
-        case ST_RESET_ACTIVATED:
-        case ST_BUS_ERROR: /* Bus error during MST or selected slave modes */
-        default:
-  	    //write_hex(STDOUT_FILENO, status);
-            /* Some undefined state has encountered. Clear Start bit to make
-             * sure, next good transaction happen */
-            HAL_set_8bit_reg_field(this_i2c->base_address, STA, 0x00u);
-            /*
-             * Set the transaction back to NO_TRANSACTION to allow user to do further
-             * transaction.
-             */
-            this_i2c->transaction = NO_TRANSACTION;
-            /*
-             * Reset slave_tx_idx so that a subsequent read will result in the slave's
-             * transmit buffer being sent from the first byte.
-             */
-            this_i2c->slave_tx_idx = 0u;
-            /*
-             * Clear statuses to I2C_FAILED only if there was an operation in progress.
-             */
-            if(I2C_IN_PROGRESS == this_i2c->master_status)
-            {
-                this_i2c->master_status = I2C_FAILED;
-            }
-
-            if(I2C_IN_PROGRESS == this_i2c->slave_status)
-            {
-                this_i2c->slave_status = I2C_FAILED;
-            }
-
-            break;
-    }
-    
-    if ( clear_irq )
-    {
-        /* clear interrupt. */
-        HAL_set_8bit_reg_field(this_i2c->base_address, SI, 0x00u);
-    }
-    
-    /* Read the status register to ensure the last I2C registers write took place
-     * in a system built around a bus making use of posted writes. */
-//    status = HAL_get_8bit_reg( this_i2c->base_address, STATUS);
-}
-
-/*------------------------------------------------------------------------------
- * I2C_smbus_init()
- * See "i2c.h" for details of how to use this function.
- */
- 
-/*
- * SMBSUS_NO    = 1
- * SMBALERT_NO  = 1
- * SMBus enable = 1
- */
-#define INIT_AND_ENABLE_SMBUS   0x54u
-void I2C_smbus_init
-(
-    i2c_instance_t * this_i2c
-)
-{
-    /*
-     * Single byte register write, should be interrupt safe
-     */
-    /* Enable SMBUS */
-    HAL_set_8bit_reg(this_i2c->base_address, SMBUS, INIT_AND_ENABLE_SMBUS);
-}
-
-/*------------------------------------------------------------------------------
- * I2C_enable_smbus_irq()
- * See "i2c.h" for details of how to use this function.
- */
-void I2C_enable_smbus_irq
-(
-    i2c_instance_t * this_i2c,
-    uint8_t  irq_type
-)
-{
-    psr_t saved_psr;
-
-    /*
-     * We need to disable interrupts here to ensure we can update the
-     * hardware register without the SMBUS IRQs interrupting us.
-     */
-
-   	saved_psr=HAL_disable_interrupts();
-
-    if ( irq_type & I2C_SMBALERT_IRQ)
-    {
-        HAL_set_8bit_reg_field(this_i2c->base_address, SMBALERT_IE, 0x01u);
-    }
-    if ( irq_type & I2C_SMBSUS_IRQ)
-    {
-        HAL_set_8bit_reg_field(this_i2c->base_address, SMBSUS_IE, 0x01u);
-    }
-    
-
-   	HAL_restore_interrupts( saved_psr );
-}
-
-/*------------------------------------------------------------------------------
- * I2C_disable_smbus_irq()
- * See "i2c.h" for details of how to use this function.
- */
-void I2C_disable_smbus_irq
-(
-    i2c_instance_t * this_i2c,
-    uint8_t  irq_type
-)
-{
-    psr_t saved_psr;
-
-    /*
-     * We need to disable interrupts here to ensure we can update the
-     * hardware register without the SMBUS IRQs interrupting us.
-     */
-
-   	saved_psr=HAL_disable_interrupts();
-
-    if ( irq_type & I2C_SMBALERT_IRQ)
-    {
-        HAL_set_8bit_reg_field(this_i2c->base_address, SMBALERT_IE, 0x00u);
-    }
-    if (irq_type & I2C_SMBSUS_IRQ )
-    {
-        HAL_set_8bit_reg_field(this_i2c->base_address, SMBSUS_IE, 0x00u);
-    }
-    
-
-   	HAL_restore_interrupts( saved_psr );
-}
-
-/*------------------------------------------------------------------------------
- * I2C_suspend_smbus_slave()
- * See "i2c.h" for details of how to use this function.
- */
-void I2C_suspend_smbus_slave
-(
-    i2c_instance_t * this_i2c
-)
-{
-    psr_t saved_psr;
-
-    /*
-     * We need to disable interrupts here to ensure we can update the
-     * hardware register without the SMBUS IRQs interrupting us.
-     */
-
-   	saved_psr=HAL_disable_interrupts();
-
-    HAL_set_8bit_reg_field(this_i2c->base_address, SMBSUS_NO_CONTROL, 0x00u);
-
-
-   	HAL_restore_interrupts( saved_psr );
-}
-
-/*------------------------------------------------------------------------------
- * I2C_resume_smbus_slave()
- * See "i2c.h" for details of how to use this function.
- */
-void I2C_resume_smbus_slave
-(
-    i2c_instance_t * this_i2c
-)
-{
-    psr_t saved_psr;
-
-    /*
-     * We need to disable interrupts here to ensure we can update the
-     * hardware register without the SMBUS IRQs interrupting us.
-     */
-
-   	saved_psr=HAL_disable_interrupts();
-
-    HAL_set_8bit_reg_field(this_i2c->base_address, SMBSUS_NO_CONTROL, 0x01u);
-
-
-   	HAL_restore_interrupts( saved_psr );
-}
-
-/*------------------------------------------------------------------------------
- * I2C_reset_smbus()
- * See "i2c.h" for details of how to use this function.
- */
-void I2C_reset_smbus
-(
-    i2c_instance_t * this_i2c
-)
-{
-    psr_t saved_psr;
-
-    /*
-     * We need to disable interrupts here to ensure we can update the
-     * hardware register without the SMBUS IRQs interrupting us.
-     */
-
-   	saved_psr=HAL_disable_interrupts();
-    HAL_set_8bit_reg_field(this_i2c->base_address, SMBUS_MST_RESET, 0x01u);
-    
-
-   	HAL_restore_interrupts( saved_psr );
-}
-
-/*------------------------------------------------------------------------------
- * I2C_set_smbus_alert()
- * See "i2c.h" for details of how to use this function.
- */
-void I2C_set_smbus_alert
-(
-    i2c_instance_t * this_i2c
-)
-{
-    psr_t saved_psr;
-
-    /*
-     * We need to disable interrupts here to ensure we can update the
-     * hardware register without the SMBUS IRQs interrupting us.
-     */
-
-   	saved_psr=HAL_disable_interrupts();
-    HAL_set_8bit_reg_field(this_i2c->base_address, SMBALERT_NO_CONTROL, 0x00u);
-
-
-   	HAL_restore_interrupts( saved_psr );
-}
-
-/*------------------------------------------------------------------------------
- * I2C_clear_smbus_alert()
- * See "i2c.h" for details of how to use this function.
- */
-void I2C_clear_smbus_alert
-(
-    i2c_instance_t * this_i2c
-)
-{
-    psr_t saved_psr;
-
-    /*
-     * We need to disable interrupts here to ensure we can update the
-     * hardware register without the SMBUS IRQs interrupting us.
-     */
-
-   	saved_psr=HAL_disable_interrupts();
-
-    HAL_set_8bit_reg_field(this_i2c->base_address, SMBALERT_NO_CONTROL, 0x01u);
-
-
-   	HAL_restore_interrupts( saved_psr );
-}
-
-/*------------------------------------------------------------------------------
- * I2C_get_irq_status()
- * See "i2c.h" for details of how to use this function.
- */
-uint8_t I2C_get_irq_status
-(
-    i2c_instance_t * this_i2c
-)
-{
-    uint8_t status ;
-    uint8_t irq_type = I2C_NO_IRQ ;
-
-    status = HAL_get_8bit_reg(this_i2c->base_address, SMBUS);
-
-    if( status & (uint8_t)SMBALERT_NI_STATUS_MASK )
-    {
-        irq_type |= I2C_SMBALERT_IRQ ;
-    }
-
-    if( status & (uint8_t)SMBSUS_NI_STATUS_MASK )
-    {
-        irq_type |= I2C_SMBSUS_IRQ ;
-    }
-
-    status = HAL_get_8bit_reg(this_i2c->base_address, CONTROL);
-
-    if( status & (uint8_t)SI_MASK )
-    {
-        irq_type |= I2C_INTR_IRQ ;
-    }
-    return(irq_type);
-}
-
-/*------------------------------------------------------------------------------
- * I2C_set_slave_addr2()
- * See "i2c.h" for details of how to use this function.
- */
-void I2C_set_user_data
-(
-    i2c_instance_t * this_i2c,
-    void * p_user_data
-)
-{
-    this_i2c->p_user_data = p_user_data ;
-}
-
-/*------------------------------------------------------------------------------
- * I2C_get_user_data()
- * See "i2c.h" for details of how to use this function.
- */
-void * I2C_get_user_data
-(
-    i2c_instance_t * this_i2c
-)
-{
-    return( this_i2c->p_user_data);
-}
-
-#ifdef __cplusplus
-}
-#endif
-
diff --git a/FreeRTOS/Demo/RISC-V_Renode_Emulator_SoftConsole/Microsemi_Code/drivers/CoreI2C/i2c_interrupt.c b/FreeRTOS/Demo/RISC-V_Renode_Emulator_SoftConsole/Microsemi_Code/drivers/CoreI2C/i2c_interrupt.c
deleted file mode 100644
index f918b8c9c..000000000
--- a/FreeRTOS/Demo/RISC-V_Renode_Emulator_SoftConsole/Microsemi_Code/drivers/CoreI2C/i2c_interrupt.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * (c) Copyright 2009-2015 Microsemi SoC Products Group.  All rights reserved.
- * 
- * CoreI2C driver interrupt control.
- * 
- * SVN $Revision: 7984 $
- * SVN $Date: 2015-10-12 12:07:40 +0530 (Mon, 12 Oct 2015) $
- */
-#include "hal.h"
-#include "hal_assert.h"
-#include "core_i2c.h"
-#include "riscv_hal.h"
-
-
-#define I2C_IRQn					    External_29_IRQn
-
-/*------------------------------------------------------------------------------
- * This function must be modified to enable interrupts generated from the
- * CoreI2C instance identified as parameter.
- */
-void I2C_enable_irq( i2c_instance_t * this_i2c )
-{
-	PLIC_EnableIRQ(I2C_IRQn);
-//    HAL_ASSERT(0)
-}
-
-/*------------------------------------------------------------------------------
- * This function must be modified to disable interrupts generated from the
- * CoreI2C instance identified as parameter.
- */
-void I2C_disable_irq( i2c_instance_t * this_i2c )
-{
-	PLIC_DisableIRQ(I2C_IRQn);
-//    HAL_ASSERT(0)
-}
diff --git a/FreeRTOS/Demo/RISC-V_Renode_Emulator_SoftConsole/Microsemi_Code/riscv_hal/syscall.c b/FreeRTOS/Demo/RISC-V_Renode_Emulator_SoftConsole/Microsemi_Code/riscv_hal/syscall.c
deleted file mode 100644
index 4c99f8086..000000000
--- a/FreeRTOS/Demo/RISC-V_Renode_Emulator_SoftConsole/Microsemi_Code/riscv_hal/syscall.c
+++ /dev/null
@@ -1,266 +0,0 @@
-/*******************************************************************************
- * (c) Copyright 2016-2018 Microsemi SoC Products Group.  All rights reserved.
- *
- * @file syscall.c
- * @author Microsemi SoC Products Group
- * @brief Stubs for system calls.
- *
- * SVN $Revision: 9661 $
- * SVN $Date: 2018-01-15 16:13:33 +0530 (Mon, 15 Jan 2018) $
- */
-#include <stdint.h>
-#include <stdlib.h>
-#include <stddef.h>
-#include <unistd.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include <sys/times.h>
-#include <stdio.h>
-#include <string.h>
-
-#include "encoding.h"
-
-#ifdef MSCC_STDIO_THRU_CORE_UART_APB
-
-#include "core_uart_apb.h"
-#include "hw_platform.h"
-
-#endif  /*MSCC_STDIO_THRU_CORE_UART_APB*/
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifdef MSCC_STDIO_THRU_CORE_UART_APB
-
-/*------------------------------------------------------------------------------
- * CoreUARTapb instance data for the CoreUARTapb instance used for standard
- * output.
- */
-static UART_instance_t g_stdio_uart;
-
-/*==============================================================================
- * Flag used to indicate if the UART driver needs to be initialized.
- */
-static int g_stdio_uart_init_done = 0;
-#endif /*MSCC_STDIO_THRU_CORE_UART_APB*/
-
-#undef errno
-int errno;
-
-char *__env[1] = { 0 };
-char **environ = __env;
-
-void write_hex(int fd, uint32_t hex)
-{
-    uint8_t ii;
-    uint8_t jj;
-    char towrite;
-    uint8_t digit;
-
-    write( fd , "0x", 2 );
-
-    for (ii = 8 ; ii > 0; ii--)
-    {
-        jj = ii-1;
-        digit = ((hex & (0xF << (jj*4))) >> (jj*4));
-        towrite = digit < 0xA ? ('0' + digit) : ('A' +  (digit - 0xA));
-        write( fd, &towrite, 1);
-    }
-}
-
-               
-void _exit(int code)
-{
-#ifdef MSCC_STDIO_THRU_CORE_UART_APB
-    const char * message = "\nProgam has exited with code:";
-
-    write(STDERR_FILENO, message, strlen(message));
-    write_hex(STDERR_FILENO, code);
-#endif
-
-    while (1);
-}
-
-void *_sbrk(ptrdiff_t incr)
-{
-    extern char _end[];
-    extern char _heap_end[];
-    static char *curbrk = _end;
-
-    if ((curbrk + incr < _end) || (curbrk + incr > _heap_end))
-    {
-        return ((char *) - 1);
-    }
-
-    curbrk += incr;
-    return curbrk - incr;
-}
-
-int _isatty(int fd)
-{
-    if (fd == STDOUT_FILENO || fd == STDERR_FILENO)
-    {
-        return 1;
-    }
-
-    errno = EBADF;
-    return 0;
-}
-
-static int stub(int err)
-{
-    errno = err;
-    return -1;
-}
-
-int _open(const char* name, int flags, int mode)
-{
-    return stub(ENOENT);
-}
-
-int _openat(int dirfd, const char* name, int flags, int mode)
-{
-    return stub(ENOENT);
-}
-
-int _close(int fd)
-{
-    return stub(EBADF);
-}
-
-int _execve(const char* name, char* const argv[], char* const env[])
-{
-    return stub(ENOMEM);
-}
-
-int _fork()
-{
-    return stub(EAGAIN);
-}
-
-int _fstat(int fd, struct stat *st)
-{
-    if (isatty(fd))
-    {
-        st->st_mode = S_IFCHR;
-        return 0;
-    }
-
-    return stub(EBADF);
-}
-
-int _getpid()
-{
-    return 1;
-}
-
-int _kill(int pid, int sig)
-{
-    return stub(EINVAL);
-}
-
-int _link(const char *old_name, const char *new_name)
-{
-    return stub(EMLINK);
-}
-
-off_t _lseek(int fd, off_t ptr, int dir)
-{
-    if (_isatty(fd))
-    {
-        return 0;
-    }
-
-    return stub(EBADF);
-}
-
-ssize_t _read(int fd, void* ptr, size_t len)
-{
-#ifdef MSCC_STDIO_THRU_CORE_UART_APB
-    if (_isatty(fd))
-    {
-        /*--------------------------------------------------------------------------
-        * Initialize the UART driver if it is the first time this function is
-        * called.
-        */
-        if ( !g_stdio_uart_init_done )
-        {
-            /******************************************************************************
-            * Baud value:
-            * This value is calculated using the following equation:
-            *      BAUD_VALUE = (CLOCK / (16 * BAUD_RATE)) - 1
-            *****************************************************************************/
-            UART_init( &g_stdio_uart, MSCC_STDIO_UART_BASE_ADDR, ((SYS_CLK_FREQ/(16 * MSCC_STDIO_BAUD_VALUE))-1), (DATA_8_BITS | NO_PARITY));
-            g_stdio_uart_init_done = 1;
-        }
-
-        return UART_get_rx(&g_stdio_uart, (uint8_t*) ptr, len);
-    }
-#endif
-
-    return stub(EBADF);
-}
-
-int _stat(const char* file, struct stat* st)
-{
-    return stub(EACCES);
-}
-
-clock_t _times(struct tms* buf)
-{
-    return stub(EACCES);
-}
-
-int _unlink(const char* name)
-{
-    return stub(ENOENT);
-}
-
-int _wait(int* status)
-{
-    return stub(ECHILD);
-}
-
-ssize_t _write(int fd, const void* ptr, size_t len)
-{
-
-#ifdef MSCC_STDIO_THRU_CORE_UART_APB
-  const uint8_t * current = (const uint8_t *) ptr;
-  size_t jj;
-
-  if (_isatty(fd))
-  {
-        /*--------------------------------------------------------------------------
-        * Initialize the UART driver if it is the first time this function is
-        * called.
-        */
-        if ( !g_stdio_uart_init_done )
-        {
-            /******************************************************************************
-            * Baud value:
-            * This value is calculated using the following equation:
-            *      BAUD_VALUE = (CLOCK / (16 * BAUD_RATE)) - 1
-            *****************************************************************************/
-            UART_init( &g_stdio_uart, MSCC_STDIO_UART_BASE_ADDR, ((SYS_CLK_FREQ/(16 * MSCC_STDIO_BAUD_VALUE))-1), (DATA_8_BITS | NO_PARITY));
-            g_stdio_uart_init_done = 1;
-        }
-
-    for (jj = 0; jj < len; jj++)
-    {
-        UART_send(&g_stdio_uart, current + jj, 1);
-        if (current[jj] == '\n')
-        {
-            UART_send(&g_stdio_uart, (const uint8_t *)"\r", 1);
-        }
-    }
-    return len;
-  }
-#endif
-
-  return stub(EBADF);
-}
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/FreeRTOS/Demo/RISC-V_Renode_Emulator_SoftConsole/blinky_demo/main_blinky.c b/FreeRTOS/Demo/RISC-V_Renode_Emulator_SoftConsole/blinky_demo/main_blinky.c
index 68440c85c..303baf193 100644
--- a/FreeRTOS/Demo/RISC-V_Renode_Emulator_SoftConsole/blinky_demo/main_blinky.c
+++ b/FreeRTOS/Demo/RISC-V_Renode_Emulator_SoftConsole/blinky_demo/main_blinky.c
@@ -175,7 +175,6 @@ unsigned long ulReceivedValue;
 const unsigned long ulExpectedValue = 100UL;
 const char * const pcPassMessage = "Blink\r\n";
 const char * const pcFailMessage = "Unexpected value received\r\n";
-extern void vSendString( const char * const pcString );
 extern void vToggleLED( void );
 
 	/* Remove compiler warning about unused parameter. */
diff --git a/FreeRTOS/Demo/RISC-V_Renode_Emulator_SoftConsole/full_demo/main_full.c b/FreeRTOS/Demo/RISC-V_Renode_Emulator_SoftConsole/full_demo/main_full.c
index 0bd63ebf2..276b15e62 100644
--- a/FreeRTOS/Demo/RISC-V_Renode_Emulator_SoftConsole/full_demo/main_full.c
+++ b/FreeRTOS/Demo/RISC-V_Renode_Emulator_SoftConsole/full_demo/main_full.c
@@ -230,7 +230,6 @@ uint32_t ulLastRegTest1Value = 0, ulLastRegTest2Value = 0;
 uint32_t ulLastTimer0Interrupts = 0, ulLastTimer1Interrupts = 0;
 char * const pcPassMessage = ".";
 char * pcStatusMessage = pcPassMessage;
-extern void vSendString( const char * const pcString );
 extern void vToggleLED( void );
 
 	/* Just to stop compiler warnings. */
diff --git a/FreeRTOS/Demo/RISC-V_Renode_Emulator_SoftConsole/main.c b/FreeRTOS/Demo/RISC-V_Renode_Emulator_SoftConsole/main.c
index 1225598ea..d8923ac5b 100644
--- a/FreeRTOS/Demo/RISC-V_Renode_Emulator_SoftConsole/main.c
+++ b/FreeRTOS/Demo/RISC-V_Renode_Emulator_SoftConsole/main.c
@@ -121,7 +121,7 @@ static uint32_t ulLEDState = 0;
 
 void vSendString( const char * const pcString )
 {
-	UART_polled_tx_string( &g_uart, pcString );
+	UART_polled_tx_string( &g_uart, ( const uint8_t * ) pcString );
 }
 /*-----------------------------------------------------------*/
 
@@ -181,5 +181,13 @@ void vApplicationTickHook( void )
 	}
 	#endif
 }
+/*-----------------------------------------------------------*/
 
+void *_sbrk( ptrdiff_t incr )
+{
+	/* Required to link, but force an assert to ensure it is never actually
+	called. */
+	configASSERT( ( void * ) incr == NULL );
+	return NULL;
+}
 
diff --git a/FreeRTOS/Demo/WIN32-MSVC-lwIP/WIN32.vcxproj b/FreeRTOS/Demo/WIN32-MSVC-lwIP/WIN32.vcxproj
index 05fa8fdd1..c0a342247 100644
--- a/FreeRTOS/Demo/WIN32-MSVC-lwIP/WIN32.vcxproj
+++ b/FreeRTOS/Demo/WIN32-MSVC-lwIP/WIN32.vcxproj
@@ -19,11 +19,13 @@
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
diff --git a/FreeRTOS/Demo/WIN32-MSVC/FreeRTOSConfig.h b/FreeRTOS/Demo/WIN32-MSVC/FreeRTOSConfig.h
index 2dca61617..1acd4555b 100644
--- a/FreeRTOS/Demo/WIN32-MSVC/FreeRTOSConfig.h
+++ b/FreeRTOS/Demo/WIN32-MSVC/FreeRTOSConfig.h
@@ -45,7 +45,7 @@
 #define configUSE_IDLE_HOOK						1
 #define configUSE_TICK_HOOK						1
 #define configUSE_DAEMON_TASK_STARTUP_HOOK		1
-#define configTICK_RATE_HZ						( 1000 ) /* In this non-real time simulated environment the tick frequency has to be at least a multiple of the Win32 tick frequency, and therefore very slow. */
+#define configTICK_RATE_HZ						( 100 ) /* In this non-real time simulated environment the tick frequency has to be at least a multiple of the Win32 tick frequency, and therefore very slow. */
 #define configMINIMAL_STACK_SIZE				( ( unsigned short ) 70 ) /* In this simulated case, the stack only has to hold one small structure as the real stack is part of the win32 thread. */
 #define configTOTAL_HEAP_SIZE					( ( size_t ) ( 52 * 1024 ) )
 #define configMAX_TASK_NAME_LEN					( 12 )
diff --git a/FreeRTOS/Source/portable/GCC/RISC-V/port.c b/FreeRTOS/Source/portable/GCC/RISC-V/port.c
index 4cd9daa93..652a8071e 100644
--- a/FreeRTOS/Source/portable/GCC/RISC-V/port.c
+++ b/FreeRTOS/Source/portable/GCC/RISC-V/port.c
@@ -34,6 +34,9 @@
 #include "task.h"
 #include "portmacro.h"
 
+/* Standard includes. */
+#include "string.h"
+
 #ifndef configCLINT_BASE_ADDRESS
 	#warning configCLINT_BASE_ADDRESS must be defined in FreeRTOSConfig.h.  If the target chip includes a Core Local Interrupter (CLINT) then set configCLINT_BASE_ADDRESS to the CLINT base address.  Otherwise set configCLINT_BASE_ADDRESS to 0.
 #endif
@@ -57,6 +60,11 @@ interrupt stack after the scheduler has started. */
 #ifdef configISR_STACK_SIZE_WORDS
 	static __attribute__ ((aligned(16))) StackType_t xISRStack[ configISR_STACK_SIZE_WORDS ] = { 0 };
 	const StackType_t xISRStackTop = ( StackType_t ) &( xISRStack[ configISR_STACK_SIZE_WORDS & ~portBYTE_ALIGNMENT_MASK ] );
+
+	/* Don't use 0xa5 as the stack fill bytes as that is used by the kernerl for
+	the task stacks, and so will legitimately appear in many positions within
+	the ISR stack. */
+	#define portISR_STACK_FILL_BYTE	0xee	
 #else
 	extern const uint32_t __freertos_irq_stack_top[];
 	const StackType_t xISRStackTop = ( StackType_t ) __freertos_irq_stack_top;
@@ -82,12 +90,8 @@ volatile uint64_t * pullMachineTimerCompareRegister = 0;
 stack checking.  A problem in the ISR stack will trigger an assert, not call the
 stack overflow hook function (because the stack overflow hook is specific to a
 task stack, not the ISR stack). */
-#if( configCHECK_FOR_STACK_OVERFLOW > 2 )
+#if defined( configISR_STACK_SIZE_WORDS ) && ( configCHECK_FOR_STACK_OVERFLOW > 2 )
 	#warning This path not tested, or even compiled yet.
-	/* Don't use 0xa5 as the stack fill bytes as that is used by the kernerl for
-	the task stacks, and so will legitimately appear in many positions within
-	the ISR stack. */
-	#define portISR_STACK_FILL_BYTE	0xee
 
 	static const uint8_t ucExpectedStackBytes[] = {
 									portISR_STACK_FILL_BYTE, portISR_STACK_FILL_BYTE, portISR_STACK_FILL_BYTE, portISR_STACK_FILL_BYTE,		\
@@ -152,6 +156,12 @@ extern void xPortStartFirstTask( void );
 		stack that was being used by main() prior to the scheduler being
 		started. */
 		configASSERT( ( xISRStackTop & portBYTE_ALIGNMENT_MASK ) == 0 );
+
+		#ifdef configISR_STACK_SIZE_WORDS
+		{
+			memset( ( void * ) xISRStack, portISR_STACK_FILL_BYTE, sizeof( xISRStack ) );
+		}
+		#endif	 /* configISR_STACK_SIZE_WORDS */
 	}
 	#endif /* configASSERT_DEFINED */
 
diff --git a/FreeRTOS/Source/portable/GCC/RISC-V/portASM.S b/FreeRTOS/Source/portable/GCC/RISC-V/portASM.S
index fc1236e46..a28942a09 100644
--- a/FreeRTOS/Source/portable/GCC/RISC-V/portASM.S
+++ b/FreeRTOS/Source/portable/GCC/RISC-V/portASM.S
@@ -172,7 +172,7 @@ handle_asynchronous:
 			li t4, -1
 			lw t2, 0(t1)				/* Load the low word of ullNextTime into t2. */
 			lw t3, 4(t1)				/* Load the high word of ullNextTime into t3. */
-			sw t4, 0(t0)				/* Low word no smaller than old value. */
+			sw t4, 0(t0)				/* Low word no smaller than old value to start with - will be overwritten below. */
 			sw t3, 4(t0)				/* Store high word of ullNextTime into compare register.  No smaller than new value. */
 			sw t2, 0(t0)				/* Store low word of ullNextTime into compare register. */
 			lw t0, uxTimerIncrementsForOneTick	/* Load the value of ullTimerIncrementForOneTick into t0 (could this be optimized by storing in an array next to pullNextTime?). */
@@ -226,7 +226,7 @@ is_exception:
 	csrr t0, mcause						/* For viewing in the debugger only. */
 	csrr t1, mepc						/* For viewing in the debugger only */
 	csrr t2, mstatus
-	j is_exception
+	j is_exception						/* No other exceptions handled yet. */
 
 as_yet_unhandled:
 	csrr t0, mcause						/* For viewing in the debugger only. */
diff --git a/FreeRTOS/Source/portable/IAR/RISC-V/port.c b/FreeRTOS/Source/portable/IAR/RISC-V/port.c
index dd32a8e50..a5ec46553 100644
--- a/FreeRTOS/Source/portable/IAR/RISC-V/port.c
+++ b/FreeRTOS/Source/portable/IAR/RISC-V/port.c
@@ -34,6 +34,9 @@
 #include "task.h"
 #include "portmacro.h"
 
+/* Standard includes. */
+#include "string.h"
+
 #ifndef configCLINT_BASE_ADDRESS
 	#warning configCLINT_BASE_ADDRESS must be defined in FreeRTOSConfig.h.  If the target chip includes a Core Local Interrupter (CLINT) then set configCLINT_BASE_ADDRESS to the CLINT base address.  Otherwise set configCLINT_BASE_ADDRESS to 0.
 #endif
@@ -57,6 +60,11 @@ interrupt stack after the scheduler has started. */
 #ifdef configISR_STACK_SIZE_WORDS
 	static __attribute__ ((aligned(16))) StackType_t xISRStack[ configISR_STACK_SIZE_WORDS ] = { 0 };
 	const StackType_t xISRStackTop = ( StackType_t ) &( xISRStack[ configISR_STACK_SIZE_WORDS & ~portBYTE_ALIGNMENT_MASK ] );
+
+	/* Don't use 0xa5 as the stack fill bytes as that is used by the kernerl for
+	the task stacks, and so will legitimately appear in many positions within
+	the ISR stack. */
+	#define portISR_STACK_FILL_BYTE	0xee
 #else
 	extern const uint32_t __freertos_irq_stack_top[];
 	const StackType_t xISRStackTop = ( StackType_t ) __freertos_irq_stack_top;
@@ -77,17 +85,12 @@ const uint64_t *pullNextTime = &ullNextTime;
 const size_t uxTimerIncrementsForOneTick = ( size_t ) ( configCPU_CLOCK_HZ / configTICK_RATE_HZ ); /* Assumes increment won't go over 32-bits. */
 volatile uint64_t * const pullMachineTimerCompareRegisterBase = ( uint64_t * ) ( configCLINT_BASE_ADDRESS + 0x4000 );
 volatile uint64_t * pullMachineTimerCompareRegister = 0;
-
 /* Set configCHECK_FOR_STACK_OVERFLOW to 3 to add ISR stack checking to task
 stack checking.  A problem in the ISR stack will trigger an assert, not call the
 stack overflow hook function (because the stack overflow hook is specific to a
 task stack, not the ISR stack). */
-#if( configCHECK_FOR_STACK_OVERFLOW > 2 )
+#if defined( configISR_STACK_SIZE_WORDS ) && ( configCHECK_FOR_STACK_OVERFLOW > 2 )
 	#warning This path not tested, or even compiled yet.
-	/* Don't use 0xa5 as the stack fill bytes as that is used by the kernerl for
-	the task stacks, and so will legitimately appear in many positions within
-	the ISR stack. */
-	#define portISR_STACK_FILL_BYTE	0xee
 
 	static const uint8_t ucExpectedStackBytes[] = {
 									portISR_STACK_FILL_BYTE, portISR_STACK_FILL_BYTE, portISR_STACK_FILL_BYTE, portISR_STACK_FILL_BYTE,		\
diff --git a/FreeRTOS/Source/portable/IAR/RISC-V/portASM.s b/FreeRTOS/Source/portable/IAR/RISC-V/portASM.s
index c4082c7b3..bcd58a878 100644
--- a/FreeRTOS/Source/portable/IAR/RISC-V/portASM.s
+++ b/FreeRTOS/Source/portable/IAR/RISC-V/portASM.s
@@ -99,12 +99,12 @@ at the top of this file. */
 	EXTERN pxCurrentTCB
 	EXTERN ulPortTrapHandler
 	EXTERN vTaskSwitchContext
+	EXTERN xTaskIncrementTick
 	EXTERN Timer_IRQHandler
 	EXTERN pullMachineTimerCompareRegister
 	EXTERN pullNextTime
 	EXTERN uxTimerIncrementsForOneTick /* size_t type so 32-bit on 32-bit core and 64-bits on 64-bit core. */
 	EXTERN xISRStackTop
-	EXTERN xTaskIncrementTick
 	EXTERN portasmHANDLE_INTERRUPT
 
 /*-----------------------------------------------------------*/
@@ -231,11 +231,13 @@ test_if_environment_call:
 	j processed_source
 
 is_exception:
-	ebreak
-	j is_exception
+	csrr t0, CSR_MCAUSE					/* For viewing in the debugger only. */
+	csrr t1, CSR_MEPC					/* For viewing in the debugger only */
+	csrr t2, CSR_MSTATUS
+	j is_exception						/* No other exceptions handled yet. */
 
 as_yet_unhandled:
-	ebreak
+	csrr t0, mcause						/* For viewing in the debugger only. */
 	j as_yet_unhandled
 
 processed_source:
-- 
2.39.2