From 1ae6eda77aa5665d50a889f814736121e7f9960e Mon Sep 17 00:00:00 2001
From: David Chalco <59750547+dachalco@users.noreply.github.com>
Date: Fri, 14 Aug 2020 10:05:09 -0700
Subject: [PATCH] RSK64M Demo - Fix build errors (#195)

* Fix linking errors. Define task notification array size
---
 .../Demo/RX600_RX64M_RSK_Renesas_e2studio/.cproject    | 10 ++++++++--
 FreeRTOS/Demo/RX600_RX64M_RSK_Renesas_e2studio/.info   |  6 +++---
 .../Demo/RX600_RX64M_RSK_Renesas_e2studio/.project     |  5 +++++
 .../Source/FreeRTOSConfig.h                            |  1 +
 .../RX600_RX64M_RSK_Renesas_e2studio/makefile.init     |  8 ++++----
 5 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/FreeRTOS/Demo/RX600_RX64M_RSK_Renesas_e2studio/.cproject b/FreeRTOS/Demo/RX600_RX64M_RSK_Renesas_e2studio/.cproject
index c3c678fae..22984fd9e 100644
--- a/FreeRTOS/Demo/RX600_RX64M_RSK_Renesas_e2studio/.cproject
+++ b/FreeRTOS/Demo/RX600_RX64M_RSK_Renesas_e2studio/.cproject
@@ -110,7 +110,7 @@
 								<option id="com.renesas.cdt.rxc.HardwareDebug.StandardLibrary.option.address.2030989684" name="Address" superClass="com.renesas.cdt.rxc.HardwareDebug.StandardLibrary.option.address" value="00000000" valueType="string"/>
 								<option id="com.renesas.cdt.renesas.StandardLibrary.option.libConfiguration.365502198" name="Library configuration" superClass="com.renesas.cdt.renesas.StandardLibrary.option.libConfiguration" value="C(C89)" valueType="enumerated"/>
 								<option id="com.renesas.cdt.renesas.StandardLibrary.option.mathc89.1961101149" name="math.h (C89/C99): Mathematical/trigonometric operations (double-precision)" superClass="com.renesas.cdt.renesas.StandardLibrary.option.mathc89" value="true" valueType="boolean"/>
-								<option id="com.renesas.cdt.renesas.StandardLibrary.option.stdioc89.219852317" name="stdio.h (C89/C99): Input/Output" superClass="com.renesas.cdt.renesas.StandardLibrary.option.stdioc89" value="false" valueType="boolean"/>
+								<option id="com.renesas.cdt.renesas.StandardLibrary.option.stdioc89.219852317" name="stdio.h (C89/C99): Input/Output" superClass="com.renesas.cdt.renesas.StandardLibrary.option.stdioc89" value="true" valueType="boolean"/>
 								<option id="com.renesas.cdt.renesas.StandardLibrary.option.stdlibc89.603288235" name="stdlib.h (C89/C99): General purpose library features" superClass="com.renesas.cdt.renesas.StandardLibrary.option.stdlibc89" value="true" valueType="boolean"/>
 								<option id="com.renesas.cdt.renesas.StandardLibrary.option.stringc89.298274803" name="string.h (C89/C99): String handling operations" superClass="com.renesas.cdt.renesas.StandardLibrary.option.stringc89" value="true" valueType="boolean"/>
 								<option id="com.renesas.cdt.renesas.StandardLibrary.option.rxcnewCPP.207113089" name="new (EC++): Memory allocation and deallocation routines" superClass="com.renesas.cdt.renesas.StandardLibrary.option.rxcnewCPP" value="false" valueType="boolean"/>
@@ -119,6 +119,7 @@
 								<option id="com.renesas.cdt.rxc.HardwareDebug.StandardLibrary.option.isa.328950611" name="Instruction set architecture" superClass="com.renesas.cdt.rxc.HardwareDebug.StandardLibrary.option.isa" value="RXv2 architecture" valueType="enumerated"/>
 							</tool>
 							<tool command="rlink" errorParsers="" id="com.renesas.cdt.rxc.hardwaredebug.win32.tool.convertor.Id.1803349405" name="Converter" superClass="com.renesas.cdt.rxc.hardwaredebug.win32.tool.convertor.Id"/>
+							<tool id="com.renesas.cdt.rxc.release.win32.tool.config.Id.718394725" name="RTOS Configurator" superClass="com.renesas.cdt.rxc.release.win32.tool.config.Id"/>
 						</toolChain>
 					</folderInfo>
 					<folderInfo id="com.renesas.cdt.rxc.hardwaredebug.win32.configuration.Id.534038930.435561194" name="/" resourcePath="Source/Common_Demo_Source/Minimal">
@@ -134,6 +135,7 @@
 							<tool id="com.renesas.cdt.rxc.hardwaredebug.win32.tool.linker.Id.629169293" name="Linker" superClass="com.renesas.cdt.rxc.hardwaredebug.win32.tool.linker.Id.1242574850"/>
 							<tool errorParsers="" id="%com.renesas.cdt.rxc.hardwaredebug.win32.tool.libgen.Id.1105527095" name="Standard Library" superClass="%com.renesas.cdt.rxc.hardwaredebug.win32.tool.libgen.Id.1405860605"/>
 							<tool id="com.renesas.cdt.rxc.hardwaredebug.win32.tool.convertor.Id.794872766" name="Converter" superClass="com.renesas.cdt.rxc.hardwaredebug.win32.tool.convertor.Id.1803349405"/>
+							<tool id="com.renesas.cdt.rxc.release.win32.tool.config.Id.599503304" name="RTOS Configurator" superClass="com.renesas.cdt.rxc.release.win32.tool.config.Id"/>
 						</toolChain>
 					</folderInfo>
 					<sourceEntries>
@@ -151,5 +153,9 @@
 		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
 	</storageModule>
 	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
-	<storageModule moduleId="refreshScope"/>
+	<storageModule moduleId="refreshScope" versionNumber="2">
+		<configuration configurationName="HardwareDebug">
+			<resource resourceType="PROJECT" workspacePath="/RTOSDemo"/>
+		</configuration>
+	</storageModule>
 </cproject>
diff --git a/FreeRTOS/Demo/RX600_RX64M_RSK_Renesas_e2studio/.info b/FreeRTOS/Demo/RX600_RX64M_RSK_Renesas_e2studio/.info
index ca59635b9..0b4a0002c 100644
--- a/FreeRTOS/Demo/RX600_RX64M_RSK_Renesas_e2studio/.info
+++ b/FreeRTOS/Demo/RX600_RX64M_RSK_Renesas_e2studio/.info
@@ -1,6 +1,6 @@
 TOOL_CHAIN=Renesas RXC Toolchain
-VERSION=v2.01.00
-TC_INSTALL=C:\Devtools\Renesas\RX\2_1_0\
+VERSION=v2.08.01
+TC_INSTALL=C:\Program Files (x86)\Renesas\RX\2_8_1\
 VERSION_IDE=
+E2STUDIO_VERSION=3.1.0.24
 ACTIVE_CONFIGURATION=HardwareDebug
-E2STUDIO_VERSION=3.0.1.09
diff --git a/FreeRTOS/Demo/RX600_RX64M_RSK_Renesas_e2studio/.project b/FreeRTOS/Demo/RX600_RX64M_RSK_Renesas_e2studio/.project
index 0255a85f6..883ac38b1 100644
--- a/FreeRTOS/Demo/RX600_RX64M_RSK_Renesas_e2studio/.project
+++ b/FreeRTOS/Demo/RX600_RX64M_RSK_Renesas_e2studio/.project
@@ -35,6 +35,11 @@
 			<type>2</type>
 			<locationURI>virtual:/virtual</locationURI>
 		</link>
+		<link>
+			<name>Source/stream_buffer.c</name>
+			<type>1</type>
+			<locationURI>FREERTOS_ROOT/FreeRTOS/Source/stream_buffer.c</locationURI>
+		</link>
 		<link>
 			<name>Source/Common_Demo_Source/Minimal</name>
 			<type>2</type>
diff --git a/FreeRTOS/Demo/RX600_RX64M_RSK_Renesas_e2studio/Source/FreeRTOSConfig.h b/FreeRTOS/Demo/RX600_RX64M_RSK_Renesas_e2studio/Source/FreeRTOSConfig.h
index ce09cda75..039e107b6 100644
--- a/FreeRTOS/Demo/RX600_RX64M_RSK_Renesas_e2studio/Source/FreeRTOSConfig.h
+++ b/FreeRTOS/Demo/RX600_RX64M_RSK_Renesas_e2studio/Source/FreeRTOSConfig.h
@@ -67,6 +67,7 @@
 #define configUSE_COUNTING_SEMAPHORES	1
 #define configMAX_PRIORITIES			( 7 )
 #define configMAX_CO_ROUTINE_PRIORITIES ( 2 )
+#define configTASK_NOTIFICATION_ARRAY_ENTRIES ( 3 )
 
 /* Software timer definitions. */
 #define configUSE_TIMERS				1
diff --git a/FreeRTOS/Demo/RX600_RX64M_RSK_Renesas_e2studio/makefile.init b/FreeRTOS/Demo/RX600_RX64M_RSK_Renesas_e2studio/makefile.init
index 832f04a6a..e3c95e06a 100644
--- a/FreeRTOS/Demo/RX600_RX64M_RSK_Renesas_e2studio/makefile.init
+++ b/FreeRTOS/Demo/RX600_RX64M_RSK_Renesas_e2studio/makefile.init
@@ -2,7 +2,7 @@
 # Automatically-generated file. Do not edit!
 ################################################################################
 
-export INC_RX=C:\devtools\Renesas\RX\2_1_0\include
-export RXC_LIB=C:\devtools\Renesas\RX\2_1_0\bin
-export BIN_RX=C:\devtools\Renesas\RX\2_1_0\bin
-PATH := $(PATH):C:\devtools\Renesas\RX\2_1_0\bin
\ No newline at end of file
+export INC_RX=C:\PROGRA~2\Renesas\RX\2_8_1\include
+export RXC_LIB=C:\PROGRA~2\Renesas\RX\2_8_1\bin
+export BIN_RX=C:\PROGRA~2\Renesas\RX\2_8_1\bin
+PATH := $(PATH):C:\PROGRA~2\Renesas\RX\2_8_1\bin
\ No newline at end of file