Microsemi RISC-V project:

Reorganize project to separate Microsemi code into its own directory.
    Add many more demo and tests.

FreeRTOS/Demo/RISC-V_IGLOO2_Creative_SoftConsole/.cproject

@@ -113,19 +113,19 @@
                                     									
                                     <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}}&quot;"/>
                                     									
-                                    <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/drivers/CoreGPIO}&quot;"/>
+                                    <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Microsemi_Code/drivers/CoreGPIO}&quot;"/>
                                     									
-                                    <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/drivers/Core16550}&quot;"/>
+                                    <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Microsemi_Code/drivers/Core16550}&quot;"/>
                                     									
-                                    <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/drivers/CoreUARTapb}&quot;"/>
+                                    <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Microsemi_Code/drivers/CoreUARTapb}&quot;"/>
                                     									
-                                    <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/drivers/CoreTimer}&quot;"/>
+                                    <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Microsemi_Code/drivers/CoreTimer}&quot;"/>
                                     									
-                                    <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/drivers/CoreSPI}&quot;"/>
+                                    <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Microsemi_Code/drivers/CoreSPI}&quot;"/>
                                     									
-                                    <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/hal}&quot;"/>
+                                    <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Microsemi_Code/hal}&quot;"/>
                                     									
-                                    <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/riscv_hal}&quot;"/>
+                                    <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Microsemi_Code/riscv_hal}&quot;"/>
                                     								
                                 </option>
                                 								
@@ -153,7 +153,7 @@
                                 								
                                 <option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="ilg.gnumcueclipse.managedbuild.cross.riscv.option.c.linker.scriptfile.746597241" name="Script files (-T)" superClass="ilg.gnumcueclipse.managedbuild.cross.riscv.option.c.linker.scriptfile" useByScannerDiscovery="false" valueType="stringList">
                                     									
-                                    <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/riscv_hal/microsemi-riscv-ram.ld}&quot;"/>
+                                    <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Microsemi_Code/riscv_hal/microsemi-riscv-ram.ld}&quot;"/>
                                     								
                                 </option>
                                 								
@@ -177,7 +177,7 @@
                                 								
                                 <option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="ilg.gnumcueclipse.managedbuild.cross.riscv.option.cpp.linker.scriptfile.1026577013" name="Script files (-T)" superClass="ilg.gnumcueclipse.managedbuild.cross.riscv.option.cpp.linker.scriptfile" valueType="stringList">
                                     									
-                                    <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/riscv_hal/microsemi-riscv-ram.ld}&quot;"/>
+                                    <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Microsemi_Code/riscv_hal/microsemi-riscv-ram.ld}&quot;"/>
                                     								
                                 </option>
                                 								

FreeRTOS/Demo/RISC-V_IGLOO2_Creative_SoftConsole/.project

@@ -34,6 +34,11 @@
 			<type>2</type>
 			<locationURI>virtual:/virtual</locationURI>
 		</link>
+		<link>
+			<name>full_demo/common_demo_tasks/AbortDelay.c</name>
+			<type>1</type>
+			<locationURI>FREERTOS_ROOT/FreeRTOS/Demo/Common/Minimal/AbortDelay.c</locationURI>
+		</link>
 		<link>
 			<name>full_demo/common_demo_tasks/EventGroupsDemo.c</name>
 			<type>1</type>
@@ -44,6 +49,21 @@
 			<type>1</type>
 			<locationURI>FREERTOS_ROOT/FreeRTOS/Demo/Common/Minimal/GenQTest.c</locationURI>
 		</link>
+		<link>
+			<name>full_demo/common_demo_tasks/MessageBufferDemo.c</name>
+			<type>1</type>
+			<locationURI>FREERTOS_ROOT/FreeRTOS/Demo/Common/Minimal/MessageBufferDemo.c</locationURI>
+		</link>
+		<link>
+			<name>full_demo/common_demo_tasks/StreamBufferDemo.c</name>
+			<type>1</type>
+			<locationURI>FREERTOS_ROOT/FreeRTOS/Demo/Common/Minimal/StreamBufferDemo.c</locationURI>
+		</link>
+		<link>
+			<name>full_demo/common_demo_tasks/StreamBufferInterrupt.c</name>
+			<type>1</type>
+			<locationURI>FREERTOS_ROOT/FreeRTOS/Demo/Common/Minimal/StreamBufferInterrupt.c</locationURI>
+		</link>
 		<link>
 			<name>full_demo/common_demo_tasks/TaskNotify.c</name>
 			<type>1</type>
@@ -59,6 +79,16 @@
 			<type>1</type>
 			<locationURI>FREERTOS_ROOT/FreeRTOS/Demo/Common/Minimal/blocktim.c</locationURI>
 		</link>
+		<link>
+			<name>full_demo/common_demo_tasks/countsem.c</name>
+			<type>1</type>
+			<locationURI>FREERTOS_ROOT/FreeRTOS/Demo/Common/Minimal/countsem.c</locationURI>
+		</link>
+		<link>
+			<name>full_demo/common_demo_tasks/death.c</name>
+			<type>1</type>
+			<locationURI>FREERTOS_ROOT/FreeRTOS/Demo/Common/Minimal/death.c</locationURI>
+		</link>
 		<link>
 			<name>full_demo/common_demo_tasks/dynamic.c</name>
 			<type>1</type>

FreeRTOS/Demo/RISC-V_IGLOO2_Creative_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="-604317697749717917" 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="-564858745062802889" 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"/>
                 				

FreeRTOS/Demo/RISC-V_IGLOO2_Creative_SoftConsole/FreeRTOSConfig.h

@@ -94,8 +94,8 @@
 //#define configCPU_CLOCK_HZ				( ( unsigned long ) ( SYS_CLK_FREQ / 100 ) ) /*_RB_ Seems to be a factor of 100 between machine timer frequency and CPU frequency. */
 #define configTICK_RATE_HZ				( ( TickType_t ) 1000 )
 #define configMAX_PRIORITIES			( 5 )
-#define configMINIMAL_STACK_SIZE		( ( unsigned short ) 256 ) /* Can be as low as 60 but some of the demo tasks that use tis constant require it to be higher. */
-#define configTOTAL_HEAP_SIZE			( ( size_t ) ( 256 * 1024 ) )
+#define configMINIMAL_STACK_SIZE		( ( unsigned short ) 200 ) /* Can be as low as 60 but some of the demo tasks that use this constant require it to be higher. */
+#define configTOTAL_HEAP_SIZE			( ( size_t ) ( 300 * 1024 ) )
 #define configMAX_TASK_NAME_LEN			( 16 )
 #define configUSE_TRACE_FACILITY		0
 #define configUSE_16_BIT_TICKS			0
@@ -126,15 +126,18 @@
 
 /* Set the following definitions to 1 to include the API function, or zero
 to exclude the API function. */
-#define INCLUDE_vTaskPrioritySet		1
-#define INCLUDE_uxTaskPriorityGet		1
-#define INCLUDE_vTaskDelete				1
-#define INCLUDE_vTaskCleanUpResources	1
-#define INCLUDE_vTaskSuspend			1
-#define INCLUDE_vTaskDelayUntil			1
-#define INCLUDE_vTaskDelay				1
-#define INCLUDE_eTaskGetState			1
-#define INCLUDE_xTimerPendFunctionCall	1
+#define INCLUDE_vTaskPrioritySet			1
+#define INCLUDE_uxTaskPriorityGet			1
+#define INCLUDE_vTaskDelete					1
+#define INCLUDE_vTaskCleanUpResources		1
+#define INCLUDE_vTaskSuspend				1
+#define INCLUDE_vTaskDelayUntil				1
+#define INCLUDE_vTaskDelay					1
+#define INCLUDE_eTaskGetState				1
+#define INCLUDE_xTimerPendFunctionCall		1
+#define INCLUDE_xTaskAbortDelay				1
+#define INCLUDE_xTaskGetHandle				1
+#define INCLUDE_xSemaphoreGetMutexHolder	1
 
 /* Normal assert() semantics without relying on the provision of an assert.h
 header file. */

FreeRTOS/Demo/RISC-V_IGLOO2_Creative_SoftConsole/full_demo/main_full.c

@@ -78,9 +78,16 @@
 #include "TimerDemo.h"
 #include "EventGroupsDemo.h"
 #include "TaskNotify.h"
+#include "AbortDelay.h"
+#include "countsem.h"
+#include "death.h"
+#include "MessageBufferDemo.h"
+#include "StreamBufferDemo.h"
+#include "StreamBufferInterrupt.h"
 
 /* Priorities for the demo application tasks. */
 #define mainCHECK_TASK_PRIORITY				( configMAX_PRIORITIES - 1 )
+#define mainCREATOR_TASK_PRIORITY			( tskIDLE_PRIORITY + 3UL )
 
 /* The period of the check task, in ms, converted to ticks using the
 pdMS_TO_TICKS() macro.  mainNO_ERROR_CHECK_TASK_PERIOD is used if no errors have
@@ -155,6 +162,11 @@ void main_full( void )
 	vStartTimerDemoTask( mainTIMER_TEST_PERIOD );
 	vStartEventGroupTasks();
 	vStartTaskNotifyTask();
+	vCreateAbortDelayTasks();
+	vStartCountingSemaphoreTasks();
+	vStartMessageBufferTasks( configMINIMAL_STACK_SIZE  );
+	vStartStreamBufferTasks();
+	vStartStreamBufferInterruptDemo();
 
 	/* Create the register check tasks, as described at the top of this	file.
 	Use xTaskCreateStatic() to create a task using only statically allocated
@@ -171,6 +183,11 @@ void main_full( void )
 	the top of this file. */
 	xTaskCreate( prvCheckTask, "Check", mainCHECK_TASK_STACK_SIZE_WORDS, NULL, mainCHECK_TASK_PRIORITY, NULL );
 
+	/* The set of tasks created by the following function call have to be
+	created last as they keep account of the number of tasks they expect to see
+	running. */
+	vCreateSuicidalTasks( mainCREATOR_TASK_PRIORITY );
+
 	/* Start the scheduler. */
 	vTaskStartScheduler();
 
@@ -183,7 +200,7 @@ void main_full( void )
 	for( ;; );
 }
 /*-----------------------------------------------------------*/
-//int count = 0;
+
 static void prvCheckTask( void *pvParameters )
 {
 TickType_t xDelayPeriod = mainNO_ERROR_CHECK_TASK_PERIOD;
@@ -209,57 +226,76 @@ extern void vToggleLED( void );
 	doing gives visual feedback of the system status. */
 	for( ;; )
 	{
-//		if( ++count == 5 ) {taskENTER_CRITICAL();for(;;);}
 		/* Delay until it is time to execute again. */
 		vTaskDelayUntil( &xLastExecutionTime, xDelayPeriod );
 
-//		taskENTER_CRITICAL();
-//		for( int i = 0; i < 100; i++ )
-//		{
-//			for( int j = 0; j < 1000; j++ ) taskYIELD();
-//			taskEXIT_CRITICAL();
-//			vTaskDelay( 1 );
-//			taskENTER_CRITICAL();
-//		}
-//		taskEXIT_CRITICAL();
-
 		/* Check all the demo tasks (other than the flash tasks) to ensure
 		that they are all still running, and that none have detected an error. */
-		if( xAreDynamicPriorityTasksStillRunning() != pdTRUE )
+		if( xAreDynamicPriorityTasksStillRunning() == pdFALSE )
 		{
 			pcStatusMessage = "ERROR: Dynamic priority demo/tests.\r\n";
 		}
 
-		if ( xAreBlockTimeTestTasksStillRunning() != pdTRUE )
+		if ( xAreBlockTimeTestTasksStillRunning() == pdFALSE )
 		{
 			pcStatusMessage = "ERROR: Block time demo/tests.\r\n";
 		}
 
-		if ( xAreGenericQueueTasksStillRunning() != pdTRUE )
+		if ( xAreGenericQueueTasksStillRunning() == pdFALSE )
 		{
 			pcStatusMessage = "ERROR: Generic queue demo/tests.\r\n";
 		}
 
-		if ( xAreRecursiveMutexTasksStillRunning() != pdTRUE )
+		if ( xAreRecursiveMutexTasksStillRunning() == pdFALSE )
 		{
 			pcStatusMessage = "ERROR: Recursive mutex demo/tests.\r\n";
 		}
 
-		if( xAreTimerDemoTasksStillRunning( ( TickType_t ) xDelayPeriod ) != pdPASS )
+		if( xAreTimerDemoTasksStillRunning( ( TickType_t ) xDelayPeriod ) == pdFALSE )
 		{
 			pcStatusMessage = "ERROR: Timer demo/tests.\r\n";
 		}
 
-		if( xAreEventGroupTasksStillRunning() != pdPASS )
+		if( xAreEventGroupTasksStillRunning() == pdFALSE )
 		{
 			pcStatusMessage = "ERROR: Event group demo/tests.\r\n";
 		}
 
-		if( xAreTaskNotificationTasksStillRunning() != pdPASS )
+		if( xAreTaskNotificationTasksStillRunning() == pdFALSE )
 		{
 			pcStatusMessage = "ERROR: Task notification demo/tests.\r\n";
 		}
 
+		if( xAreAbortDelayTestTasksStillRunning() == pdFALSE )
+		{
+			pcStatusMessage = "ERROR: Abort delay.\r\n";
+		}
+
+		if( xAreCountingSemaphoreTasksStillRunning() == pdFALSE )
+		{
+			pcStatusMessage = "ERROR: Counting semaphores.\r\n";
+		}
+
+		if( xIsCreateTaskStillRunning() == pdFALSE )
+		{
+			pcStatusMessage = "ERROR: Suicide tasks.\r\n";
+		}
+
+		if( xAreMessageBufferTasksStillRunning() == pdFALSE )
+		{
+			pcStatusMessage = "ERROR: Message buffer.\r\n";
+		}
+
+		if( xAreStreamBufferTasksStillRunning() == pdFALSE )
+		{
+			pcStatusMessage = "ERROR: Stream buffer.\r\n";
+		}
+
+		if( xIsInterruptStreamBufferDemoStillRunning() == pdFALSE )
+		{
+			pcStatusMessage = "ERROR: Stream buffer interrupt.\r\n";
+		}
+
 		/* Check that the register test 1 task is still running. */
 		if( ulLastRegTest1Value == ulRegTest1LoopCounter )
 		{
@@ -275,7 +311,7 @@ extern void vToggleLED( void );
 		ulLastRegTest2Value = ulRegTest2LoopCounter;
 
 		/* Write the status message to the UART. */
-//		vSendString( pcStatusMessage );
+		vSendString( pcStatusMessage );
 		vToggleLED();
 
 		/* If an error has been found then increase the LED toggle rate by
@@ -326,9 +362,24 @@ static void prvRegTestTaskEntry2( void *pvParameters )
 
 void vFullDemoTickHook( void )
 {
-	/* Called from vApplicationTickHook() when the project is configured to
-	build the full demo. */
+	/* The full demo includes a software timer demo/test that requires
+	prodding periodically from the tick interrupt. */
 	vTimerPeriodicISRTests();
+
+	/* Call the periodic event group from ISR demo. */
 	vPeriodicEventGroupsProcessing();
+
+	/* Use task notifications from an interrupt. */
 	xNotifyTaskFromISR();
+
+	/* Writes to stream buffer byte by byte to test the stream buffer trigger
+	level functionality. */
+	vPeriodicStreamBufferProcessing();
+
+	/* Writes a string to a string buffer four bytes at a time to demonstrate
+	a stream being sent from an interrupt to a task. */
+	vBasicStreamBufferSendFromISR();
+
+	/* Called from vApplicationTickHook() when the project is configured to
+	build the full test/demo applications. */
 }

FreeRTOS/Demo/RISC-V_IGLOO2_Creative_SoftConsole/main.c

@@ -87,7 +87,7 @@ static gpio_instance_t g_gpio_out;
 
 int main( void )
 {
-//	prvSetupHardware();
+	prvSetupHardware();
 
 	/* The mainCREATE_SIMPLE_BLINKY_DEMO_ONLY setting is described at the top
 	of this file. */
@@ -144,11 +144,6 @@ void vApplicationMallocFailedHook( void )
 }
 /*-----------------------------------------------------------*/
 
-volatile uint64_t mtimer = 0, mcompare = 0;
-volatile uint32_t mstatus;
-static volatile uint64_t * const pulCompareLow = ( volatile uint64_t * const ) ( configCLINT_BASE_ADDRESS + 0x4000 );
-static volatile uint64_t * const pulTimeLow = ( volatile uint64_t * const ) ( configCLINT_BASE_ADDRESS + 0xBFF8 );
-
 void vApplicationIdleHook( void )
 {
 	/* vApplicationIdleHook() will only be called if configUSE_IDLE_HOOK is set
@@ -160,9 +155,6 @@ void vApplicationIdleHook( void )
 	important that vApplicationIdleHook() is permitted to return to its calling
 	function, because it is the responsibility of the idle task to clean up
 	memory allocated by the kernel to any task that has since been deleted. */
-	mstatus = read_csr( mstatus );
-	mtimer = *pulTimeLow;
-	mcompare = *pulCompareLow;
 }
 /*-----------------------------------------------------------*/